Claire
44e6abe48b
Merge commit '0004ed4c8021ebd400d32eb32a5e479ebd7bcf91' into glitch-soc/merge-upstream
2025-11-30 16:40:18 +01:00
diondiondion
861625fdca
Prevent vertical videos from overflowing the viewport ( #36966 )
2025-11-25 13:21:59 +00:00
Claire
dd7d750f5d
Merge commit '21ce99f746e17867df74029d3b2caca45588818d' into glitch-soc/merge-upstream
2025-11-20 18:13:37 +01:00
Darius Kazemi
dc67dbba82
Remove stray Font Awesome styles ( #36960 )
2025-11-20 10:02:50 +00:00
Claire
7a56972381
Merge commit '366856f3bcdc2ff008b04e493a5de317ab83d5d0' into glitch-soc/merge-upstream
2025-11-19 21:49:09 +01:00
Claire
a4fd9b704a
Merge commit '284b46fee7ad682b52c99d0455a1134e1d4e3fc3' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream added an experimental feature flag to try out theme refactors.
Glitch-soc's theming system is too different, so skips the new feature flag.
- `stylelint.config.js`:
Ditto.
2025-11-19 21:34:53 +01:00
diondiondion
72c582e7e5
Fix superfluous border & spacing in domains list on the Moderation > Federation page ( #36915 )
2025-11-17 12:07:44 +00:00
diondiondion
284b46fee7
Implement CSS theme tokens behind feature flag ( #36861 )
2025-11-17 09:44:55 +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
Echo
4ddddc2573
Centers GIFs in media modal ( #36806 )
2025-11-10 13:21:45 +00:00
Claire
58b29be439
Merge commit '58b3fc03796dbde54dbba9a4c554c2d8d24f81fd' into glitch-soc/merge-upstream
2025-11-06 12:35:04 +01:00
Echo
987104f435
Add default visualizer for audio upload without poster ( #36734 )
2025-11-05 15:33:26 +00:00
diondiondion
947dfcc548
Add some outer page spacing when viewport width equals content width ( #36733 )
2025-11-05 12:17:42 +00:00
Claire
a7ba4ba446
Merge commit '26e7fe97714d077930621f9111b7eaad2774df65' into glitch-soc/merge-upstream
2025-11-04 20:38:24 +01:00
Echo
3ab5ae1e4a
Quote Posts: Add notifications for DMs and private posts ( #36696 )
2025-11-04 16:32:52 +00:00
Claire
4a9460f7bd
Fix Skeleton placeholders being animated when setting to reduce animations is enabled ( #36716 )
2025-11-04 15:30:10 +00:00
Echo
90d4b3b943
Refactor: Media Modal ( #36673 )
2025-11-04 13:58:35 +00:00
Echo
13457111d5
Remove announcement margin when in Advanced Web Interface ( #36714 )
2025-11-04 13:37:34 +00:00
Claire
6ff4dad89d
Merge commit '055f581ca58b62132c1eff23453031d9df9dbf0e' into glitch-soc/merge-upstream
2025-10-31 18:03:21 +01: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
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
