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

4955 Commits

Author SHA1 Message Date
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
github-actions[bot]
c5b6881c1d
New Crowdin Translations (automated) (#37956) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-24 09:08:25 +00:00
Claire
3508c8b2f6 Merge commit 'ef6405ab28e02686c0c9aa69d77eb43909be5f6f' into glitch-soc/merge-upstream 2026-02-23 18:20:47 +01:00
David Roetzel
e2aecd040c
Collapse posts/collections in moderation interface (#37929) 2026-02-23 15:14:24 +00:00
github-actions[bot]
6bd4d79802
New Crowdin Translations (automated) (#37940) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-23 09:03:07 +00:00
Claire
85f72a3940 Merge commit '6ba6285a73c3a8b281123814d45f534e3bcebb96' into glitch-soc/merge-upstream 2026-02-20 21:08:06 +01:00
Claire
3a1e3d7413 Fix formatting issues, remove unused JS script 2026-02-20 20:47:50 +01:00
github-actions[bot]
4d2ca8c92a
New Crowdin Translations (automated) (#37924) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-20 10:52:57 +00:00
Claire
cc1e65dcec
Add GET /api/v1/profile (#37912) 2026-02-20 10:16:04 +00:00
Claire
eebed16f59 Merge commit '8e7c3973dc67835e0ce9c7073b9344ec19d3910a' into glitch-soc/merge-upstream 2026-02-19 21:52:23 +01:00
Renaud Chaput
e24737c612
Replace prettier with oxfmt (#37893) 2026-02-19 18:04:25 +00:00
github-actions[bot]
7eb4b907eb
New Crowdin Translations (automated) (#37918) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-19 14:42:24 +00:00
David Roetzel
e288bf6516
Show reported collections in moderation interface (#37898) 2026-02-19 12:46:38 +00:00
github-actions[bot]
093528ef17
New Crowdin Translations (automated) (#37915) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-19 11:11:41 +00:00
Claire
b041869887 Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream 2026-02-18 18:40:03 +01:00
github-actions[bot]
b62ba9e29e
New Crowdin Translations (automated) (#37896) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-18 10:33:31 +00:00
Echo
4b1f66418b
Profile editing: Add initial route (#37885) 2026-02-17 15:45:24 +00:00
Claire
f47e2937cf Merge commit '0b66e744263a4af1f14d03886ea2a9da4ca156db' into glitch-soc/merge-upstream 2026-02-17 12:11:33 +01:00
Claire
0b66e74426
Add GET /api/v1/donation_campaigns (#37880) 2026-02-17 10:54:21 +00:00
github-actions[bot]
0a6412faf9
New Crowdin Translations (automated) (#37884) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-17 09:21:35 +00:00
Matt Jankowski
2cb8471d81
Update doorkeeper i18n for invalid code challenge method (#37827) 2026-02-17 09:01:59 +00:00
Claire
02ad266b81 Merge commit 'cff25c186bb8bb7cdd29de8938949c775dc0ec7f' into glitch-soc/merge-upstream 2026-02-16 18:27:08 +01:00
Claire
5769ceb6e3 Merge commit '284c53f4391c0e2cdea788bc0aff73190913a488' into glitch-soc/merge-upstream 2026-02-16 13:35:39 +01:00
Claire
f199d7995c
Add missing “Filter action” source string (#37838) 2026-02-16 12:34:38 +00:00
github-actions[bot]
6d3eb43500
New Crowdin Translations (automated) (#37863) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-16 09:14:21 +00:00
github-actions[bot]
4149067b18
New Crowdin translations (#3382) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-14 22:03:41 +01:00
Claire
5f72148834 Merge commit '56ecdde1523cec87c55d3d0e7e9b6757dcfe2491' into glitch-soc/merge-upstream 2026-02-13 18:26:08 +01:00
Echo
f5aa5adcf7
Profile redesign: About tab (#37851) 2026-02-13 13:37:39 +00:00