mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-12 05:53:14 -08:00
Code Issues Projects Releases Packages Wiki Activity
22,838 commits 2 branches 0 tags 263 MiB
Commit graph

1,009 commits

Author SHA1 Message Date
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
Claire
360590ecd8 Merge commit 'a390299744' 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
Emelia Smith
049b159beb
 		Add read:me OAuth 2.0 scope, allowing more limited access to user data (#29087) 2024-04-23 11:47:00 +00:00
Matt Jankowski
650c548c31
 		Add not_featured_by scope to Tag (#28815) 2024-04-17 10:05:38 +00:00
Matt Jankowski
1d3ecd3fba
 		Add API::Pagination concern (#28826) 2024-04-17 09:22:45 +00:00
Matt Jankowski
caad1e2628
 		Add scope Status.distributable_visibility (#29950) 2024-04-16 13:16:54 +00:00
Essem
ce98ee9b00
 		Merge remote-tracking branch 'upstream/main' 2024-04-10 17:36:38 -05:00
Claire
777984faeb Merge commit '119c7aa0df' into glitch-soc/merge-upstream 2024-04-06 20:34:07 +02:00
Matt Jankowski
34f293475e
 		Fix results/query in api/v1/featured_tags/suggestions (#29597) 2024-03-22 15:08:27 +00:00
Essem
aaf54c6395
 		Merge remote-tracking branch 'upstream/main' 2024-03-20 16:41:33 -05:00
Claire
876aa35350 Merge commit 'ffc5be4820' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
- `yarn.lock`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
 2024-03-19 19:21:12 +01:00
Matt Jankowski
b5115850bb
 		Move repeated insert_pagination_headers method to api base class (#29606) 2024-03-18 10:11:53 +00:00
Essem
fd1f0891d9
 		Merge remote-tracking branch 'upstream/main' 2024-03-14 20:36:26 -05:00
Claire
e91ede5be6 Merge commit 'df6086d402' into glitch-soc/merge-upstream 2024-03-14 17:27:16 +01:00
Matt Jankowski
f9100743ec
 		Add Api::ErrorHandling concern for api/base controller (#29574) 2024-03-14 09:09:47 +00:00
Claire
06881a8669 Merge commit '2c0441acd7' into glitch-soc/merge-upstream 2024-03-13 19:16:47 +01:00
Matt Jankowski
9754967d5f
 		Move pagination_max_id and pagination_since_id into api/base controller (#28844) 2024-03-13 08:51:44 +00:00
Claire
a5127d0ef8 Merge commit '24319836de' into glitch-soc/merge-upstream 
Conflicts:
- `config/routes/api.rb`:
  glitch-soc has an extra `:destroy` action on notifications for historical reasons.
  Kept it for now, while otherwise updating as upstream did.
 2024-03-11 17:29:07 +01:00
Eugen Rochko
c10bbf5fe3
 		Add notification policies and notification requests in web UI (#29433) 2024-03-11 15:02:21 +00:00
Eugen Rochko
50b17f7e10
 		Add notification policies and notification requests (#29366) 2024-03-07 14:53:37 +00:00
Essem
c609845d47
 		Merge remote-tracking branch 'upstream/main' 2024-02-29 16:35:17 -06:00
Claire
4d7e7cc562 Merge commit '6dfe318f34' into glitch-soc/merge-upstream 2024-02-29 18:24:47 +01:00