Claire
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
Matt Jankowski
a7dbf6f5a5
Use heredoc/squish for inline css styles in oembed serializer ( #31991 )
2024-09-20 12:50:51 +00:00
Matt Jankowski
bdf83c353f
Move default embed size knowledge into `OEmbedSerializer` ( #31990 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-20 12:39:48 +00:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code ( #31193 )
2024-09-18 09:27:43 +00:00
Claire
6de18bb475
Merge commit '3e91c101b3c4b5166dab778837e38bed424b4333' into glitch-soc/merge-upstream
2024-09-17 17:54:00 +02:00
Claire
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
Claire
c620452fd7
Enable grouped notifications unconditionally ( #31929 )
2024-09-16 13:12:10 +00:00
Claire
e0648a916a
Rename `/api/v2_alpha/notifications*` to `/api/v2/notifications*` ( #31840 )
2024-09-16 12:10:02 +00:00
Claire
3465d39494
Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Upstream removed a helper, textually adjacent to a glitch-soc-only one.
Not really a conflict.
Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to theming system.
Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
Removed upstream, but we had local changes.
Removed as upstream did.
2024-09-12 20:05:08 +02:00
Eugen Rochko
24ef8255b3
Change design of embed modal in web UI ( #31801 )
2024-09-12 12:54:16 +00:00
Claire
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02:00
Eugen Rochko
3d46f47817
Change embedded posts to use web UI ( #31766 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 09:41:19 +00:00
Eugen Rochko
e0c27a5047
Add ability to manage which websites can credit you in link previews ( #31819 )
2024-09-10 12:00:40 +00:00
Claire
402c1e116d
Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream
2024-09-02 17:43:10 +02:00
Claire
a23b3747ac
Fix N+1s in grouped notifications ( #31638 )
2024-09-02 09:56:00 +00:00
Claire
6f35e93f72
Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream
2024-08-31 16:06:04 +02:00
Matt Jankowski
662f87dbe9
Use `MediaAttachment.supported_mime_types` method where relevant ( #31635 )
2024-08-29 08:52:29 +00:00
Claire
94d8cdc494
Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream
2024-08-27 20:00:07 +02:00
Claire
c73868cd78
Add ability for admins to force grouped notifications in web UI ( #31610 )
2024-08-27 14:55:51 +00:00
Claire
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
Renaud Chaput
4a968cb7a9
Add `icon` field to instance endpoint ( #30205 )
2024-08-22 10:04:27 +00:00
Claire
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
Claire
19a1acb38b
Add `api_versions` to `/api/v2/instance` ( #31354 )
2024-08-21 14:54:59 +00:00
Claire
31a00c0c1a
Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream
2024-08-09 17:15:32 +02:00
Claire
cbdd8edf68
Revamp notification policy options ( #31343 )
2024-08-09 13:30:55 +00:00
Claire
08adca0c63
Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream
2024-08-06 17:27:48 +02:00
Claire
438dac99d6
Add option to request partial accounts in grouped notifications API ( #31299 )
2024-08-06 12:09:35 +00:00
Claire
8dd671a977
Merge commit 'a50c8e951f03a8eb53957ad1c3703155b223ed24' into glitch-soc/merge-upstream
2024-07-31 18:16:01 +02:00
Claire
549ab089ee
Change grouped notifications API shape (take 2) ( #31214 )
2024-07-31 10:50:13 +00:00
Claire
fb411b6d0f
Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream
2024-07-27 13:19:38 +02:00
Emelia Smith
693d9b03ed
Enable OAuth PKCE Extension ( #31129 )
2024-07-26 08:53:10 +00:00
Claire
c75fe09e2b
Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream
2024-07-18 17:56:25 +02:00
Renaud Chaput
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
Claire
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
Claire
1dd8262071
Add optional `filtered` attribute to notification entities in REST API ( #31011 )
2024-07-15 09:29:57 +00:00
Claire
55cf5e0188
Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream
2024-07-12 13:41:54 +02:00
Claire
ad52b04a1c
Add setting to disable hover cards ( #30931 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2024-07-11 19:42:58 +00:00
Claire
d2aea85e6c
Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream
2024-06-30 11:25:40 +02:00
Eugen Rochko
096057b845
Change `author_account` to be `authors` in REST API ( #30846 )
2024-06-27 13:17:18 +00:00
Claire
3b4607991d
Merge commit '4743657ba24e83c376e9f477fbf49114e6f09a57' into glitch-soc/merge-upstream
2024-06-22 20:59:23 +02:00
Matt Jankowski
348ccf206e
Fix `Style/ClassEqualityComparison` cop ( #30058 )
2024-06-21 15:33:55 +00:00
Claire
04e57efa55
Merge commit '27529247b289a0e78d2deb97626ddb60baf04d86' into glitch-soc/merge-upstream
2024-06-20 13:57:08 +02:00
Claire
7889e983fb
Add `group_key` attribute to `NotificationSerializer` ( #30776 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-06-20 11:05:25 +00:00
Claire
b0c979af49
Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-soc/merge-upstream
2024-06-18 18:20:36 +02:00
Renaud Chaput
d558dfd77d
Convert notifications policies frontend code to Typescript ( #29868 )
2024-06-18 13:23:30 +00:00
Claire
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
Claire
677f73f793
Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream
2024-06-17 13:41:58 +02:00
Claire
8eb27c60e1
Add `most_recent_notification_id` to `NotificationGroup` ( #30707 )
2024-06-14 10:33:06 +00:00
Claire
45abddb302
Fix pagination attributes not being returned in ungroupable-only pages ( #30688 )
2024-06-13 14:10:34 +00:00
Claire
7277d2f130
Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream
2024-06-07 20:30:51 +02:00