tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,404 Commits 5 Branches 0 Tags
d9fa3feeebb6dd73e4c00bb1489fb24cfdceb2e8
Commit Graph
2978 Commits
Author SHA1 Message Date
Claire 08027edb10 Merge commit 'b902c825054b953599cd0341acf428332fca5044' into glitch-soc/merge-upstream 2026-06-12 18:37:02 +02: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
ShleeandClaire c6e2e2255c Fix missing boolean check in Admin Reports API (#39197) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-10 13:40:59 +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
David Roetzel 200fda1cdc Add collection reach finder (#39346) 2026-06-09 14:22:21 +00:00
Shlee a2064d4c7f Add sign? methods to the Quote and CollectionItem models (#39047) 2026-06-09 12:49:42 +00:00
Evan Prodromou 9c493c20b9 Add policy to filter notifications from bots (#38494) (#38809) 2026-06-09 12:28:53 +00:00
Claire c4ea89dfd9 Change media attachment limit to 10000 characters (#39306) 2026-06-08 14:03:56 +00:00
Claire c2e6cbb12b Merge commit 'ead13d4826a7ba1699d6bb310e58642b15687671' into glitch-soc/merge-upstream 2026-06-07 14:29:57 +02:00
Pia B. ead13d4826 fix naming of custom filter export param (#39304) 2026-06-05 16:02:20 +00:00
Claire 3cf0fb7ba0 Merge commit 'facb552c9cdbe8a2ebff0b94ebf2c9e9ec385347' into glitch-soc/merge-upstream 2026-06-01 18:00:03 +02:00
Matt Jankowski 8d4f9a97fe Move by_domain/local interaction check to filter (#39216) 2026-06-01 14:52:19 +00:00
Claire 89d9fc8889 Remove ignored_columns for columns removed in pre-4.2.0 migrations (#39237) 2026-06-01 14:40:03 +00:00
Pia B.andClaire f6c156197e Add export for custom filters (#39085) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-01 09:56:17 +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
nicole mikołajczyk 6b2616453f Make it possible to retrieve both resolved and unresolved reports by api (#38323) 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-05-23 11:07:02 +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
David Roetzel dee85c6df9 Only preload accounts in Collections when needed (#39143) 2026-05-22 10:11:41 +00:00
Claire cdf721a273 Fix remote statuses with large media descriptions being rejected (#39135) 2026-05-21 15:46:10 +00:00
David Roetzel e18ca373eb Revert "Add partial accounts to collections endpoint (#38919)" (#39128) 2026-05-21 13:45:09 +00:00
David Roetzel fe885d5788 Remove superfluous comment (#39123) 2026-05-21 12:10:31 +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
David Roetzel db304735bf Temporary tweak to account background refresh (#39062) 2026-05-18 10:04:28 +00:00
Claire 808b7a858d Merge commit '8bbde181db0d6d79018fb1754a8296e753d47415' into glitch-soc/merge-upstream 2026-05-13 18:42:04 +02:00
David Roetzel 8bbde181db Use the same condition for stale refresh (#39026) 2026-05-13 14:57:25 +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
David Roetzel 11803e3d04 Relax uniqueness constraint to allow nil (#38934) 2026-05-07 10:08:50 +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
David Roetzel f6f45c43a9 Add partial accounts to collections endpoint (#38919) 2026-05-06 15:08:26 +00:00
David Roetzel 07ce066d68 Move PartialAccountSerializer to the top-level (#38916) 2026-05-06 09:35:07 +00:00
Claire 6935fce458 Merge commit 'ba83509ff4ed3f7193f3ca5c5deb3038c39620b1' into glitch-soc/merge-upstream 2026-05-04 21:08:25 +02:00
Eugen RochkoandClaire 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 44394878a4 Merge commit 'c6facd27ed191177afb003640b8ee7d0742c7f63' into glitch-soc/merge-upstream 2026-04-30 19:00:48 +02:00
Claire 5b395774c0 Add fallback attributes to notifications for new and infrequent notifications (#38832) 2026-04-29 15:53:29 +00:00
David Roetzel 1f1653e039 Remove rejected and revoked collection items (#38792) 2026-04-28 11:10:25 +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
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 e7ee3a997c Merge commit '28e5c3bb5116d012a1f58b4cbfe1a5fb302ac227' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream added fallback behavior for when the admin-set theme does not exist.
  Glitch-soc has a different theming system, but already had similar fallback,
  so not changing glitch-soc code.
- `spec/helpers/theme_helper_spec.rb`:
  Upstream adapted existing tests for the new fallback behavior, and added some
  tests accordingly.
  Glitch-soc has a different theming system, adapted the new tests accordingly.
 2026-04-20 18:51:00 +02:00
Claire ccf5c09ad3 Fix incorrect value for feature_approval.current_user for local users (#38751) 2026-04-20 16:00:15 +00:00
David Roetzel c0b1fbe0a9 Fix item limit on collections (#38749) 2026-04-20 10:17:12 +00:00
Claire e0a34e6d89 Merge commit 'b15d234ccb5d004180561c440dd45536d70e67b2' into glitch-soc/merge-upstream 2026-04-17 18:06:10 +02:00
Matt Jankowski b15d234ccb Add domain_variants helper to DomainNormalizable concern (#38539) 2026-04-17 15:36:09 +00:00
Matt Jankowski ea33d7fba6 Add AccountMigration#remaining_cooldown_days method (#38561) 2026-04-17 14:01:07 +00:00