Claire
b1d219afd0
Merge commit '82fb2596c70a18fc4a2d99ab51106180196bfe98' into glitch-soc/merge-upstream
2026-01-05 18:19:58 +01:00
Claire
e8a49bd6ae
Fix outdated link target for “locked” warning ( #37366 )
2026-01-05 10:35:23 +00: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
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
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
Echo
f254b47067
Remove trailing variation selector code for legacy emojis ( #37320 )
2025-12-19 13:43:27 +00:00
Claire
baa6af0e18
Merge commit 'ff20ab7510a189bee75bdd5460f6c2ae38e7009a' into glitch-soc/merge-upstream
2025-12-18 18:56:31 +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
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
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
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
Echo
5fa7654688
Fixes display names not rendering with emojis ( #37251 )
2025-12-15 12:54:46 +00:00
diondiondion
a9e228361c
Fix badly visible focus outlines in composer ( #37250 )
2025-12-15 12:39:04 +00: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
303a5478af
Merge commit 'dfbf908870fcde76396ebccfb3d71ee1a06ffe82' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/wrapstodon/show.html.haml`:
Conflict because of glitch-soc's theming system.
Applied upstream's changes.
2025-12-11 19:05:32 +01:00
Claire
dfbf908870
Fix wrapstodon modal closing on any click ( #37209 )
2025-12-11 17:49:26 +00:00
diondiondion
c06eb371e6
Add Wrapstodon footer links ( #37207 )
2025-12-11 17:06:26 +00:00
Claire
53617cef5a
Merge commit 'd730f6b0c5cfb18894d1a9e34d0aa2556dda3c62' into glitch-soc/merge-upstream
2025-12-11 18:05:28 +01:00
diondiondion
4323963053
Fix Wrapstodon modal scrolling not working on iOS ( #37203 )
2025-12-11 14:25:28 +00:00
diondiondion
5651900b89
Wrapstodon design QA tweaks ( #37201 )
2025-12-11 11:40:53 +00:00
Claire
17ba99e5de
Merge commit 'd6f2a3ac8d61e0828a17f68a6e9094d0f4662f4c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/wrapstodon/show.html.haml`:
Conflict because of glitch-soc's theming change.
Adapted upstream's changes.
- `docker-compose.yml`:
Conflict because of container repo name change.
Adapted upstream's changes.
- `yarn.lock`:
Conflict because of an additional glitch-soc dependency.
Updated the dependencies upstream did.
2025-12-10 18:05:44 +01:00
diondiondion
c42b9f6996
Implement custom font for Wrapstodon heading ( #37193 )
2025-12-10 16:26:46 +00:00
Echo
76184c998c
Fix issue where Wrapstodon was pushed to the bottom of the feed ( #37190 )
2025-12-10 15:55:12 +00:00
diondiondion
8137ce87ce
Fix Wrapstodon Storybook & other Wrapstodon issues ( #37189 )
2025-12-10 14:07:25 +00:00
diondiondion
91500a7f53
Minor Wrapstodon tweaks, add stub Storybook page ( #37186 )
2025-12-10 09:05:14 +00:00
Claire
315f5e5a31
Merge commit '9d81561bb2440c8fb9a75bd05277120aff346b1e' into glitch-soc/merge-upstream
2025-12-09 18:06:56 +01:00
diondiondion
9d81561bb2
Update Wrapstodon design ( #37169 )
2025-12-09 16:51:05 +00:00
Claire
2f6cdd6d47
Merge commit '1ae3b4672bffbc4aaf26f60c7063d6901239de5d' into glitch-soc/merge-upstream
2025-12-05 20:00:40 +01:00
diondiondion
591776d7ad
Fix inversion of emoji colours based on dark/light mode ( #37120 )
2025-12-05 10:08:59 +00:00
Claire
c8f365fd1d
Merge commit '0dac31dfd588e4cd866f382ed001a9535f06234a' into glitch-soc/merge-upstream
2025-12-04 20:59:54 +01:00
Claire
34aa825e96
Merge commit 'b3b5bf26d14f809a562244642949826b6a91bade' into glitch-soc/merge-upstream
2025-12-04 20:16:21 +01:00
Echo
46f3b39fae
Fixes YouTube embeds ( #37126 )
2025-12-04 16:27:20 +00:00
