Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-20 13:48:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,915 Commits 74 Branches 58 Tags
e68de292b41fd8a9ad2e032c2079d8286992a2db
Commit Graph

9213 Commits

Author SHA1 Message Date
Claire
e68de292b4 Merge commit 'a485f97d21c3fb7da927e8fd239b301a590ee9b8' into glitch-soc/merge-upstream 2025-08-07 18:16:54 +02:00
github-actions[bot]
39a3ffaf2f New Crowdin Translations (automated) (#35708) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-07 08:46:11 +00:00
Claire
9da8c9e07c [Glitch] Bundle quotes and mentions in the same quickfilter bar since quotes don't have their own icon 
Port 4838085d66 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-06 22:43:44 +02:00
Claire
4b507c0f05 [Glitch] Add UI for revoking quote posts 
Port 55a98580aa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-06 22:43:44 +02:00
Claire
dbb2908eeb [Glitch] Fix quote notification filtering and add settings 
Port a4c05c694f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-06 22:34:14 +02:00
Claire
235037a3b2 Merge commit 'ac59772dc6cda646258e61debfd792f9057c1c39' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Conflict because upstream added a parameter where glitch-soc had an extra one.
  Added upstream's parameter while keeping glitch-soc's.
- `app/serializers/activitypub/note_serializer.rb`:
  Conflict because upstream added an extension where glitch-soc had an extra one.
  Added upstream's extension while keeping glitch-soc's.
- `app/services/update_status_service.rb`:
  Conflict because upstream added a parameter where glitch-soc had an extra one.
  Added upstream's parameter while keeping glitch-soc's.
 2025-08-06 22:02:55 +02:00
Claire
ac59772dc6 Change icon of quote notification mails (#35701) 2025-08-06 15:20:16 +00:00
Claire
4838085d66 Bundle quotes and mentions in the same quickfilter bar since quotes don't have their own icon (#35700) 2025-08-06 14:54:03 +00:00
Claire
55a98580aa Add UI for revoking quote posts (#35689) 2025-08-06 11:52:56 +00:00
github-actions[bot]
6f6e7d8d49 New Crowdin Translations (automated) (#35694) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-06 09:06:22 +00:00
Claire
a4c05c694f Fix quote notification filtering and add settings (#35690) 2025-08-05 16:15:16 +00:00
Claire
3f166bb068 Merge commit 'ffeb5da9912a3b7db0deb8aec429e661ef609c59' into glitch-soc/merge-upstream 2025-08-05 15:46:33 +02:00
github-actions[bot]
54fd1c1f9b New Crowdin Translations (automated) (#35674) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-05 08:19:55 +00:00
Claire
98685f744d [Glitch] Add quote notifications to WebUI 
Port 081d38679f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-04 21:33:45 +02:00
Echo
3fc07508ee [Glitch] Performance regression fixes 
Port 570c9d16be to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-04 21:26:57 +02:00
Echo
b8f66e1d33 [Glitch] Provides legacy fallback for browser that don't support regex flag v 
Port 28b0e5ee78 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-04 21:26:23 +02:00
Claire
a6f0ec160e [Glitch] Fix WebUI crashing for accounts with null URL 
Port 3caa318dfe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-04 21:25:46 +02:00
Claire
53185f5381 Merge commit '081d38679f965ac20ff1a6c72e2fc1108c34ac30' into glitch-soc/merge-upstream 2025-08-04 21:24:47 +02:00
Claire
081d38679f Add quote notifications to WebUI (#35653) 2025-08-04 18:12:37 +00:00
Echo
570c9d16be Performance regression fixes (#35664) 2025-08-04 17:16:12 +00:00
Echo
28b0e5ee78 Provides legacy fallback for browser that don't support regex flag v (#35659) 2025-08-04 17:15:46 +00:00
github-actions[bot]
f68bd21600 New Crowdin Translations (automated) (#35634) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-04 09:20:50 +00:00
Claire
3caa318dfe Fix WebUI crashing for accounts with null URL (#35651) 2025-08-04 07:49:12 +00:00
Echo
0d54a47ec3 [Glitch] Emoji Rendering Efficiency 
Port 6bca52453a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-01 22:17:21 +02:00
Echo
c5144c0c7d [Glitch] Modern Emoji: Use local storage to opt-in 
Port b81670776f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-01 22:13:04 +02:00
Claire
dbab707d64 Merge commit '591df1f205c654381203b56d46498efc62370776' into glitch-soc/merge-upstream 2025-08-01 22:11:59 +02:00
github-actions[bot]
d09f866daa New Crowdin Translations (automated) (#35622) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-01 07:57:38 +00:00
Echo
6bca52453a Emoji Rendering Efficiency (#35568) 2025-07-31 17:30:14 +00:00
Echo
b81670776f Modern Emoji: Use local storage to opt-in (#35605) 2025-07-31 13:33:34 +00:00
github-actions[bot]
2131d1ff23 New Crowdin Translations (automated) (#35611) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-31 07:26:24 +00:00
Eugen Rochko
27fdc1258b [Glitch] Change new replies to be loaded automatically if thread previously empty 
Port b80e95b2aa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-30 20:12:20 +02:00
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