tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,816 Commits 5 Branches 0 Tags
83ea9b94de798a93ca06ea0629e4920e3421c4e5
Commit Graph
28816 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
renovate[bot] 0a1111d5a5 Update dependency @reduxjs/toolkit to v2.9.1 (#36515) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-20 12:10:45 +00:00
renovate[bot] 95be29d700 Update dependency rubocop-performance to v1.26.1 (#36525) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-20 10:56:54 +00:00
Ben Sheldon [he/him] 843c43c97a Replace ThreadingHelper wait loop with functional CyclicBarrier (#36508) 2025-10-20 10:10:43 +00:00
github-actions[bot]andGitHub Actions 82483ed8b0 New Crowdin Translations (automated) (#36520) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-20 10:10:37 +00:00
Claire 4c5e9e2419 Merge pull request #3245 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 612771de46
 2025-10-18 21:33:35 +02:00
Claire 5123f8aa94 [Glitch] Fix relationship not being fetched to evaluate whether to show a quote post 
Port 811c1eaf7e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-17 19:08:59 +02:00
diondiondion 460222e8e1 [Glitch] Add new "quick boosting" setting 
Port 6dad80eb8c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-17 19:08:20 +02:00
Claire 22e3c0e745 Merge commit '612771de465da60dbd58790adc6b1556a7fa739b' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a setting adjacent to a glitch-soc-only setting.
  Added upstream's setting while keeping ours.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a setting adjacent to a glitch-soc-only setting.
  Added upstream's setting while keeping ours.
 2025-10-17 19:00:18 +02:00
Claire 84563e54cf Merge pull request #3244 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to c96e28a41d
 2025-10-17 18:58:06 +02:00
diondiondion e1b109f074 [Glitch] Add keyboard shortcut info banner to the boosting preferences section 
Port 20961c7538 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-17 18:39:19 +02:00
Echo d81bdb96e0 [Glitch] Emoji: Fix emoji picker not centering native emoji 
Port 63dc426fae to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-17 18:38:43 +02:00
Emelia Smith 2b2de5cdb1 [Glitch] Implement quote posts in Moderator UI 
Port 210b389643 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-17 18:38:19 +02:00
Claire 4c0104084d Merge commit 'c96e28a41d6f3dee898b09ab1b250ac5b5dfd9e4' into glitch-soc/merge-upstream 2025-10-17 18:36:27 +02:00
Claire cfee957dd1 Merge pull request #3243 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 51d0bfcb38
 2025-10-17 18:35:17 +02:00
Echo 90ab9fe13c [Glitch] Emoji: Update Twemoji to v16 
Port 51d0bfcb38 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-17 18:13:18 +02:00
Claire 515ce38a52 Merge commit '51d0bfcb385b49bfdd30b742d05e8e37257168d6' into glitch-soc/merge-upstream 2025-10-17 18:11:59 +02:00
renovate[bot] 612771de46 Update dependency rack-attack to v6.8.0 (#36471) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-17 14:10:42 +00:00
renovate[bot] 950e7beeea Update dependency rubyzip to v3.2.0 (#36472) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-17 14:10:39 +00:00
renovate[bot] 1018a4def4 Update dependency vite-plugin-static-copy to v3.1.4 (#36480) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-17 14:10:36 +00:00
Claire 811c1eaf7e Fix relationship not being fetched to evaluate whether to show a quote post (#36517) 2025-10-17 13:03:18 +00:00
diondiondion 6dad80eb8c Add new "quick boosting" setting (#36516) 2025-10-17 13:02:47 +00:00
Claire c96e28a41d Change HttpMessageSignature to perform assertions directly on Linzer objects (#36510) 2025-10-17 08:41:28 +00:00
github-actions[bot]andGitHub Actions ccac6da3e8 New Crowdin Translations (automated) (#36513) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-17 08:41:07 +00:00
Claire ff8f0135b3 Merge pull request #3242 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 7530f06dee
 2025-10-16 20:14:24 +02:00
Echo be5c1cceea [Glitch] Emoji: Fix autoplay incorrectly being applied 
Port 7530f06dee to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-16 19:26:41 +02:00
diondiondion 614dd00457 [Glitch] Restructure appearance settings to introduce new Advanced settings section 
Port SCSS changes from 05244c335d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-16 19:26:07 +02:00
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 cf16039ea1 Merge pull request #3241 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 241ad1c587
 2025-10-16 19:21:19 +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
diondiondion 20961c7538 Add keyboard shortcut info banner to the boosting preferences section (#36506) 2025-10-16 14:53:23 +00:00
Echo 63dc426fae Emoji: Fix emoji picker not centering native emoji (#36502) 2025-10-16 13:45:20 +00:00
Emelia Smith 210b389643 Implement quote posts in Moderator UI (#35964) 2025-10-16 13:40:24 +00:00
Echo 51d0bfcb38 Emoji: Update Twemoji to v16 (#36501) 2025-10-16 13:15:16 +00: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