Claire
6fc9febb47
Merge commit '1b664cf20dbb696cf16a42efcf59ab186cb211eb' into glitch-soc/merge-upstream
2025-09-05 20:03:42 +02:00
Claire
14cb5ff881
Add compatibility hack for GoToSocial interaction policies ( #36004 )
2025-09-03 19:35:43 +00:00
Claire
6abe6cdef5
Merge commit '40242fafee83cf9a6bcb2d0ac1e228827969402f' into glitch-soc/merge-upstream
2025-08-29 18:21:28 +02:00
Claire
8b7685d956
Add default quote policy to API ( #35948 )
2025-08-29 11:37:20 +00:00
Claire
884d7996b1
Merge commit '02de05dc272856c77fac5c9e1d84cf585ae20c1e' into glitch-soc/merge-upstream
2025-08-27 18:13:03 +02:00
Claire
a6a0d982ef
Fix streaming and handling of quoted_update notifications ( #35924 )
2025-08-27 14:53:54 +00:00
Claire
7e25f6b606
Merge commit '6ad0ddebe4be9fb76b9119924674b4679e8da74a' into glitch-soc/merge-upstream
2025-08-26 19:07:52 +02:00
Claire
e8fe33f273
Merge commit '7aba79ade9bfeb86105aa575bc7156acef78f7da' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Conflict because of glitch-soc's theming system.
Updated the line as upstream did.
2025-08-25 22:15:28 +02:00
Claire
f3a932d8a1
Add quoted_update notification type ( #35820 )
2025-08-25 15:44:18 +00:00
Claire
7aba79ade9
Fix quotes_count attribute on Status not being serialized ( #35895 )
2025-08-25 14:33:25 +00:00
Claire
2560242972
Add quotes_count to statuses stats ( #35832 )
2025-08-25 12:21:28 +00:00
Claire
02134172f1
Merge commit 'e770303968dc04d20dd5f3a5d7da3b9d7ba888fc' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Glitch-soc had different overrides, but upstream simply disabled the rules.
Disabled them as well.
- `app/serializers/initial_state_serializer.rb`:
Not really a conflict, again because of a rubocop comment.
2025-08-22 22:33:11 +02:00
Matt Jankowski
20a71a5479
Disable Metrics/* cops ( #35000 )
2025-08-20 17:04:36 +00:00
Claire
b7c9b881e3
Merge commit '8d3bca3bb8c84e1e3735eb71bdce7acac3779bff' into glitch-soc/merge-upstream
2025-08-19 21:01:33 +02:00
Claire
8d3bca3bb8
Fix serialization of quote policies in nested quotes ( #35828 )
2025-08-19 17:13:43 +00:00
Claire
4d9150735a
Merge commit '651e51a82eba542c4d8c3fec5edd16420ea1ff3e' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated a dependency textually adjacent to a glitch-soc-specific one.
Updated the dependency as upstream did.
2025-08-17 20:52:34 +02:00
Claire
0e99d428b2
Change serialization of Delete activities for QuoteAuthorization to inline the latter ( #35725 )
2025-08-11 08:55:18 +00:00
Claire
11902d958f
Merge commit 'ce1680e6f979889ebd5c775353f3b82a8b2698bb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
Upstream added a new helper for a setting, where glitch-soc had extra ones.
Not a real conflict, added upstream's new helper without removing glitch-soc's ones.
2025-08-09 23:02:43 +02:00
Echo
8ee4b3f906
Update Redux to handle quote posts ( #35715 )
2025-08-08 08:44:05 +00:00
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
