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
Eugen Rochko
ea5b613796
Add ability to view individual newsletters in admin UI ( #39271 )
2026-06-08 07:05:27 +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
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
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 and Claire
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
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
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
Claire
e0a34e6d89
Merge commit 'b15d234ccb5d004180561c440dd45536d70e67b2' into glitch-soc/merge-upstream
2026-04-17 18:06:10 +02:00
Matt Jankowski
1d3ca80bf7
Use model constants more consistently for view expiration collections ( #38589 )
2026-04-17 13:57:18 +00:00
Claire
da85a16692
Merge commit '8fa91b4b81951f884a773d0aa56fc4f1a48da03e' into glitch-soc/merge-upstream
2026-04-04 09:31:50 +02:00
Matt Jankowski
ee69290003
Use collection partial for "software updates" list in admin area ( #38550 )
2026-04-03 13:28:50 +00:00
Claire
bd9e7d6060
Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/settings/discovery/show.html.haml`:
Glitch-soc has an extra setting textually adjacent to a line upstream has changed.
Applied upstream's change while keeping glitch-soc's setting.
2026-03-17 18:53:00 +01:00
diondiondion
68984de5b5
Revamp heading levels in settings & admin pages ( #38230 )
2026-03-17 10:32:24 +00:00
Claire
1b92ac0729
Merge commit '74b3b6c798d1f137947e80df8eefb7412e70febd' into glitch-soc/merge-upstream
2026-03-02 18:11:45 +01:00
Matt Jankowski
e7cec161fd
Reduce haml-lint LineLength configuration to 240 ( #37287 )
2026-03-02 14:43:57 +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
Matt Jankowski
c86a8f8798
Use file_field support for array to accept attribute ( #37844 )
2026-03-02 09:27:04 +00:00
Claire
e3cb4dea42
Merge commit '4d2a148ccbedc818c98fd712a0b44869c1019321' into glitch-soc/merge-upstream
2026-02-25 19:11:22 +01:00
David Roetzel
f9326efef6
Add moderation consequences for collections ( #37974 )
2026-02-25 14:32:07 +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
Claire
eebed16f59
Merge commit '8e7c3973dc67835e0ce9c7073b9344ec19d3910a' into glitch-soc/merge-upstream
2026-02-19 21:52:23 +01:00
David Roetzel
e288bf6516
Show reported collections in moderation interface ( #37898 )
2026-02-19 12:46:38 +00:00
Claire
5f72148834
Merge commit '56ecdde1523cec87c55d3d0e7e9b6757dcfe2491' into glitch-soc/merge-upstream
2026-02-13 18:26:08 +01:00
Matt Jankowski
56ecdde152
Add ContentPoliciesHelper#policy_list to wrap string building in views ( #37856 )
2026-02-13 15:54:41 +00:00
Claire
2373c5a132
Merge commit 'ca9966ce2ff79dcac90b2feced65fa991534d53e' into glitch-soc/merge-upstream
2026-02-11 20:26:56 +01:00
Claire
dfe44bcaef
Add ability to require 2FA for specific roles (including Everybody) ( #37701 )
2026-02-11 14:34:09 +00:00
Claire
d62a7775b5
Merge commit 'd0502ac3c1630e281fda5492cbc28390262b0aeb' into glitch-soc/merge-upstream
2026-01-29 21:08:46 +01:00
Matt Jankowski
d0502ac3c1
Use "namespace style" for URL generation in admin/ area forms ( #35080 )
2026-01-29 15:56:10 +00:00
Claire
b96c8ecff4
Merge commit '89c1b9a8fdfe38881ad1b6c22f20240b087aa993' into glitch-soc/merge-upstream
2026-01-26 18:09:54 +01:00
Matt Jankowski
24fb3e8465
Use collection render on admin dashboard system checks ( #35976 )
2026-01-26 09:43:30 +00:00
Claire
Eugen Rochko
David Roetzel
Pia B.
Echo
Matt Jankowski
diondiondion