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

10011 Commits

Author SHA1 Message Date
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
diondiondion
c4a760d6ba
Improve search menu keyboard navigation (#37255) 2025-12-17 14:42:07 +00:00
Echo
dbc5af6641
Remove rendering of custom emoji using the database (#37284) 2025-12-17 14:40:34 +00:00
diondiondion
71af094f97
Fix notifications page error in Tor browser (#37285) 2025-12-17 14:38:46 +00:00
Claire
d6a40c2891
Fix hashtag autocomplete replacing suggestion's first characters with input (#37281) 2025-12-17 14:28:53 +00:00
github-actions[bot]
8debc5760b
New Crowdin Translations (automated) (#37174) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-12-17 11:18:17 +00:00
diondiondion
cfc64a2ea9 [Glitch] Updates Wrapstodon footer with dedicated local server info 
Port e6b0cdcc83750aee357f69f3ff41807b435fe083 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-16 18:37:45 +01:00
Echo
fbacb5ae7a [Glitch] Emojis: Show in embedded statuses 
Port f118d613349bd43e915c5be58477c7d4d8175371 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-16 18:32:54 +01:00
Echo
f56f360a5c [Glitch] Wrapstodon: Load report data only on display 
Port a9c84529b2c1c2ef3cf5c88521917834f2fe9e1c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-16 18:32:30 +01:00
diondiondion
59d2a712c5 [Glitch] Fix bad contrast on disabled dropdown menu items 
Port 9e97ad04d8e771dd8a618d3b0e1fda6f3efcfec9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-16 18:31:01 +01:00
Echo
177479fe37 [Glitch] Improve Redux Storybook 
Port 8c2845906c1f8f60708dad452b056bc7696c1224 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-16 18:30:39 +01:00
Claire
3cd033df0c [Glitch] Add wrapstodon to initial state and show wrapstodon sidebar item on load 
Port 550a6d4765e5af144052b9fb6cdc5d3a4e958a87 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-16 18:29:51 +01:00
Claire
780fefa700 Merge commit '53be8392eceea8c3a576478e209fe82c2ceb458a' into glitch-soc/merge-upstream 2025-12-16 18:27:03 +01:00
Echo
f118d61334
Emojis: Show in embedded statuses (#37272) 2025-12-16 16:06:59 +00:00
diondiondion
e6b0cdcc83
Updates Wrapstodon footer with dedicated local server info (#37270) 2025-12-16 15:35:26 +00:00
Echo
a9c84529b2
Wrapstodon: Load report data only on display (#37269) 2025-12-16 13:00:40 +00:00
diondiondion
9e97ad04d8
Fix bad contrast on disabled dropdown menu items (#37268) 2025-12-16 11:38:47 +00:00
Echo
8c2845906c
Improve Redux Storybook (#37227) 2025-12-16 11:27:18 +00:00
Claire
550a6d4765
Add wrapstodon to initial state and show wrapstodon sidebar item on load (#37261) 2025-12-16 09:47:18 +00:00
renovate[bot]
0551455a3c [Glitch] Update devDependencies (non-major) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-15 20:38:29 +01:00
Echo
460e675327 [Glitch] Emoji: Import and use shortcode data 
Port cbe135210305c0ce4455130c4e75680e53ff1425 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-15 20:30:02 +01:00