Claire
ace0a3d61f
Merge commit 'b33f9ea60338a78dde2fb7fe3f083c2ffaafcf1f' into glitch-soc/merge-upstream
2025-04-21 15:22:22 +02:00
Claire
8cbd99e645
Merge commit 'a324edabdfc19b6978ed31800b92e36022006cd5' into glitch-soc/merge-upstream
2025-04-21 14:32:47 +02:00
Claire
df2611a10f
Add initial support for ingesting and verifying remote quote posts ( #34370 )
2025-04-17 07:45:23 +00:00
Matt Jankowski
2eaef09166
Use enum validation instead of ArgumentError rescue for List replies policy check ( #34452 )
2025-04-14 21:11:10 +00:00
Matt Jankowski
aadff24099
Enable validate: true on CustomFilter#action ( #34434 )
2025-04-14 07:28:11 +00:00
Claire
4e6c7fba78
Merge commit '678c8dfeec2c221cf609b924161dc03cebfa41e1' into glitch-soc/merge-upstream
2025-04-10 17:50:04 +02:00
Matt Jankowski
4c2f64907b
Remove deprecated Import model ( #34371 )
2025-04-10 12:49:24 +00:00
Claire
99e3ea232f
Merge commit '5f87ae101c5e0e940e148d493eaac1ce31fe24c1' into glitch-soc/merge-upstream
2025-04-04 20:00:24 +02:00
Matt Jankowski
6e607f97a3
Extract constant for Poll last fetch duration check ( #34341 )
2025-04-02 06:43:46 +00:00
Claire
aebb6c8ab7
Merge commit 'b4e56822c72db54ba338940e2517a4e25e2159a6' into glitch-soc/merge-upstream
2025-03-31 17:12:44 +02:00
Matt Jankowski
b4e56822c7
Fix Style/MapToHash cop ( #34327 )
2025-03-31 14:08:02 +00:00
Claire
8efc381063
Merge commit '04a9252a93fe18aa514957765a35e0abe2596864' into glitch-soc/merge-upstream
2025-03-29 19:19:58 +01:00
Claire
f8b0f38636
Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream
2025-03-29 17:02:39 +01:00
Claire
ee65f77a7e
Add server-side support for grouping account sign-up notifications ( #34298 )
2025-03-28 12:35:25 +00:00
David Roetzel
97b9994743
Basic FASP support ( #34031 )
2025-03-28 12:16:40 +00:00
Claire
166514d252
Merge commit 'aa575341c2da1e84d349ca0b42211b0da30a2254' into glitch-soc/merge-upstream
2025-03-27 19:40:04 +01:00
Matt Jankowski
0e3ff680d3
Update rubocop to version 1.75.0 ( #34283 )
2025-03-27 07:48:19 +00:00
Claire
449dc30739
Merge commit 'c43508b3e0b05c5e739d726bad53f1eef89e9376' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/content_security_policy.rb`:
Upstream added support for `EXTRA_MEDIA_HOSTS` which is very similar to
glitch-soc's `EXTRA_DATA_HOST`.
Deprecate `EXTRA_DATA_HOST` FOR `EXTRA_MEDIA_HOST`.
2025-03-26 19:14:26 +01:00
Claire
9c5c86c947
Merge commit 'c93b2c6809905d24262b5973efe20832f1b04a6d' into glitch-soc/merge-upstream
2025-03-26 18:18:07 +01:00
Claire
59e189ad3c
Add support for paginating partial collections in SynchronizeFollowersService ( #34277 )
2025-03-26 11:33:59 +00:00
Claire
c93b2c6809
Add new filter action to blur media ( #34256 )
2025-03-26 07:31:05 +00:00
Claire
e7498887a7
Merge commit '2e9b2df570af19b67a5ccc754c7b581034ca79c6' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
Upstream removed some code that somehow had been modified in glitch-soc.
Removed it as upstream did.
2025-03-24 20:06:25 +01:00
Claire
ef870007e9
Fix CacheBuster being queued for missing media attachments ( #34253 )
2025-03-24 08:58:15 +00:00
Claire
6f2979b0b0
Merge commit '547658f086b2bfb396f69822d7ba938e4c0caf80' into glitch-soc/merge-upstream
2025-03-18 22:03:50 +01:00
Claire
547658f086
Fix handling of malformed/unusual HTML ( #34201 )
2025-03-18 14:50:41 +00:00
Claire
d2c4f69148
Merge commit '30e334b51a4e7add05401895bff5a2ea4a97e0bd' into glitch-soc/merge-upstream
2025-03-17 20:25:32 +01:00
Claire
e30001bc80
Fix incorrect URL being used when cache busting ( #34189 )
2025-03-17 16:40:28 +00:00
Claire
0efa669fe9
Merge commit '2f98134ac69ee840095c9d8389e4b2fff72f20c1' into glitch-soc/merge-upstream
2025-03-15 17:49:32 +01:00
Eugen Rochko
d213c585ff
Add age verification on sign-up ( #34150 )
2025-03-14 14:07:29 +00:00
rinsuki
2d97215aad
chore: Allow yuvj420p (full color range yuv420p) movies passthrough ( #34098 )
2025-03-14 09:30:14 +00:00
Claire
b330cc21c4
Merge commit 'aff51823752b809c3349698b6be02bfdda7a9010' into glitch-soc/merge-upstream
2025-03-12 19:48:51 +01:00
Claire
9db26db495
Refactor reply-fetching code and disable it by default ( #34147 )
2025-03-12 10:28:06 +00:00
Jonny Saunders
46e13dd81c
Add Fetch All Replies Part 1: Backend ( #32615 )
...
Signed-off-by: sneakers-the-rat <sneakers-the-rat@protonmail.com>
Co-authored-by: jonny <j@nny.fyi>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Kouhai <66407198+kouhaidev@users.noreply.github.com>
2025-03-12 09:03:01 +00:00
Claire
4bea9a0a66
Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream
2025-03-07 18:34:27 +01:00
Claire
dbd3e05812
Merge commit 'b57687083f4af178f2e2f43665eb4e49d32a50c2' into glitch-soc/merge-upstream
2025-03-07 17:37:36 +01:00
Claire
9d5a9123b9
Merge commit 'ce23342d72a7f2ca6f8c35727c86ba54c9c365ca' into glitch-soc/merge-upstream
2025-03-07 13:15:10 +01:00
Eugen Rochko
2cabbae132
Add min. age to terms of service ( #34105 )
2025-03-07 11:50:52 +00:00
Claire
b6f3cfb302
Merge commit 'e5655a5f65eb8116640ae434125553e0fe77f35e' into glitch-soc/merge-upstream
2025-03-06 20:10:00 +01:00
Claire
5a100bf38f
Add ability to email announcements to all users ( #33928 )
2025-03-06 14:05:27 +00:00
Eugen Rochko
cadda2f957
Add effective date to terms of service ( #33993 )
2025-03-05 09:01:33 +00:00
Matt Jankowski
d90d68bddf
Remove deprecated mb_chars method ( #34039 )
2025-03-03 16:50:57 +00:00
Matt Jankowski
bdc9cb27e2
Update rubocop to version 1.73.1 ( #34034 )
2025-02-28 14:26:43 +00:00
Claire
a682bd19f5
Merge commit '20531d1e078a27116dea53ce21c1b32bf3774eca' into glitch-soc/merge-upstream
2025-02-25 18:52:24 +01:00
Claire
20531d1e07
Fix GET /api/v2/notifications/:id and POST /api/v2/notifications/:id/dismiss for ungrouped notifications ( #33990 )
2025-02-25 14:37:44 +00:00
Eugen Rochko
298ca53593
Add choice of law to terms of service generator ( #33994 )
2025-02-25 10:58:11 +00:00
Claire
c85616ee3a
Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/feed_manager.rb`:
Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
Added upstream's code.
- `app/models/user_settings.rb`:
Not a real conflict, glitch-soc has an extra setting textually-adjacent to a
setting added upstream.
Added upstream's setting.
- `app/serializers/initial_state_serializer.rb`:
Same.
- `app/services/precompute_feed_service.rb`:
Not a real conflict, glitch-soc has extra code for the direct feed.
Added upstream's new code for populating lists.
2025-02-01 19:07:13 +01:00
Claire
a3d2849d15
Fix tootctl feeds build not building list timelines ( #33783 )
2025-01-30 09:18:46 +00:00
Eugen Rochko
1e70da5e3c
Add reminder when about to post without alt text in web UI ( #33760 )
2025-01-29 11:37:56 +00:00
Claire
353e5f797c
Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/merge-upstream
...
Conflicts:
- `app/validators/poll_options_validator.rb`:
Upstream split `PollValidator` in two, and glitch-soc had local changes to
make the options configurable.
Refactored as upstream did, keeping glitch-soc's configurable limits.
2025-01-28 18:29:46 +01:00
Claire
32aa83e9d7
Fix polls not being validated on edition ( #33755 )
2025-01-28 14:38:18 +00:00
