Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,705 Commits 74 Branches 58 Tags
1e2a9167bcf36c550ffb069d88975bcdc3471d76
Commit Graph

25705 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emelia Smith
1e2a9167bc [Glitch] Support displaying polls in Admin UI 
Port 1137a0ca3a to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-04 19:06:10 +02:00
diondiondion
1947f3a18b [Glitch] Fix error alerts for deleted quotes 
Port 1faf520ce4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-04 19:06:10 +02:00
Claire
5a46e3a234 [Glitch] Fix API return types for interaction API helpers 
Port 8777443c9b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-04 19:06:10 +02:00
Claire
75ba0f757a [Glitch] Fix WebUI fetching deleted quote in an endless loop 
Port bd6d1f0e3f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-04 19:06:10 +02:00
Claire
62ed8d633e [Glitch] Fix Edit as well as “Delete & Redraft” on a poll not inserting empty option 
Port a48567784c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-04 19:06:10 +02:00
Echo
02d92d3b68 [Glitch] Redirect on success for standalone compose 
Port 1675eab561 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-04 19:06:10 +02:00
Emelia Smith
2a87fe5860 [Glitch] Refactor to reuse the one status partial across moderation tools 
Port cbb9a4dbe3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-04 18:38:00 +02:00
Claire
00c61317d3 Merge remote-tracking branch 'upstream/stable-4.4' into HEAD 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflict because of glitch-soc's theming system.
  Updated the line as upstream did.
 2025-09-04 18:33:21 +02:00
