Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 00:38:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,831 Commits 74 Branches 58 Tags
2f8fa59b856c8912d015ebbe5aba9ad8127d3d26
Commit Graph

9182 Commits

Author SHA1 Message Date
Eugen Rochko
2f8fa59b85 [Glitch] Change design of quote posts in web UI 
Port 92bf55afd0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-30 20:11:55 +02:00
Eugen Rochko
0f54e51777 [Glitch] Change "new replies available" notice to be above replies in web UI 
Port d121007927 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-30 20:08:58 +02:00
Colin Dean
6f7ab952c8 [Glitch] Swap order of translation restoration and service credit on post card 
Port b5cebf45ea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-30 20:08:38 +02:00
william light
2e6ed97416 [Glitch] hotkeys: only match just() when no modifiers are held 
Port f3786e0816 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-30 20:08:20 +02:00
Claire
e53421b548 Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Not a real conflict, upstream removed settings that are identical in glitch-soc
  but textually adjacent to glitch-soc-only settings.
  Removed what upstream removed.
 2025-07-30 20:05:45 +02:00
Eugen Rochko
b80e95b2aa Change new replies to be loaded automatically if thread previously empty (#35603) 2025-07-30 16:18:58 +00:00
Eugen Rochko
92bf55afd0 Change design of quote posts in web UI (#35584) 2025-07-30 15:53:42 +00:00
github-actions[bot]
1c89309db0 New Crowdin Translations (automated) (#35592) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-30 08:37:33 +00:00
Eugen Rochko
20bbd20ef1 Add ability to block words in usernames (#35407) 2025-07-29 10:19:15 +00:00
Eugen Rochko
d121007927 Change "new replies available" notice to be above replies in web UI (#35575) 2025-07-29 09:00:27 +00:00
github-actions[bot]
d299b0d576 New Crowdin Translations (automated) (#35574) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-29 08:59:00 +00:00
Colin Dean
b5cebf45ea Swap order of translation restoration and service credit on post card (#33619) 2025-07-28 11:33:11 +00:00
github-actions[bot]
a57a9505d4 New Crowdin Translations (automated) (#35537) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-28 08:14:11 +00:00
william light
f3786e0816 hotkeys: only match just() when no modifiers are held (#35535) 2025-07-26 05:51:50 +00:00
Claire
8649681c51 Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/activitypub/note_serializer.rb`:
  Conflict because upstream added context extensions where glitch-soc had its own.
  Added upstream's new context extension while keeping ours.
 2025-07-25 21:45:00 +02:00
github-actions[bot]
d950298d29 New Crowdin Translations (automated) (#35514) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-25 07:29:48 +00:00
Echo
ad0f2c5e02 [Glitch] Force modern emoji experimental to be dev mode only 
Port dfaca794bf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-24 18:21:51 +02:00
diondiondion
3f980d6751 [Glitch] fix: Fix TypeError on pages with empty feeds 
Port 6fc77a545b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-24 18:16:23 +02:00
Mayank
d235b2ce62 [Glitch] remove redundant title text from media modal images in web UI 
Port 8baed8b90e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-24 18:14:52 +02:00
Echo
ec412e1748 [Glitch] Enables cross-origin Web Workers 
Port 7f9ad7eabf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-24 18:14:25 +02:00
Claire
cee41da8d8 [Glitch] Fix “Expand this post” link including user @undefined 
Port a6794c066d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-24 18:13:22 +02:00
Claire
72affd6b45 Merge commit 'a863e68d174b176dc350d8e3472c010cd37b7807' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends/statuses.rb`:
  Conflict because of glitch-soc's setting to allow CWs in trends.
  Kept glitch-soc's setting but followed upstream's refactor.
- `docker-compose.yml`:
  Conflict because of upstream VS glitch-soc repos.
  Updated version number as upstream did, but kept glitch-soc repos.
 2025-07-24 18:10:38 +02:00
Echo
dfaca794bf Force modern emoji experimental to be dev mode only (#35505) 2025-07-24 14:55:00 +00:00
diondiondion
6fc77a545b fix: Fix TypeError on pages with empty feeds (#35504) 2025-07-24 14:30:56 +00:00
Mayank
8baed8b90e remove redundant title text from media modal images in web UI (#35468) 2025-07-24 08:58:22 +00:00
github-actions[bot]
469304359a New Crowdin Translations (automated) (#35495) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-24 07:49:09 +00:00
Echo
7f9ad7eabf Enables cross-origin Web Workers (#35483) 2025-07-24 07:14:27 +00:00
Claire
a6794c066d Fix “Expand this post” link including user @undefined (#35478) 2025-07-23 23:09:24 +00:00
Echo
afa217da97 [Glitch] Fix accidentally instantiating Web Worker 
Port 7d3ef27a8d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-23 19:05:46 +02:00
Echo
8a8453e3b1 [Glitch] Emoji Rendering 
Port 760d00b7f7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-23 19:05:04 +02:00
Eugen Rochko
a8432560ba [Glitch] Add button to load new replies in web UI 
Port 14a781fa24 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-23 18:49:25 +02:00
diondiondion
d9c1e45739 [Glitch] fix: Fix glitchy status keyboard navigation 
Port d36236cbcd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-23 18:45:47 +02:00
Claire
63af7ecb1f Merge commit '7d3ef27a8dc8fb281bae959b245d3db63aa82260' into glitch-soc/merge-upstream 2025-07-23 18:43:56 +02:00
Echo
7d3ef27a8d Fix accidentally instantiating Web Worker (#35473) 2025-07-23 14:01:45 +00:00
Eugen Rochko
14a781fa24 Add button to load new replies in web UI (#35210) 2025-07-23 13:42:07 +00:00
diondiondion
26ba2db53f [Glitch] fix: Don't submit post when pressing Enter in CW field 
Port ee21f72211 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-23 12:28:15 +02:00
diondiondion
0ae7c7e406 [Glitch] refactor: Replace react-hotkeys with custom hook 
Port 4de5cbd6f5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-23 12:22:42 +02:00
Claire
45d79427c4 Merge commit '0af2c4829ff86cf84ed9e7804d023f31e805542b' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Conflict because of differently-named theme plugins.
  Updated to go with upstream's changes.
 2025-07-23 12:08:59 +02:00
diondiondion
d36236cbcd fix: Fix glitchy status keyboard navigation (#35455) 2025-07-23 07:39:36 +00:00
diondiondion
82f1bb4191 [Glitch] fix: Fix quote posts styling on notifications page 
Port 3771f9e04b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-22 23:20:30 +02:00
diondiondion
40de31ddad [Glitch] refactor: Disable useDrag hook when main menu is not openable 
Port a842b14c84 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-22 23:20:11 +02:00
diondiondion
696ad9d414 [Glitch] fix: Add lang attribute to current composer language in alt text modal 
Port 138746bdcc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-22 23:19:55 +02:00
Claire
5ff0039d7b Merge commit 'fab95b8dae3db411318638804a01675dd5b38a01' into glitch-soc/merge-upstream 2025-07-22 23:17:48 +02:00
Echo
760d00b7f7 Emoji Rendering (#35424) 2025-07-22 14:43:15 +00:00
github-actions[bot]
be3dc5b508 New Crowdin Translations (automated) (#35453) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-22 10:10:37 +00:00
diondiondion
9c918e31e3 [Glitch] fix: Improve a11y of custom select menus in notifications settings 
Port faffb73cbd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-21 21:21:03 +02:00
Claire
4bc361546e Merge commit '19626ad89f66a32a3ddecb4f43a7b84e3236d287' into glitch-soc/merge-upstream 2025-07-21 21:19:53 +02:00
diondiondion
ee21f72211 fix: Don't submit post when pressing Enter in CW field (#35445) 2025-07-21 15:57:20 +00:00
diondiondion
4de5cbd6f5 refactor: Replace react-hotkeys with custom hook (#35425) 2025-07-21 14:43:38 +00:00
github-actions[bot]
6bb4113d0a New Crowdin Translations (automated) (#35428) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-21 09:01:34 +00:00