Claire
e68de292b4
Merge commit 'a485f97d21c3fb7da927e8fd239b301a590ee9b8' into glitch-soc/merge-upstream
2025-08-07 18:16:54 +02:00
Claire
496a5f423e
Inline instrument quote post in outgoing QuoteRequest activities ( #35713 )
2025-08-07 13:19:18 +00:00
Claire
235037a3b2
Merge commit 'ac59772dc6cda646258e61debfd792f9057c1c39' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
Conflict because upstream added a parameter where glitch-soc had an extra one.
Added upstream's parameter while keeping glitch-soc's.
- `app/serializers/activitypub/note_serializer.rb`:
Conflict because upstream added an extension where glitch-soc had an extra one.
Added upstream's extension while keeping glitch-soc's.
- `app/services/update_status_service.rb`:
Conflict because upstream added a parameter where glitch-soc had an extra one.
Added upstream's parameter while keeping glitch-soc's.
2025-08-06 22:02:55 +02:00
Claire
c8f263c419
Export interaction policies for local posts over ActivityPub ( #35697 )
2025-08-06 11:31:36 +00:00
Claire
3f166bb068
Merge commit 'ffeb5da9912a3b7db0deb8aec429e661ef609c59' into glitch-soc/merge-upstream
2025-08-05 15:46:33 +02:00
Claire
5318957ab3
Fix serialization of quote post notification groups ( #35670 )
2025-08-04 20:58:59 +00:00
Claire
53185f5381
Merge commit '081d38679f965ac20ff1a6c72e2fc1108c34ac30' into glitch-soc/merge-upstream
2025-08-04 21:24:47 +02:00
Claire
32791c9745
Accept remote quotes of local quotes according to set policy ( #35629 )
2025-08-04 15:27:46 +00:00
Claire
3caa318dfe
Fix WebUI crashing for accounts with null URL ( #35651 )
2025-08-04 07:49:12 +00:00
Claire
dbab707d64
Merge commit '591df1f205c654381203b56d46498efc62370776' into glitch-soc/merge-upstream
2025-08-01 22:11:59 +02:00
Claire
591df1f205
Add support for local quote stamps ( #35626 )
2025-08-01 14:55:25 +00:00
Claire
29a5f059d2
Add notifications for inbound quotes ( #35618 )
2025-08-01 09:12:46 +00:00
Claire
2dfdcc7dcb
Add API endpoints to view and revoke one's quoted posts ( #35578 )
2025-07-31 09:36:51 +00:00
Claire
8649681c51
Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/activitypub/note_serializer.rb`:
Conflict because upstream added context extensions where glitch-soc had its own.
Added upstream's new context extension while keeping ours.
2025-07-25 21:45:00 +02:00
Claire
5a88b7f683
Add experimental basic quote post authoring ( #35355 )
2025-07-25 12:35:24 +00:00
Claire
63af7ecb1f
Merge commit '7d3ef27a8dc8fb281bae959b245d3db63aa82260' into glitch-soc/merge-upstream
2025-07-23 18:43:56 +02:00
Echo
760d00b7f7
Emoji Rendering ( #35424 )
2025-07-22 14:43:15 +00:00
Claire
eeffe580d8
Merge commit '74fc4dbacf5a9168074e91fc2d75309dc42ff1ed' into glitch-soc/merge-upstream
2025-07-15 18:19:32 +02:00
Claire
c0eabe289b
Always give local quote of remote posts a quote request URI ( #35383 )
2025-07-15 13:01:03 +00:00
Claire
1716f8da71
Merge commit '3b52dca4057560c58b260433722d91650fcd5040' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream added a `features` attribute where glitch-soc had extra ones.
Added `features` like upstream did.
2025-07-11 18:53:47 +02:00
Echo
94bceb8683
Expose enabled features to the frontend ( #35348 )
2025-07-11 13:15:22 +00:00
Claire
c9a1e27a49
Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream
...
Conflicts:
- `tsconfig.json`:
glitch-soc had extra paths under `app/javascript/flavours`, but upstream
added `app/javascript` as a whole, so updated to upstream's.
2025-06-25 19:29:09 +02:00
Matt Jankowski
47fda2df2c
Update OAuth inflection to match spec ( #35160 )
2025-06-25 07:52:30 +00:00
Claire
9cb5a77c3e
Merge commit 'ac039d5f1323c46062d004896996f50549bfa38b' into glitch-soc/merge-upstream
2025-06-21 22:59:04 +02:00
David Roetzel
adf812efb3
Fix missing terms of services link ( #35115 )
2025-06-21 08:59:47 +00:00
Claire
2c751a6a19
Merge commit 'c644413f8a068490ddb8038441e5b59112e8294e' into glitch-soc/merge-upstream
2025-06-16 20:08:52 +02:00
Matt Jankowski
6f2aba989f
Move "limited federation mode" config to x.mastodon area ( #35041 )
2025-06-16 06:13:03 +00:00
Claire
7da6b07c75
Merge commit '71d4ce1c228bab470fa9d3bcb5a130cf53665103' into glitch-soc/merge-upstream
2025-06-13 18:07:59 +02:00
Claire
e8868af079
Fix crash in StatusEdit serializer when quote posts are involved ( #35036 )
2025-06-13 14:59:52 +00:00
Claire
220b78d4a9
Merge commit '2254f47702368938bdfd0d997f2487fb2950d676' into glitch-soc/merge-upstream
2025-06-12 17:39:03 +02:00
Eugen Rochko
24d943fee0
Change media attachments in moderated posts to not be accessible ( #34872 )
2025-06-12 08:53:02 +00:00
Claire
2085b0b53a
Merge commit '520974e05211e988b0447f7f29e88798b1794bcf' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/rest/status_serializer.rb`:
Not a real conflict, just glitch-soc code textually adjacent to code added
upstream.
2025-06-05 18:02:40 +02:00
Claire
3d474807bf
Change “legacy” non-fast-tracked quote posts to not be displayed as such ( #34945 )
2025-06-05 13:53:57 +00:00
Claire
c00e27aa55
Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream
2025-05-30 17:41:31 +02:00
Matt Jankowski
f7a3dd0e38
Use config_for for VAPID key storage ( #34845 )
2025-05-30 07:00:33 +00:00
Claire
b031f65670
Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream
2025-05-25 14:51:59 +02:00
Claire
8c51a8ba94
Add ability to translate server rules ( #34494 )
2025-05-21 11:54:12 +00:00
Claire
a5a3a781e0
Merge commit '82688387a8d19906371a6dd4af64e5b662031603' into glitch-soc/merge-upstream
2025-05-09 18:16:46 +02:00
Claire
912268295c
Change /api/v2/instance to be enabled without authentication when limited federation mode is enabled ( #34576 )
2025-05-09 07:46:57 +00:00
Claire
3ec3814f8e
Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream
2025-05-03 17:37:26 +02:00
Claire
ae3b7dd28d
Reject incoming QuoteRequest activities ( #34480 )
2025-04-25 23:28:09 +00:00
Claire
dae6f19490
Merge commit '7a70d9543525681b5c408cfd17782843da13177f' into glitch-soc/merge-upstream
2025-04-25 17:22:10 +02:00
Eugen Rochko
a97647158c
Add REST API for featuring and unfeaturing a hashtag ( #34489 )
...
Co-authored-by: Matt Jankowski <matt@jankowski.online >
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
2025-04-25 15:12:05 +00:00
Terence Eden
13b13c8726
Reduce path size for oEmbed and logo ( #34538 )
...
Co-authored-by: Terence Eden <git@shkspr.mobi >
2025-04-24 11:38:02 +00:00
Claire
7bc301e184
Make Web::PushSubscription#user and Web::PushSubscription#access_token relationships non-optional ( #34498 )
...
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com >
2025-04-23 08:12:31 +00:00
Claire
dee744c793
Fix quote serializer ( #34510 )
2025-04-23 07:29:13 +00:00
Claire
ace0a3d61f
Merge commit 'b33f9ea60338a78dde2fb7fe3f083c2ffaafcf1f' into glitch-soc/merge-upstream
2025-04-21 15:22:22 +02:00
Claire
df2611a10f
Add initial support for ingesting and verifying remote quote posts ( #34370 )
2025-04-17 07:45:23 +00:00
Claire
80f7175379
Merge commit 'a296facdea884cc828999c9f9be0f4bc83afe68d' into glitch-soc/merge-upstream
2025-04-11 19:14:53 +02:00
Matt Jankowski
e753776930
Fix Style/HashTransformValues cop ( #34416 )
2025-04-11 08:09:40 +00:00
