tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,374 Commits 5 Branches 0 Tags
86a7a1ef3bfc20d34fc01ea6715635c22b7435cc
Commit Graph
25374 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire 86a7a1ef3b Merge commit '3aed93711c0118ab68fa09f4d3ac2635cb3344b8' into glitch-soc/merge-upstream 2025-06-11 22:52:21 +02:00
Claire 14c5e3433c Merge pull request #3095 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 629bb74451
 2025-06-11 22:51:03 +02:00
Echo 1190780d79 [Glitch] Ensure featured carousel respects tags 
Port c543e823ab to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-11 18:59:45 +02:00
Claire 533af5dcee [Glitch] Fix crash in /about when server returns cached rules without translations attribute 
Port c727701839 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-11 18:58:09 +02:00
Eugen Rochko 3c7da05f85 [Glitch] Fix broken colors in some themed SVGs in web UI 
Port 1824b1fd29 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-11 18:57:30 +02:00
Eugen Rochko 7c1178ab84 [Glitch] Fix wrong dimensions on blurhash previews of news articles in web UI 
Port a2a6117143 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-11 18:57:07 +02:00
Eugen Rochko fb532ab172 [Glitch] Fix wrong styles on action bar in media modal in web UI 
Port f3d60a4a6f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-11 18:56:44 +02:00
Claire aa6d1d4ac1 Merge commit '629bb74451242060298c6fb305c5337002379cc2' into glitch-soc/merge-upstream 2025-06-11 18:55:03 +02:00
Echo 3aed93711c Make React Spring respect animation preferences (#35018) 2025-06-11 16:51:55 +00:00
Eugen Rochko f53bb4cd7d Add "More" to the sidebar menu with links to mutes, blocks, and so on (#34987) 2025-06-11 16:12:04 +00:00
diondiondion 9896bed85f fix: Fix direction of media gallery arrows (#35014) 2025-06-11 15:17:14 +00:00
diondiondion 2c828748a3 fix: Fix cramped layout of follower recommendations on small viewports (#34967) 2025-06-11 15:15:12 +00:00
David Roetzel 1623d54ec0 Start local prometheus_exporter server only in puma/sidekiq startup (#35005) 2025-06-11 13:37:59 +00:00
Claire 722fb1ff55 Fix quoted posts appearing between text and media (#35011) 2025-06-11 13:17:42 +00:00
Claire 933ee420c3 Remove some unused CSS classes (#35012) 2025-06-11 13:17:07 +00:00
renovate[bot] 0cdf11d6ad fix(deps): update dependency postcss-preset-env to v10.2.3 (#35009) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-11 12:12:53 +00:00
Eugen Rochko a13b33d851 Change navigation layout on small screens in web UI (#34910) 2025-06-11 11:55:43 +00:00
Echo 8cf246e4d3 Prevent two composers from being shown (#35006) 2025-06-11 11:12:39 +00:00
Matt Jankowski 629bb74451 Replace selenium-webdriver with playwright (#34867) 2025-06-10 16:33:46 +00:00
renovate[bot] b8cc9b3290 fix(deps): update dependency postcss-preset-env to v10.2.2 (#34998) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-10 14:12:56 +00:00
renovate[bot] 2c085ea044 fix(deps): update dependency core-js to v3.43.0 (#34999) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-10 14:12:53 +00:00
renovate[bot] bb89a64af0 chore(deps): update dependency http to '~> 5.3.0' (#34994) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-10 14:12:44 +00:00
Echo c543e823ab Ensure featured carousel respects tags (#34995) 2025-06-10 13:28:41 +00:00
Claire 7a7e0ba4cd Add basic support for remote attachments with multiple media types (#34996) 2025-06-10 13:26:29 +00:00
Claire c727701839 Fix crash in /about when server returns cached rules without translations attribute (#34997) 2025-06-10 13:25:24 +00:00
Eugen Rochko 1824b1fd29 Fix broken colors in some themed SVGs in web UI (#34988) 2025-06-10 08:36:42 +00:00
renovate[bot] 1bf8a642f0 fix(deps): update dependency sass to v1.89.2 (#34993) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-10 08:36:27 +00:00
Matt Jankowski dc2cfd50a0 Fix Style/OptionalBooleanParameter cop (#34968) 2025-06-10 08:17:35 +00:00
Eugen Rochko a2a6117143 Fix wrong dimensions on blurhash previews of news articles in web UI (#34990) 2025-06-10 08:11:46 +00:00
renovate[bot] 24803db2bc fix(deps): update dependency @vitejs/plugin-react to v4.5.2 (#34992) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-10 08:11:21 +00:00
renovate[bot] 90183b6c27 chore(deps): update dependency rubocop to v1.76.1 (#34991) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-10 07:55:27 +00:00
github-actions[bot]andGitHub Actions c3022fe10f New Crowdin Translations (automated) (#34973) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-10 07:52:52 +00:00
Eugen Rochko f3d60a4a6f Fix wrong styles on action bar in media modal in web UI (#34989) 2025-06-10 07:42:29 +00:00
renovate[bot] 1dd8a99d9f fix(deps): update dependency use-debounce to v10.0.5 (#34982) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-10 07:38:19 +00:00
renovate[bot] 66a42c11ba fix(deps): update dependency rollup-plugin-visualizer to v6.0.3 (#34974) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-10 07:38:00 +00:00
renovate[bot] 132f32dd70 chore(deps): update dependency libvips to v8.17.0 (#34956) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-10 07:37:16 +00:00
Claire e557769a3c Remove broken link to /start/share in welcome e-mail (#34962) 2025-06-08 13:58:53 +00:00
Claire 87e72fb8e1 Merge pull request #3093 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to d887790e86
 2025-06-06 23:42:55 +02:00
diondiondion 49071fd4c0 [Glitch] fix: Fix indentation of quote posts in threads 
Port c92e21813e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-06 18:20:19 +02:00
PGray 9df67e0c74 [Glitch] fix: update search column input on param change 
Port 076005eae2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-06 18:20:02 +02:00
Claireanddiondiondion 3b13487e8f [Glitch] Rewrite AccountNote as Typescript functional component 
Port 68810643d8 to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-06 18:19:07 +02:00
Claire 564d74ea36 Merge commit 'd887790e86124493df850e9bc52e1e059207b523' into glitch-soc/merge-upstream 2025-06-06 18:16:52 +02:00
Matt Jankowski d887790e86 Update SafeReblogInsert concern to match Rails 8 method (#34966) 2025-06-06 15:25:09 +00:00
Claire d0c6f30378 Add fasp queue to sidekiq queue system check (#34965) 2025-06-06 15:23:16 +00:00
Claire ba75ba3adc Change github workflow for chromatic to only run on official Mastodon repository (#34963) 2025-06-06 12:57:41 +00:00
diondiondion c92e21813e fix: Fix indentation of quote posts in threads (#34961) 2025-06-06 12:37:56 +00:00
PGray 076005eae2 fix: update search column input on param change (#34951) 2025-06-06 12:25:38 +00:00
Claire 619b9bc2d8 Merge pull request #3092 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to b10fde673d
 2025-06-06 13:53:27 +02:00
Claire ac68d7e471 Merge commit 'b10fde673d4e703b53f43691419a6e91672daf9e' into glitch-soc/merge-upstream 
Conflicts:
- `tsconfig.json`:
  Upstream added config for storybook files, while glitch-soc had an addition
  for the glitch flavor on the last line.
  Added upstream's new config.
- `yarn.lock`:
  Upstream added a new dependency to an `eslint` plugin textually adjacent to
  a couple glitch-only-dependencies.
  Added upstream's new dependency.
 2025-06-06 13:32:20 +02:00
Claire 00154f3f92 Merge pull request #3091 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 989ca63b59
 2025-06-06 13:26:34 +02:00