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

2476 Commits

Author SHA1 Message Date
Claire
8941f1f98c Merge commit '06d64519da4c6fc50536744f0d950dae22c6e2b9' into glitch-soc/merge-4.6 2026-07-02 18:31:59 +02:00
diondiondion
3a6e78eef3 Render post images in emails (#39636) 2026-07-02 14:14:43 +02:00
Claire
08027edb10 Merge commit 'b902c825054b953599cd0341acf428332fca5044' into glitch-soc/merge-upstream 2026-06-12 18:37:02 +02:00
Eugen Rochko
77740e0ce1
Fix missing heading styles in settings area (#39387) 2026-06-12 05:59:08 +00:00
Pia B.
35f3748482
Add import for custom filters (#39256) 2026-06-11 16:32:46 +00:00
Claire
89c2ac444f Merge commit '9e0a3aaf08e7d4fc700f7f19d61f5f8fee346b6a' into glitch-soc/merge-upstream 2026-06-10 18:52:58 +02:00
David Roetzel
70bb70c2e6
Add meta tags to Collection HTML (#39357) 2026-06-10 13:28:52 +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
Matt Jankowski
e9697922c1
Handle offset relative to TZ in options list (#39334) 2026-06-09 12:58:45 +00:00
diondiondion
5553448678
[Accessibility] Patch over a11y issues caused by "simple" ruby gems (#39325) 2026-06-08 13:30:10 +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
Claire
24609bf041
Change rule acceptance link to form (#39283) 2026-06-05 12:45:28 +00:00
diondiondion
0c78d1fd0f
Remove outdated hint for "Use system scrollbar" preference (#39297) 2026-06-05 09:27:45 +00:00
Claire
3cf0fb7ba0 Merge commit 'facb552c9cdbe8a2ebff0b94ebf2c9e9ec385347' into glitch-soc/merge-upstream 2026-06-01 18:00:03 +02: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
Michael Stanclift
88c5d17cf7
Link directly to pending user account in email notification (#39206) 2026-06-01 09:36:39 +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
572612fde9
Remove collections feature flag (#39211) 2026-05-29 09:37:42 +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
diondiondion
e1aa4e3a8c
Accessibility: Add landmark regions to Web UI (#39133) 2026-05-26 10:22:22 +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
diondiondion
15a7507a09
Use radio buttons for emoji style preference (#39126) 2026-05-21 16:55:28 +00:00
diondiondion
e54f927149
Accessibility: Add skip link & landmark regions to settings (#39129) 2026-05-21 13:41:14 +00:00
Claire
ca427bc176 Merge commit 'f5b57e8ba7a2d3687b1ae496f6213bfe5347c0fa' into glitch-soc/merge-upstream 2026-05-20 15:43:33 +02:00
diondiondion
a444a0b572
Accessibility: Add landmark elements to login/sign-up pages (#39098) 2026-05-20 11:28:37 +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
Claire
808b7a858d Merge commit '8bbde181db0d6d79018fb1754a8296e753d47415' into glitch-soc/merge-upstream 2026-05-13 18:42:04 +02:00
Pia B.
bbb3392dbe
add collections icon to admin report interface (#39009) 2026-05-12 17:46:24 +00:00
Pia B.
7c05f56fe8
Add batch actions to collections and possibility to report multiple collections (#38991) 2026-05-12 16:13:01 +00:00
Claire
99f0a03dec Merge commit 'b2aa476abbe82e2b49d84c9fb8ef654f95391fd3' into glitch-soc/merge-upstream 2026-05-07 18:26:17 +02:00
diondiondion
53d0499254
Add label to "Why do you want to join" field during sign-up (#38936) 2026-05-07 11:34:54 +00:00
Echo
f24f98ce40
Profile: Remove old classes (#38920) 2026-05-07 09:41:03 +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
Matt Jankowski
d243ba36ce
Add admin area spec for email subscriptions management (#38912) 2026-05-06 08:47:12 +00:00
Claire
80a452220c Merge commit 'cb2e7705848e602b7cdc513560004715134b10d4' into glitch-soc/merge-upstream 2026-05-05 18:01:14 +02:00
Claire
5e3e11bbfa
Fix role management interface not offering to require 2FA for all users (#38906) 2026-05-05 14:46:52 +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
Claire
030104a30c
Change how invalid-but-not-expired invites are shown in moderation interface (#38736) 2026-05-04 11:38:11 +00:00
Claire
44394878a4 Merge commit 'c6facd27ed191177afb003640b8ee7d0742c7f63' into glitch-soc/merge-upstream 2026-04-30 19:00:48 +02:00
Echo
c270634565
Profile editing: Control follower/following list visibility (#38845) 2026-04-30 14:16:30 +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
diondiondion
a217b633b7
Allow defining alt text for server thumbnail (#38796) 2026-04-23 17:46:50 +00:00
David Roetzel
fdb2563abf
Use /collections/:id as canonical URL for a collection (#38783) 2026-04-23 07:36:35 +00:00