mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,339 Commits
69 Branches
20 Tags
354 MiB
Commit Graph

23339 Commits (bfb610922d7d84ee4f34c5377c8f7152364f237c)

Author SHA1 Message Date
renovate[bot] efc0d4d526
Update dependency react-intl to v6.7.0 (#32028) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-23 08:35:11 +00:00
Claire 6ac6d86525
Merge pull request #2852 from ClearlyClaire/glitch-soc/features/grouped-notifications-cw 
Add content warning support to grouped notifications
 2024-09-22 21:57:55 +02:00
Claire 7c148ed1cb Use new CW class in more places 2024-09-22 21:17:15 +02:00
Claire 4d754935a9 Replace new-style upstream CWs with old-style CWs for now 2024-09-22 20:55:06 +02:00
Eugen Rochko 0d26c9fb0b [Glitch] Fix wrong width on content warnings and filters in web UI 
Port b265a654d7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-22 19:31:22 +02:00
Eugen Rochko 7d97e3d82f [Glitch] Change how content warnings and filters are displayed in web UI 
Partially apply 500f4925a5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-22 19:31:22 +02:00
Claire 5aebdc9bcb
Merge pull request #2850 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 7ed9c590b9
 2024-09-21 20:27:48 +02:00
Eugen Rochko a969c6a6a6 [Glitch] Change zoom icon in web UI 
Port e7fd0985c9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-21 15:36:17 +02:00
Renaud Chaput 03829d8e1d [Glitch] Update directory page options to use URL params 
Port ae03e4ffc6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-21 15:17:56 +02:00
Claire 86b9d3b4e5 [Glitch] Fix custom `history.push` and `history.replace` building bogus location if path is omitted 
Port 57a38f071b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-21 15:16:54 +02:00
Eugen Rochko 9bd5838646 [Glitch] Fix browser glitch caused by two overlapping scroll animations in web UI 
Port ef4d6ab988 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-21 15:16:28 +02:00
Eugen Rochko 80cb285819 [Glitch] Fix sass deprecation warning 
Port 29656cb9e0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-21 15:14:54 +02:00
Renaud Chaput d77348f830 [Glitch] Fix the appearance of avatars when they do not load 
Port 8b70834035 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-21 15:13:57 +02:00
Christian Schmidt 0820cbcb35 [Glitch] Mute XHR abort errors 
Port 7740f1a6bb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-21 15:13:23 +02:00
Claire 221bba1897 Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream 2024-09-21 15:06:06 +02:00
github-actions[bot] b0f6d3e112
New Crowdin Translations (automated) (#2773) 
* New Crowdin translations

* Fix bogus `no.yml`

* Fix bogus `simple_form.no.yml`

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-21 14:57:30 +02:00
Claire 7ed9c590b9
Fix issue when encountering reblog of deleted post in feed rebuild (#32001) 2024-09-20 14:58:06 +00:00
Claire ed8b0e4b1e
Fix links for reblogs in moderation interface (#31979) 2024-09-20 13:33:26 +00:00
Matt Jankowski d55f4fbda1
Add content type checks to api/v2 request specs (#31983) 2024-09-20 13:19:53 +00:00
Matt Jankowski 171394e914
Add coverage for CSV responses for severed relationships (#31962) 2024-09-20 13:13:47 +00:00
Matt Jankowski 66326065b0
Add `response.content_type` checks for JSON to `api/v1` request specs (#31981) 2024-09-20 13:13:04 +00:00
Matt Jankowski a7dbf6f5a5
Use heredoc/squish for inline css styles in oembed serializer (#31991) 2024-09-20 12:50:51 +00:00
Matt Jankowski bdf83c353f
Move default embed size knowledge into `OEmbedSerializer` (#31990) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-20 12:39:48 +00:00
Claire 8afa3bb2fa
Change Mastodon to issue correctly-signed queries by default (#31994) 2024-09-20 10:10:09 +00:00
Eugen Rochko e7fd0985c9
Change zoom icon in web UI (#29683) 2024-09-20 09:42:02 +00:00
Matt Jankowski 04a939d640
Add `reviewed` and `unreviewed` scopes to `Reviewable` model concern (#31988) 2024-09-20 08:51:37 +00:00
Matt Jankowski c922af2737
Add `LIMIT` constant for `api/v1/peers/search` endpoint (#31989) 2024-09-20 08:31:58 +00:00
github-actions[bot] 162f9a3c90
New Crowdin Translations (automated) (#31993) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-20 08:31:28 +00:00
renovate[bot] 840fd69730
Update dependency sass to v1.79.2 (#31992) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-20 08:20:27 +00:00
Matt Jankowski 9a03902ab6
Capture actual behavior in v2/notifications "someone else" dismiss scenario (#31985) 2024-09-20 08:16:19 +00:00
renovate[bot] 09459ed000
Update dependency react-select to v5.8.1 (#31982) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-20 08:15:14 +00:00
Renaud Chaput ae03e4ffc6
Update directory page options to use URL params (#31977) 2024-09-19 15:34:08 +00:00
Claire 57a38f071b
Fix custom `history.push` and `history.replace` building bogus location if path is omitted (#31980) 2024-09-19 14:58:33 +00:00
Matt Jankowski 5a8f2fe31d
Convert `settings/exports` controller spec to system/request specs (#31965) 2024-09-19 13:43:40 +00:00
Matt Jankowski 2946a9286b
Use `headers` shorthand in mailers (#31956) 2024-09-19 13:38:32 +00:00
renovate[bot] 6801afa12f
Update dependency devise-two-factor to v6 [SECURITY] (#31957) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: David Roetzel <david@roetzel.de>
 2024-09-19 10:56:09 +00:00
Eugen Rochko ef4d6ab988
Fix browser glitch caused by two overlapping scroll animations in web UI (#31960) 2024-09-19 10:52:46 +00:00
github-actions[bot] efdc17513d
New Crowdin Translations (automated) (#31974) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-19 10:34:19 +00:00
Matt Jankowski 5d573c976e
Remove unused E2EE-related methods (#31964) 2024-09-19 10:23:58 +00:00
Matt Jankowski b071e618e7
Combine API request spec assertions (#31970) 2024-09-19 10:15:21 +00:00
renovate[bot] 1fce55cf5d
Update dependency aws-sdk-s3 to v1.163.0 (#31972) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-19 09:51:14 +00:00
renovate[bot] 90db524a90
Update dependency puma to v6.4.3 (#31975) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-19 09:50:58 +00:00
Claire 62a39d60ce
Fix rolling updates by moving DropEndToEndMessageTables to post-deployment migrations (#31963) 2024-09-19 09:50:06 +00:00
Eugen Rochko 29656cb9e0
Fix sass deprecation warning (#31961) 2024-09-18 17:39:32 +00:00
Renaud Chaput 8b70834035
Fix the appearance of avatars when they do not load (#31966) 2024-09-18 17:39:15 +00:00
Matt Jankowski e3baa1cdda
Add coverage for `AccountDeletionRequest` class (#31937) 2024-09-18 13:29:57 +00:00
renovate[bot] 42f9f507b6
Update dependency pg to v8.13.0 (#31949) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-18 13:29:21 +00:00
Matt Jankowski bf8eaaa9a5
Convert controller spec for security_key_options endpoint to request spec (#31938) 2024-09-18 09:42:36 +00:00
Matt Jankowski 6f836c45aa
Remove `crypto` values from doorkeeper application/token `scopes` (#31945) 2024-09-18 09:27:50 +00:00
Matt Jankowski 5405bdd344
Remove unused E2EE messaging code (#31193) 2024-09-18 09:27:43 +00:00