tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,634 Commits 5 Branches 0 Tags
Commit Graph

26634 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
f4ca3e6c74
Merge pull request #3249 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 118ff13bd028cfb19370a12edb9307ea96007ad7
 2025-10-21 16:13:52 +02:00
Claire
5674100f0b Merge commit '118ff13bd028cfb19370a12edb9307ea96007ad7' into glitch-soc/merge-upstream 2025-10-21 15:57:43 +02:00
Claire
118ff13bd0
Bump version to v4.5.0-beta.2 (#36543) 2025-10-21 13:43:38 +00:00
Claire
405a49df44
Merge commit from fork 
* Refuse granting quote authorization for reblogs

* Add validation to reject quotes of reblogs

* Do not process quotes of reblogs as potentially valid quotes

* Refuse to serve quoted reblogs over REST API
 2025-10-21 15:00:28 +02:00
github-actions[bot]
2b9e4294fe
New Crowdin Translations (automated) (#36538) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-21 08:50:24 +00:00
Matt Jankowski
2eccd7b53c
Specs for validation error in API responses (#36507) 2025-10-21 07:33:30 +00:00
renovate[bot]
74172ced81
Update dependency playwright to v1.55.1 [SECURITY] (#36534) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-21 07:20:24 +00:00
Claire
a74b3c549a
Merge pull request #3246 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 341ea7f462c68ebe2fc5ee15dc7c58aa5775d5a0
 2025-10-20 22:13:15 +02:00
Echo
8b3ff4f8b1 [Glitch] Emoji: Fix unneeded re-renders when StatusContent changes 
Port 6e2973aa2d3dc9466f2cc9b352e0eb2b260bf463 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-20 21:40:05 +02:00
Claire
af1b658c20 [Glitch] Fix position of quote dropdown menu item when “quick boosting” is enabled 
Port 97c8cc560675070a5c82c1f253e41229fb5d2493 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-20 21:38:56 +02:00
Echo
7b44fd6d3c [Glitch] Emoji: Swap mode test to an emoji from 16.0 
Port 50dfab30c27a8557105fe6c0e99f4c1737dff363 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-20 21:38:37 +02:00
Claire
9080083263 Merge commit '341ea7f462c68ebe2fc5ee15dc7c58aa5775d5a0' into glitch-soc/merge-upstream 2025-10-20 21:37:50 +02:00
renovate[bot]
341ea7f462
Update dependency vite to v7.1.11 (#36526) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-20 17:07:28 +00:00
renovate[bot]
168cba35e3
Update dependency puma to v7.1.0 (#36519) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-20 17:07:11 +00:00
Echo
6e2973aa2d
Emoji: Fix unneeded re-renders when StatusContent changes (#36532) 2025-10-20 14:52:27 +00:00
Claire
97c8cc5606
Fix position of quote dropdown menu item when “quick boosting” is enabled (#36528) 2025-10-20 13:05:40 +00:00
Echo
50dfab30c2
Emoji: Swap mode test to an emoji from 16.0 (#36530) 2025-10-20 13:04:38 +00:00
renovate[bot]
53e20d5c83
Update dependency jsdom to v27.0.1 (#36524) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-10-20 12:11:04 +00:00
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]
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 612771de465da60dbd58790adc6b1556a7fa739b
 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 811c1eaf7e8978d93f24669e55b173052c01fb9f 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 6dad80eb8c9030af59c57f0369b078efee3e3a82 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 c96e28a41d6f3dee898b09ab1b250ac5b5dfd9e4
 2025-10-17 18:58:06 +02:00
diondiondion
e1b109f074 [Glitch] Add keyboard shortcut info banner to the boosting preferences section 
Port 20961c75383dcb1d60068ebf923868388d8661a7 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 63dc426fae9410a346e944773cf86a33c0600c13 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 210b3896439c3ec741be477bfc4054ef3705a76e 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 51d0bfcb385b49bfdd30b742d05e8e37257168d6
 2025-10-17 18:35:17 +02:00
Echo
90ab9fe13c [Glitch] Emoji: Update Twemoji to v16 
Port 51d0bfcb385b49bfdd30b742d05e8e37257168d6 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]
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 7530f06deea63a03e0ca05f777f0f1582372c305
 2025-10-16 20:14:24 +02:00
Echo
be5c1cceea [Glitch] Emoji: Fix autoplay incorrectly being applied 
Port 7530f06deea63a03e0ca05f777f0f1582372c305 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 05244c335d23951b9ec069bd682845cc9c435968 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 241ad1c5878161f5f4a19c16ed6c042f1c2cb6c2
 2025-10-16 19:21:19 +02:00
Claire
383445c977 [Glitch] Fix pinned hashtag columns fully refreshing unprompted 
Port ef53dcfd8c593655ac907e0c7f3c3018e3a91b72 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 869eeecfee61d6e2a18ca3f7761809c0493e1fcc 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 28a42bb62c71f7a2b25002a41ebc586445a93b69 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