Claire
c96eebde37
Merge commit 'ded7f50f2c2672879292ff571b2e531ea87f77e4' into glitch-soc/merge-4.5
...
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
Upstream refactored a bit where we had an extra argument for markdown/HTML.
Adapted upstream change.
2026-01-19 18:29:02 +01:00
Echo
f354bbe8aa
Remove trailing variation selector code for legacy emojis ( #37320 )
2026-01-19 11:37:34 +01:00
Claire
b134c6a8ef
Merge commit 'a846ed17ffb85087de658678b482495981f02770' into glitch-soc/merge-4.5
2026-01-06 18:12:51 +01:00
Claire
1c5461fffe
Fix outdated link target for “locked” warning ( #37366 )
2026-01-06 14:11:56 +01:00
Claire
b868e598bc
Merge commit '3de59a93441367fbca0fd22818c8411adc73a967' into glitch-soc/merge-4.5
2025-12-28 10:51:43 +01:00
ChaosExAnima
3de59a9344
Remove rendering of custom emoji using the database ( #37284 )
2025-12-19 11:02:32 +01:00
Claire
962ae88caf
Fix custom emojis not displaying in CWs and fav/boost notifications ( #37306 )
2025-12-19 11:02:32 +01:00
Echo
546a95349e
Emojis: Show in embedded statuses ( #37272 )
2025-12-19 11:02:32 +01:00
Claire
6c1e892dd7
Merge commit '86cff1abca6af7ffb1a6ca004ae308c0df6d45ba' into glitch-soc/merge-4.5
2025-12-08 16:37:11 +01:00
Echo
9bc9ebc59e
Fixes YouTube embeds ( #37126 )
2025-12-05 11:15:16 +01:00
diondiondion
1ef4bbd88d
Fix post navigation in single-column mode when Advanced UI is enabled ( #37044 )
2025-12-05 11:15:16 +01:00
Claire
fe6d3690fd
Merge commit '5fe316b2e94bccb91732a1d6675854abb60e9a4b' into glitch-soc/merge-4.5
2025-11-19 22:15:12 +01:00
Claire
6ccd9c2f1f
Fix scroll-to-status in threaded view being unreliable ( #36927 )
2025-11-19 15:20:01 +01:00
Claire
261d9b33fe
Change private quote education modal to not show up on self-quotes ( #36926 )
2025-11-19 15:20:01 +01:00
Echo
c08cd6d62a
Emoji: Fix path resolution for emoji worker ( #36897 )
2025-11-19 15:20:01 +01:00
diondiondion
1d081250f4
Fix Cmd/Ctrl + Enter in the composer triggering confirmation dialog action ( #36870 )
2025-11-19 15:20:01 +01:00
Claire
585827c14f
Merge commit 'bb6093c3153f092736e2f25959e3dcdceeb7bce1' into glitch-soc/merge-4.5
2025-11-13 17:22:33 +01:00
diondiondion
6baa8f2466
Fix Cmd/Ctrl + Enter not submitting Alt text modal on some browsers ( #36866 )
2025-11-13 17:12:07 +01:00
Claire
55b9d21537
Fix posts coming from public/hashtag streaming being marked as unquotable ( #36860 )
2025-11-13 15:24:58 +01:00
Echo
28b9e9087a
Fix deprecation warning in Vite ( #36849 )
2025-11-13 15:24:58 +01:00
diondiondion
fa2cc409ce
Fixes blank screen in browsers that don't support Intl.DisplayNames ( #36847 )
2025-11-13 15:24:58 +01:00
Claire
8a100d84c5
Fix filters not being applied to quotes in detailed view ( #36843 )
2025-11-13 15:24:58 +01:00
Echo
9ae0464e8f
Emoji: Load emoji with hash in URL ( #36808 )
2025-11-13 15:24:58 +01:00
diondiondion
9eea4479e1
Fix scroll shift caused by fetch-all-replies alerts ( #36807 )
2025-11-13 15:24:58 +01:00
Claire
8a2d38a47b
Merge commit '048430f4e8010672eb667f1ccf2372571cfb97dd' into glitch-soc/merge-4.5
2025-11-06 12:16:55 +01:00
Echo
d45b4db1d7
Fix: correctly dismisses announcement when viewed ( #36750 )
2025-11-06 11:23:46 +01:00
Echo
ef3a95affc
Add default visualizer for audio upload without poster ( #36734 )
2025-11-06 10:34:12 +01:00
Claire
7ea3c6a039
Merge commit 'e91c7645905972d9663a0d944b133ff24670bce2' into glitch-soc/merge-4.5
2025-11-05 10:02:33 +01:00
Claire
cfdd9396c0
Change paste-link-to-quote loading state from generic loading bar to compose placeholder ( #36695 )
2025-11-05 09:59:00 +01:00
Echo
5bae08d1ff
Quote Posts: Add notifications for DMs and private posts ( #36696 )
2025-11-05 09:59:00 +01:00
Claire
a978e37f4c
Fix quote dropdown menu item in detailed status view ( #36704 )
2025-11-05 09:59:00 +01:00
Claire
5f5e6ca031
Merge commit 'af4c372ab22b636742833592235d18418604fcc1' into glitch-soc/merge-4.5
2025-10-31 16:04:05 +01:00
diondiondion
aa579ce286
Fix initially selected language in Rules panel, hide selector when no alternative translations exist ( #36672 )
2025-10-31 16:01:06 +01:00
diondiondion
214d59bd37
Show error when submitting empty post rather than failing silently ( #36650 )
2025-10-31 14:09:36 +01:00
Claire
48ec31bec8
Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream changed stuff too close to glitch-soc's theming system changes.
Applied upstream's changes.
- `streaming/index.js`:
Upstream refactored a bunch of stuff where our code was different due to
local-only posts.
Applied upstream's changes while taking care of local-only posts.
2025-10-28 22:10:12 +01:00
Claire
5f3f75559f
Merge commit '1dead10312caa0cc7719cb80052af549ddf3e6a1' into glitch-soc/merge-upstream
2025-10-28 20:25:09 +01:00
Claire
4896d2c4c6
Change firehose labels depending on which feeds are accessible ( #36607 )
2025-10-28 16:59:37 +00:00
Echo
85d0cdb5f7
Emoji: Remove final flag ( #36409 )
2025-10-28 11:33:27 +00:00
Echo
d0d09fd3a5
Emoji: Fix Web Worker import ( #36603 )
2025-10-27 17:36:01 +00:00
Renaud Chaput
779a1f8448
Add a new setting to choose the server landing page ( #36588 )
2025-10-27 10:16:59 +00:00
Claire
deed31ba8c
Merge commit '1ba579b0a181fbfff514ef32b50179d2ab1fc342' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/public_feed.rb`:
Minor conflict due to glitch-soc's local-only posts.
Adopted upstream's changes.
- `spec/models/tag_feed_spec.rb`:
Minor conflict due to glitch-soc's local-only posts.
Adopted upstream's changes.
2025-10-23 18:33:52 +02:00
diondiondion
1ba579b0a1
Fix "new post highlighting" in threads being applied when navigating between posts ( #36583 )
2025-10-23 15:52:07 +00:00
Claire
2fa5dd6d1f
Add UI support for disabled live feeds ( #36577 )
...
Co-authored-by: diondiondion <mail@diondiondion.com >
2025-10-23 09:59:43 +00:00
Claire
ee9a15031b
Merge commit '9f7075a0ce2b6ecef8d92ef318785fa8ce708688' into glitch-soc/merge-upstream
2025-10-22 18:06:32 +02:00
diondiondion
7ea2af6ae2
Refresh thread replies periodically & when refocusing window ( #36547 )
2025-10-22 09:43:03 +00:00
Claire
9080083263
Merge commit '341ea7f462c68ebe2fc5ee15dc7c58aa5775d5a0' into glitch-soc/merge-upstream
2025-10-20 21:37:50 +02:00
Echo
6e2973aa2d
Emoji: Fix unneeded re-renders when StatusContent changes ( #36532 )
2025-10-20 14:52:27 +00:00
Claire
97c8cc5606
Fix position of quote dropdown menu item when “quick boosting” is enabled ( #36528 )
2025-10-20 13:05:40 +00:00
Echo
50dfab30c2
Emoji: Swap mode test to an emoji from 16.0 ( #36530 )
2025-10-20 13:04:38 +00:00
Claire
22e3c0e745
Merge commit '612771de465da60dbd58790adc6b1556a7fa739b' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a setting adjacent to a glitch-soc-only setting.
Added upstream's setting while keeping ours.
- `app/serializers/initial_state_serializer.rb`:
Upstream added a setting adjacent to a glitch-soc-only setting.
Added upstream's setting while keeping ours.
2025-10-17 19:00:18 +02:00
