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
5fa7654688
Fixes display names not rendering with emojis ( #37251 )
2025-12-15 12:54:46 +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
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
Claire
5e3387539e
Add image to Wrapstodon OpenGraph banner ( #37205 )
2025-12-11 16:22:48 +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
Claire
6838497fe8
Add title and description to Opengraph data for Wrapstodon share page ( #37188 )
2025-12-10 11:27:10 +00:00
Claire
5422e43e31
Fix wrapstodon standalone page not loading JS module
2025-12-10 09:49:09 +01: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
3b4c4c5b09
Merge commit '65b216353e9bc9ae8517d967f8c2cd8122551fdc' into glitch-soc/merge-upstream
...
- `app/helpers/application_helper.rb`:
Upstream updated the classes used for theming purposes,
but glitch-soc has its own theming system.
Adapted upstream's changes.
- `spec/helpers/application_helper_spec.rb`:
Upstream updated the classes used for theming purposes,
but glitch-soc has its own theming system.
Adapted upstream's changes.
2025-12-05 19:25:40 +01: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
diondiondion
65b216353e
Handle dark/light/contrast theme modes in common CSS ( #37095 )
2025-12-04 15:56:35 +00:00
Echo
0dac31dfd5
Create new entrypoint for sharable Wrapstodon ( #37121 )
2025-12-04 15:48:10 +00:00
Claire
5d84957117
Add shareable wrapstodon links ( #37047 )
2025-12-03 11:00:41 +00:00
Echo
048746e56b
Hide domain for local emojis in admin ( #37080 )
2025-12-01 14:24:24 +00:00
Claire
652ed7ab50
Merge commit '585545d0d5678a6ea4b958af4a3bc6593134d0f6' into glitch-soc/merge-upstream
2025-11-21 19:33:14 +01:00
Matt Jankowski
d967137adf
Remove unneeded type check on Status in og_image partial ( #36980 )
2025-11-21 14:29:03 +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
Matt Jankowski
53703202fb
Add IpBlock#to_cidr method to build string ( #35773 )
2025-11-17 14:51:05 +00:00
diondiondion
284b46fee7
Implement CSS theme tokens behind feature flag ( #36861 )
2025-11-17 09:44:55 +00:00
Claire
58b29be439
Merge commit '58b3fc03796dbde54dbba9a4c554c2d8d24f81fd' into glitch-soc/merge-upstream
2025-11-06 12:35:04 +01:00
Josh Soref
50e1320c8d
Improve account migration warnings ( #20387 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
Co-authored-by: diondiondion <mail@diondiondion.com >
2025-11-05 15:27:40 +00:00
Oneric
c0c6f5ea32
Fix Accept headers when fetching AP objects to match spec ( #30354 )
2025-11-05 13:32:29 +00:00
Claire
a7ba4ba446
Merge commit '26e7fe97714d077930621f9111b7eaad2774df65' into glitch-soc/merge-upstream
2025-11-04 20:38:24 +01:00
Claire
b5c550ff0b
Remove option to disable access to local topic feeds for logged-in users ( #36703 )
2025-11-04 10:37:43 +00:00
Claire
8d1208224f
Merge commit 'd1f57822af0da2b2836e33baab5f89469ac6fa25' into glitch-soc/merge-upstream
2025-11-03 21:04:45 +01:00
Rachael Wright-Munn
d1f57822af
Move "Privacy and reach" from "Public profile" to top-level navigation ( #27294 )
2025-11-03 17:56:17 +00:00
Claire
d04e6ec597
Remove glitch-soc system emoji font option now that it's superseded by upstream
2025-10-28 22:57:31 +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
Echo
85d0cdb5f7
Emoji: Remove final flag ( #36409 )
2025-10-28 11:33:27 +00:00
M.J. Fieggen (Joni)
e8382c7332
Fix layout of severed relationships when purged events are listed ( #36593 )
2025-10-27 15:19:38 +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
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
diondiondion
20961c7538
Add keyboard shortcut info banner to the boosting preferences section ( #36506 )
2025-10-16 14:53:23 +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
Claire
302e3fe8be
Merge commit '50743cc35be19deae9356bd21f1143e3a9b4fbb8' into glitch-soc/merge-upstream
2025-10-14 18:01:40 +02:00
Claire
44ecc4b1e3
Fix moderation warning e-mails that include posts ( #36462 )
2025-10-14 11:48:51 +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
