Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,725 Commits 74 Branches 58 Tags
d5ff3ee4a05a36442286f0f5d7803a6f278b4f4a
Commit Graph

4174 Commits

Author SHA1 Message Date
Claire
166514d252 Merge commit 'aa575341c2da1e84d349ca0b42211b0da30a2254' into glitch-soc/merge-upstream 2025-03-27 19:40:04 +01:00
github-actions[bot]
99f93e675a New Crowdin Translations (automated) (#34290) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-27 08:07:54 +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
github-actions[bot]
dd6c573cc3 New Crowdin Translations (automated) (#34276) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-26 07:42:25 +00:00
Claire
c93b2c6809 Add new filter action to blur media (#34256) 2025-03-26 07:31:05 +00:00
Claire
745c445e7e Merge commit 'e1dbbf6c9db6dbf3f356dae4c59fa05299372370' into glitch-soc/merge-upstream 2025-03-25 19:59:59 +01:00
github-actions[bot]
90bf67f053 New Crowdin Translations (automated) (#34265) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-25 09:05:59 +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
Eugen Rochko
2e9b2df570 Add double tap to zoom and swipe to dismiss to media modal in web UI (#34210) 
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
 2025-03-24 17:25:30 +00:00
github-actions[bot]
b892b15ba6 New Crowdin Translations (automated) (#34240) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-24 08:35:40 +00:00
Claire
f1fa6b3cd0 Merge commit '1960aac90b16fce1ec620ac990aa931efcf04700' into glitch-soc/merge-upstream 2025-03-22 15:41:48 +01:00
github-actions[bot]
5eba86e2d1 New Crowdin Translations (automated) (#34231) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-21 07:31:42 +00:00
github-actions[bot]
936d3a7de9 New Crowdin Translations (automated) (#34222) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-20 09:32:41 +00:00
Claire
971690caf2 Merge commit 'f7b1769e8a69e2831493f3a704d68efa5cf9beff' into glitch-soc/merge-upstream 2025-03-19 20:09:14 +01:00
github-actions[bot]
ffc568589c New Crowdin Translations (automated) (#34211) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-19 08:16:25 +00:00
Claire
6f2979b0b0 Merge commit '547658f086b2bfb396f69822d7ba938e4c0caf80' into glitch-soc/merge-upstream 2025-03-18 22:03:50 +01:00
github-actions[bot]
dc21104c04 New Crowdin Translations (automated) (#34178) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-18 14:49:53 +00:00
Claire
d2c4f69148 Merge commit '30e334b51a4e7add05401895bff5a2ea4a97e0bd' into glitch-soc/merge-upstream 2025-03-17 20:25:32 +01:00
David Roetzel
e74774e366 Disable installation of instrumentation hooks (#34192) 2025-03-17 15:50:13 +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
David Roetzel
4a6cf67c46 Add middleware to record queue time (#34172) 2025-03-14 13:52:04 +00:00
github-actions[bot]
7a6a898ca1 New Crowdin Translations (automated) (#34170) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-14 09:17:00 +00:00
Claire
e479626110 Merge commit '7866745a6bf21e5187137c321040ed58d37e4331' into glitch-soc/merge-upstream 2025-03-13 15:37:44 +01:00
github-actions[bot]
95dcd69542 New Crowdin Translations (automated) (#34157) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-13 12:55:17 +00:00
Claire
b330cc21c4 Merge commit 'aff51823752b809c3349698b6be02bfdda7a9010' into glitch-soc/merge-upstream 2025-03-12 19:48:51 +01:00
github-actions[bot]
fef446d22c New Crowdin Translations (automated) (#34136) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-12 12:51:16 +00:00
Claire
399fbf97de Merge commit '420ffdfb6259740602d4ce727ed5c60432c776a5' into glitch-soc/merge-upstream 2025-03-11 18:44:32 +01:00
David Roetzel
9041ce3c18 Refactoring: Move rack middleware (#34140) 2025-03-11 15:24:06 +00:00
David Roetzel
bedf808e02 Move feature flag test setup into config (#34124) 2025-03-11 13:29:17 +00:00
Claire
fb55d09f77 Merge commit 'fb34d9c5909116d586a0187d86ada36ee1234f61' into glitch-soc/merge-upstream 2025-03-10 19:48:45 +01:00
github-actions[bot]
207029eb2f New Crowdin Translations (automated) (#34043) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-10 09:45:11 +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
04492e7f93 Fix behavior of database schema loading with SKIP_POST_DEPLOYMENT_MIGRATIONS (#34089) 2025-03-07 13:41:16 +00: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
Damien Erambert
debe6c0545 Add emoji from Twemoji 15.0 to the emoji picker/completion (#33395) 2025-03-05 17:05:15 +00:00
David Roetzel
8cf27d0fbb Add simple feature flag system (#34038) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-03-05 15:41:54 +00:00
Eugen Rochko
cadda2f957 Add effective date to terms of service (#33993) 2025-03-05 09:01:33 +00:00
Emelia Smith
4960193ed0 Add API to delete media attachments that are not in use (#33991) 2025-02-28 13:41:42 +00:00
github-actions[bot]
5f486a1424 New Crowdin Translations (automated) (#34027) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-28 08:29:06 +00:00
Claire
1cdd91d6f1 Merge commit '6b519cfefa93a923b19d0f20c292c7185f8fd5f5' into glitch-soc/merge-upstream 2025-02-27 15:52:20 +01:00
Claire
06f879ce9b Merge commit from fork 
* Add rate-limit on `/auth/setup`

* Remove useless test
 2025-02-27 15:44:35 +01:00
github-actions[bot]
cde3167d09 New Crowdin Translations (automated) (#34009) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-27 09:36:16 +00:00
Claire
a682bd19f5 Merge commit '20531d1e078a27116dea53ce21c1b32bf3774eca' into glitch-soc/merge-upstream 2025-02-25 18:52:24 +01:00
github-actions[bot]
33643c4c07 New Crowdin Translations (automated) (#33996) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-25 13:08:40 +00:00
Eugen Rochko
298ca53593 Add choice of law to terms of service generator (#33994) 2025-02-25 10:58:11 +00:00