mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,072 Commits
69 Branches
21 Tags
364 MiB
Commit Graph

24072 Commits (68106f250ccaf0972af3475c383ff6024217ef65)

Author SHA1 Message Date
Claire 68106f250c Merge commit '6ffa251d6ad239d1ad2b95e784c3a7a21cbf50e8' into glitch-soc/merge-upstream 2025-01-03 12:34:47 +01:00
renovate[bot] 6ffa251d6a
Update dependency net-http to '~> 0.6.0' (#33130) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-03 11:20:13 +00:00
renovate[bot] 098dd91523
Update dependency typescript to v5.7.2 (#33059) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-03 11:16:44 +00:00
Claire c62fae6d94
Merge pull request #2926 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 8e3fd1b823
 2025-01-03 12:10:57 +01:00
Claire ed04547de2
Fix Renovate by temporarily constraining it to Ruby 3.3 (#33440) 2025-01-03 09:24:55 +00:00
Claire 79a9069deb
Add `t` hotkey for post translations (#33441) 2025-01-03 09:24:50 +00:00
Matt Jankowski 7cbdcd7b3f
Add role-specific user fabricators (#33437) 2025-01-03 08:28:14 +00:00
github-actions[bot] a8a16695f1
New Crowdin Translations (automated) (#33439) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-03 07:53:00 +00:00
Matt Jankowski 590b7b2bb5
Use bundler version 2.6.2 (#33436) 2025-01-03 07:52:58 +00:00
gunchleoc 216b1fcd45 [Glitch] Fix favorite & bookmark text toggle in timeline, status and image view 
Port 3201485df2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-02 22:08:43 +01:00
Jeong Arm 539fa40623 [Glitch] Fix keyboard shortcut for open status 
Port a557f9bbaa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-02 21:16:56 +01:00
Claire 970eaae2f1 [Glitch] Fix processing of incoming notifications for unfilterable types 
Port 655c4a5ebb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-02 21:16:01 +01:00
Claire b9a32b0003 [Glitch] Fix WebUI erroneously stopping to offer expanding search results after second page 
Port 68bfa7ae3f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-02 21:15:38 +01:00
Claire cef665788a Merge commit '8e3fd1b8236448f01221b1d7745736e50de51e11' into glitch-soc/merge-upstream 2025-01-02 21:14:14 +01:00
Matt Jankowski 8e3fd1b823
Convert `disputes/appeals` spec controller->system (#33434) 2025-01-02 16:08:25 +00:00
Matt Jankowski 1fbd106af9
Convert `admin/report_notes` spec controller->system (#33433) 2025-01-02 15:54:21 +00:00
Jeong Arm a557f9bbaa
Fix keyboard shortcut for open status (#33419) 2025-01-02 15:48:59 +00:00
Matt Jankowski 00a8a5467c
Convert `admin/relays` spec controller->system (#33430) 2025-01-02 15:01:44 +00:00
gunchleoc 3201485df2
Fix favorite & bookmark text toggle in timeline, status and image view (#27209) 2025-01-02 13:52:07 +00:00
Claire 655c4a5ebb
Fix processing of incoming notifications for unfilterable types (#33429) 2025-01-02 13:22:25 +00:00
Matt Jankowski 2e936785b7
Convert `admin/rules` spec controller->system (#33377) 2025-01-02 12:57:55 +00:00
Claire 68bfa7ae3f
Fix WebUI erroneously stopping to offer expanding search results after second page (#33428) 2025-01-02 10:58:00 +00:00
Claire f9fef9864a
Fix intermittent failure on ap/activity/update spec timestamp check (#33425) 2025-01-02 09:17:49 +00:00
renovate[bot] ca06156087
Update Yarn to v4.6.0 (#33417) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-02 09:07:45 +00:00
renovate[bot] a9f2e261d3
Update dependency ox to v2.14.19 (#33398) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-02 09:05:15 +00:00
renovate[bot] 7b5adb0d64
Update dependency pino to v9.6.0 (#33386) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-02 09:03:56 +00:00
github-actions[bot] ba18289477
New Crowdin Translations (automated) (#33378) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-02 09:02:47 +00:00
renovate[bot] 28466865c1
Update dependency csv to v3.3.2 (#33381) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-02 08:38:56 +00:00
Matt Jankowski 441dcd7396
Fix intermittent failure on ap/activity/create spec timestamp check (#33406) 2025-01-02 08:38:22 +00:00
renovate[bot] 7c50e53baa
Update dependency bufferutil to v4.0.9 (#33414) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-02 08:37:51 +00:00
renovate[bot] 79cfffda3b
Update dependency postcss-preset-env to v10.1.3 (#33415) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-02 08:36:40 +00:00
renovate[bot] d94b2b1c39
Update dependency rubocop-rails to v2.28.0 (#33397) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-02 08:36:24 +00:00
Claire b7afca0f05
Change status content markup to match upstream (#2923) 
* Remove option to have media outside of CWs

Upstream adopted the media-in-CW design glitch-soc originally had.

* Move poll to StatusContent

* Refactor status media icons

* Rename `forceFilter` to `showDespiteFilter` for consistency with upstream

* Change media and status content markup to match upstream's

* Add mention placeholders back
 2024-12-29 19:59:19 +01:00
Claire 5e65586161
Merge `MoveGlitchUserSettings` migration into `MoveUserSettings` (#2925) 2024-12-29 19:24:52 +01:00
Claire a6007ef5fa
Fix “Media“ local settings page being inaccessible (#2922) 2024-12-28 19:31:27 +01:00
Claire 3fc97b14f0
Merge pull request #2921 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 8770905186
 2024-12-26 13:18:22 +01:00
Eugen Rochko c40016b785 [Glitch] Change search to use query params in web UI 
Port 0636bcdbe1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-25 21:38:02 +01:00
Claire 0d25e4f54d Fix rubocop failure in old glitch-soc migration 2024-12-25 21:21:39 +01:00
Eugen Rochko 168d14c920 [Glitch] Change design of interaction modal in web UI 
Port f19fd0b889 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-25 21:21:39 +01:00
Eugen Rochko 2f9efb721c [Glitch] Change animation on feed generation screen in web UI 
Port 3cf6681736 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-25 21:21:39 +01:00
Matt Jankowski e516066112 [Glitch] Fix long account username leaving container 
Port 234af14966 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-25 21:21:39 +01:00
Renaud Chaput e5dc03a353 [Glitch] Fix voting on polls 
Port da279df8ae to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-25 21:21:39 +01:00
Claire 9e7a7c713f [Glitch] Change label of grouped favourite notification on private mentions 
Port a4560d9278 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-25 21:21:39 +01:00
Renaud Chaput 37070a7881 [Glitch] Convert polls to Typescript / Immutable Records 
Port ded799f913 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-25 21:21:39 +01:00
Claire 967e095724 [Glitch] Fix Chromium showing scrollbar on embedded posts 
Port 58c5068bda to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-25 21:21:39 +01:00
Eugen Rochko bb17ffac92 [Glitch] Change referrer policy to be controlled by header in web UI 
Port 425311e1d9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-25 21:21:39 +01:00
Emelia Smith 39ebf707f0 [Glitch] Fix missing top border on Admin Hashtags UI 
Port 6615f17b48 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-25 21:21:38 +01:00
Eugen Rochko cbe88a1e9c [Glitch] Add terms of service 
Port 30aa0df88c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-25 21:21:38 +01:00
Eugen Rochko 1da3010ffd [Glitch] Fix design of search bar on explore screen in light theme in web UI 
Port bf79174829 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-25 21:21:38 +01:00
Eugen Rochko 0bf4d49166 [Glitch] Fix various visual sign-up flow issues 
Port ca45f896dd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-25 21:21:38 +01:00