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

9820 Commits

Author SHA1 Message Date
Claire
b76530a7f1 Merge commit '76d8ac3fe680e92d20059c590ccb1cd8f74078c2' into glitch-soc/merge-upstream 2025-11-24 19:08:03 +01:00
github-actions[bot]
e44a9c0879
New Crowdin Translations (automated) (#36984) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-24 08:08:01 +00:00
diondiondion
975c7097b8 [Glitch] Refactor PrivacyDropdown to TypeScript 
Port 8a235dd1873be73a3a4cbf607fcdc152e0150e35 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-11-21 19:35:20 +01:00
Claire
652ed7ab50 Merge commit '585545d0d5678a6ea4b958af4a3bc6593134d0f6' into glitch-soc/merge-upstream 2025-11-21 19:33:14 +01:00
diondiondion
8a235dd187
Refactor PrivacyDropdown to TypeScript (#36979) 2025-11-21 13:33:27 +00:00
github-actions[bot]
cfa4f402ef
New Crowdin Translations (automated) (#36976) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-21 09:34:55 +00:00
diondiondion
aec23fd4a2 [Glitch] Fix error when visiting non-public hashtag timelines 
Port f01e80bed3788409ecdea46029f9eeca417351bd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-11-20 18:20:53 +01:00
Darius Kazemi
8e70c54d0e [Glitch] Remove stray Font Awesome styles 
Port dc67dbba8265b290d5f9740dae039c75016ab2fa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-11-20 18:19:33 +01:00
Claire
284223f45f [Glitch] Fix statuses without text disappearing on reload 
Port bb9a633b990d6073a1ff9a52b411cdaa34d617bc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-11-20 18:19:11 +01:00
Echo
8e68d6c6bf [Glitch] Improve media modal swipe animation 
Port ea616ac4a4981323a567f2f4e28d893ce4cad81c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-11-20 18:18:46 +01:00
Claire
dd7d750f5d Merge commit '21ce99f746e17867df74029d3b2caca45588818d' into glitch-soc/merge-upstream 2025-11-20 18:13:37 +01:00
github-actions[bot]
8e8669b5ef
New Crowdin Translations (automated) (#36957) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-20 10:54:39 +00:00
diondiondion
f01e80bed3
Fix error when visiting non-public hashtag timelines (#36961) 2025-11-20 10:08:00 +00:00
Darius Kazemi
dc67dbba82
Remove stray Font Awesome styles (#36960) 2025-11-20 10:02:50 +00:00
Claire
bb9a633b99
Fix statuses without text disappearing on reload (#36962) 2025-11-20 09:52:53 +00:00
Claire
21110f0270
Fix d bookmark keyboard shortcut (#3285) 2025-11-19 22:25:53 +01:00
diondiondion
b1974a2147 [Glitch] Fix g + h keyboard shortcut not working when a post is focused 
Port 4d0aab4a319320a7ca5d96c25e15eb91dbcaa7e7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-11-19 22:07:22 +01:00
Claire
c57ca36006 [Glitch] Fix quoting overwriting current content warning 
Port c22b203bca7c49765d530f7f6ea088bd62cdc981 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-11-19 22:07:22 +01:00
Claire
69dfde3153 [Glitch] Fix scroll-to-status in threaded view being unreliable 
Port be0e23bb0ad2912416cabf0d8676db3af23eef27 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-11-19 22:07:22 +01:00
Claire
c5a6519af9 [Glitch] Change private quote education modal to not show up on self-quotes 
Port c820c66d3c54a7c5d8896d03b7d21327295bf145 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-11-19 21:54:24 +01:00
Claire
9c7f27ba14 [Glitch] Fix double encoding in links 
Port b4daad8c894b23d8bf953626144d8bcb60b32c55 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-11-19 21:51:54 +01:00
Echo
76ba4000d9 [Glitch] Emoji: Fix path resolution for emoji worker 
Port caffb0fd633913e5c4c67c0b804aff0966c4d89b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-11-19 21:51:34 +01:00
diondiondion
89d04f3bb3 [Glitch] Fix superfluous border & spacing in domains list on the Moderation > Federation page 
Port 72c582e7e50fba3dc6394c85718d05fe6fb49dca to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-11-19 21:50:37 +01:00
Claire
7a56972381 Merge commit '366856f3bcdc2ff008b04e493a5de317ab83d5d0' into glitch-soc/merge-upstream 2025-11-19 21:49:09 +01:00
Claire
a4fd9b704a Merge commit '284b46fee7ad682b52c99d0455a1134e1d4e3fc3' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream added an experimental feature flag to try out theme refactors.
  Glitch-soc's theming system is too different, so skips the new feature flag.
- `stylelint.config.js`:
  Ditto.
 2025-11-19 21:34:53 +01:00
Claire
fa721568e0
Change quotes to inherit local-only status of quoted post in composer (#3286) 2025-11-19 21:28:51 +01:00
Echo
ea616ac4a4
Improve media modal swipe animation (#36916) 2025-11-19 15:56:24 +00:00
diondiondion
4d0aab4a31
Fix g + h keyboard shortcut not working when a post is focused (#36935) 2025-11-19 10:58:07 +00:00
Claire
c22b203bca
Fix quoting overwriting current content warning (#36934) 2025-11-19 10:35:10 +00:00
github-actions[bot]
81ffd1d3c7
New Crowdin Translations (automated) (#36933) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-19 10:09:54 +00:00
Claire
41279ac801
Fix threaded mode not resetting quote (#3284) 2025-11-18 18:38:53 +01:00
Claire
902b5a169c
Clean up CSS differences with upstream (#3283) 2025-11-18 18:38:48 +01:00
Claire
be0e23bb0a
Fix scroll-to-status in threaded view being unreliable (#36927) 2025-11-18 16:20:50 +00:00
Claire
c820c66d3c
Change private quote education modal to not show up on self-quotes (#36926) 2025-11-18 16:17:26 +00:00
Claire
b4daad8c89
Fix double encoding in links (#36925) 2025-11-18 15:37:14 +00:00
github-actions[bot]
b14f113929
New Crowdin Translations (automated) (#36922) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-18 08:22:25 +00:00
Echo
caffb0fd63
Emoji: Fix path resolution for emoji worker (#36897) 2025-11-17 15:34:18 +00:00
diondiondion
72c582e7e5
Fix superfluous border & spacing in domains list on the Moderation > Federation page (#36915) 2025-11-17 12:07:44 +00:00
diondiondion
284b46fee7
Implement CSS theme tokens behind feature flag (#36861) 2025-11-17 09:44:55 +00:00
github-actions[bot]
489bee8f4e
New Crowdin Translations (automated) (#36898) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-17 09:33:15 +00:00
Claire
932f479a34
Fix missing alt-text confirmation modal not opening (#3281) 2025-11-15 12:03:56 +01:00
Claire
5645a017b3 [Glitch] Fix inability to paste links 
Port c87b05282909383353a9561e97b9f18a2db0766d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-11-14 18:29:07 +01:00
Echo
8817ebda50 [Glitch] Remove rails delegate 
Port 7dbb2ac79a18e5acb106928f956a1f409a0b0c85 to glitch-soc

Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-11-14 18:28:42 +01:00
Jeong Arm
f782c2c8e9 [Glitch] Allow drag&drop of link to quote in compose form 
Port 4ab1d5d7242b07ebcb547d6d4866533f718a5ce9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-11-14 18:27:29 +01:00
Echo
ee257dc307 [Glitch] Fix error with remote tags including percent signs 
Port c5eca8ffb26f5ecbdec212e5e1c352ae9dd8e28d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-11-14 18:26:42 +01:00
Claire
8240644b6e [Glitch] Fix bogus quote approval policy not always being replaced correctly 
Port f25e066112b1b2c2db9b692e32b95f99aadef4ee to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-11-14 18:25:37 +01:00
Claire
593d21d2ed [Glitch] Fix hashtag completion not being inserted correctly 
Port 6d8c43ab85da55bd7b4994feb662bbd07da119fe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-11-14 18:24:45 +01:00
diondiondion
951816c5d6 [Glitch] Fix Cmd/Ctrl + Enter in the composer triggering confirmation dialog action 
Port 6e294828d65eeddb8145291083db1a5ee41d9d57 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-11-14 18:24:22 +01:00
Claire
e0d7230f97 Merge commit 'c87b05282909383353a9561e97b9f18a2db0766d' into glitch-soc/merge-upstream 2025-11-14 18:19:00 +01:00
Claire
c87b052829
Fix inability to paste links (#36896) 2025-11-14 16:44:08 +00:00