Claire
c96db36396
Merge commit '8a0261c51caf76b6d12e3801da471759c31c9608' into glitch-soc/merge-upstream
2026-03-04 12:40:16 +01:00
Claire
8a0261c51c
Add missing_attribution boolean to preview cards ( #38043 )
2026-03-04 11:18:37 +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
David Roetzel
2f65701920
Add service to revoke inclusion in a Collection ( #38026 )
2026-03-02 10:16:41 +00:00
Matt Jankowski
c86a8f8798
Use file_field support for array to accept attribute ( #37844 )
2026-03-02 09:27:04 +00:00
Claire
0e1ea3110e
Merge commit '7f16397f3c37a8e378239974b73afbfe2b6e6844' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/mastodon/version.rb`:
Upstream bumped the mastodon API version, glitch-soc has a change on an adjacent
line adding a glitch API version.
2026-02-27 21:25:37 +01:00
Matt Jankowski
7e5e96739f
Use consistent calling style for TagManager#normalize_domain ( #35764 )
2026-02-27 16:38:34 +00:00
Matt Jankowski
9762b4a75c
Use normalizes for tag name attribute ( #37119 )
2026-02-27 15:56:08 +00:00
David Roetzel
6b88dd4923
Issue FeatureAuthorizations ( #38004 )
2026-02-27 11:00:21 +00:00
Claire
dc27eccc8e
Merge commit 'bca57020a04c552a3c91912a0e0b69ddafaad06a' into glitch-soc/merge-upstream
2026-02-26 18:27:02 +01:00
David Roetzel
b09e63da87
Federate activity when remote account is added to a Collection ( #37992 )
2026-02-26 15:11:02 +00:00
David Roetzel
51b81b3ce9
Allow remote accounts in Collections ( #37989 )
2026-02-26 13:31:23 +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
David Roetzel
e2c9426c77
Split status batch and moderation actions ( #37970 )
2026-02-25 10:07:46 +00:00
David Roetzel
72406a1cd1
Refactor: Introduce admin base action class ( #37960 )
2026-02-24 14:22:44 +00:00
Claire
c15c49b5b6
Merge commit '1e87bd178d96ab7d760f019fcf651ecc1585e701' into glitch-soc/merge-upstream
2026-02-24 15:14:25 +01:00
Claire
43ef9f66b6
Add PATCH /api/v1/profile ( #37934 )
2026-02-24 10:48:56 +00:00
Claire
85f72a3940
Merge commit '6ba6285a73c3a8b281123814d45f534e3bcebb96' into glitch-soc/merge-upstream
2026-02-20 21:08:06 +01:00
David Roetzel
6ba6285a73
Reject unconfirmed FASPs ( #37926 )
2026-02-20 14:40:31 +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
925d1ffde5
Fix Ruby linting for glitch-soc code
2026-02-18 18:47:21 +01:00
Claire
b041869887
Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream
2026-02-18 18:40:03 +01:00
Claire
bd64ca2583
Add new profile settings ( #37890 )
2026-02-18 13:18:44 +00:00
Nicholas La Roux
438602c488
Upgrade rubocop from v1.84.0 to v1.84.2, update config, and correct offences ( #37795 )
2026-02-17 14:56:46 +00:00
Claire
f47e2937cf
Merge commit '0b66e744263a4af1f14d03886ea2a9da4ca156db' into glitch-soc/merge-upstream
2026-02-17 12:11:33 +01:00
Claire
4a6d17ad7b
Fix hashtag matching by replacing negative lookbehind with positive lookbehind ( #37684 )
2026-02-17 10:27:36 +00:00
Claire
ddc7df2064
Merge commit '6c3bd944f8890e1a349bd06e9585cb5ec25507e6' into glitch-soc/merge-upstream
2026-02-13 13:03:51 +01:00
David Roetzel
6c3bd944f8
Allow reporting (local) Collections ( #37848 )
2026-02-13 11:11:44 +00:00
Claire
e451416d90
Merge commit 'c44cc1f5c3bafb49a324f8f72a42a91d09eecfe3' into glitch-soc/merge-upstream
2026-02-12 18:00:45 +01:00
David Roetzel
f57167c61a
Add ID/URI to collection items ( #37842 )
2026-02-12 15:31:45 +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
8f58c42ca3
Merge commit '2e30044a374811bc94fd62a8159cb2c9ffe18a4d' into glitch-soc/merge-upstream
2026-02-06 22:45:55 +01:00
Echo
1310628a60
Bust relationship cache key ( #37760 )
2026-02-06 14:36:12 +00:00
Echo
7a4945c0d3
Show mute end date in badge ( #37747 )
2026-02-05 20:01:28 +00:00
Claire
d62a7775b5
Merge commit 'd0502ac3c1630e281fda5492cbc28390262b0aeb' into glitch-soc/merge-upstream
2026-01-29 21:08:46 +01:00
Daniel King and Daniel King
d5d57ac25a
Add flag to preserve cached media on cleanup ( #36200 )
...
Co-authored-by: Daniel King <git@kin.gy >
2026-01-29 15:53:51 +00:00
Matt Jankowski
23148dc536
Update rubocop to version 1.8.40 ( #37628 )
2026-01-29 10:14:14 +00:00
Claire
36be9bbebf
Merge commit 'a495a0cbfcf9f6111c0e598af0864de2b76e4111' into glitch-soc/merge-upstream
2026-01-28 19:29:10 +01:00
Matt Jankowski
f861a5cee0
Add action_logs association for account ( #36022 )
2026-01-28 11:04:00 +00:00
Claire
6af4696c70
Add backend support for storing remote actors profile pic and header descriptions ( #37634 )
2026-01-28 09:32:59 +00:00
Claire
b14cbb3ee9
Merge pull request #3364 from ClearlyClaire/glitch-soc/features/local-only-drop-emoji
...
Deprecate eye emoji in favor of a bespoke API parameter
2026-01-27 22:30:17 +01:00
Claire
5a45a3203a
Merge commit '7af5ba271d6f04831f000e9b815914375e42abeb' into glitch-soc/merge-upstream
2026-01-27 18:03:27 +01:00
Claire
9ea64fcb5a
Fix last_status_at not accurately tracking last status time for remote accounts ( #37619 )
2026-01-27 13:23:12 +00:00
Claire
b96c8ecff4
Merge commit '89c1b9a8fdfe38881ad1b6c22f20240b087aa993' into glitch-soc/merge-upstream
2026-01-26 18:09:54 +01:00
Claire
8b95254883
Merge commit 'c36db57acedf0033c090748125c665a0360cd11f' into glitch-soc/merge-upstream
2026-01-23 17:57:20 +01:00
Matt Jankowski
29ec2cd186
Add targeted_account_notes association to simplify usage ( #35540 )
2026-01-23 16:35:19 +00:00
Claire
d05df5c197
Fix quote cache invalidation ( #37592 )
2026-01-23 13:35:43 +00:00
Claire
David Roetzel
Matt Jankowski
Nicholas La Roux
Echo
Daniel KingandDaniel King