Echo
4b1532e008
Fix duplicate counters ( #36844 )
2025-11-12 11:01:34 +00:00
Claire
48146e5371
Merge commit 'b5a2fe715d158d5fdf4ad9ddef0787b781b4da6e' into glitch-soc/merge-upstream
2025-11-11 20:22:04 +01:00
Echo
b5a2fe715d
Revert "Fix duplicated counters ( fix #32614 )" ( #36834 )
2025-11-11 18:05:44 +00:00
xatier
84cdb6cc66
Fix duplicated counters ( fix #32614 ) ( #36785 )
2025-11-11 11:02:41 +00:00
Echo
ff5d745e3d
Emoji: Load emoji with hash in URL ( #36808 )
2025-11-11 10:03:06 +00:00
Claire
d31aaf9ed8
Merge commit '1c3e7545cb6137025a6efd208d195352c54ffda8' into glitch-soc/merge-upstream
2025-11-10 22:18:01 +01:00
diondiondion
400943cb4e
Fix scroll shift caused by fetch-all-replies alerts ( #36807 )
2025-11-10 15:33:56 +00:00
Renaud Chaput
9addad8ce5
Update to latest eslint-plugin-react-hooks ( #36702 )
...
Co-authored-by: diondiondion <mail@diondiondion.com>
2025-11-10 14:50:04 +00:00
Claire
c1ef6e31cb
Merge commit '441eb895371cf8ed6a5b8e294367bbbfd0f4c037' into glitch-soc/merge-upstream
2025-11-08 10:44:43 +01:00
Echo
882afd7748
Reset background color on media modal ( #36782 )
2025-11-07 10:44:31 +00:00
Claire
58b29be439
Merge commit '58b3fc03796dbde54dbba9a4c554c2d8d24f81fd' into glitch-soc/merge-upstream
2025-11-06 12:35:04 +01:00
diondiondion
58b3fc0379
Refactor "New/Edit list" page to avoid setting state in effect ( #36753 )
2025-11-06 11:00:37 +00:00
Echo
41a4022988
Fix: correctly dismisses announcement when viewed ( #36750 )
2025-11-06 09:48:34 +00:00
Echo
987104f435
Add default visualizer for audio upload without poster ( #36734 )
2025-11-05 15:33:26 +00:00
Echo
6337e036f3
Add new ESLint rule requiring explicit button types ( #36738 )
2025-11-05 15:11:04 +00:00
Claire
a7ba4ba446
Merge commit '26e7fe97714d077930621f9111b7eaad2774df65' into glitch-soc/merge-upstream
2025-11-04 20:38:24 +01:00
Claire
26e7fe9771
Change paste-link-to-quote loading state from generic loading bar to compose placeholder ( #36695 )
2025-11-04 19:20:39 +00:00
Echo
3ab5ae1e4a
Quote Posts: Add notifications for DMs and private posts ( #36696 )
2025-11-04 16:32:52 +00:00
Echo
90d4b3b943
Refactor: Media Modal ( #36673 )
2025-11-04 13:58:35 +00:00
Claire
3a54d56fbd
Fix quote dropdown menu item in detailed status view ( #36704 )
2025-11-04 11:01:25 +00:00
Jeong Arm
b999a626e5
Reverse 'Hide/Show all' eye icon for thread view ( #22301 )
2025-11-04 10:35:50 +00:00
Claire
6ff4dad89d
Merge commit '055f581ca58b62132c1eff23453031d9df9dbf0e' into glitch-soc/merge-upstream
2025-10-31 18:03:21 +01:00
diondiondion
055f581ca5
Fix initially selected language in Rules panel, hide selector when no alternative translations exist ( #36672 )
2025-10-31 14:20:59 +00:00
diondiondion
499ddfe8e1
Add separate translation key for "About this server" string ( #36664 )
2025-10-31 10:07:10 +00:00
diondiondion
fcecbf31ed
Show error when submitting empty post rather than failing silently ( #36650 )
2025-10-30 19:29:25 +00:00
Echo
e7cd5a430e
Refactor carousel components ( #36425 )
...
Co-authored-by: diondiondion <mail@diondiondion.com>
2025-10-29 14:44:46 +00: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
Claire
515ce38a52
Merge commit '51d0bfcb385b49bfdd30b742d05e8e37257168d6' into glitch-soc/merge-upstream
2025-10-17 18:11:59 +02:00
diondiondion
6dad80eb8c
Add new "quick boosting" setting ( #36516 )
2025-10-17 13:02:47 +00:00
Claire
f56fc1bab4
Merge commit '241ad1c5878161f5f4a19c16ed6c042f1c2cb6c2' into glitch-soc/merge-upstream
2025-10-16 18:36:25 +02:00
Echo
51d0bfcb38
Emoji: Update Twemoji to v16 ( #36501 )
2025-10-16 13:15:16 +00:00
Claire
ef53dcfd8c
Fix pinned hashtag columns fully refreshing unprompted ( #36497 )
2025-10-16 09:10:53 +00:00
diondiondion
869eeecfee
Show new replies early if the fetch-all-replies task takes long to finish ( #36481 )
2025-10-15 17:30:47 +00:00
Claire
ef413ef713
Merge commit '5a8ab0a3e62a8825e28bb74c1760ba6488d20c97' into glitch-soc/merge-upstream
2025-10-15 16:35:37 +02:00
Emelia Smith
d8bdce2835
Fix rendering of poll options in status history modal ( #35633 )
2025-10-15 09:05:10 +00:00
