| Age | Commit message (Collapse) | Author |
|---|
|
Conflicts:
- `config/locales/en.yml`
No real conflict, upstream added a translatable string “too close” to
one specific to glitch-soc
- `lib/mastodon/statuses_cli.rb`
Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses
- `package.json`
No real conflict, additional dependency in glitch-soc
|
|
Fixes #12607
`will-change: transform` apparently makes manual scrolling impossible on
Firefox/Windows. While this should probably be considered a Firefox bug,
`will-change: transform` seem like a very aggressive performance hint that
may possibly make the browser consume more resources than needed, especially
in multiple-column mode.
This was originally added to improve scrolling performances on mobile, but
I think this isn't necessary anymore, because of the two following reasons:
- `contain: paint` (which is implied by `contain: strict`, which we apply
whenever the browser supports grids) should have similar effects
- in single-column mode, the scrolling container is the root element, which
I believe is optimized in at least Chromium
Keep in mind that I have not been able to make in-depth benchmarks, and
especially not been able to try on mobile, so performances should probably
be investigated further…
|
|
|
|
|
|
|
|
* Move resolved button to the heading
This is one of the commits on improving overall reports page structure.
It changes where resolved button is located, moving it to the heading,
right next to the "Report #n" header, so-called "hot-place" to look at.
To accomplish this we have to declare one more content variable, change
admin dashboard template to respect it and CSS files for minor styling,
so buttons are inlined and centrally aligned according to the heading.
* Move actions buttons below the report table
I believe that actions to react on report should not be located at the
top of the page, instead they should be either after the table or
reporter's comment. This is just a logical sign that you should not
react to the report without reading all the details first.
|
|
|
|
|
|
Conflicts:
- app/controllers/application_controller.rb
Minor conflict due to glitch-soc's theming system
|
|
This reverts commit 054ef83fc5808596643dd366286b4e85446b850c.
|
|
|
|
Port eb551c480d4c687d75d6bc94915adfcd8aae93fb to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port f43f1e01840cd0bad7a88c90d9ea44b183a2a15d to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port c05ed8a6254bc82fda3ae0fd3934dc2cdcf7c82d to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 911cc144815babf83ddf99f2daa3682021d401b8 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port f92ed32df4489210ab0ef557f1df90bc5e97d8e6 to glitch-soc
Co-authored-by: hina <hina@hinaloe.net>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Conflicts:
- package.json
Not really a conflict, caused by an additional dependency in glitch-soc.
- yarn.lock
Not really a conflict, caused by an additional dependency in glitch-soc.
|
|
|
|
|
|
* Show badge on group actor in WebUI
* Do not notify in case of by following group actor
* If you mention group actor, also mention group actor followers
* Relax characters that can be used in username (same as Application)
* Revert "Relax characters that can be used in username (same as Application)"
This reverts commit 7e10a137b878d0db1b5252c52106faef5e09ca4b.
* Delete display_name method
|
|
* Update stream.js
* Update package.json
* Update yarn.lock
Co-authored-by: hina <hina@hinaloe.net>
|
|
* Fix poll options not being selectable via keyboard
Fixes #12384
* Improve styling of poll option checkboxes/radio buttons
* Use more appropriate ARIA roles for poll options
* Allow switching between single and multiple choice from keyboard
* Coding style
* Avoid using .bind()
|
|
Fixes #12511
|
|
* Fix translations not being displayed
* ran `yarn manage:translations en`
|
|
* Add follow_request notification type
The notification type already existed in the backend but was never pushed
to the front-end. This also means translation strings were also available
for the backend, from the notification mailer.
Unlike other notification types, these are off by default, to match what
I remember of Gargron's view on the topic: that follow requests should not
clutter notifications and should instead be reviewed at the user's own
leisure in the dedicated column.
Since follow requests have their own column, I've deemed it unnecessary to
add a specific tab for them in the notification quick filter.
* Show follow request link in single-column if there are pending requests, even if account isn't locked
* Push follow requests from notifications to the follow_requests list
* Offer to accept or reject follow request from the notification
* Redesign follow request notification
|
|
Fix ed73376f1ca7ef5e254a3ec21e1ead85b2d34fd6 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 35b142a7ad19821483f900e81e915a7925fd4eaf to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
|
|
* Fix lost focus after modal closes
Regression caused by the use of the wicg-inert polyfill
* Fix regression introduced by wicg-inert
* Catch errors to please CodeClimate
|
|
Port b532ead798c481fd03be9eb78e910d62654cdaa8 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port a690b3e470ed85cc6f3f8fa7aec57d04b60a4705 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 667708f5b00ee8b7795eacd9c20d29f77c8ae602 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port e7a7f88df7a763be6dad3a982829ef5a1b1dea09 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Counter size is currently set to strict 33.3% width, but with it
counter may break in other languages than English. For example it is
already broken on Gargron's profile on mastodon.social using Russian
locale.
This commit changes "width" to "min-width", so counters still displayed
correctly, but if they need more width to fit text, they are now allowed
to take as many width as they need.
|
|
* [WiP] Add hotkey to open media
* Give focus to play/pause button when opening video modal
|
|
The arguments were passed to the wrong function… also, there is no
need to have a conditional decrementation: failure to upload means
we marked an upload as pending, in all cases.
|
|
|
|
|
|
|
|
|
|
Port SCSS changes from 42b3b019e01ee0c290a510483a2400e85cc250f1 to glitch flavour
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port e86234b1e90975de6e507a86549f0eb4600c723b to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
|
|
* Fix closed registration message blur
* Adjust overlay margins to account for blur
Fixes #12425
|
|
“Describe for the visually impaired” makes no sense when the uploaded media
is an audio file.
|
|
community timelines
Port 0d6da8892a675962f8e7fe1f1edc960c4a0ce36d to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Conflicts:
- README.md
discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
finally merged upstream, some code style fixes
and slightly changed pagination code
- app/controllers/application_controller.rb
changed upstream to always return HTML error pages
slight conflict caused by theming code
- app/models/bookmark.rb
finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
finally merged upstream, slightly changed pagination code
|
