6f35e93f72
Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream
2024-08-31 16:06:04 +02:00
3ddeaca863
Change background color of notifications on private messages ( #31657 )
2024-08-30 09:42:48 +00:00
35538fe694
Fix inconsistencies between code and notification source translation strings ( #31658 )
2024-08-30 09:37:39 +00:00
3c412578c9
update: max_media_attachments follow server advertised value ( #31616 )
2024-08-28 09:28:48 +00:00
94d8cdc494
Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream
2024-08-27 20:00:07 +02:00
c73868cd78
Add ability for admins to force grouped notifications in web UI ( #31610 )
2024-08-27 14:55:51 +00:00
29b9642b31
Change design of boost modal in web UI ( #31555 )
2024-08-26 17:12:17 +00:00
d820c0883d
Add quick links to Administration and Moderation Reports from Web UI ( #24838 )
2024-08-26 16:42:46 +00:00
dc70ef25b2
Merge commit 'e08d22724d9baf6c639466507c2b117788e5b8de' into glitch-soc/merge-upstream
2024-08-22 22:09:10 +02:00
18556d3e9b
Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream refactored some helpers and moved them in another file.
Not a real conflict, but glitch-soc had adjacent glitch-only definitions.
Kept glitch-soc definitions where they are and moved upstream ones
as upstream did.
2024-08-22 19:54:20 +02:00
500f4925a5
Change how content warnings and filters are displayed in web UI ( #31365 )
2024-08-22 17:12:35 +00:00
abe292b0ec
Hide multiple selection bar for notification requests when no notificion requests are loaded ( #31540 )
2024-08-22 13:42:02 +00:00
0cec9077a4
Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
Upstream added a test for a new attribute, next to a line we modified
in glitch-soc because of a different default value.
Updated as upstream's did, keeping glitch-soc's default value.
2024-08-21 18:44:21 +02:00
8c7642cd18
Change translation strings of grouped notification label to have full context ( #31486 )
2024-08-21 08:56:36 +00:00
b06c7b6b5a
Change hints for missing remote content in web UI ( #31516 )
2024-08-21 07:08:58 +00:00
f5c0c32edd
Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/material-icons/400-24px/chat.svg`:
Glitch-soc used this one but not upstream.
Upstream pulled a presumably more up-to-date version of the file.
Switched to upstream's version.
- `app/views/layouts/application.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/embedded.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/error.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
2024-08-20 18:31:50 +02:00
98bf2fc27c
Improve the list selection UI for notification requests ( #31457 )
2024-08-19 22:11:58 +00:00
1760f84349
Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream
2024-08-19 18:25:31 +02:00
53c183f899
Reload notifications when accepted notifications are merged (streaming only) ( #31419 )
2024-08-19 15:59:06 +00:00
1e612c5a09
Refactor some actions to be proper async actions instead of passing a continuation ( #31453 )
2024-08-19 14:41:32 +00:00
3ea00508ac
Merge commit '2d589a5ed445b474ab7cec27b0db2a331ed7bd49' into glitch-soc/merge-upstream
2024-08-16 20:06:59 +02:00
32a78e56e0
Add a follow button & follower count on follow notifications ( #31433 )
2024-08-16 10:00:59 +00:00
169b35869f
Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream
2024-08-14 21:17:43 +02:00
0d85a79f19
Fix notification screen crashing in rare cases where the status no longer exists ( #31403 )
2024-08-14 06:47:15 +00:00
12582d095e
Fix styling of notification browser permission denied banner ( #31406 )
2024-08-13 19:32:27 +00:00
c3e1d86d58
Fix log out from user menu not working on Safari ( #31402 )
2024-08-13 17:49:23 +00:00
7e501c59c2
Add a border above the timeline hint for statuses with replies ( #31387 )
2024-08-13 07:14:41 +00:00
f441b280dc
Merge commit '85152af95f51642bcef0ba781a1e7213d79e8f03' into glitch-soc/merge-upstream
2024-08-11 21:05:09 +02:00
19dbc74d82
Fix typos in localisation from #31342 ( #31369 )
2024-08-10 18:14:37 +00:00
f43a4842f7
Merge commit '28411acebb5626acf43b44a7b6c33ac783156f72' into glitch-soc/merge-upstream
2024-08-09 18:51:31 +02:00
28411acebb
Fix “Accept all”/“Dismiss all” notification requests not working ( #31358 )
2024-08-09 16:40:15 +00:00
bcec8f53a4
Add hint to user that other remote statuses may not be displayed ( #26910 )
2024-08-09 16:12:51 +00:00
31a00c0c1a
Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream
2024-08-09 17:15:32 +02:00
658addcbf7
Add ability to report, block and mute from notification requests list ( #31309 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-08-09 14:56:39 +00:00
1701575704
Add option to ignore filtered notifications to the web interface ( #31342 )
2024-08-09 14:21:55 +00:00
6ca731e9b6
Change unread notification count to only cover the selected notification type ( #31326 )
2024-08-08 20:20:52 +00:00
2095d0f2b0
Update notification labels for mentions ( #31304 )
2024-08-08 20:20:35 +00:00
dd2a991e24
Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/material-icons/400-24px/code.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/mail.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/manufacturing.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/views/admin/settings/shared/_links.html.haml`:
Glitch-soc had extra menu items, ported the changes for them too.
- `config/navigation.rb`:
Glitch-soc had extra menu items, ported the changes for them too.
2024-08-08 19:30:16 +02:00
2edae5ea28
Convert PrivacyDropdownMenu to Typescript and generalize it to DropdownSelector component ( #31338 )
2024-08-08 10:57:21 +00:00
ac9040b76b
Add explainer for filtered notifications from limited accounts ( #31331 )
2024-08-08 09:16:33 +00:00
f8629367d2
Add unchangeable filtered notification setting for limited accounts ( #31324 )
2024-08-07 23:09:30 +00:00
06e034db15
Merge commit '670e4655d13975e0597bd1c74ebeeeeffc4edc37' into glitch-soc/merge-upstream
2024-08-07 19:22:25 +02:00
6f285bb2a6
Change group notifications unread markers to only be cleared when focusing/navigating again ( #31325 )
2024-08-07 11:12:42 +00:00
08adca0c63
Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream
2024-08-06 17:27:48 +02:00
97b9e8befd
Add account notes to hover cards ( #31300 )
2024-08-06 06:53:59 +00:00
19f4aa1147
Fix typo in english message (filtred => filtered) ( #31273 )
2024-08-02 19:55:13 +00:00
e67e07211f
Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
to glitch-soc-only dependency `atrament`.
Removed direct dependency on `autoprefixer`.
- `yarn.lock`:
Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
to glitch-soc-only dependency `atrament`.
Removed direct dependency on `autoprefixer`.
2024-08-02 18:09:48 +02:00
ad95c98054
Further de-emphasize filtered notifications banner and add setting to minimize it ( #31250 )
2024-08-02 14:59:37 +00:00
cc453f2221
Change the filtered notification count to be in the account avatar ( #31262 )
2024-08-02 13:18:19 +00:00
8dd671a977
Merge commit 'a50c8e951f03a8eb53957ad1c3703155b223ed24' into glitch-soc/merge-upstream
2024-07-31 18:16:01 +02:00
Claire
HolgerHuo
Eugen Rochko
Emelia Smith
mogaminsk
Renaud Chaput
Travis Briggs