tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,161 Commits 5 Branches 0 Tags
c2c3a664784f29fbd12fea841ef9dc0abeef6fa0
Commit Graph
23161 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire c2c3a66478 Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream 2024-09-23 20:24:18 +02:00
Matt Jankowski 5dfdec6453 Convert settings/applications controller spec to system/request specs (#32006) 2024-09-23 13:37:32 +00:00
Eugen Rochko aaab6b7adc Add reblogs and favourites counts to statuses in ActivityPub (#32007) 2024-09-23 13:14:15 +00:00
Claire b5bdc69f7b Change mobile breakpoint back to old version and allow main column to shrink (#32033) 2024-09-23 12:53:35 +00:00
Matt Jankowski bbf7752256 Combine assertions in Notification model spec (#32015) 2024-09-23 10:45:34 +00:00
Matt Jankowski 2b4bda8004 Add response_avatar_link helper to webfinger request spec (#31999) 2024-09-23 10:44:52 +00:00
Matt Jankowski 447d0a3e88 Remove double no-records cases in api/v1/admin req specs (#32014) 2024-09-23 09:27:53 +00:00
Matt Jankowski 66ed7ea4b5 Move status creation to "with rss" context in accounts request spec (#32020) 2024-09-23 09:20:43 +00:00
Matt Jankowski cd7b670cd8 Reduce factory creation in User#reset_password! spec (#32021) 2024-09-23 09:18:04 +00:00
Claire 5d6a3f2cb0 Update dependency google-protobuf (#32029) 2024-09-23 09:13:51 +00:00
renovate[bot] 770ec9240a Update Yarn to v4.5.0 (#31914) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-23 09:02:16 +00:00
Tim Campbell 11eae691ba Feature more otel customization (#31998) 2024-09-23 08:55:35 +00:00
github-actions[bot]andGitHub Actions ed90d9342e New Crowdin Translations (automated) (#32011) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-23 08:50:19 +00:00
Matt Jankowski 0ba3ad4a35 Remove body_json_ids from api/v2/admin/accounts spec (#32003) 2024-09-23 08:45:05 +00:00
Matt Jankowski e0b45b35c9 Combine repeated parsed_body assertions into single (#32002) 2024-09-23 08:42:52 +00:00
Eugen Rochko 5fae1d55e5 Fix OAuth authorization prompt referring to third-party apps (#32005) 2024-09-23 08:42:03 +00:00
renovate[bot] 10d2f83025 Update dependency selenium-webdriver to v4.25.0 (#32008) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-23 08:41:26 +00:00
renovate[bot] 958f01e722 Update dependency sass to v1.79.3 (#32009) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-23 08:41:05 +00:00
renovate[bot] f4632d941a Update dependency aws-sdk-s3 to v1.164.0 (#32010) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-23 08:40:46 +00:00
renovate[bot] c37f9c0d44 Update dependency jsdom to v25.0.1 (#32017) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-23 08:36:57 +00:00
renovate[bot] 84d04386dd Update DefinitelyTyped types (non-major) (#32026) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-23 08:35:37 +00:00
renovate[bot] f294c4a594 Update libretranslate/libretranslate Docker tag to v1.6.1 (#32027) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-23 08:35:23 +00:00
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]GitHub ActionsClaire
 		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 JankowskiandClaire 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]andGitHub Actions 162f9a3c90 New Crowdin Translations (automated) (#31993) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-20 08:31:28 +00:00