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
Claire
08027edb10 Merge commit 'b902c825054b953599cd0341acf428332fca5044' into glitch-soc/merge-upstream 2026-06-12 18:37:02 +02:00
github-actions[bot]
03ccfc2172
New Crowdin Translations (automated) (#39390) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-12 07:56:12 +00:00
Eugen Rochko
2630e7e7a2
Fix missing string for custom filter import (#39386) 2026-06-12 05:59:23 +00:00
Pia B.
35f3748482
Add import for custom filters (#39256) 2026-06-11 16:32:46 +00:00
Claire
bbbbb24dbd Merge commit '96e23af89258068d05cc8557df914b4a9add385b' into glitch-soc/merge-upstream 2026-06-11 13:26:25 +02:00
github-actions[bot]
b5a2dd20f6
New Crowdin Translations (automated) (#39367) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-11 07:42:56 +00:00
Claire
89c2ac444f Merge commit '9e0a3aaf08e7d4fc700f7f19d61f5f8fee346b6a' into glitch-soc/merge-upstream 2026-06-10 18:52:58 +02:00
github-actions[bot]
6432fa6649
New Crowdin Translations (automated) (#39351) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-10 09:03:15 +00:00
Claire
e08c8b6933 Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/settings_helper.rb`:
  Upstream added a new helper.
  Conflict caused by the fact there is a glitch-soc specific helper.
  Added upstream's new helper in addition to glitch-soc's.
 2026-06-09 21:30:54 +02:00
Matt Jankowski
e0fc0858a1
Use http POST on rules acceptance button during registration (#39345) 2026-06-09 15:39:24 +00:00
github-actions[bot]
7b858ec3e6
New Crowdin Translations (automated) (#39341) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-09 09:25:45 +00:00
Claire
0b0cdd7a77
Remove doorkeeper workaround (#39336) 2026-06-09 08:30:48 +00:00
Pia B.
d139e57628
fix remove unused translation keys (#39326) 2026-06-08 11:14:10 +00:00
github-actions[bot]
a3c6a52117
New Crowdin Translations (automated) (#39314) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-08 08:23:55 +00:00
Eugen Rochko
ea5b613796
Add ability to view individual newsletters in admin UI (#39271) 2026-06-08 07:05:27 +00:00
Claire
c2e6cbb12b Merge commit 'ead13d4826a7ba1699d6bb310e58642b15687671' into glitch-soc/merge-upstream 2026-06-07 14:29:57 +02:00
Claire
2778eeffba
Add link to profile editing from “Privacy and reach” (#39309) 2026-06-05 14:24:42 +00:00
diondiondion
0c78d1fd0f
Remove outdated hint for "Use system scrollbar" preference (#39297) 2026-06-05 09:27:45 +00:00
Matt Jankowski
be3dce70b8
Update doorkeeper to version 5.9.1 (#39132) 2026-06-05 09:22:05 +00:00
github-actions[bot]
8c80fc612a
New Crowdin Translations (automated) (#39295) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-05 08:29:12 +00:00
github-actions[bot]
2713f14447
New Crowdin Translations (automated) (#39259) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-04 08:12:30 +00:00
Claire
659a077616 Merge commit '07236016bcc78a82205093b3e067bf4a1bb07d88' into glitch-soc/merge-upstream 2026-06-03 12:19:05 +02:00
Renaud Chaput
f0359af358
Change Mastodon gGmbH => Mastodon GmbH (#39261) 2026-06-03 09:36:50 +00:00
Claire
dd12ed2b98 Merge commit 'd1c26c1e27348278fb8081b290e300b327a61ca1' into glitch-soc/merge-upstream 2026-06-02 18:01:45 +02:00
github-actions[bot]
f851dcbefb
New Crowdin Translations (automated) (#39244) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-02 08:00:21 +00:00
Claire
3cf0fb7ba0 Merge commit 'facb552c9cdbe8a2ebff0b94ebf2c9e9ec385347' into glitch-soc/merge-upstream 2026-06-01 18:00:03 +02:00
David Roetzel
300bc7ddc5
Add collections to moderation action button/hint text (#39234) 2026-06-01 11:49:48 +00:00
Pia B.
f6c156197e
Add export for custom filters (#39085) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-01 09:56:17 +00:00
github-actions[bot]
1dfad49524
New Crowdin Translations (automated) (#39224) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-06-01 07:52:25 +00:00
Claire
ae2ff31f32 Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream updated the API version, while we also have a custom glitch API version.
  Updated as upstream did.
 2026-05-30 12:13:35 +02:00
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