Claire
564d74ea36
Merge commit 'd887790e86124493df850e9bc52e1e059207b523' into glitch-soc/merge-upstream
2025-06-06 18:16:52 +02:00
diondiondion
c92e21813e
fix: Fix indentation of quote posts in threads ( #34961 )
2025-06-06 12:37:56 +00:00
Claire
2085b0b53a
Merge commit '520974e05211e988b0447f7f29e88798b1794bcf' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/rest/status_serializer.rb`:
Not a real conflict, just glitch-soc code textually adjacent to code added
upstream.
2025-06-05 18:02:40 +02:00
Claire
375add0c83
Fix account note textarea being interactable before the relationship gets fetched ( #34932 )
2025-06-05 08:49:26 +00:00
diondiondion
1dafd8c9dd
fix: Fix broken audio player layout in Safari, #34930 ( #34933 )
2025-06-04 15:34:13 +00:00
Echo
e9f197740d
Ensure carousel slides don't overflow ( #34927 )
2025-06-04 14:29:34 +00:00
Claire
088af860b3
Merge commit '9c80b16401e7606cbd7eb2bf3af32c18953d1d3f' into glitch-soc/merge-upstream
2025-06-02 12:16:06 +02:00
Eugen Rochko
d47199dd4b
Fix not being able to scroll dropdown on touch devices in web UI ( #34873 )
2025-06-02 08:07:42 +00:00
Claire
c2989e231d
Merge commit '44d71d59efd79ee723a1dec72ec77833560c45cf' into glitch-soc/merge-upstream
2025-05-31 15:30:19 +02:00
Eugen Rochko
44d71d59ef
Add icon to header of pinned posts carousel in web UI ( #34869 )
2025-05-30 22:24:34 +00:00
Claire
c00e27aa55
Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream
2025-05-30 17:41:31 +02:00
Nicholas La Roux
0789ec93f8
Make account header profile pic exactly 2x post profile pic ( #34807 )
2025-05-30 12:33:30 +00:00
diondiondion
975db93e3f
feat: Add relationship info to hover card ( #34792 )
2025-05-30 12:32:19 +00:00
Echo
9860046b04
Fix pinned carousel scroll on mobile ( #34858 )
2025-05-30 09:08:09 +00:00
Claire
086a7016c4
Merge commit 'd78535eab9cefc285c0d7ef88adb125ab1ceb6bd' into glitch-soc/merge-upstream
...
Conflicts:
- `vite.config.mts`:
Upstream moved its theming system to a plug-in, where we had our own.
Adapted the file as well as our own plugin to adopt the same mechanisms.
2025-05-27 20:49:19 +02:00
Echo
d78535eab9
Add language picker to server rules section ( #34820 )
2025-05-27 13:57:34 +00:00
Claire
e1cac17f4a
Merge commit 'ba5320671c287b66284bc42544b3bccc506f22b9' into glitch-soc/merge-upstream
2025-05-26 20:47:12 +02:00
Echo
ba5320671c
Move pinned posts to a carousel ( #34754 )
...
Co-authored-by: diondiondion <mail@diondiondion.com >
2025-05-26 13:35:28 +00:00
Claire
558c73a21e
Use @/ absolute paths instead of relative paths in CSS ( #34806 )
2025-05-26 07:27:44 +00:00
Claire
706c8bf1a0
Merge commit 'a13756148d353c7479f68e65a210f6d88d26c785' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/embedded.html.haml`:
Upstream made a change to javascript tags next to lines changed in glitch-soc
because of the theming system.
Added the javascript entrypoint upstream added.
- `app/views/layouts/error.html.haml`:
Upstream made a change to javascript tags next to lines changed in glitch-soc
because of the theming system.
Added the javascript entrypoint upstream added.
2025-05-25 15:11:58 +02:00
Claire
b031f65670
Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream
2025-05-25 14:51:59 +02:00
Claire
f49940db85
Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream
...
Too many conflicts to list, because of webpack → vite migration.
2025-05-25 14:36:51 +02:00
diondiondion
5dda094daa
fix: Fix various UI text wrapping and overflow issues ( #34774 )
2025-05-23 07:07:05 +00:00
Claire
02ac18da51
Change display of quote posts to strip fallback link and preview cards ( #34772 )
2025-05-23 06:53:04 +00:00
diondiondion
12c8a6498c
Add "Followers you know" to hovercard ( #34769 )
2025-05-22 12:46:14 +00:00
diondiondion
79ccba1758
Add visual indicator & link to nested quote posts ( #34766 )
2025-05-22 10:39:45 +00:00
diondiondion
97b9e8849d
Add rendering of quote posts in web UI ( #34738 )
2025-05-21 15:50:45 +00:00
Nick Schonning
d8ea8bc3bb
Enable Stylelint color-hex-length ( #34310 )
2025-05-21 08:05:45 +00:00
Claire
d7cb6068b1
Add ability to reorder server rules from admin interface ( #34737 )
2025-05-20 12:49:11 +00:00
renovate[bot]
8ab2c4a9fc
chore(deps): update dependency stylelint-config-standard-scss to v15 ( #34658 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com >
2025-05-19 12:46:11 +00:00
diondiondion
4372d17114
fix: Prevent long link names in admin sidebar from being truncated ( #34727 )
2025-05-19 12:36:46 +00:00
Echo
c4f47adb49
Convert from Webpack to Vite ( #34450 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com >
2025-05-16 13:26:12 +00:00
Claire
0fda1f0e94
Merge commit '6c743831aab13a39f2020827f20933a51bc7cbc2' into glitch-soc/merge-upstream
2025-05-15 18:52:02 +02:00
diondiondion
6c743831aa
fix: Hide "Followers you know" widget from your own profile, #34698 ( #34699 )
2025-05-15 14:40:01 +00:00
diondiondion
3f965d83b0
fix: More "Followers you know" polish & bug fixes ( #34697 )
2025-05-15 11:33:16 +00:00
diondiondion
ccffa11f2b
refactor: Remove duplicated AvatarGroup CSS and familiar followers cleanup ( #34681 )
2025-05-15 08:07:38 +00:00
Claire
5321a553d5
Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Not a real conflict, upstream added a setting on a line adjacent to a
glitch-soc-only line.
Added upstream's new setting.
2025-05-14 13:38:23 +02:00
diondiondion
b135a831ea
feat: Add "Followers you know" widget to user profiles ( #34652 )
2025-05-13 06:38:18 +00:00
Claire
68bb158c84
Merge commit '8b34daf2541c6afdb5ade19e4531373ef7b05bc0' into glitch-soc/merge-upstream
2025-05-03 18:28:25 +02:00
Claire
3ec3814f8e
Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream
2025-05-03 17:37:26 +02:00
Eugen Rochko
b4394ec129
Change design of audio player in web UI ( #34520 )
2025-05-02 16:15:00 +00:00
Eugen Rochko
926c67c648
Refactor <ActionsModal> to TypeScript ( #34559 )
2025-04-28 11:43:42 +00:00
Claire
5e679f41f9
Merge commit 'e097f0e9eb76514efc405f3d1cef0692ff4cff35' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
glitch-soc-specific dependency too close to a dependency updated upstream.
Updated dependencies as upstream did.
2025-04-22 19:55:29 +02:00
Gomasy
6027764c31
Fix icon crushed when account name was too long ( #34514 )
2025-04-22 12:39:35 +00:00
Claire
3628717595
Merge commit '3159f3b2f6ed444d4f247c5e7864e4c41ca285df' into glitch-soc/merge-upstream
2025-04-21 15:47:21 +02:00
Claire
8cbd99e645
Merge commit 'a324edabdfc19b6978ed31800b92e36022006cd5' into glitch-soc/merge-upstream
2025-04-21 14:32:47 +02:00
Eugen Rochko
ee62ac53e1
Add "Mutual" relationship tag to profiles in web UI ( #34467 )
2025-04-17 08:10:11 +00:00
SASAGAWA Hiroto
5991caae87
Disable kerning for Japanese text to preserve monospaced alignment for readability ( #34448 )
2025-04-14 10:57:21 +00:00
Claire
2e16be22bf
Merge commit '0e5be63fb327403902076df602ec2dd410ada789' into glitch-soc/merge-upstream
2025-04-08 20:26:30 +02:00
Claire
4b491674b2
Merge commit '887336f2c66b6ac5049d10bf5f27fa69a15e0745' into glitch-soc/merge-upstream
2025-04-08 19:12:28 +02:00
