b240bad61a
Merge commit '5260233b81c301cf7b0c79b179858748b693460b' into glitch-soc/merge-upstream
2024-09-11 20:58:35 +02:00
a3215c0f88
Change inner borders in media galleries in web UI ( #31852 )
2024-09-11 07:29:18 +00:00
e09f9f885e
Fix alt text modal styling ( #31844 )
2024-09-10 17:33:55 +00:00
e0c27a5047
Add ability to manage which websites can credit you in link previews ( #31819 )
2024-09-10 12:00:40 +00:00
3929e3c6d2
Change design of hide media button in web UI ( #31807 )
2024-09-10 09:29:17 +00:00
a021dee642
Change labels on thread indicators in web UI ( #31806 )
2024-09-09 15:28:54 +00:00
1a0ef0c526
Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream
2024-09-05 20:36:25 +02:00
bc435c63bd
Change width of columns in advanced web UI ( #31762 )
2024-09-05 14:57:53 +00:00
b4b639ee4a
Fix radio checkbox visibility in Report dialogs ( #31752 )
2024-09-05 12:34:13 +00:00
b265a654d7
Fix wrong width on content warnings and filters in web UI ( #31761 )
2024-09-05 09:46:11 +00:00
ec4c49082e
Change design of unread conversations in web UI ( #31763 )
2024-09-05 09:39:59 +00:00
fef055db96
Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
Upstream refactored this file, while we had a change to switch a default setting.
Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
Upstream refactored this file, while we stubbed different methods.
Updated as upstream did, and updated the stubs accordingly.
2024-09-03 21:51:53 +02:00
0437dd9e77
Fix radio buttons styling in web UI ( #31723 )
2024-09-03 11:37:09 +00:00
6f35e93f72
Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream
2024-08-31 16:06:04 +02:00
3ddeaca863
Change background color of notifications on private messages ( #31657 )
2024-08-30 09:42:48 +00:00
94d8cdc494
Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream
2024-08-27 20:00:07 +02:00
29b9642b31
Change design of boost modal in web UI ( #31555 )
2024-08-26 17:12:17 +00:00
532b53eece
Fix assets build issue due to slightly different webpack config
2024-08-22 22:23:06 +02:00
dc70ef25b2
Merge commit 'e08d22724d9baf6c639466507c2b117788e5b8de' into glitch-soc/merge-upstream
2024-08-22 22:09:10 +02:00
e08d22724d
Fix missing CSS in moderation interface ( #31550 )
2024-08-22 18:57:22 +00:00
18556d3e9b
Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream refactored some helpers and moved them in another file.
Not a real conflict, but glitch-soc had adjacent glitch-only definitions.
Kept glitch-soc definitions where they are and moved upstream ones
as upstream did.
2024-08-22 19:54:20 +02:00
500f4925a5
Change how content warnings and filters are displayed in web UI ( #31365 )
2024-08-22 17:12:35 +00:00
376088f6da
Add button to view the Hashtag on the instance from Hashtags in Moderation UI ( #31533 )
2024-08-22 08:42:33 +00:00
fa2e758152
Merge commit '2da687a28b509025343d3d8ca17753de9b128e8f' into glitch-soc/merge-upstream
2024-08-21 20:32:02 +02:00
2da687a28b
Remove dead CSS code ( #31527 )
2024-08-21 17:05:02 +00:00
0cec9077a4
Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
Upstream added a test for a new attribute, next to a line we modified
in glitch-soc because of a different default value.
Updated as upstream's did, keeping glitch-soc's default value.
2024-08-21 18:44:21 +02:00
edeae945c0
Remove fontawesome leftovers ( #31525 )
2024-08-21 15:55:35 +00:00
e48a64d3b5
Fix distracting and confusing always-showing scrollbar track in boost confirmation modal ( #31524 )
2024-08-21 10:25:14 +00:00
b06c7b6b5a
Change hints for missing remote content in web UI ( #31516 )
2024-08-21 07:08:58 +00:00
f5c0c32edd
Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/material-icons/400-24px/chat.svg`:
Glitch-soc used this one but not upstream.
Upstream pulled a presumably more up-to-date version of the file.
Switched to upstream's version.
- `app/views/layouts/application.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/embedded.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/error.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
2024-08-20 18:31:50 +02:00
4016fd5128
Update CSS color variables to match our latest design system ( #31510 )
2024-08-20 15:56:44 +00:00
05b4380051
Fix margin in follow notification in web UI ( #31508 )
2024-08-20 14:03:09 +00:00
fa2e7b1708
Migrate fontawesome->material in more views ( #31360 )
2024-08-20 11:52:45 +00:00
2f01f5f4ea
Harmonize persistent scrollbar styles ( #31445 )
2024-08-20 07:48:51 +00:00
98bf2fc27c
Improve the list selection UI for notification requests ( #31457 )
2024-08-19 22:11:58 +00:00
3ea00508ac
Merge commit '2d589a5ed445b474ab7cec27b0db2a331ed7bd49' into glitch-soc/merge-upstream
2024-08-16 20:06:59 +02:00
32a78e56e0
Add a follow button & follower count on follow notifications ( #31433 )
2024-08-16 10:00:59 +00:00
9f2775830c
Merge commit '5d04e297755c4a8b4e908f706d272520521341d4' into glitch-soc/merge-upstream
2024-08-15 21:58:04 +02:00
9194197de5
Modify profile directory page image borders ( #31391 )
2024-08-14 19:23:45 +00:00
169b35869f
Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream
2024-08-14 21:17:43 +02:00
a1ddaa9ee9
Fix removal of border from account listing ( #31432 )
2024-08-14 17:09:23 +00:00
7d4b602cb2
Fix collapsable column borders in Safari and improve Safari scrollbars ( #31389 )
2024-08-13 21:54:03 +00:00
2b1670da48
Fix modal border and padding inconsistencies ( #31399 )
2024-08-13 17:48:28 +00:00
f6d090fdf5
Change avatars border radius ( #31390 )
2024-08-13 07:26:23 +00:00
7e501c59c2
Add a border above the timeline hint for statuses with replies ( #31387 )
2024-08-13 07:14:41 +00:00
83480df820
Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added `<s>` to the list of allowed tags, the conflict is because
we have a different list of allowed tags.
Added `<s>` like upstream did.
2024-08-12 17:46:24 +02:00
fbdda9f6c1
Fix account header avatar border ( #31373 )
2024-08-11 21:32:22 +00:00
7365a13ee7
Revert Safari scrollbar changes ( #31372 )
2024-08-11 21:30:52 +00:00
f441b280dc
Merge commit '85152af95f51642bcef0ba781a1e7213d79e8f03' into glitch-soc/merge-upstream
2024-08-11 21:05:09 +02:00
d3089018d5
Move Follow Recommendations to Trends menu, rename to Recommendations & Trends ( #31292 )
2024-08-10 09:17:10 +00:00
7519ef2fa1
Use material symbol for responsive menu toggle ( #31362 )
2024-08-10 09:12:47 +00:00
caf0164f00
Improve legibility of account/hashtag autosuggest ( #31361 )
2024-08-10 09:11:34 +00:00
31a00c0c1a
Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream
2024-08-09 17:15:32 +02:00
658addcbf7
Add ability to report, block and mute from notification requests list ( #31309 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-08-09 14:56:39 +00:00
1701575704
Add option to ignore filtered notifications to the web interface ( #31342 )
2024-08-09 14:21:55 +00:00
9538d9c298
Fix post filter & report styling ( #31349 )
2024-08-09 12:45:39 +00:00
389549e783
Fix list creation textbox styling ( #31348 )
2024-08-08 19:23:15 +00:00
664bef3573
Fix styling issues with notification settings and mobile borders ( #31346 )
2024-08-08 17:31:06 +00:00
dd2a991e24
Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/material-icons/400-24px/code.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/mail.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/manufacturing.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/views/admin/settings/shared/_links.html.haml`:
Glitch-soc had extra menu items, ported the changes for them too.
- `config/navigation.rb`:
Glitch-soc had extra menu items, ported the changes for them too.
2024-08-08 19:30:16 +02:00
a95fe931d7
Really fix duplicate border around search results ( #31305 )
2024-08-08 09:22:48 +00:00
176ba984d4
Follow up tweaking of admin UI changes part 2 ( #31268 )
2024-08-08 09:21:54 +00:00
84c3cc4e5b
Replace more `font-awesome` icons in `views/admin` area ( #30961 )
2024-08-07 23:08:36 +00:00
08adca0c63
Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream
2024-08-06 17:27:48 +02:00
97b9e8befd
Add account notes to hover cards ( #31300 )
2024-08-06 06:53:59 +00:00
c01a6a6eeb
Improve look of verified header fields in profile ( #31275 )
2024-08-05 11:35:16 +00:00
315308b10c
Fix duplicate border around search results ( #31284 )
2024-08-04 15:14:11 +00:00
b6c1b8f748
Fix missing border around tab/filter bar ( #31286 )
2024-08-04 15:13:15 +00:00
e67e07211f
Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
to glitch-soc-only dependency `atrament`.
Removed direct dependency on `autoprefixer`.
- `yarn.lock`:
Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
to glitch-soc-only dependency `atrament`.
Removed direct dependency on `autoprefixer`.
2024-08-02 18:09:48 +02:00
2ec1181ee5
Fix contrast between background and form elements on some pages ( #31266 )
2024-08-02 13:55:31 +00:00
cc453f2221
Change the filtered notification count to be in the account avatar ( #31262 )
2024-08-02 13:18:19 +00:00
f6dc8ae8e3
Fix handling of long display names in notification requests ( #31225 )
2024-08-01 07:41:32 +00:00
8dd671a977
Merge commit 'a50c8e951f03a8eb53957ad1c3703155b223ed24' into glitch-soc/merge-upstream
2024-07-31 18:16:01 +02:00
2c1e75727d
Change filtered notification banner design to take up less space ( #31222 )
2024-07-31 12:36:08 +00:00
654187a995
Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream
2024-07-29 19:16:58 +02:00
c40e481169
Implement UI for Admin Search of Hashtags ( #30880 )
2024-07-29 15:49:44 +00:00
848a5ca53d
Follow up tweaking of admin UI changes ( #31168 )
2024-07-29 08:10:23 +00:00
fb411b6d0f
Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream
2024-07-27 13:19:38 +02:00
8818748b90
Change design of confirmation modals in web UI ( #30884 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-07-25 17:05:54 +00:00
d999fc52ba
Merge commit '06f070d86d448b97c082c038220becaec8a038ce' into glitch-soc/merge-upstream
2024-07-24 20:07:37 +02:00
68000956f4
Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream
2024-07-23 19:31:23 +02:00
8b7f93cc7f
Recolor Preferences/Admin UI to better match main design ( #31034 )
2024-07-23 15:30:45 +00:00
a8330be93e
Widen the clickable area for statuses in grouped notifications ( #31111 )
2024-07-23 12:11:08 +00:00
f7598b267b
Merge commit '0397df9bef82042221f35e9938ad5b917fa1d4fc' into glitch-soc/merge-upstream
2024-07-19 17:45:19 +02:00
784e088533
Fix double border on column filter on narrow screens ( #31068 )
2024-07-19 08:30:26 +00:00
c75fe09e2b
Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream
2024-07-18 17:56:25 +02:00
f587ff643f
Grouped Notifications UI ( #30440 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-07-18 14:36:09 +00:00
64b2c712d4
Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Conflict because upstream refactored theme-related code, and glitch-soc has
a different theming system.
2024-07-15 18:51:38 +02:00
9d0bce4072
Move filtered notifications bar in scrollable area ( #30996 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-07-15 13:42:47 +00:00
db0b12e5dc
Merge commit '8c8bee5a36e0cd0b5d35903f8891896447c3e060' into glitch-soc/merge-upstream
2024-07-11 21:07:03 +02:00
8c8bee5a36
Change disabled buttons color in light mode to make it more visible ( #30998 )
2024-07-11 13:43:42 +00:00
959ad1d6be
Fix deprecation warning in win95 theme
2024-07-10 17:46:33 +02:00
52fb4f16ef
Merge commit '2ea9336b6855b44126a55106a81e96ea68eaf8ff' into glitch-soc/merge-upstream
2024-07-10 16:58:06 +02:00
182b9248c0
Fix SCSS mixed declarations deprecation ( #30986 )
2024-07-10 12:23:24 +00:00
11dd51ef44
Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Upstream and glitch-soc had different comments, some comments got updated upstream.
Updated them in glitch-soc accordingly.
2024-07-06 21:02:42 +02:00
63ba69810e
Fix overflow behavior on profile fields in hover cards ( #30928 )
2024-07-06 07:22:24 +00:00
92dcc50278
Merge commit 'd3f504245cab5a9a0e89262e0a1398d035dffac9' into glitch-soc/merge-upstream
2024-07-01 20:45:13 +02:00
b728c0e8ce
Change hover cards to not appear until the mouse stops in web UI ( #30850 )
2024-07-01 15:52:01 +00:00
d2aea85e6c
Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream
2024-06-30 11:25:40 +02:00
e89317d4c1
Add hover cards in web UI ( #30754 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-06-26 19:33:38 +00:00
8c0ff6498e
Change light mode to apply CSS variables to the body ( #30839 )
2024-06-25 21:57:22 +00:00
Claire
Eugen Rochko
Michael Stanclift
Emelia Smith
Renaud Chaput
Matt Jankowski
Valtteri Laitinen
David Roetzel