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

10031 Commits

Author SHA1 Message Date
Echo
124d6e37eb [Glitch] Emoji: Adds search 
Port 628fc9b95b064f7feba7f54f3c4146210828f18d to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:18:05 +01:00
Echo
c5fd0d47da [Glitch] Remove trailing variation selector code for legacy emojis 
Port f254b4706731fd5921047c7c95f64f71d560d494 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:17:30 +01:00
Joshua Rogers
9d33d43006 [Glitch] Fix modal closeModal ignoreFocus payload type 
Port 25053db22ba1e7c6ea1fb08f4a18b95305305d42 to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:15:12 +01:00
Echo
bb640bd845 [Glitch] Video modals should not be pushed down on mobile 
Port de7b405e55e9ad95e5f624e6992fc72944189496 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:14:49 +01:00
Claire
d7254ecec4 Merge commit 'a4b8b9fe98c677f718e4b2c1ffe1755d58e7f8d7' into glitch-soc/merge-upstream 2026-01-10 13:12:36 +01:00
Claire
3c1bf72e1a
Fix custom emojis not being rendered in status prepend (#3342) 2026-01-10 13:11:50 +01:00
Echo
a4b8b9fe98
Fix bug with how Emojibase wasn't stripping characters (#37442) 2026-01-09 18:38:22 +00:00
diondiondion
973fef4b69
Further clean up types for the card object (#37023) 2026-01-09 14:40:27 +00:00
Echo
628fc9b95b
Emoji: Adds search (#37418) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-01-09 10:37:14 +00:00
Joshua Rogers
25053db22b
Fix modal closeModal ignoreFocus payload type (#37424) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-01-08 13:22:31 +00:00
github-actions[bot]
780c6378e0
New Crowdin Translations (automated) (#37407) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-08 11:18:50 +00:00
Echo
de7b405e55
Video modals should not be pushed down on mobile (#37421) 2026-01-08 09:44:17 +00:00
Claire
3e4cd799fd Merge commit '7e634eecbc5dc2f65b7bdbfc5c2b5c8a0955156d' into glitch-soc/merge-upstream 2026-01-06 18:11:26 +01:00
github-actions[bot]
7e634eecbc
New Crowdin Translations (automated) (#37394) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-06 10:40:22 +00:00
Claire
0aa70234aa [Glitch] Fix custom emojis not being rendered in profile fields 
Port b622f4c698fe4d22e6f35be39b7e91199d9eceec to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-05 18:24:51 +01:00
Claire
550240281e [Glitch] Fix outdated link target for “locked” warning 
Port e8a49bd6ae5b2a0f02a2049ffcea0f9cfaf6c9a9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-05 18:24:29 +01:00
Claire
b1d219afd0 Merge commit '82fb2596c70a18fc4a2d99ab51106180196bfe98' into glitch-soc/merge-upstream 2026-01-05 18:19:58 +01:00
Claire
b622f4c698
Fix custom emojis not being rendered in profile fields (#37365) 2026-01-05 14:24:59 +00:00
Claire
e8a49bd6ae
Fix outdated link target for “locked” warning (#37366) 2026-01-05 10:35:23 +00:00
github-actions[bot]
bdf490e949
New Crowdin Translations (automated) (#37378) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-05 09:56:40 +00:00
Chan Nyein Tun
e826e0e281 [Glitch] Hide empty padding box if no status in Wrapstodon highlighted post 
Port 54bc97cfce757d9520db1e63ce5975141b94aad3 to glitch-soc

Co-authored-by: Chan Nyein Tun <29679269+channyeintun@users.noreply.github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-03 16:10:04 +01:00
Echo
06a49fa0d0 [Glitch] Prevents swiping when zoomed in 
Port 4bae3da85c8ee935539aacc92429bdb55aaf145e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-03 16:08:16 +01:00
Claire
2ebf6d60a6 Merge commit 'e89acc2302df49cbd7815b031e9c2939632bd204' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Conflict because of an extra dependency in glitch-soc.
  Updated upstream's dependencies as upstream did.
 2026-01-03 16:05:35 +01:00
diondiondion
cf461c79ca [Glitch] Add dedicated user preferences for theme mode & contrast 
Port a0ce77673c977e3a90d0c7d1c2acd250b7fad0c2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-03 15:31:38 +01:00
Claire
c7ad055ff3 Merge commit 'a0ce77673c977e3a90d0c7d1c2acd250b7fad0c2' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/application_controller.rb`:
  Upstream added an experimental color and contrast theme control.
  Conflicts because of glitch-soc's different theming system.
  Adapted upstream's changes.
- `app/views/layouts/application.html.haml`:
  Upstream added an experimental color and contrast theme control.
  Conflicts because of glitch-soc's different theming system.
  Adapted upstream's changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream added an experimental color and contrast theme control.
  Conflicts because of glitch-soc's different theming system.
  Adapted upstream's changes.
 2026-01-03 15:26:58 +01:00
github-actions[bot]
04f7638224
New Crowdin Translations (automated) (#37326) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-02 13:48:08 +00:00
Chan Nyein Tun
54bc97cfce
Hide empty padding box if no status in Wrapstodon highlighted post (#37289) 
Co-authored-by: Chan Nyein Tun <29679269+channyeintun@users.noreply.github.com>
 2026-01-02 13:20:11 +00:00
Andy Piper
f32bed6809
Update keyboard shortcut description for direct mentions (#37347) 2026-01-02 11:15:24 +00:00
GitHub Actions
aace2679bd New Crowdin translations 2026-01-01 04:56:54 +00:00
Claire
04f4725249 Merge commit '0231b6d350d6027fa822f286732405b573d634e8' into glitch-soc/merge-upstream 2025-12-19 18:43:09 +01:00
Echo
4bae3da85c
Prevents swiping when zoomed in (#37323) 2025-12-19 16:18:50 +00:00
diondiondion
a0ce77673c
Add dedicated user preferences for theme mode & contrast (#37288) 2025-12-19 15:31:44 +00:00
diondiondion
8d9192835d
Add stub story for StatusQuoteManager / Status component (#37321) 2025-12-19 15:18:10 +00:00
Echo
f254b47067
Remove trailing variation selector code for legacy emojis (#37320) 2025-12-19 13:43:27 +00:00
github-actions[bot]
ff005bae0b
New Crowdin Translations (automated) (#37312) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-12-19 10:40:07 +00:00
diondiondion
a505c2efd8
Fix mobile admin sidebar displaying under batch table toolbar (#37307) 2025-12-19 08:39:25 +00:00
Echo
9ce81baff9 [Glitch] Emoji loading fixes 
Port ba4710debe65e204f28ffd4d105433b26cd6721c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-18 18:59:46 +01:00
Claire
baa6af0e18 Merge commit 'ff20ab7510a189bee75bdd5460f6c2ae38e7009a' into glitch-soc/merge-upstream 2025-12-18 18:56:31 +01:00
Claire
4bfd92310f [Glitch] Fix custom emojis not displaying in CWs and fav/boost notifications 
Port a8109e50fc313b8124a3e471d41b490df59a68b8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-18 18:11:41 +01:00
Claire
97ff0f94bf Merge commit 'a8109e50fc313b8124a3e471d41b490df59a68b8' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed a field that was moved to another page due to glitch-soc's theming system.
  Ignored this one change.
 2025-12-18 18:10:30 +01:00
Echo
ba4710debe
Emoji loading fixes (#37300) 2025-12-18 16:58:44 +00:00
Claire
a8109e50fc
Fix custom emojis not displaying in CWs and fav/boost notifications (#37306) 2025-12-18 16:49:03 +00:00
github-actions[bot]
ed2a8c32ce
New Crowdin Translations (automated) (#37293) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-12-18 09:20:07 +00:00
Echo
177d3c59d0 [Glitch] Emoji: Refresh custom emoji on new 
Port 3d55dcdf7fbbebe3006ef86e765e9fc2455d34e1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-17 18:34:02 +01:00
diondiondion
392a241637 [Glitch] Improve search menu keyboard navigation 
Port c4a760d6ba4394f07d1147259ebf280b0bade33f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-17 18:32:57 +01:00
Echo
34dbea26a7 [Glitch] Remove rendering of custom emoji using the database 
Port dbc5af6641b06e19b2dbb36274bb647b7564d3f5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-17 18:32:34 +01:00
diondiondion
516f0ce131 [Glitch] Fix notifications page error in Tor browser 
Port 71af094f9735cea10cb0e2da92ebac1608393ebb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-17 18:31:49 +01:00
Claire
22724d2367 [Glitch] Fix hashtag autocomplete replacing suggestion's first characters with input 
Port d6a40c2891770d2bd5dfa881d482a34c4acd646f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-17 18:31:31 +01:00
Claire
84feffd6e6 Merge commit '009275e66b55729f754da7b4c814b37b67dc76dc' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added a method right next to glitch-soc-only methods.
  Added upstream's method.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed a line right next to a glitch-soc addition.
  Changed the code as upstream did.
 2025-12-17 18:27:14 +01:00
Echo
3d55dcdf7f
Emoji: Refresh custom emoji on new (#37271) 2025-12-17 14:58:22 +00:00