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
David Roetzel
6d3182a6eb
Move Collections API to v1 namespace (#39210) 2026-05-29 08:39:51 +00:00
github-actions[bot]
f436be9410
New Crowdin Translations (automated) (#39193) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-05-29 07:30:42 +00:00
Pia B.
8a9ea06dee
fixes bug Admin Mailer trends mail not displayed correctly (#39122) 2026-05-28 20:14:31 +00:00
Claire
83e77e88ae Merge commit '9215e1ec53dcf3714080c84af7af070bcb8d9978' into glitch-soc/merge-upstream 2026-05-27 20:04:47 +02:00
github-actions[bot]
991a8af7a0
New Crowdin Translations (automated) (#39152) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-05-27 09:35:56 +00:00
Claire
06176deee2 Merge commit 'd20d04922672ed016029c40ed64798f341ebca91' into glitch-soc/merge-upstream 2026-05-26 20:48:49 +02:00
Eugen Rochko
07d099cbf7
Add new overview landing page setting (#39074) 2026-05-26 12:36:54 +00:00
Claire
487c814eb9 Merge commit '6a4d14b178fc00de989b4a2758f2a1e4adf5ed33' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Glitch-soc allows a wider range of HTML than upstream.
  Upstream added `:all => %w(lang)`, which was not supported by glitch-soc,
  added it there too.
 2026-05-22 19:43:42 +02:00
github-actions[bot]
efa729c6d4
New Crowdin Translations (automated) (#39142) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-05-22 09:12:41 +00:00
github-actions[bot]
82670fb5e6
New Crowdin translations (#3500) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-05-21 17:17:29 +02:00
diondiondion
e54f927149
Accessibility: Add skip link & landmark regions to settings (#39129) 2026-05-21 13:41:14 +00:00
github-actions[bot]
6b5e18fb1d
New Crowdin Translations (automated) (#39095) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-05-21 07:37:39 +00:00
Claire
0c80bf0e82 Merge commit 'fcf012c6026418b6c76bff173eec944e0c25913f' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Upstream changed a line adjacent to one glitch-soc modified due to its theming system.
  Adapted upstream's change.
- `yarn.lock`:
  Upstream updated a dependency next to one glitch-soc added.
  Updated the dependency as upstream did.
 2026-05-19 20:40:57 +02:00
Echo
34c91555ae
Refactor emoji search (#39008) 2026-05-19 10:47:45 +00:00
Matt Jankowski
5f33cf0b0a
Extract api/v1/statuses#context to standalone controller (#38348) 2026-05-19 07:15:35 +00:00
github-actions[bot]
eec97e387a
New Crowdin Translations (automated) (#39075) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-05-19 07:00:03 +00:00
Claire
42ec9a607b Merge commit 'c26003af215da7696e2b0dcece7fa695b1be8871' into glitch-soc/merge-upstream 2026-05-18 19:35:08 +02:00
Pia B.
07a05e1edf
Add batch remove for collections in reports (#39020) 2026-05-18 14:53:40 +00:00
github-actions[bot]
3294b5777f
New Crowdin Translations (automated) (#39037) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-05-18 07:26:12 +00:00
Claire
808b7a858d Merge commit '8bbde181db0d6d79018fb1754a8296e753d47415' into glitch-soc/merge-upstream 2026-05-13 18:42:04 +02:00
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