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

4935 Commits

Author SHA1 Message Date
github-actions[bot]
771fdcbb9f
New Crowdin Translations (automated) (#39024) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-05-13 09:08:11 +00:00
Claire
4fcc9b8a40 Merge commit 'd2f640272f3f36c8979cff645416682840528906' into glitch-soc/merge-upstream 2026-05-12 18:37:31 +02:00
Pia B.
7c05f56fe8
Add batch actions to collections and possibility to report multiple collections (#38991) 2026-05-12 16:13:01 +00:00
github-actions[bot]
735a00d741
New Crowdin Translations (automated) (#39000) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-05-12 07:54:35 +00:00
github-actions[bot]
e081d5936c
New Crowdin Translations (automated) (#38952) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-05-11 07:02:39 +00:00
Claire
99f0a03dec Merge commit 'b2aa476abbe82e2b49d84c9fb8ef654f95391fd3' into glitch-soc/merge-upstream 2026-05-07 18:26:17 +02:00
Claire
b2aa476abb
Redirect with interstitial when trying to view a remote collection while logged out (#38941) 2026-05-07 16:04:26 +00:00
github-actions[bot]
92c9fda9e6
New Crowdin Translations (automated) (#38930) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-05-07 09:26:43 +00:00
Claire
49310aeecf Merge commit '1a2038775c0a999024a615348fcba6240e27b0fa' into glitch-soc/merge-upstream 2026-05-06 21:00:32 +02:00
Pia B.
1a2038775c
Add ability to search email blocks by domain (#38923) 2026-05-06 15:54:12 +00:00
nicole mikołajczyk
194b889873
Expose mastodon-async-refresh response header through CORS (#38914) 2026-05-06 10:41:25 +00:00
github-actions[bot]
b04f7e7411
New Crowdin Translations (automated) (#38915) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-05-06 08:54:35 +00:00
Claire
80a452220c Merge commit 'cb2e7705848e602b7cdc513560004715134b10d4' into glitch-soc/merge-upstream 2026-05-05 18:01:14 +02:00
github-actions[bot]
127de5bb3d
New Crowdin Translations (automated) (#38905) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-05-05 10:24:49 +00:00
Claire
6935fce458 Merge commit 'ba83509ff4ed3f7193f3ca5c5deb3038c39620b1' into glitch-soc/merge-upstream 2026-05-04 21:08:25 +02:00
Eugen Rochko
ee88da4511
Add admin UI for managing email subscriptions (#38741) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-04 13:56:04 +00:00
github-actions[bot]
e4b8bbe6e8
New Crowdin Translations (automated) (#38875) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-05-04 07:49:54 +00:00
Claire
44394878a4 Merge commit 'c6facd27ed191177afb003640b8ee7d0742c7f63' into glitch-soc/merge-upstream 2026-04-30 19:00:48 +02:00
github-actions[bot]
c6facd27ed
New Crowdin Translations (automated) (#38871) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-30 16:44:20 +00:00
github-actions[bot]
20e3265f3b
New Crowdin Translations (automated) (#38864) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-30 12:32:25 +00:00
Claire
1df259f8c9
Fix translation string of some fallback notifications (#38860) 2026-04-30 09:18:32 +00:00
github-actions[bot]
deb72a4c91
New Crowdin Translations (automated) (#38859) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-30 08:21:13 +00:00
Claire
5b395774c0
Add fallback attributes to notifications for new and infrequent notifications (#38832) 2026-04-29 15:53:29 +00:00
David Roetzel
725d8983fa
Fix client-side collection routes (#38850) 2026-04-29 14:52:32 +00:00
github-actions[bot]
578836f9ae
New Crowdin Translations (automated) (#38842) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-29 13:47:29 +00:00
github-actions[bot]
4f76bdfcb7
New Crowdin Translations (automated) (#38824) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-28 11:39:12 +00:00
David Roetzel
1f1653e039
Remove rejected and revoked collection items (#38792) 2026-04-28 11:10:25 +00:00
Claire
57017329a4 Merge commit '2dd630bc581dfd73950b45f6c3b1f47619b7ea6c' into glitch-soc/merge-upstream 2026-04-27 20:18:51 +02:00
github-actions[bot]
c53bb2fcd6
New Crowdin Translations (automated) (#38805) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-27 08:09:16 +00:00
Claire
b3bae7e78f Merge commit '3473b8a65278783bc74ce2738aea98cca0c7a5ed' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Upstream added a new setting textually adjacent to ones modified by glitch-soc's.
  Added upstream's new setting.
 2026-04-25 09:20:39 +02:00
github-actions[bot]
a4e5c3244f
New Crowdin Translations (automated) (#38800) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-24 08:46:34 +00:00
diondiondion
a217b633b7
Allow defining alt text for server thumbnail (#38796) 2026-04-23 17:46:50 +00:00
Claire
be4ba1495c
Remove unused devise strategies (#38795) 2026-04-23 14:26:19 +00:00
github-actions[bot]
a8741495c4
New Crowdin Translations (automated) (#38790) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-23 08:42:05 +00:00
David Roetzel
fdb2563abf
Use /collections/:id as canonical URL for a collection (#38783) 2026-04-23 07:36:35 +00:00
Claire
b6abf7a69f Merge commit 'c4eec632b92c800ae38dba111c4c76e63bb1c0de' into glitch-soc/merge-upstream 2026-04-22 20:24:21 +02:00
David Roetzel
1cae543e8f
Add per-user maximum number of collections (#38769) 2026-04-22 12:34:08 +00:00
github-actions[bot]
a3127a146d
New Crowdin Translations (automated) (#38774) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-22 10:42:55 +00:00
Claire
0b3c848958 Merge commit 'a706fce6781104b3aa1315be14f1fb8ccd4fcb1b' into glitch-soc/merge-upstream 2026-04-21 19:20:05 +02:00
github-actions[bot]
9717dc64d0
New Crowdin Translations (automated) (#38762) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-21 11:10:06 +00:00
Claire
e7ee3a997c Merge commit '28e5c3bb5116d012a1f58b4cbfe1a5fb302ac227' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream added fallback behavior for when the admin-set theme does not exist.
  Glitch-soc has a different theming system, but already had similar fallback,
  so not changing glitch-soc code.
- `spec/helpers/theme_helper_spec.rb`:
  Upstream adapted existing tests for the new fallback behavior, and added some
  tests accordingly.
  Glitch-soc has a different theming system, adapted the new tests accordingly.
 2026-04-20 18:51:00 +02:00
github-actions[bot]
d9149bfed9
New Crowdin Translations (automated) (#38743) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-20 07:47:02 +00:00
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