b28ce2424c
Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper where glitch-soc had its own, not really
a conflict.
Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream renamed a constant that was used slightly differently in glitch-soc.
Renamed it as upstream did.
2024-10-06 16:07:58 +02:00
63a959099b
Add margin-bottom to error.dialog to reduce whitespace ( #25708 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-10-04 08:02:14 +00:00
4c0e44ebbe
Fix recently-broken admin interface buttons ( #32240 )
2024-10-03 16:12:15 +00:00
b5006539c9
Fix media uploads in composer appearing over search results in advanced interface ( #32217 )
2024-10-02 13:28:36 +00:00
f10d61bf86
Adjust spacing on setting sub-nav items when below mobile size ( #32137 )
2024-10-01 13:41:25 +00:00
c009507912
Use `button_to` for `method: :post` links on account show page ( #32154 )
2024-10-01 11:14:12 +00:00
f811fcb2b2
Improve alignment of icons on admin roles list ( #32153 )
2024-10-01 09:08:29 +00:00
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
9d664f87a0
Mailer layout fixes ( #32132 )
2024-09-27 19:41:41 +00:00
24d3ce7bab
Add `no-toolbar` state for "nothing here" batch table views ( #32128 )
2024-09-27 19:38:44 +00:00
11a12e56b3
Change media reordering design in the compose form in web UI ( #32093 )
2024-09-27 15:09:39 +00:00
106b22bd2d
Use 1 column layout for form `ul` on narrow widths ( #32112 )
2024-09-26 19:26:40 +00:00
89c39e7826
Fix scrollbar width ( #32091 )
2024-09-26 14:26:04 +00:00
a04433f995
Add ability to view alt text by clicking the ALT badge in web UI ( #32058 )
2024-09-26 13:26:49 +00:00
89df27a06c
Change design of media tab on profiles in web UI ( #31967 )
2024-09-26 12:31:32 +00:00
00aaf77e04
Use same styling for statuses in email as on web ( #32073 )
2024-09-26 11:48:01 +00:00
3426ea2912
Add preview of followers removed in domain block modal in web UI ( #32032 )
2024-09-25 18:13:36 +00:00
28c4eca0af
Change responsive break points on navigation panel in web UI ( #32034 )
2024-09-25 16:36:19 +00:00
633165ba9c
Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream
2024-09-25 17:41:37 +02:00
739ad0eed2
Keep the status action buttons at their position regardless of the counter size ( #32084 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-25 14:33:58 +00:00
69aa5699ce
Use `not-allowed` for cursor on disabled buttons ( #32076 )
2024-09-25 07:43:12 +00:00
c6039f99ce
Merge commit '70988519df66f0b8edeb6ca95140f1d3e436fea8' into glitch-soc/merge-upstream
2024-09-24 19:34:30 +02:00
f1b6a611aa
Fix wrapping in dashboard quick access buttons ( #32043 )
2024-09-24 16:47:45 +00:00
d54ce67dc9
Change hide media button to be in top right corner in web UI ( #32048 )
2024-09-24 08:00:20 +00:00
c2c3a66478
Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream
2024-09-23 20:24:18 +02:00
b5bdc69f7b
Change mobile breakpoint back to old version and allow main column to shrink ( #32033 )
2024-09-23 12:53:35 +00:00
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
e7fd0985c9
Change zoom icon in web UI ( #29683 )
2024-09-20 09:42:02 +00:00
29656cb9e0
Fix sass deprecation warning ( #31961 )
2024-09-18 17:39:32 +00:00
8b70834035
Fix the appearance of avatars when they do not load ( #31966 )
2024-09-18 17:39:15 +00:00
6de18bb475
Merge commit '3e91c101b3c4b5166dab778837e38bed424b4333' into glitch-soc/merge-upstream
2024-09-17 17:54:00 +02:00
d2f9075078
Increase no-gap-breakpoint by 32px to fix overflow ( #31889 )
2024-09-17 03:19:42 +00:00
5a33a5658b
Fix background of text detection progress ( #31943 )
2024-09-17 03:19:04 +00:00
665e9129fe
Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/custom_emoji.rb`:
An upstream refactor touched lines adjacent to ones modified in glitch-soc.
Ported upstream's changes.
2024-09-16 21:08:58 +02:00
efb0e2c34b
Fix horizontal scrollbar on who to follow carousel in web UI ( #31912 )
2024-09-16 12:08:37 +00:00
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
3465d39494
Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Upstream removed a helper, textually adjacent to a glitch-soc-only one.
Not really a conflict.
Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to theming system.
Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
Removed upstream, but we had local changes.
Removed as upstream did.
2024-09-12 20:05:08 +02:00
90d7a4bac4
Merge commit 'a27f7f4e561c9d2fe21d984059603d2f500c005b' into glitch-soc/merge-upstream
2024-09-12 17:22:06 +02:00
a269ff9253
Fix review history and action modal styling ( #31864 )
2024-09-12 14:18:43 +00:00
24ef8255b3
Change design of embed modal in web UI ( #31801 )
2024-09-12 12:54:16 +00:00
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02:00
3d46f47817
Change embedded posts to use web UI ( #31766 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 09:41:19 +00:00
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
Claire
forsamori
Matt Jankowski
Christian Schmidt
Eugen Rochko
Renaud Chaput
Michael Stanclift