221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
5405bdd344
Remove unused E2EE messaging code ( #31193 )
2024-09-18 09:27:43 +00:00
665e9129fe
Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/custom_emoji.rb`:
An upstream refactor touched lines adjacent to ones modified in glitch-soc.
Ported upstream's changes.
2024-09-16 21:08:58 +02:00
e0648a916a
Rename `/api/v2_alpha/notifications*` to `/api/v2/notifications*` ( #31840 )
2024-09-16 12:10:02 +00:00
402c1e116d
Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream
2024-09-02 17:43:10 +02:00
a23b3747ac
Fix N+1s in grouped notifications ( #31638 )
2024-09-02 09:56:00 +00:00
6f35e93f72
Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream
2024-08-31 16:06:04 +02:00
662f87dbe9
Use `MediaAttachment.supported_mime_types` method where relevant ( #31635 )
2024-08-29 08:52:29 +00: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
4a968cb7a9
Add `icon` field to instance endpoint ( #30205 )
2024-08-22 10:04:27 +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
19a1acb38b
Add `api_versions` to `/api/v2/instance` ( #31354 )
2024-08-21 14:54:59 +00:00
31a00c0c1a
Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream
2024-08-09 17:15:32 +02:00
cbdd8edf68
Revamp notification policy options ( #31343 )
2024-08-09 13:30:55 +00:00
08adca0c63
Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream
2024-08-06 17:27:48 +02:00
438dac99d6
Add option to request partial accounts in grouped notifications API ( #31299 )
2024-08-06 12:09:35 +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
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
64b2c712d4
Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Conflict because upstream refactored theme-related code, and glitch-soc has
a different theming system.
2024-07-15 18:51:38 +02:00
1dd8262071
Add optional `filtered` attribute to notification entities in REST API ( #31011 )
2024-07-15 09:29:57 +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
04e57efa55
Merge commit '27529247b289a0e78d2deb97626ddb60baf04d86' into glitch-soc/merge-upstream
2024-06-20 13:57:08 +02:00
7889e983fb
Add `group_key` attribute to `NotificationSerializer` ( #30776 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-06-20 11:05:25 +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
395b9011ee
Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Not a real conflict, just upstream adding a method textually adjacent to
glitch-soc only code.
Ported upstream's change.
2024-06-17 18:30:28 +02:00
677f73f793
Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream
2024-06-17 13:41:58 +02:00
8eb27c60e1
Add `most_recent_notification_id` to `NotificationGroup` ( #30707 )
2024-06-14 10:33:06 +00:00
45abddb302
Fix pagination attributes not being returned in ungroupable-only pages ( #30688 )
2024-06-13 14:10:34 +00:00
7277d2f130
Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream
2024-06-07 20:30:51 +02:00
1ffc293b86
Add missing `moderation_warning` notification support to grouped notifications API ( #30576 )
2024-06-06 14:12:06 +00:00
30b00ca2b5
Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream
2024-06-06 12:27:26 +02:00
974335e414
Add experimental server-side notification grouping ( #29889 )
2024-06-03 08:35:59 +00:00
c827a98f19
Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Not a real conflict, just a line adjacent to a glitch-soc only dependency
getting updated.
Updated dependencies as upstream did.
2024-05-29 17:03:24 +02:00
128987eded
Add support for `fediverse:creator` OpenGraph tag ( #30398 )
2024-05-29 01:34:33 +02:00
c61e356475
Add `Status::MEDIA_ATTACHMENTS_LIMIT` configuration constant ( #30433 )
2024-05-27 09:49:44 +00:00
e46321e63d
Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream
2024-05-20 12:17:36 +02:00
2da2a1dae9
Support multiple redirect_uris when creating OAuth 2.0 Applications ( #29192 )
2024-05-17 13:46:12 +00:00
d6f9c97ae4
Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream
2024-05-04 15:24:22 +02:00
360590ecd8
Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/accounts_controller.rb`:
Conflict due to glitch-soc's local-only posting feature.
Refactored as upstream did but kept local changes.
- `app/lib/account_statuses_filter.rb`:
Conflict due to glitch-soc's local-only posting feature.
Refactored as upstream did but kept local changes.
2024-05-01 19:30:41 +02:00
15f6d2d038
Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
Conflict due to glitch-soc having a different default site name.
Updated the tests as upstream did, keeping glitch-soc's default name.
2024-05-01 17:22:02 +02:00
2c386d4cfe
Merge commit 'c70c39cad03824c64564fa7d241e6bf01acbab76' into glitch-soc/merge-upstream
2024-05-01 17:06:49 +02:00
3f61981f5d
Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream
2024-05-01 14:50:16 +02:00
4ef0b48b95
Add in-app notifications for moderation actions/warnings ( #30065 )
2024-04-25 17:26:05 +00:00
fc89ecc6ca
Change `/api/v1/announcements` to return regular `Status` entities ( #26736 )
2024-04-17 09:06:23 +00:00
777984faeb
Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream
2024-04-06 20:34:07 +02:00
67842ffb22
Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream
2024-04-06 19:54:11 +02:00
Claire
Matt Jankowski
Renaud Chaput
Eugen Rochko
Emelia Smith