tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,252 Commits 5 Branches 0 Tags
c2989e231da2cbb136f5347f372c46452fa9bc86
Commit Graph
25252 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire c2989e231d Merge commit '44d71d59efd79ee723a1dec72ec77833560c45cf' into glitch-soc/merge-upstream 2025-05-31 15:30:19 +02:00
Eugen Rochko 44d71d59ef Add icon to header of pinned posts carousel in web UI (#34869) 2025-05-30 22:24:34 +00:00
Claire f4ad91bd6a Merge pull request #3081 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 54ad57ea95
 2025-05-30 22:18:34 +02:00
diondiondion 1cc853059f refactor(Pinned posts carousel): Don't animate initial resize (#34868) 2025-05-30 18:06:41 +00:00
diondiondion f97bcb00b4 [Glitch] fix: Fix autoplay not working properly in AudioModal, #34841 
Port 54ad57ea95 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-30 17:44:53 +02:00
Nicholas La Roux 0f591649c4 [Glitch] Make account header profile pic exactly 2x post profile pic 
Port 0789ec93f8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-30 17:44:27 +02:00
diondiondion c80b14e251 [Glitch] feat: Add relationship info to hover card 
Port 975db93e3f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-30 17:43:58 +02:00
Echo d7ba8451cf [Glitch] Fix pinned carousel scroll on mobile 
Port 9860046b04 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-30 17:43:38 +02:00
Claire 4693aab179 [Glitch] Fix featured posts and familiar followers showing up on hidden accounts 
Port 71a4a92dda to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-30 17:43:13 +02:00
Claire c00e27aa55 Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream 2025-05-30 17:41:31 +02:00
Matt Jankowski 7efe20337c Fix Style/FetchEnvVar cop in omniauth config (#34862) 2025-05-30 15:32:47 +00:00
diondiondion 54ad57ea95 fix: Fix autoplay not working properly in AudioModal, #34841 (#34865) 2025-05-30 15:26:08 +00:00
Claire 064d333620 Fix inconsistent filtering of silenced accounts for other silenced accounts (#34863) 2025-05-30 13:20:51 +00:00
Claire 4b39bced3e Increase capybara default timeout to reduce test flakiness (#34859) 2025-05-30 13:13:24 +00:00
Nicholas La Roux 0789ec93f8 Make account header profile pic exactly 2x post profile pic (#34807) 2025-05-30 12:33:30 +00:00
diondiondion 975db93e3f feat: Add relationship info to hover card (#34792) 2025-05-30 12:32:19 +00:00
Matt Jankowski c025824f98 Use config_for for cache buster values (#34851) 2025-05-30 11:54:25 +00:00
Echo 9860046b04 Fix pinned carousel scroll on mobile (#34858) 2025-05-30 09:08:09 +00:00
Claire 71a4a92dda Fix featured posts and familiar followers showing up on hidden accounts (#34855) 2025-05-30 08:33:52 +00:00
Matt Jankowski 426ee069b5 Update fabrication to version 3.0.0 (#34850) 2025-05-30 08:30:42 +00:00
Matt Jankowski 7fc10bc7b0 Update rack-cors to version 3.0.0 (#34849) 2025-05-30 08:29:25 +00:00
github-actions[bot]andGitHub Actions 4130d9659c New Crowdin Translations (automated) (#34847) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-30 07:34:17 +00:00
renovate[bot] 208dbb8821 chore(deps): update dependency oj to v3.16.11 (#34853) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-30 07:34:04 +00:00
Matt Jankowski 3c09fd3f89 Fix Style/FetchEnvVar cop in devise config (#34846) 2025-05-30 07:00:37 +00:00
Matt Jankowski f7a3dd0e38 Use config_for for VAPID key storage (#34845) 2025-05-30 07:00:33 +00:00
Matt Jankowski a1c260696f Fix Style/FetchEnvVar cop in production env config (#34844) 2025-05-30 07:00:30 +00:00
Claire 79d0f41296 Merge pull request #3080 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to ca41a95872
 2025-05-29 13:14:38 +02:00
Echo 7fa6d6193c [Glitch] Update ESLint to not try to resolve virtual modules 
Port 6ffa262546 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-28 18:43:22 +02:00
Claire b627aee45f Merge commit 'ca41a95872545502dbc6bae6f7237ee20acc38ee' into glitch-soc/merge-upstream 
Conflicts:
- `spec/helpers/theme_helper_spec.rb`:
  Conflict due to glitch-soc's different theming system.
  Adapted upstream changes to glitch-soc's theming system.
 2025-05-28 18:41:47 +02:00
renovate[bot] ca41a95872 chore(deps): update dependency rubocop to v1.75.8 (#34843) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-28 15:46:21 +00:00
renovate[bot] 6e16cac09f chore(deps): update dependency ox to v2.14.23 (#34835) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-28 14:53:42 +00:00
Matt Jankowski 38e0a360ca Add coverage for "default" stylesheet theme helper path (#34732) 2025-05-28 13:33:07 +00:00
David Roetzel b195956ecb Encapsulate redis key usage (#34840) 2025-05-28 12:34:37 +00:00
Emelia Smith a73ade526a Assert usage of client credentials for account registration (#34828) 2025-05-28 12:09:32 +00:00
Echo 6ffa262546 Update ESLint to not try to resolve virtual modules (#34837) 2025-05-28 10:04:52 +00:00
Darius KazemiandClaire 991796172a Fix NoMethodError in edge case of emoji cache handling (#34749) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-28 09:39:55 +00:00
Matt Jankowski 71d46e26b2 Update rack to version 3 (#34816) 2025-05-28 08:39:17 +00:00
Matt Jankowski 887533392f Regenerate rubocop todo with 1.75.7 (#34825) 2025-05-28 08:38:57 +00:00
github-actions[bot]andGitHub Actions 43ccb04548 New Crowdin Translations (automated) (#34834) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-28 08:38:51 +00:00
renovate[bot] 75ae084976 fix(deps): update dependency rollup-plugin-visualizer to v6.0.1 (#34836) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-28 08:20:55 +00:00
renovate[bot] 474013b48c fix(deps): update dependency postcss-preset-env to v10.2.0 (#34821) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-28 08:01:02 +00:00
renovate[bot] 9d7ecf92fe chore(deps): update dependency omniauth-saml to v2.2.4 (#34831) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-28 07:45:16 +00:00
Claire a76647c406 Merge pull request #3079 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to d78535eab9
 2025-05-27 22:33:44 +02:00
Echo ebab5e42c0 [Glitch] Add language picker to server rules section 
Port d78535eab9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-27 20:51:37 +02:00
Claire 086a7016c4 Merge commit 'd78535eab9cefc285c0d7ef88adb125ab1ceb6bd' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Upstream moved its theming system to a plug-in, where we had our own.
  Adapted the file as well as our own plugin to adopt the same mechanisms.
 2025-05-27 20:49:19 +02:00
Echo d78535eab9 Add language picker to server rules section (#34820) 2025-05-27 13:57:34 +00:00
renovate[bot] 7ede5460d8 chore(deps): update dependency pghero to v3.7.0 (#34819) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-27 12:14:38 +00:00
github-actions[bot]andGitHub Actions 32b5da558e New Crowdin Translations (automated) (#34817) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-27 09:28:32 +00:00
renovate[bot] 7132e660a6 chore(deps): update dependency sidekiq-unique-jobs to v8.0.11 (#34815) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-27 08:56:08 +00:00
ClaireandEcho 0372344d33 Move Mastodon theme handling to custom vite plugin (#34808) 
Co-authored-by: Echo <ChaosExAnima@users.noreply.github.com>
 2025-05-27 08:50:48 +00:00