tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,613 Commits 5 Branches 0 Tags
Commit Graph

4826 Commits

Author SHA1 Message Date
Claire
b9014ec220 Merge commit '66fdd3ae65e13349fbc0b2818d4b91a389075553' into glitch-soc/main 2026-04-08 19:32:32 +02:00
github-actions[bot]
de86ad56e5
New Crowdin Translations (automated) (#38597) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-08 08:37:51 +00:00
Claire
69b70d48c6 Merge commit 'db13dddcf90343574dee320fff7e8bb9bf3707e4' into glitch-soc/merge-upstream 2026-04-07 20:08:57 +02:00
Echo
e4e7e679b3
Profile editing: Removes old profile editing page (#38584) 2026-04-07 13:52:04 +00:00
Matt Jankowski
71e6e50846
Simplify media attachment lookup in show/player actions (#38565) 2026-04-07 09:58:37 +00:00
github-actions[bot]
0a64bcae63
New Crowdin Translations (automated) (#38564) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-07 09:34:30 +00:00
Claire
da85a16692 Merge commit '8fa91b4b81951f884a773d0aa56fc4f1a48da03e' into glitch-soc/merge-upstream 2026-04-04 09:31:50 +02:00
Matt Jankowski
621628e2cf
Clarify that language filter does not impact home/lists (#38490) 
Co-authored-by: Brendan Jones <16049594+brendanjones@users.noreply.github.com>
 2026-04-03 14:46:29 +00:00
github-actions[bot]
627023b452
New Crowdin Translations (automated) (#38553) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-03 09:36:56 +00:00
Matt Jankowski
671568aec9
Use "batch" concern in admin routes (#38551) 2026-04-03 08:37:41 +00:00
github-actions[bot]
93e7a3318b
New Crowdin translations (#3446) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-02 19:53:52 +02:00
Matt Jankowski
47f58212de
Use approvable concern for repeated API approve/reject routes (#38542) 2026-04-02 16:11:37 +00:00
Claire
45bd1ca785 Merge commit 'ffcf87e0234a5529652295d2386a8c9c8e43a7ff' into glitch-soc/merge-upstream 2026-04-02 12:03:44 +02:00
github-actions[bot]
9b5c676468
New Crowdin Translations (automated) (#38520) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-02 08:55:13 +00:00
Claire
7a4747122e Merge commit 'ca5c0a144ade4bff7bd10446a39d86116879884e' into glitch-soc/merge-upstream 
- `CODE_OF_CONDUCT.md`:
  Adopt upstream's new Code of Conduct
 2026-04-01 19:11:21 +02:00
Claire
b5c1a13341 Merge commit '30275cd80e8552d6cbcdeb11f83a4d5028aa6eae' into glitch-soc/merge-upstream 2026-04-01 18:37:21 +02:00
github-actions[bot]
eda0f62f89
New Crowdin Translations (automated) (#38505) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-01 09:16:06 +00:00
Eugen Rochko
14544dc4dd
Fix subject of email subscription notification e-mail being difficult to localize (#38507) 2026-04-01 08:32:47 +00:00
github-actions[bot]
6736b50c14
New Crowdin Translations (automated) (#38496) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-31 14:53:38 +00:00
Claire
30275cd80e
Disable extraneous devise strategies if DISABLE_DEVISE_TWO_STRATEGIES is set to true (#38486) 2026-03-30 14:45:59 +00:00
github-actions[bot]
ac69a3374c
New Crowdin Translations (automated) (#38470) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-30 09:37:48 +00:00
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 1935f4db79cc6b33ab4f4ef9cd3cf198df320343 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