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
11b8017b45
Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream
2024-08-26 18:52:33 +02:00
e38ce3beb7
Fix spurious loading bar middleware usage ( #31592 )
2024-08-26 16:38:34 +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
d67e11733e
Add automatic notification polling for grouped notifications ( #31513 )
2024-08-21 14:41:31 +00:00
01a757d306
Fix boost dialog visibility selection not being taken into account ( #31523 )
2024-08-21 13:11:36 +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
9ba7c90151
Fix non-grouped notifications not loading on page load ( #31514 )
2024-08-20 16:18:33 +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
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
83480df820
Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added `<s>` to the list of allowed tags, the conflict is because
we have a different list of allowed tags.
Added `<s>` like upstream did.
2024-08-12 17:46:24 +02:00
a7b718c31a
Fix all streamed notification types being stored without filtering ( #31384 )
2024-08-12 13:40:29 +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
8dd671a977
Merge commit 'a50c8e951f03a8eb53957ad1c3703155b223ed24' into glitch-soc/merge-upstream
2024-07-31 18:16:01 +02:00
549ab089ee
Change grouped notifications API shape (take 2) ( #31214 )
2024-07-31 10:50:13 +00:00
fb411b6d0f
Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream
2024-07-27 13:19:38 +02:00
dfd43869c9
Decrease count of filtered notifications when notification requests are accepted or dismissed ( #31149 )
2024-07-26 09:36:54 +00:00
68000956f4
Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream
2024-07-23 19:31:23 +02:00
af06d74574
Fix keyboard shortcuts and navigation in grouped notifications ( #31076 )
2024-07-23 06:20:17 +00:00
dcfcfdcb14
Merge commit '55705d8191f31c1089095956fb4124f7505b4bd7' into glitch-soc/merge-upstream
2024-07-22 21:41:31 +02:00
55705d8191
Fix reblogging after refactor ( #31105 )
2024-07-22 19:30:06 +00:00
9cb9427133
Refactor CW handling in an action ( #31103 )
2024-07-22 16:03:58 +00:00
03dea64b79
Refactor code for reblogging and favouriting ( #31102 )
2024-07-22 15:45:07 +00:00
f7598b267b
Merge commit '0397df9bef82042221f35e9938ad5b917fa1d4fc' into glitch-soc/merge-upstream
2024-07-19 17:45:19 +02:00
e768b23aa9
Remove routerHistory parameters from composer actions ( #31077 )
2024-07-19 15:26:44 +00:00
c75fe09e2b
Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream
2024-07-18 17:56:25 +02:00
f587ff643f
Grouped Notifications UI ( #30440 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-07-18 14:36:09 +00:00
6a55232988
Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream
2024-07-08 19:41:14 +02:00
36d819bef3
Change to use an unified constant for max media attachments per status ( #29073 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-07-08 08:10:57 +00:00
92dcc50278
Merge commit 'd3f504245cab5a9a0e89262e0a1398d035dffac9' into glitch-soc/merge-upstream
2024-07-01 20:45:13 +02:00
20fa9ce484
Add timeline of public posts about a trending link in web UI ( #30840 )
2024-07-01 14:45:48 +00:00
d2aea85e6c
Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream
2024-06-30 11:25:40 +02:00
096057b845
Change `author_account` to be `authors` in REST API ( #30846 )
2024-06-27 13:17:18 +00:00
863c470a2b
Convert `<Directory>` to Typescript / function component ( #30829 )
2024-06-26 18:04:50 +00:00
6300273664
Merge commit '9e932fa1ddaea569ca52fe663eb4bb13a5a43e0a' into glitch-soc/merge-upstream
2024-06-21 12:02:42 +02:00
7d12522ed7
Fix error when deleting a status ( #30784 )
2024-06-20 22:39:06 +00:00
fd867adffe
Merge commit 'bb2d77b4a07e95e7d96df080f2d6994c1422b0c0' into glitch-soc/merge-upstream
2024-06-20 18:36:13 +02:00
1c65932776
Convert `disconnectTimeline` and `timelineDelete` actions to Typescript ( #30777 )
2024-06-20 11:56:52 +00:00
b0c979af49
Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-soc/merge-upstream
2024-06-18 18:20:36 +02:00
d558dfd77d
Convert notifications policies frontend code to Typescript ( #29868 )
2024-06-18 13:23:30 +00:00
677f73f793
Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream
2024-06-17 13:41:58 +02:00
ed6d24330b
Add author links on the explore page in web UI ( #30521 )
2024-06-13 13:04:16 +00:00
51631c785f
Merge commit 'b6fd14f0e2842eca269ef8962e3c5bd560a76357' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
Glitch-soc had changes to adjacent lines.
Ported upstream's changes.
2024-05-23 20:30:23 +02:00
b6fd14f0e2
Fix `createDataLoadingThunk` and related actions ( #30408 )
2024-05-23 18:22:42 +00:00
10ec421dd4
Proposal: a modern & typed way of writing Redux actions doing API requests ( #30270 )
2024-05-23 09:50:13 +00:00
Claire
KMY（雪あすか）
Renaud Chaput
David Roetzel
Tianwei Dong
Eugen Rochko