fiona
c0f9e7f4c3 Fix handling of edited status with new media and no text (#35970) 2025-09-04 10:45:54 +02:00
Emelia Smith
1137a0ca3a Support displaying polls in Admin UI (#35933) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-04 10:45:54 +02:00
diondiondion
1faf520ce4 Fix error alerts for deleted quotes (#35918) 2025-09-04 10:45:54 +02:00
Claire
8777443c9b Fix API return types for interaction API helpers (#35915) 2025-09-04 10:45:54 +02:00
Claire
bd6d1f0e3f Fix WebUI fetching deleted quote in an endless loop (#35909) 2025-09-04 10:45:54 +02:00
Claire
1a1a23f6f0 Consolidate labels for quote policy settings (#35893) 2025-09-04 10:45:54 +02:00
Claire
a48567784c Fix Edit as well as “Delete & Redraft” on a poll not inserting empty option (#35892) 2025-09-04 10:45:54 +02:00
Shlee
b71216a08a Add crossorigin back to inert css (regression? of #30687) (#35876) 2025-09-04 10:45:54 +02:00
Matt Jankowski
36974aaa99 Use debug? query method on httplog initializer check (#35833) 2025-09-04 10:45:54 +02:00
Claire
567f337db3 Fix self-destruct scheduler behavior on some Redis setups (#35823) 2025-09-04 10:45:54 +02:00
Matt Jankowski
97f118013a Include update in the resources args for api/web/push_subscriptions route (#35801) 2025-09-04 10:45:54 +02:00
Claire
ea5d1f0297 Fix tootctl admin create not bypassing reserved username checks (#35779) 2025-09-04 10:45:54 +02:00
Matt Jankowski
7a862d3308 First pass coverage addition for antispam class (#35771) 2025-09-04 10:45:54 +02:00
Echo
1675eab561 Redirect on success for standalone compose (#35763) 2025-09-04 10:45:54 +02:00
Claire
5f4116a311 Fix interaction policy changes in implicit updates not being saved (#35751) 2025-09-04 10:45:54 +02:00
Claire
0741381670 Add test for Delete of inlined QuoteAuthorization (#35724) 2025-09-04 10:45:54 +02:00
Claire
e61900cadc Fix quote revocation not being streamed (#35710) 2025-09-04 10:45:54 +02:00
Emelia Smith
cbb9a4dbe3 Refactor to reuse the one status partial across moderation tools (#35644) 2025-09-04 10:45:54 +02:00
Claire
4ef0ce033e Fix export of large user archives on 4.4 by enabling Zip64 (#35850) 2025-08-23 01:59:11 +02:00
Claire
48315a719d Change glitch flavor to show approximate reply count by default (#3157) 2025-08-22 22:31:39 +02:00
Claire
45932983fc Merge pull request #3152 from ClearlyClaire/glitch-soc/backports-4.4 
Merge upstream changes up to v4.4.3
v4.4.3 		2025-08-05 15:42:23 +02:00
Claire
1ed3e4cc77 Merge commit '5478ef9b32be0c7ac8f86330760485a7531d218a' into glitch-soc/backports-4.4 2025-08-05 15:24:44 +02:00
Claire
5478ef9b32 Bump version to v4.4.3 (#35686) 2025-08-05 15:20:40 +02:00
Claire
e2592419d9 Merge commit from fork 2025-08-05 14:53:04 +02:00
github-actions[bot]
e330447b0e New Crowdin Translations for stable-4.4 (automated) (#35681) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-05 14:02:35 +02:00
Claire
b15861528c Update dependency ruby-saml to v1.18.1 2025-08-05 11:43:15 +02:00
Claire
83dc7dc16e Disable ActiveRecord query cache in Create critical path (#35662) 2025-08-05 11:43:15 +02:00
Claire
7d3cc51148 Avoid nested transactions when fetching quote posts (#35657) 2025-08-05 11:43:15 +02:00
Claire
cabb33bc49 Fix WebUI crashing for accounts with null URL (#35651) 2025-08-05 11:43:15 +02:00
Claire
ba6f4de3e4 Merge pull request #3150 from ClearlyClaire/glitch-soc/merge-4.4 
Merge upstream changes up to 208cb8276a into stable-4.4
 2025-08-04 22:42:04 +02:00
Claire
6af9646bbd [Glitch] Fix “Expand this post” link including user @undefined 
Port 5429351889 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-04 21:50:10 +02:00
Claire
fcb7917344 Merge commit '208cb8276ae618aa36aec5fad0dc31341402c133' into glitch-soc/merge-4.4 
Conflicts:
- `app/models/trends/statuses.rb`:
  Conflict because of glitch-soc's setting to allow CWs in trends.
  Kept glitch-soc's setting but followed upstream's refactor.
 2025-08-04 21:48:37 +02:00
Claire
208cb8276a Fix friends-of-friends recommendations suggesting already-requested accounts (#35604) 2025-08-01 11:34:27 +02:00
Claire
4ae47f4263 Change StatusReachFinder to consider quotes as well as reblogs (#35601) 2025-08-01 11:34:27 +02:00
Claire
08b2f255fc Fix synchronous recursive fetching of deeply-nested quoted posts (#35600) 2025-08-01 11:34:27 +02:00
Claire
8242f06eca Add restrictions on which quote posts can trend (#35507) 2025-08-01 11:34:27 +02:00
Claire
5429351889 Fix “Expand this post” link including user @undefined (#35478) 2025-08-01 11:34:27 +02:00
Claire
6ff4e83937 Change quote verification to not bypass authorization flow for mentions (#35528) 2025-08-01 11:34:27 +02:00
Claire
5e639d7384 [Glitch] Fix replying from media modal or pop-in-player tagging user @undefined 
Port e7c5c25dce81bd4e32a4bf599c759303420c47e3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-25 23:43:01 +02:00
Claire
26e524836d Merge pull request #3140 from ClearlyClaire/glitch-soc/backports-4.4 
Merge upstream changes up to v4.4.2 into stable-4.4
v4.4.2 		2025-07-23 18:39:12 +02:00
Claire
cfc4bb1dc0 Fix links in posts always having noreferrer in glitch flavor (#3135) 
Fixes #3128
 2025-07-23 18:20:21 +02:00
diondiondion
d7099b1b38 [Glitch] refactor: Disable useDrag hook when main menu is not openable 
Port a842b14c84 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-23 18:20:08 +02:00