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

4198 Commits

Author SHA1 Message Date
Claire
80f7175379 Merge commit 'a296facdea884cc828999c9f9be0f4bc83afe68d' into glitch-soc/merge-upstream 2025-04-11 19:14:53 +02:00
Claire
00cd218741 Add paragraph to tell admins that email announcements cannot be opted out (#34411) 2025-04-11 09:52:23 +00:00
github-actions[bot]
7d50942b36 New Crowdin Translations (automated) (#34424) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-11 08:16:00 +00:00
Claire
4e6c7fba78 Merge commit '678c8dfeec2c221cf609b924161dc03cebfa41e1' into glitch-soc/merge-upstream 2025-04-10 17:50:04 +02:00
Echo
d43bfa95aa Adds featured tab to web (#34405) 2025-04-10 15:40:30 +00:00
Claire
300e9de24d Merge commit '498372fd06bfb0235b75888629ca5de0336ccd71' into glitch-soc/merge-upstream 2025-04-10 17:02:40 +02:00
Matt Jankowski
4c2f64907b Remove deprecated Import model (#34371) 2025-04-10 12:49:24 +00:00
github-actions[bot]
a89ddcfd2d New Crowdin Translations (automated) (#34407) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-10 07:01:39 +00:00
github-actions[bot]
498372fd06 New Crowdin Translations (automated) (#34403) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-09 07:57:18 +00:00
Claire
4b491674b2 Merge commit '887336f2c66b6ac5049d10bf5f27fa69a15e0745' into glitch-soc/merge-upstream 2025-04-08 19:12:28 +02:00
github-actions[bot]
f31b533435 New Crowdin Translations (automated) (#34395) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-08 06:46:46 +00:00
github-actions[bot]
9a05688326 New Crowdin Translations (automated) (#34374) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-07 06:45:26 +00:00
Claire
99e3ea232f Merge commit '5f87ae101c5e0e940e148d493eaac1ce31fe24c1' into glitch-soc/merge-upstream 2025-04-04 20:00:24 +02:00
github-actions[bot]
58e3e43e06 New Crowdin Translations (automated) (#34366) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-04 07:24:27 +00:00
github-actions[bot]
e1d6748422 New Crowdin Translations (automated) (#34360) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-03 08:42:19 +00:00
github-actions[bot]
324acff572 New Crowdin Translations (automated) (#34348) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-02 07:14:45 +00:00
Claire
e0406fcf02 Merge commit 'e8270e2807727e1cf6a47a40442b3038c5bca858' into glitch-soc/merge-upstream 
Conflicts:
- `.eslintrc.js`:
  Upstream moved it to `eslint.config.mjs`.
  Ported the glitch-soc changes there.
- `yarn.lock`:
  Upstream updated dependencies close to glitch-soc-only dependencies.
  Ported upstream's changes.
 2025-04-01 20:59:34 +02:00
github-actions[bot]
b2b532708e New Crowdin Translations (automated) (#34333) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-01 06:20:23 +00:00
Claire
aebb6c8ab7 Merge commit 'b4e56822c72db54ba338940e2517a4e25e2159a6' into glitch-soc/merge-upstream 2025-03-31 17:12:44 +02:00
github-actions[bot]
758d2da887 New Crowdin Translations (automated) (#34311) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-31 07:21:33 +00:00
Claire
f8b0f38636 Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream 2025-03-29 17:02:39 +01:00
Claire
a5eaa95bb2 Merge commit 'e28b64ac2dcd381f8b7e6bcfc2cc2b2ed3121cd9' into glitch-soc/merge-upstream 2025-03-28 18:48:04 +01:00
David Roetzel
97b9994743 Basic FASP support (#34031) 2025-03-28 12:16:40 +00:00
github-actions[bot]
e28b64ac2d New Crowdin Translations (automated) (#34297) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-03-28 09:47:53 +00:00
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