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
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
711e1fce0a
Fix pagination parameters in `GET /api/v2_alpha/notificatins` ( #31509 )
2024-08-20 13:54:08 +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
d2e4be0456
Hopefully fix notifications pagination flaky test ( #31494 )
2024-08-19 14:53:54 +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
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
da5b45a573
Add endpoints to accept and dismiss multiple notification requests at once ( #31242 )
2024-08-01 12:36:54 +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
1f796d129d
Merge commit '598ae4f2da86029b1c3c3e35e64b89873037b598' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes/api.rb`:
Upstream added an endpoint, textually close to a glitch-soc-only endpoint.
Ported upstream changes.
2024-07-30 20:47:34 +02:00
598ae4f2da
Add endpoints for unread notifications count ( #31191 )
2024-07-30 08:39:11 +00:00
c546757cd1
Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream
2024-07-16 17:54:36 +02:00
aa88aca0ad
Add optional OAuth application to reports ( #30539 )
2024-07-16 13:23:08 +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
edec2e9fdf
Merge commit '00cb4a0313190bfa118966692a649db9c8328094' into glitch-soc/merge-upstream
2024-07-14 18:43:35 +02:00
35a437a03f
Destroy `NotificationRequest`s that are dismissed ( #31008 )
2024-07-12 12:09:52 +00:00
55cf5e0188
Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream
2024-07-12 13:41:54 +02:00
43e24dbb13
Use `include_pagination_headers` in more places ( #30999 )
2024-07-12 08:30:52 +00:00
388672ff0d
Merge commit '967505ee9bcacf0e5189aa06c654ff586c198a46' into glitch-soc/merge-upstream
2024-07-09 20:39:09 +02:00
3875bd138d
Fix HTTP 500 in `/api/v1/polls/:id/votes` ( #25598 )
2024-07-09 12:41:49 +00:00
6a55232988
Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream
2024-07-08 19:41:14 +02:00
f1300ad284
Rename jobs/attachments rspec tag names ( #29762 )
2024-07-08 16:01:08 +00:00
e61a7794f8
Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Conflict because glitch-soc has a different list of allowed tags.
Added upstream's new allowed tags while keeping ours.
- `spec/requests/api/v1/timelines/public_spec.rb`:
Conflict because of glitch-soc's default settings.
Updated accordingly.
2024-07-04 17:12:14 +02:00
502cf75b16
Merge pull request from GHSA-58x8-3qxw-6hm7
...
* Fix insufficient permission checking for public timeline endpoints
Note that this changes unauthenticated access failure code from 401 to 422
* Add more tests for public timelines
* Require user token in `/api/v1/statuses/:id/translate` and `/api/v1/scheduled_statuses`
2024-07-04 16:26:49 +02:00
b0c979af49
Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-soc/merge-upstream
2024-06-18 18:20:36 +02:00
58ace2e45e
Fix SQL error in admin measures API ( #30753 )
2024-06-18 16:04:58 +00:00
677f73f793
Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream
2024-06-17 13:41:58 +02:00
45abddb302
Fix pagination attributes not being returned in ungroupable-only pages ( #30688 )
2024-06-13 14:10:34 +00:00
4daed855e5
Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream
2024-06-11 19:46:11 +02:00
b2496177e0
Use correct params in `v1/admin/domain_allows` spec ( #30378 )
2024-06-11 07:35:30 +00:00
be68f8f4af
Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream
2024-06-10 18:20:08 +02:00
77c2216e47
fix: Return HTTP 422 when scheduled status time is less than 5 minutes ( #30584 )
2024-06-10 13:33:48 +00:00
7277d2f130
Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream
2024-06-07 20:30:51 +02:00
07cc94e05f
Use `sidekiq_inline` in requests/api/v1/admin/account_actions spec ( #30563 )
2024-06-06 14:19:22 +00:00
9b9b0e25b6
Use `sidekiq_inline` in requests/api/v1/reports spec ( #30564 )
2024-06-06 14:14:33 +00:00
578b0eae7d
Fix /api/v1/timelines/link specs for glitch-soc default settings
2024-06-06 12:52:15 +02:00
30b00ca2b5
Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream
2024-06-06 12:27:26 +02:00
a2505e8611
Add timeline of public posts about a trending link to REST API ( #30381 )
2024-06-06 08:43:04 +00:00
e02d23b549
Change `read:me` scope to `profile` scope ( #30357 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-06 07:30:10 +00:00
4655be0da6
Fix add validation to webpush subscription keys ( #30542 )
2024-06-05 19:16:47 +00:00
eef2cc054f
Add url validation to Web::PushSubscription endpoints ( #30540 )
2024-06-05 08:06:06 +00: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
Claire