Claire
dc70ef25b2
Merge commit 'e08d22724d9baf6c639466507c2b117788e5b8de' into glitch-soc/merge-upstream
2024-08-22 22:09:10 +02:00
Eugen Rochko
500f4925a5
Change how content warnings and filters are displayed in web UI ( #31365 )
2024-08-22 17:12:35 +00:00
Claire
fa2e758152
Merge commit '2da687a28b509025343d3d8ca17753de9b128e8f' into glitch-soc/merge-upstream
2024-08-21 20:32:02 +02:00
Claire
2da687a28b
Remove dead CSS code ( #31527 )
2024-08-21 17:05:02 +00:00
Claire
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
Claire
edeae945c0
Remove fontawesome leftovers ( #31525 )
2024-08-21 15:55:35 +00:00
Claire
e48a64d3b5
Fix distracting and confusing always-showing scrollbar track in boost confirmation modal ( #31524 )
2024-08-21 10:25:14 +00:00
Eugen Rochko
b06c7b6b5a
Change hints for missing remote content in web UI ( #31516 )
2024-08-21 07:08:58 +00:00
Claire
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
Eugen Rochko
05b4380051
Fix margin in follow notification in web UI ( #31508 )
2024-08-20 14:03:09 +00:00
Michael Stanclift
2f01f5f4ea
Harmonize persistent scrollbar styles ( #31445 )
2024-08-20 07:48:51 +00:00
Renaud Chaput
98bf2fc27c
Improve the list selection UI for notification requests ( #31457 )
2024-08-19 22:11:58 +00:00
Claire
3ea00508ac
Merge commit '2d589a5ed445b474ab7cec27b0db2a331ed7bd49' into glitch-soc/merge-upstream
2024-08-16 20:06:59 +02:00
Renaud Chaput
32a78e56e0
Add a follow button & follower count on follow notifications ( #31433 )
2024-08-16 10:00:59 +00:00
Claire
9f2775830c
Merge commit '5d04e297755c4a8b4e908f706d272520521341d4' into glitch-soc/merge-upstream
2024-08-15 21:58:04 +02:00
Michael Stanclift
9194197de5
Modify profile directory page image borders ( #31391 )
2024-08-14 19:23:45 +00:00
Claire
169b35869f
Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream
2024-08-14 21:17:43 +02:00
Michael Stanclift
a1ddaa9ee9
Fix removal of border from account listing ( #31432 )
2024-08-14 17:09:23 +00:00
Michael Stanclift
7d4b602cb2
Fix collapsable column borders in Safari and improve Safari scrollbars ( #31389 )
2024-08-13 21:54:03 +00:00
Claire
2b1670da48
Fix modal border and padding inconsistencies ( #31399 )
2024-08-13 17:48:28 +00:00
Renaud Chaput
f6d090fdf5
Change avatars border radius ( #31390 )
2024-08-13 07:26:23 +00:00
Renaud Chaput
7e501c59c2
Add a border above the timeline hint for statuses with replies ( #31387 )
2024-08-13 07:14:41 +00:00
Claire
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
Michael Stanclift
fbdda9f6c1
Fix account header avatar border ( #31373 )
2024-08-11 21:32:22 +00:00
Claire
f441b280dc
Merge commit '85152af95f51642bcef0ba781a1e7213d79e8f03' into glitch-soc/merge-upstream
2024-08-11 21:05:09 +02:00
Michael Stanclift
caf0164f00
Improve legibility of account/hashtag autosuggest ( #31361 )
2024-08-10 09:11:34 +00:00
Claire
31a00c0c1a
Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream
2024-08-09 17:15:32 +02:00
Claire
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
Claire
1701575704
Add option to ignore filtered notifications to the web interface ( #31342 )
2024-08-09 14:21:55 +00:00
Michael Stanclift
9538d9c298
Fix post filter & report styling ( #31349 )
2024-08-09 12:45:39 +00:00
Michael Stanclift
389549e783
Fix list creation textbox styling ( #31348 )
2024-08-08 19:23:15 +00:00
Michael Stanclift
664bef3573
Fix styling issues with notification settings and mobile borders ( #31346 )
2024-08-08 17:31:06 +00:00
Claire
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
Valtteri Laitinen
a95fe931d7
Really fix duplicate border around search results ( #31305 )
2024-08-08 09:22:48 +00:00
Michael Stanclift
176ba984d4
Follow up tweaking of admin UI changes part 2 ( #31268 )
2024-08-08 09:21:54 +00:00
Claire
08adca0c63
Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream
2024-08-06 17:27:48 +02:00
Renaud Chaput
97b9e8befd
Add account notes to hover cards ( #31300 )
2024-08-06 06:53:59 +00:00
Valtteri Laitinen
c01a6a6eeb
Improve look of verified header fields in profile ( #31275 )
2024-08-05 11:35:16 +00:00
Valtteri Laitinen
315308b10c
Fix duplicate border around search results ( #31284 )
2024-08-04 15:14:11 +00:00
Valtteri Laitinen
b6c1b8f748
Fix missing border around tab/filter bar ( #31286 )
2024-08-04 15:13:15 +00:00
Claire
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
Renaud Chaput
cc453f2221
Change the filtered notification count to be in the account avatar ( #31262 )
2024-08-02 13:18:19 +00:00
Claire
f6dc8ae8e3
Fix handling of long display names in notification requests ( #31225 )
2024-08-01 07:41:32 +00:00
Claire
8dd671a977
Merge commit 'a50c8e951f03a8eb53957ad1c3703155b223ed24' into glitch-soc/merge-upstream
2024-07-31 18:16:01 +02:00
Claire
2c1e75727d
Change filtered notification banner design to take up less space ( #31222 )
2024-07-31 12:36:08 +00:00
Claire
fb411b6d0f
Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream
2024-07-27 13:19:38 +02:00
Eugen Rochko
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
Claire
d999fc52ba
Merge commit '06f070d86d448b97c082c038220becaec8a038ce' into glitch-soc/merge-upstream
2024-07-24 20:07:37 +02:00
Claire
68000956f4
Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream
2024-07-23 19:31:23 +02:00
Michael Stanclift
8b7f93cc7f
Recolor Preferences/Admin UI to better match main design ( #31034 )
2024-07-23 15:30:45 +00:00
