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

2963 Commits

Author SHA1 Message Date
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 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
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
Matt Jankowski
1d3ca80bf7
Use model constants more consistently for view expiration collections (#38589) 2026-04-17 13:57:18 +00:00
Shlee
9afaa23e78
Fix incorrect only option in before_validation filters (#38704) 2026-04-17 13:36:38 +00:00
Matt Jankowski
475e6833ff
Update to copy and order for media display options (#38731) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-17 13:31:14 +00:00
David Roetzel
b846f88e16
Improve collection item behavior in REST API (#38732) 2026-04-17 13:28:39 +00:00
David Roetzel
fee38e57f0
Federate and store a collection url (#38697) 2026-04-16 07:26:34 +00:00
Claire
6b1e1899fd
Change discoverable accounts to only allow followers to feature them if they are locked (#38672) 2026-04-15 15:05:58 +00:00
Claire
3072de056a Merge commit '3a84990780fb1b48999f661f0cea5cb29cca4d33' into glitch-soc/merge-upstream 2026-04-15 16:27:32 +02:00
Claire
d6f62f5fa4
Merge commit from fork 
* Disallow some special characters in e-mail addresses

* Add size limit to email columns
 2026-04-15 15:22:33 +02:00
Claire
817291c692 Merge commit '2b93d19d2ca18366b015e3dcde412e67625fe8f5' into glitch-soc/merge-upstream 2026-04-14 18:19:27 +02:00
Claire
63a244fe1a
Add /api/v1_alpha/accounts/:id/in_collections to list collections you are in (#38657) 2026-04-13 17:28:28 +00:00
Claire
9177a3e807 Merge commit '02deb0b2381e116b512a826064f6d4008c260cd5' into glitch-soc/merge-upstream 2026-04-13 19:12:08 +02:00
Claire
06a8379dce
Fix collections allowing multiple occurrences of the same user (#38636) 2026-04-13 10:28:54 +00:00
Claire
1eac058989 Merge commit '73fc8d34d98a80cfb32d3c7c5dc4794fad5470d5' into glitch-soc/merge-upstream 2026-04-11 13:22:19 +02:00
Shlee
f429019f34
Missing .freeze on collection_update reference in notification.rb (#38628) 2026-04-09 14:36:54 +00:00
Claire
b9014ec220 Merge commit '66fdd3ae65e13349fbc0b2818d4b91a389075553' into glitch-soc/main 2026-04-08 19:32:32 +02:00