Claire
585827c14f
Merge commit 'bb6093c3153f092736e2f25959e3dcdceeb7bce1' into glitch-soc/merge-4.5
2025-11-13 17:22:33 +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
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
Echo
5bae08d1ff
Quote Posts: Add notifications for DMs and private posts ( #36696 )
2025-11-05 09:59:00 +01:00
Claire
0b50789c5b
Fix Skeleton placeholders being animated when setting to reduce animations is enabled ( #36716 )
2025-11-05 09:59:00 +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
26ec19a649
Change styling of column banners ( #36531 )
2025-10-28 14:45:46 +00:00
diondiondion
422fa1cf9f
Revert "Fix custom emoji width ( #27969 )" ( #36620 )
2025-10-28 12:36:22 +00:00
marousta
dc851c9efc
Fix custom emoji width ( #27969 )
2025-10-27 15:56:06 +00:00
Claire
ee9a15031b
Merge commit '9f7075a0ce2b6ecef8d92ef318785fa8ce708688' into glitch-soc/merge-upstream
2025-10-22 18:06:32 +02:00
diondiondion
7538bc77b7
Fix text overflow alignment for long author names in News ( #36562 )
2025-10-22 13:08:51 +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
4c0104084d
Merge commit 'c96e28a41d6f3dee898b09ab1b250ac5b5dfd9e4' into glitch-soc/merge-upstream
2025-10-17 18:36:27 +02:00
diondiondion
6dad80eb8c
Add new "quick boosting" setting ( #36516 )
2025-10-17 13:02:47 +00:00
Claire
323c6e51fe
Merge commit '7530f06deea63a03e0ca05f777f0f1582372c305' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream reorganized the whole page, while glitch-soc had an extra setting.
Adopted upstream's redesign and moved the extra setting where it made sense.
2025-10-16 19:23:29 +02:00
Claire
f56fc1bab4
Merge commit '241ad1c5878161f5f4a19c16ed6c042f1c2cb6c2' into glitch-soc/merge-upstream
2025-10-16 18:36:25 +02:00
diondiondion
20961c7538
Add keyboard shortcut info banner to the boosting preferences section ( #36506 )
2025-10-16 14:53:23 +00:00
Echo
63dc426fae
Emoji: Fix emoji picker not centering native emoji ( #36502 )
2025-10-16 13:45:20 +00:00
Emelia Smith
210b389643
Implement quote posts in Moderator UI ( #35964 )
2025-10-16 13:40:24 +00:00
diondiondion
05244c335d
Restructure appearance settings to introduce new Advanced settings section ( #36496 )
2025-10-16 09:44:24 +00:00
diondiondion
28a42bb62c
Fix low-contrast hover colour of alert actions (light theme only) ( #36484 )
2025-10-15 15:38:36 +00:00
Claire
ef413ef713
Merge commit '5a8ab0a3e62a8825e28bb74c1760ba6488d20c97' into glitch-soc/merge-upstream
2025-10-15 16:35:37 +02:00
Matt Jankowski
c6de46d12d
Update stylelint-config-standard-scss to version 16.0.0 ( #36429 )
...
Co-authored-by: diondiondion <mail@diondiondion.com >
2025-10-15 11:30:09 +00:00
Claire
302e3fe8be
Merge commit '50743cc35be19deae9356bd21f1143e3a9b4fbb8' into glitch-soc/merge-upstream
2025-10-14 18:01:40 +02:00
diondiondion
9a001e7839
Fix videos not being indented properly in thread view ( #36459 )
2025-10-14 08:58:03 +00:00
Claire
ee88f8550c
Merge commit '0219b7cad7d9ef800f82cc561571b70da040433f' into glitch-soc/merge-upstream
2025-10-10 19:01:35 +02:00
Emelia Smith
8898f120dc
Improve display of content warnings in Admin UI ( #35935 )
2025-10-10 08:55:41 +00:00
Emelia Smith
81350c7cfb
Add support for displaying link previews for Admin UI ( #35958 )
2025-10-10 08:43:48 +00:00
Claire
f800057008
Merge commit 'b8444d9bb7885d75112a3cae74b6a5c711c7d547' into glitch-soc/merge-upstream
2025-10-08 18:07:04 +02:00
diondiondion
e4c3854ae8
Ensure Fetch-all-replies snackbar is shown at the bottom of the screen ( #36383 )
2025-10-07 16:43:40 +00:00
diondiondion
63bbe4ee16
Display quotes in email notifications ( #36379 )
2025-10-07 12:50:40 +00:00
Claire
17e0c745c6
Merge commit 'f69ca085dbfca2253404574dcdc4dc6c2aaa35c0' into glitch-soc/merge-upstream
2025-10-01 19:13:18 +02:00
Terence Eden
6c3c2714d7
Add overflow to .more-from-author ( #36310 )
2025-10-01 09:23:49 +00:00
metalhead
e4094d9fb2
Add support for dynamic viewport height ( #36272 )
...
Co-authored-by: l <eh.chahkiev@smartics.ru >
2025-10-01 08:53:29 +00:00
diondiondion
473bd84c24
Update confirmation dialogs for follow button actions "unfollow", "unblock", and "withdraw request" ( #36289 )
2025-09-30 14:55:25 +00:00
Claire
8fad4926c5
Merge commit '1571514e49ec02a57c050612b3bca856f54933fb' into glitch-soc/merge-upstream
2025-09-27 21:29:19 +02:00
diondiondion
1571514e49
Fix page being vertically scrollable in Advanced UI ( #36271 )
2025-09-26 09:23:30 +00:00
Claire
9db7ad670f
Merge commit 'df72a2dbbec8173515568c02427076ebff5c2297' into glitch-soc/merge-upstream
2025-09-24 23:03:32 +02:00
Claire
df72a2dbbe
Fix newly-highlighted replies not being interactable ( #36256 )
2025-09-24 20:37:20 +00:00
Claire
b15b07606c
Merge commit '28be5a199f685b9fb26742c4d78ddca53df05d57' into glitch-soc/merge-upstream
2025-09-24 18:26:13 +02:00
diondiondion
3a81ee8f5b
Implement new design for "Refetch all" ( #36172 )
2025-09-24 09:54:07 +00:00
diondiondion
059bf1e980
Highlight newly added replies in thread view ( #36237 )
2025-09-24 09:27:33 +00:00
diondiondion
6cbc857ee0
Fix unfortunate action button wrapping in admin area ( #36247 )
2025-09-24 08:57:18 +00:00
Claire
a548c5c29b
Merge commit '24ddf80ff7a707bcea01a6e59831ffefe495f3e0' into glitch-soc/merge-upstream
2025-09-23 18:41:09 +02:00
diondiondion
9bd151808c
Fix line break in Read more button ( #36216 )
2025-09-22 08:39:32 +00:00
Claire
af360df59b
Merge commit '48005c55fffd1540105ca53870da64f742a0f7fc' into glitch-soc/merge-upstream
2025-09-18 19:19:36 +02:00
diondiondion
c368a16dc1
Fix translate button width in Safari ( #36164 )
2025-09-18 10:16:22 +00:00
Claire
21cf2673f2
Merge commit '085e9ea676f11cad4ae7fafce5ceadb16ecd0f83' into glitch-soc/merge-upstream
2025-09-17 20:13:13 +02:00
