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

9983 Commits

Author SHA1 Message Date
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
diondiondion
5aaf5f2256 [Glitch] Prevent "invalid access token" error when opening Mastodon while logged out 
Port 807e1254e6f1e4d73941a94623d606159382245e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-15 20:28:14 +01:00
Echo
56a9d62972 [Glitch] Fixes display names not rendering with emojis 
Port 5fa765468878a0efcee58f832075df8a499bd18b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-15 20:27:54 +01:00
diondiondion
0c852a426f [Glitch] Fix badly visible focus outlines in composer 
Port a9e228361ca862f143e57debca7eccde52bb4797 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-15 20:27:02 +01:00
Claire
1fdb48c668 Merge commit 'cbe135210305c0ce4455130c4e75680e53ff1425' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/wrapstodon/show.html.haml`:
  Conflict caused by glitch-soc's theming system.
  Updated upstream changes.
 2025-12-15 20:22:20 +01:00
Echo
cbe1352103
Emoji: Import and use shortcode data (#37178) 2025-12-15 15:38:13 +00:00
diondiondion
807e1254e6
Prevent "invalid access token" error when opening Mastodon while logged out (#37256) 2025-12-15 15:24:03 +00:00
Echo
5fa7654688
Fixes display names not rendering with emojis (#37251) 2025-12-15 12:54:46 +00:00
renovate[bot]
2984f377e8
Update devDependencies (non-major) (#37074) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
 2025-12-15 12:53:21 +00:00
diondiondion
a9e228361c
Fix badly visible focus outlines in composer (#37250) 2025-12-15 12:39:04 +00:00
Claire
235af71f85 [Glitch] Fix wrapstodon not falling back to username when display name is not set 
Port 4af8e83c8a236265c46a1b984fa5dbd3a7c73dfe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-12 17:59:53 +01:00
diondiondion
6734fd206e [Glitch] Change Emoji in Wrapstodon footer 🐘 
Port 861202fd080d9a7db0e478d14df79ed317dcf501 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-12 17:59:53 +01:00
diondiondion
cb1d1e289e [Glitch] Add secondary Wrapstodon share button 
Port 6821b707960e2f0a639069665865b08df8bc672f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-12 17:59:53 +01:00
diondiondion
acf583d374 [Glitch] Remember revealed archetype on future Wrapstodon visits 
Port b72b5075848e65cb7eebb5e64ece59ed0e77be57 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-12 17:59:53 +01:00
diondiondion
8fad8681ab [Glitch] Convert Settings class to TS 
Port 8748f0812d17eb602eefca840d134d1da7a9b9ab to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-12 17:59:53 +01:00
Echo
e7c383251b [Glitch] Wrapstodon: Add nav modal 
Port e206b0d0dead4cf48e211f9e57724ae63d3d8b08 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-12 17:59:52 +01:00
diondiondion
febd6241bf [Glitch] Change Wrapstodon 'About' link to point to joinmastodon.org 
Port 571c93c563e81cbb838d74fe45dda37f3b18a254 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-12 17:48:32 +01:00
Echo
aa45a5fa83 [Glitch] Wrapstodon: Allow dismissing banner 
Port 10f232ca08f9fab4d91c6fd29f4344f4d9f6a08f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-12 17:48:12 +01:00
Claire
6503287c2d Merge commit '4af8e83c8a236265c46a1b984fa5dbd3a7c73dfe' into glitch-soc/merge-upstream 2025-12-12 17:45:26 +01:00
Claire
4af8e83c8a
Fix wrapstodon not falling back to username when display name is not set (#37229) 2025-12-12 16:30:22 +00:00
diondiondion
861202fd08
Change Emoji in Wrapstodon footer 🐘 (#37226) 2025-12-12 14:31:21 +00:00
diondiondion
6821b70796
Add secondary Wrapstodon share button (#37224) 2025-12-12 13:39:56 +00:00
diondiondion
b72b507584
Remember revealed archetype on future Wrapstodon visits (#37219) 2025-12-12 11:03:00 +00:00
diondiondion
8748f0812d
Convert Settings class to TS (#37218) 2025-12-12 10:20:32 +00:00
Echo
e206b0d0de
Wrapstodon: Add nav modal (#37210) 2025-12-12 10:11:47 +00:00
diondiondion
571c93c563
Change Wrapstodon 'About' link to point to joinmastodon.org (#37216) 2025-12-12 09:43:34 +00:00
Echo
10f232ca08
Wrapstodon: Allow dismissing banner (#37202) 2025-12-12 09:40:45 +00:00
Claire
a56b739c68 [Glitch] Fix wrapstodon modal closing on any click 
Port dfbf908870fcde76396ebccfb3d71ee1a06ffe82 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-11 19:07:26 +01:00
diondiondion
183a42a5ee [Glitch] Add Wrapstodon footer links 
Port c06eb371e6601c740c5998aa4c7e492f336e00eb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-12-11 19:06:54 +01:00