Leatherface/mastodon
1
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,482 Commits 75 Branches 73 Tags
main
Commit Graph

4805 Commits

Author SHA1 Message Date
Claire
30bb39fe54 Merge commit '8e00f7cc8fab9b447f80a27a972eef78186633ad' into glitch-soc/merge-upstream 2026-03-27 18:15:50 +01:00
Matt Jankowski
5a880ff995 Clean up some route declarations (#38444) 2026-03-27 15:29:52 +00:00
github-actions[bot]
28284b8452 New Crowdin Translations (automated) (#38435) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-27 08:26:09 +00:00
Claire
2ac493ee8e Merge commit '9d5e10a70e006c1c0bc61e7f591b1078c7be6ab4' into glitch-soc/merge-upstream 2026-03-26 18:23:45 +01:00
Matt Jankowski
b321d5d377 Use resources to declare API TOS access endpoints (#38416) 2026-03-26 14:07:06 +00:00
Claire
e81a4e258c Add support for FEP-2c59 (#38239) 2026-03-26 13:33:16 +00:00
Echo
dd8602a928 Profile editing: Add notice in profile preferences (#38404) 2026-03-26 11:03:40 +00:00
github-actions[bot]
1dd604df20 New Crowdin Translations (automated) (#38408) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-26 10:35:06 +00:00
Claire
79958d9442 Merge commit '31abef8917879917a330419fe3981a2fb7f35b69' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/post_status_service.rb`:
  Upstream added a line adjacent to one that had been modified due to local-only posting.
  Added upstream's change.
- `tsconfig.json`:
  Upstream updated Typescript and updated `tsconfig` in the process by changing paths, where
  glitch-soc had extra paths. Updated as upstream did.
 2026-03-25 21:36:32 +01:00
Claire
572f18c322 Merge commit '664efcf4c3f9713894054fb642a252d8752a4123' into glitch-soc/merge-upstream 2026-03-25 21:09:30 +01:00
Eugen Rochko
bcf0718a9a Add email subscriptions (#38163) 2026-03-25 16:25:45 +00:00
Matt Jankowski
5d7682c7dd Extract security_key_options endpoint to standalone controller (#38367) 2026-03-25 10:35:09 +00:00
github-actions[bot]
c6691e77bd New Crowdin Translations (automated) (#38380) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-25 09:51:42 +00:00
Claire
3d8e40f7c9 Merge commit 'c72ca33fac1ae1518371f5954ae9487692b17709' into glitch-soc/merge-upstream 2026-03-24 17:05:53 +01:00
Claire
ab251290d6 Merge commit from fork 2026-03-24 15:42:40 +01:00
renovate[bot]
7c5471e763 [Glitch] Update dependency vite to v8 
Port changes from 1935f4db79 to glitch-soc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-24 12:19:00 +01:00
Claire
60236bffe6 Merge commit '0ef43a431d353a17419ea6664ed745b5dbfbf2f9' into glitch-soc/merge-upstream 2026-03-24 12:13:39 +01:00
github-actions[bot]
65952f9b4c New Crowdin Translations (automated) (#38354) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-24 09:40:31 +00:00
Claire
970313a83e Drop support for ENABLE_SIDEKIQ_UNIQUE_JOBS_UI (#38340) 2026-03-23 18:34:21 +00:00
renovate[bot]
1935f4db79 Update dependency vite to v8 (#38174) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
 2026-03-23 11:47:03 +00:00
github-actions[bot]
34a52fd38b New Crowdin Translations (automated) (#38321) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-23 07:45:28 +00:00
Claire
469076c357 Merge commit '4e276e4476c81482143440f1f405479e0e4be7eb' into glitch-soc/merge-upstream 2026-03-20 18:03:14 +01:00
github-actions[bot]
d7d8d7f5ab New Crowdin Translations (automated) (#38303) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-20 09:38:52 +00:00
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