tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,585 Commits 5 Branches 0 Tags
323c6e51fe17fd4acb2a63d245367e5ef310b20a
Commit Graph
26585 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire 323c6e51fe Merge commit '7530f06deea63a03e0ca05f777f0f1582372c305' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream reorganized the whole page, while glitch-soc had an extra setting.
  Adopted upstream's redesign and moved the extra setting where it made sense.
 2025-10-16 19:23:29 +02:00
Claire 383445c977 [Glitch] Fix pinned hashtag columns fully refreshing unprompted 
Port ef53dcfd8c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-16 18:38:10 +02:00
diondiondion 2fb14cbb2b [Glitch] Show new replies early if the fetch-all-replies task takes long to finish 
Port 869eeecfee to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-16 18:37:48 +02:00
diondiondion 0512ffcbcd [Glitch] Fix low-contrast hover colour of alert actions (light theme only) 
Port 28a42bb62c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-16 18:37:13 +02:00
Claire f56fc1bab4 Merge commit '241ad1c5878161f5f4a19c16ed6c042f1c2cb6c2' into glitch-soc/merge-upstream 2025-10-16 18:36:25 +02:00
Echo 7530f06dee Emoji: Fix autoplay incorrectly being applied (#36503) 2025-10-16 12:46:17 +00:00
renovate[bot] 28339cad6d Update dependency rollup-plugin-visualizer to v6.0.5 (#36499) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-16 10:29:13 +00:00
github-actions[bot]andGitHub Actions 5404f92cee New Crowdin Translations (automated) (#36494) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-16 10:29:07 +00:00
diondiondion 05244c335d Restructure appearance settings to introduce new Advanced settings section (#36496) 2025-10-16 09:44:24 +00:00
Claire 241ad1c587 Update docker-compose.yml sidekiq health check to work for both 4.4 and 4.5 (#36498) 2025-10-16 09:24:22 +00:00
Claire ef53dcfd8c Fix pinned hashtag columns fully refreshing unprompted (#36497) 2025-10-16 09:10:53 +00:00
diondiondion 869eeecfee Show new replies early if the fetch-all-replies task takes long to finish (#36481) 2025-10-15 17:30:47 +00:00
Claire 24089589b7 Merge pull request #3239 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 5a8ab0a3e6
 2025-10-15 17:41:44 +02:00
diondiondion 28a42bb62c Fix low-contrast hover colour of alert actions (light theme only) (#36484) 2025-10-15 15:38:36 +00:00
Aung Htet Nay 905aa9434d Change FFmpeg source to GitHub mirror in Dockerfile (#36424) 2025-10-15 15:25:39 +00:00
Matt Jankowskianddiondiondion ef3f2ced09 [Glitch] Update stylelint-config-standard-scss to version 16.0.0 
Port c6de46d12d to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-15 16:42:23 +02:00
Emelia Smith 2ccab68636 [Glitch] Fix rendering of poll options in status history modal 
Port d8bdce2835 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-15 16:37:45 +02:00
Claire ef413ef713 Merge commit '5a8ab0a3e62a8825e28bb74c1760ba6488d20c97' into glitch-soc/merge-upstream 2025-10-15 16:35:37 +02:00
Claire 5a8ab0a3e6 Update changelog with last-minute changes (#36482) 2025-10-15 14:12:33 +00:00
Claire c5fb080ab8 Bump version to v4.5.0-beta.1 (#36479) 2025-10-15 13:09:25 +00:00
Claire fab0dd0bcf Change redirection for denied registration from web app to sign-in page with error message (#36384) 2025-10-15 11:37:22 +00:00
Matt Jankowskianddiondiondion c6de46d12d Update stylelint-config-standard-scss to version 16.0.0 (#36429) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-10-15 11:30:09 +00:00
Claire 3160f5746d Bump version to v4.4.7 (#36478) 2025-10-15 09:11:03 +00:00
Emelia Smith d8bdce2835 Fix rendering of poll options in status history modal (#35633) 2025-10-15 09:05:10 +00:00
github-actions[bot]andGitHub Actions 339673d533 New Crowdin Translations (automated) (#36476) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-15 08:54:47 +00:00
renovate[bot] d0d1fcd034 Update opentelemetry-ruby (non-major) (#36477) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-15 07:56:45 +00:00
renovate[bot] 3550508421 Update dependency core-js to v3.46.0 (#36417) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-15 07:55:10 +00:00
renovate[bot] e3e5067772 Update formatjs monorepo (#36415) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-15 07:11:45 +00:00
renovate[bot] 5fd380096f Update dependency vite-plugin-pwa to v1.1.0 (#36452) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-15 07:10:52 +00:00
renovate[bot] d788e45628 Update dependency vite to v7.1.10 (#36468) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-15 07:08:49 +00:00
Claire b4aae2262b Merge pull request #3236 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 50743cc35b
 2025-10-14 18:37:22 +02:00
Claire 264d068d8d Change new accounts to use new ActivityPub numeric ID scheme (#36365) 2025-10-14 16:36:55 +00:00
Claire c4c906eb0c [Glitch] Fix error in logged-out hashtag view when remote posts require log-in 
Port 3232eee358 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-14 18:05:28 +02:00
Claire 7330ec670b [Glitch] Fix WebUI mistakenly allowing to attach quotes when editing 
Port 156f031ed0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-14 18:04:48 +02:00
Echo 8d1e67b6b2 [Glitch] Emoji: Cleanup new code 
Port 0c64e7f75e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-14 18:04:18 +02:00
diondiondion a7f207604a [Glitch] Fix videos not being indented properly in thread view 
Port 9a001e7839 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-14 18:03:25 +02:00
Claire 302e3fe8be Merge commit '50743cc35be19deae9356bd21f1143e3a9b4fbb8' into glitch-soc/merge-upstream 2025-10-14 18:01:40 +02:00
Claire 50743cc35b Fix forwarder being called with nil status when quote post is soft-deleted (#36463) 2025-10-14 15:15:45 +00:00
Claire fd516347cb Fix deletion of posts quoting soft-deleted local post (#36461) 2025-10-14 15:15:38 +00:00
Claire 3232eee358 Fix error in logged-out hashtag view when remote posts require log-in (#36467) 2025-10-14 14:04:18 +00:00
github-actions[bot]andGitHub Actions 484225895f New Crowdin Translations (automated) (#36457) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-14 12:26:21 +00:00
Claire 156f031ed0 Fix WebUI mistakenly allowing to attach quotes when editing (#36464) 2025-10-14 12:21:13 +00:00
renovate[bot] ad858ebe81 Update dependency strong_migrations to v2.5.1 (#36458) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-14 12:17:40 +00:00
Jonathan de Jong f2f711deeb Fix allow_referrer_origin typo (#36460) 2025-10-14 12:07:15 +00:00
Claire 44ecc4b1e3 Fix moderation warning e-mails that include posts (#36462) 2025-10-14 11:48:51 +00:00
Echo 0c64e7f75e Emoji: Cleanup new code (#36402) 2025-10-14 09:36:25 +00:00
Claire b0ef7ee922 Merge pull request #3235 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to edd7fd9872
 2025-10-14 11:20:14 +02:00
diondiondion 9a001e7839 Fix videos not being indented properly in thread view (#36459) 2025-10-14 08:58:03 +00:00
Echo ed456a6446 [Glitch] Emoji: Picker native rendering 
Port edd7fd9872 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-13 18:07:21 +02:00
Claire af82db5271 Merge commit 'edd7fd98722a0d49ea486aa790a186735e491f35' into glitch-soc/merge-upstream 2025-10-13 18:07:08 +02:00