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

4843 Commits

Author SHA1 Message Date
Claire
e0a34e6d89 Merge commit 'b15d234ccb5d004180561c440dd45536d70e67b2' into glitch-soc/merge-upstream 2026-04-17 18:06:10 +02:00
Matt Jankowski
475e6833ff
Update to copy and order for media display options (#38731) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-17 13:31:14 +00:00
github-actions[bot]
18c79e4e45
New Crowdin Translations (automated) (#38705) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-16 09:32:46 +00:00
Claire
ff80786d2e Merge commit 'd9ea631d5911ebfe090e0d1ea1b11441aa58c918' into glitch-soc/merge-upstream 2026-04-15 13:36:46 +02:00
github-actions[bot]
05c9ebf2ce
New Crowdin Translations (automated) (#38683) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-15 09:25:46 +00:00
github-actions[bot]
91cb6aa410
Merge pull request #3469 from glitch-soc/i18n/crowdin/translations 
New Crowdin Translations (automated)
 2026-04-14 19:40:03 +02:00
Claire
817291c692 Merge commit '2b93d19d2ca18366b015e3dcde412e67625fe8f5' into glitch-soc/merge-upstream 2026-04-14 18:19:27 +02:00
github-actions[bot]
4fcab304e3
New Crowdin Translations (automated) (#38665) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-14 10:12:20 +00:00
Claire
63a244fe1a
Add /api/v1_alpha/accounts/:id/in_collections to list collections you are in (#38657) 2026-04-13 17:28:28 +00:00
Claire
9177a3e807 Merge commit '02deb0b2381e116b512a826064f6d4008c260cd5' into glitch-soc/merge-upstream 2026-04-13 19:12:08 +02:00
github-actions[bot]
f4f1a86da6
New Crowdin Translations (automated) (#38647) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-13 08:57:02 +00:00
Matt Jankowski
bb64905b21
Update redis gem to version 5.4.1 (#38110) 2026-04-13 07:44:06 +00:00
Claire
1eac058989 Merge commit '73fc8d34d98a80cfb32d3c7c5dc4794fad5470d5' into glitch-soc/merge-upstream 2026-04-11 13:22:19 +02:00
github-actions[bot]
9c164aa16c
New Crowdin Translations (automated) (#38635) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-10 11:18:59 +00:00
diondiondion
eed704d4bd
Update wording for discoverable option (#38633) 2026-04-09 15:32:20 +00:00
diondiondion
d6c0b93c85
Change "My collections" path to /@username/collections (#38630) 2026-04-09 15:31:49 +00:00
github-actions[bot]
875cd30150
New Crowdin Translations (automated) (#38620) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-09 10:50:03 +00:00
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