sd/chuckya-fe-standalone
2
0
Fork 0
Code Pull requests Activity
23,227 commits 2 branches 0 tags 263 MiB
Commit graph

1,030 commits

Author SHA1 Message Date
Essem
2f50bcafc8
 		Merge remote-tracking branch 'upstream/main' 2024-07-24 23:04:49 -05:00
Claire
f7598b267b Merge commit '0397df9bef' into glitch-soc/merge-upstream 2024-07-19 17:45:19 +02:00
Matt Jankowski
0397df9bef
 		Resolve TODO in api/v1/admin/domain_* controllers (#31067) 2024-07-19 15:32:42 +00:00
Essem
63f5f98eb8
 		Merge remote-tracking branch 'upstream/main' 2024-07-18 16:21:00 -05:00
Claire
c75fe09e2b Merge commit '82344342c1' 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
Essem
dd4980342f
 		Merge remote-tracking branch 'upstream/main' 2024-07-17 14:46:24 -05:00
Claire
c546757cd1 Merge commit '66430cb25c' into glitch-soc/merge-upstream 2024-07-16 17:54:36 +02:00
Emelia Smith
aa88aca0ad
 		Add optional OAuth application to reports (#30539) 2024-07-16 13:23:08 +00:00
Essem
d0d49b2540
 		Merge remote-tracking branch 'upstream/main' 2024-07-14 16:32:10 -05:00
Claire
edec2e9fdf Merge commit '00cb4a0313' into glitch-soc/merge-upstream 2024-07-14 18:43:35 +02:00
David Roetzel
35a437a03f
 		Destroy NotificationRequests that are dismissed (#31008) 2024-07-12 12:09:52 +00:00
Essem
4aa2f92bef
 		Merge remote-tracking branch 'upstream/main' 2024-07-10 09:41:37 -05:00
Claire
388672ff0d Merge commit '967505ee9b' into glitch-soc/merge-upstream 2024-07-09 20:39:09 +02:00
Daniel M Brasil
3875bd138d
 		Fix HTTP 500 in /api/v1/polls/:id/votes (#25598) 2024-07-09 12:41:49 +00:00
Essem
6450fb0cf5
 		Merge remote-tracking branch 'upstream/main' 2024-07-04 10:31:27 -05:00
Claire
e61a7794f8 Merge commit 'df9e26158d' 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
Claire
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
Essem
37467c0194
 		Merge remote-tracking branch 'upstream/main' 2024-06-21 10:27:51 -05:00
Claire
fd867adffe Merge commit 'bb2d77b4a0' into glitch-soc/merge-upstream 2024-06-20 18:36:13 +02:00
Claire
bb2d77b4a0
 		Change /api/v2_alpha/notifications to only return historical data in pages (#30781) 2024-06-20 15:54:50 +00:00
Essem
167a30b2bf
 		Merge remote-tracking branch 'upstream/main' 2024-06-19 21:43:32 -05:00
Claire
4daed855e5 Merge commit 'd818ddd687' into glitch-soc/merge-upstream 2024-06-11 19:46:11 +02:00
Matt Jankowski
978601a0ae
 		Extract permitted params constant in v1/admin/tags (#30652) 2024-06-11 15:29:41 +00:00
Essem
9dcd9ba5b2
 		Merge remote-tracking branch 'upstream/main' 2024-06-10 16:59:22 -05:00
Claire
30b00ca2b5 Merge commit '5652ca6135' into glitch-soc/merge-upstream 2024-06-06 12:27:26 +02:00
Eugen Rochko
a2505e8611
 		Add timeline of public posts about a trending link to REST API (#30381) 2024-06-06 08:43:04 +00:00
Emelia Smith
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
Claire
974335e414
 		Add experimental server-side notification grouping (#29889) 2024-06-03 08:35:59 +00:00
Matt Jankowski
469de923aa
 		Update current_user override mode description in controllers (#30515) 2024-06-03 07:16:29 +00:00
Matt Jankowski
85d9053b36
 		Move pagination_params into API::BaseController (#28845) 2024-05-30 14:56:48 +00:00
Essem
fad5adbfe6
 		Merge remote-tracking branch 'upstream/main' 2024-05-30 09:32:49 -05:00
Claire
c827a98f19 Merge commit 'd20a5c3ec9' 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
36fe8f8566
 		Change ids param to id in /api/v1/statuses and /api/v1/accounts for consistency (#30465) 2024-05-29 09:19:17 +00:00
Eugen Rochko
128987eded
 		Add support for fediverse:creator OpenGraph tag (#30398) 2024-05-29 01:34:33 +02:00
Essem
9b0c46ebf2
 		Merge remote-tracking branch 'upstream/main' 2024-05-20 21:35:02 -05:00
Claire
e46321e63d Merge commit 'de4815afda' into glitch-soc/merge-upstream 2024-05-20 12:17:36 +02:00
Emelia Smith
2da2a1dae9
 		Support multiple redirect_uris when creating OAuth 2.0 Applications (#29192) 2024-05-17 13:46:12 +00:00
Claire
2810231180 Merge commit 'b2388be71e' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Upstream renamed a helper method everywhere.
  There was one glitch-soc line involving changes because of the local-only post
  feature.
  Ported upstream's change.
 2024-05-16 19:30:10 +02:00
Matt Jankowski
65e82211cd
 		Rename cache_* methods to preload_* in controller concern (#30209) 2024-05-16 08:03:46 +00:00
Essem
f26fba7473
 		Merge remote-tracking branch 'upstream/main' 2024-05-08 13:58:54 -05:00
Essem
b636ca2099
 		Merge remote-tracking branch 'upstream/main' 2024-05-06 22:12:42 -05:00
Claire
016d194274 Merge commit '2fe1b8d169' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, upstream added helpers right next to glitch-soc only
  helpers.
  Added upstream's helpers.
- `spec/models/status_spec.rb`:
  Not a real conflict, upstream added specs right next to glitch-soc only
  specs.
  Added upstream's tests.
 2024-05-06 17:53:51 +02:00
Claire
2fe1b8d169
 		Add API to get multiple accounts and statuses (#27871) 
Co-authored-by: noellabo <noel.yoshiba@gmail.com>
 2024-05-06 15:19:15 +00:00
Claire
8e4fea77e3
 		Fix race condition in POST /api/v1/push/subscription (#30166) 2024-05-06 12:41:14 +00:00
Claire
3789d9f825 Merge commit 'b7902225d6' into glitch-soc/merge-upstream 
Conflicts:
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS`
  while glitch-soc had custom code to read from `MAX_TOOT_CHARS`.
  Switched to using upstream's implementation of the tests.
 2024-05-04 16:28:30 +02:00
Essem
a7b905d573
 		Merge remote-tracking branch 'upstream/main' 2024-05-02 23:31:54 -05:00
Claire
253ead3aa7
 		Fix not being able to block a subdomain of an already-blocked domain through the API (#30119) 2024-05-02 20:56:21 +00:00
Claire
b039e62194 Merge commit 'a2399046ca' into glitch-soc/merge-upstream 2024-05-01 19:49:59 +02:00
Claire
6204d13a2e Merge commit 'ec71c02c4b' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile`:
  There was an extra newline in glitch-soc for some reason.
  Removed it.
 2024-05-01 19:38:34 +02:00