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
Eugen Rochko
bdf9baa2e8
Refactor <FollowedTags> into TypeScript ( #34355 )
2025-04-08 16:06:23 +00:00
Echo
ff7230df06
Forces radio buttons to be correctly centred ( #34389 )
2025-04-07 10:56:30 +00:00
Echo
54aefa9014
Fix visual glitches with filtering posts ( #34387 )
2025-04-07 10:55:04 +00:00
Claire
99e3ea232f
Merge commit '5f87ae101c5e0e940e148d493eaac1ce31fe24c1' into glitch-soc/merge-upstream
2025-04-04 20:00:24 +02:00
Eugen Rochko
2c70c28bbb
Refactor <DomainBlocks> to TypeScript ( #34347 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
2025-04-02 12:31:39 +00:00
Claire
aebb6c8ab7
Merge commit 'b4e56822c72db54ba338940e2517a4e25e2159a6' into glitch-soc/merge-upstream
2025-03-31 17:12:44 +02:00
Eugen Rochko
70e14c1ed0
Fix being unable to hide controls in full screen video in web UI ( #34308 )
2025-03-31 08:17:57 +00:00
Essem
5e74cb6c40
Fix remaining Sass deprecation logs in win95 style ( #3022 )
2025-03-31 08:54:03 +02:00
Claire
c06527cf5d
Merge commit 'e5fd61a84eb3a919c1e53f688e424df9d0f20924' into glitch-soc/merge-upstream
2025-03-28 20:48:53 +01:00
Eugen Rochko
e5fd61a84e
Refactor <Video> to TypeScript ( #34284 )
2025-03-28 12:15:43 +00:00
Claire
e8a652a8dd
Fix win95 theme
2025-03-27 20:46:46 +01:00
Claire
eb8dd42de0
Merge commit '8a3bed1933b7afdaa196639b753f41e743c4491a' into glitch-soc/merge-upstream
2025-03-27 20:31:48 +01:00
Echo
8a3bed1933
Fix SASS deprecation notices ( #34278 )
2025-03-27 13:09:42 +00:00
Claire
4ace929129
Merge commit '94d71c992e0fd88fc3a3fc92b598f139c874ab3f' into glitch-soc/merge-upstream
2025-03-25 21:12:37 +01:00
Eugen Rochko
94d71c992e
Refactor alerts to TypeScript, remove react-notification dependency ( #34239 )
2025-03-25 18:25:07 +00:00
Claire
e7498887a7
Merge commit '2e9b2df570af19b67a5ccc754c7b581034ca79c6' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
Upstream removed some code that somehow had been modified in glitch-soc.
Removed it as upstream did.
2025-03-24 20:06:25 +01:00
Eugen Rochko
2e9b2df570
Add double tap to zoom and swipe to dismiss to media modal in web UI ( #34210 )
...
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com >
2025-03-24 17:25:30 +00:00
Claire
f1fa6b3cd0
Merge commit '1960aac90b16fce1ec620ac990aa931efcf04700' into glitch-soc/merge-upstream
2025-03-22 15:41:48 +01:00
Eugen Rochko
1960aac90b
Fix display of failed-to-load image attachments in web UI ( #34217 )
2025-03-21 10:23:49 +00:00
