Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,311 Commits 75 Branches 73 Tags
296bff71c335cc99500c4ce882762dd4b8eefc23
Commit Graph

4782 Commits

Author SHA1 Message Date
Claire
291f141a02 Merge commit '1ee457f2d37c2b77a7fbce246a7c72ac9f9d3056' into glitch-soc/merge-upstream 2026-03-19 18:14:55 +01:00
Claire
1ee457f2d3 Split invite_users permission into invite_bypass_approval (#38278) 2026-03-19 15:25:54 +00:00
Claire
fac3080289 Merge commit 'cffa8de6267a57673b7f6264fab671153f965d23' into glitch-soc/merge-upstream 2026-03-19 12:38:31 +01:00
github-actions[bot]
6aedd2f9ec New Crowdin Translations (automated) (#38288) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-19 09:30:49 +00:00
Claire
842bac86f6 Merge commit 'db074fc3e2b671e28a44ae379e6df1fcbdbbce53' into glitch-soc/merge-upstream 2026-03-18 18:01:57 +01:00
diondiondion
380b898d0d Improve accessibility of server rules list in sign-up flow (#38257) 2026-03-18 16:08:23 +00:00
Claire
2b0531914f Merge commit 'd52d0e4dedcc4c8ca12781681debe68f77c007e2' into glitch-soc/merge-upstream 2026-03-18 12:01:23 +01:00
github-actions[bot]
5e7f221cab New Crowdin Translations (automated) (#38267) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-18 09:17:33 +00:00
Nicholas La Roux
36400681cf Remove oj and its initializer and add json to the Gemfile (#37752) 2026-03-18 09:02:11 +00:00
Claire
3593ddff11 Merge commit 'b320c9e4c901bf99ccbca321bad2ceb2f51de140' into glitch-soc/merge-upstream 2026-03-17 18:58:19 +01:00
Claire
04bf07a9cf Merge commit 'c37bc5a8a94758e19b2d50db5e7816a96cec5cf4' into glitch-soc/merge-upstream 2026-03-17 18:01:07 +01:00
diondiondion
75c4ff35d2 Improve accessibility of sign-up progress indicator (#38252) 2026-03-17 12:44:40 +00:00
github-actions[bot]
75c5f30556 New Crowdin Translations (automated) (#38247) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-17 09:36:34 +00:00
Claire
4359098740 Merge commit '9c8be1e72146af247e2b6cdae6e1d37371506569' into glitch-soc/merge-upstream 2026-03-16 12:17:49 +01:00
github-actions[bot]
5b6b86c97c New Crowdin Translations (automated) (#38201) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-16 08:26:09 +00:00
Claire
3afb58ad18 Merge commit '89b7a3d7fb73ba79d33cab9755424b4aa2050b1b' into glitch-soc/merge-upstream 2026-03-14 11:41:24 +01:00
github-actions[bot]
3a2613a3e8 New Crowdin Translations (automated) (#38185) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-13 09:33:06 +00:00
Claire
3833eadfbf Merge commit 'adede83c7c9a943cf9954fe865becf6a0c2d2280' into glitch-soc/merge-upstream 2026-03-12 18:48:32 +01:00
Hugo Gameiro
4552cda15a Fix OpenStack Swift Keystone token rate limiting (#38145) 2026-03-12 10:15:49 +00:00
github-actions[bot]
7f9df6d02d New Crowdin Translations (automated) (#38164) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-12 09:53:59 +00:00
Claire
b5222606e3 Merge commit '811575a10903cada549580979cc809ca98ad570c' into glitch-soc/merge-upstream 2026-03-11 18:50:59 +01:00
Matt Jankowski
0a216003ff Disable use_multi_json for json validator / match_json_schema (#38151) 2026-03-11 17:11:00 +00:00
Claire
5fdcac60b9 Merge commit '64629eadb71afab79a741b016dc56a8bdf1d46f2' into glitch-soc/merge-upstream 2026-03-10 18:04:32 +01:00
github-actions[bot]
b64bed5acd New Crowdin Translations (automated) (#38122) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-10 10:01:38 +00:00
Claire
4bcd0caa79 Merge commit 'e235c446c96280c015fb27f7eefe4e95a5a39892' into glitch-soc/merge-upstream 2026-03-09 12:41:12 +01:00
github-actions[bot]
5838fce8f4 New Crowdin Translations (automated) (#38100) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-09 09:50:28 +00:00
Claire
a4af7a531d Merge commit 'eb848d082afc8864b2aa15858f414e4867902c65' into glitch-soc/merge-upstream 2026-03-07 17:29:09 +01:00
github-actions[bot]
11fb1df7a6 New Crowdin Translations (automated) (#38091) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-06 11:39:35 +00:00
Claire
0a989af8c6 Merge commit '3d8d5f6dc7625d9638cc2e3387247442225d4e3f' into glitch-soc/merge-upstream 2026-03-05 18:21:07 +01:00
github-actions[bot]
94954aed5e New Crowdin Translations (automated) (#38070) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-05 09:27:43 +00:00
github-actions[bot]
b12429e41c New Crowdin translations (#3424) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-03 19:30:59 +01:00
Claire
45b87f31ff Merge commit 'a3aeae02885408381c7c1f3f6a0cc88799823409' into glitch-soc/merge-upstream 2026-03-03 18:12:16 +01:00
github-actions[bot]
80066631ee New Crowdin Translations (automated) (#38032) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-03 10:47:19 +00:00
Claire
1b92ac0729 Merge commit '74b3b6c798d1f137947e80df8eefb7412e70febd' into glitch-soc/merge-upstream 2026-03-02 18:11:45 +01:00
David Roetzel
f953d40289 Add API to revoke collection item (#38027) 2026-03-02 13:38:03 +00:00
Claire
799bd69189 Merge commit '2f657019201d73c9d86d1ece339e66e72954f0eb' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
  Upstream refactored a line adjacent to a glitch-soc modified line.
  Ported upstream changes.
 2026-03-02 12:19:02 +01:00
github-actions[bot]
7444c8f82e New Crowdin Translations (automated) (#38018) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-02 08:51:13 +00:00
Claire
0e1ea3110e Merge commit '7f16397f3c37a8e378239974b73afbfe2b6e6844' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the mastodon API version, glitch-soc has a change on an adjacent
  line adding a glitch API version.
 2026-02-27 21:25:37 +01:00
David Roetzel
6b88dd4923 Issue FeatureAuthorizations (#38004) 2026-02-27 11:00:21 +00:00
github-actions[bot]
fc1f57b5f1 New Crowdin Translations (automated) (#38001) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-27 09:29:07 +00:00
Matt Jankowski
1dbb258d53 Update rails to version 8.1.2 (#36505) 2026-02-27 07:50:35 +00:00
Claire
dc27eccc8e Merge commit 'bca57020a04c552a3c91912a0e0b69ddafaad06a' into glitch-soc/merge-upstream 2026-02-26 18:27:02 +01:00
github-actions[bot]
970ac04be7 New Crowdin Translations (automated) (#37985) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-26 10:07:33 +00:00
Claire
e3cb4dea42 Merge commit '4d2a148ccbedc818c98fd712a0b44869c1019321' into glitch-soc/merge-upstream 2026-02-25 19:11:22 +01:00
Echo
dcbf7ab8dc Profile redesign: Account fields grid (#37976) 2026-02-25 16:59:18 +00:00
David Roetzel
f9326efef6 Add moderation consequences for collections (#37974) 2026-02-25 14:32:07 +00:00
github-actions[bot]
953472b40d New Crowdin Translations (automated) (#37968) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-25 10:14:08 +00:00
Claire
c15c49b5b6 Merge commit '1e87bd178d96ab7d760f019fcf651ecc1585e701' into glitch-soc/merge-upstream 2026-02-24 15:14:25 +01:00
Claire
5a5560ca45 Merge commit '3ed16489d05d701e62be5038adbe2891c1a3ac1d' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream dependency updated textually adjacent to glitch-soc dependency
 2026-02-24 12:01:25 +01:00
Claire
43ef9f66b6 Add PATCH /api/v1/profile (#37934) 2026-02-24 10:48:56 +00:00