Commit Graph

1752 Commits (169b35869f6684a2f5d71b851f6b0b6402526b55)

Author SHA1 Message Date
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
Michael Stanclift 7365a13ee7
Revert Safari scrollbar changes (#31372) 2024-08-11 21:30:52 +00:00
Claire f441b280dc Merge commit '85152af95f51642bcef0ba781a1e7213d79e8f03' into glitch-soc/merge-upstream 2024-08-11 21:05:09 +02:00
Emelia Smith d3089018d5
Move Follow Recommendations to Trends menu, rename to Recommendations & Trends (#31292) 2024-08-10 09:17:10 +00:00
Matt Jankowski 7519ef2fa1
Use material symbol for responsive menu toggle (#31362) 2024-08-10 09:12:47 +00: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
Matt Jankowski 84c3cc4e5b
Replace more `font-awesome` icons in `views/admin` area (#30961) 2024-08-07 23:08:36 +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
Claire 2ec1181ee5
Fix contrast between background and form elements on some pages (#31266) 2024-08-02 13:55:31 +00: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 654187a995 Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream 2024-07-29 19:16:58 +02:00
Emelia Smith c40e481169
Implement UI for Admin Search of Hashtags (#30880) 2024-07-29 15:49:44 +00:00
Michael Stanclift 848a5ca53d
Follow up tweaking of admin UI changes (#31168) 2024-07-29 08:10:23 +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
Claire a8330be93e
Widen the clickable area for statuses in grouped notifications (#31111) 2024-07-23 12:11:08 +00:00
Claire f7598b267b Merge commit '0397df9bef82042221f35e9938ad5b917fa1d4fc' into glitch-soc/merge-upstream 2024-07-19 17:45:19 +02:00
Michael Stanclift 784e088533
Fix double border on column filter on narrow screens (#31068) 2024-07-19 08:30:26 +00:00
Claire c75fe09e2b Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream 2024-07-18 17:56:25 +02:00
Renaud Chaput 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
Claire 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
David Roetzel 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
Claire db0b12e5dc Merge commit '8c8bee5a36e0cd0b5d35903f8891896447c3e060' into glitch-soc/merge-upstream 2024-07-11 21:07:03 +02:00