Claire
f624ef2778
Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/formatting_helper.rb`:
Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
Wrapped the modified code.
2024-11-03 20:51:58 +01:00
Claire
742eb549ab
Fix preview cards with long titles erroneously causing layout changes ( #32678 )
2024-10-30 08:34:56 +00:00
Nathan Sparrow
de1d8dc63a
Embed modal mobile fix ( #32641 )
2024-10-29 15:12:35 +00:00
Claire
8a222b3951
Fix assets build failure on glitch-soc
2024-10-26 13:54:36 +02:00
Claire
8103e69b17
Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
Conflict caused by glitch-soc changing the path to images, and upstream
removing styling using such an image.
Removed the styling as upstream did.
- `app/models/account.rb`:
Conflict due to upstream changing lines adjacent to a change made in glitch-soc
to have configurable limits.
Ported upstream's changes.
- `yarn.lock`:
Dependencies adjacent to glitch-soc-only dependencies updated.
Updated them as well.
2024-10-26 13:38:07 +02:00
Eugen Rochko
d11231a420
Change design of rich text elements in web UI ( #32633 )
2024-10-24 07:28:22 +00:00
Claire
393f0a0159
Redesign Content Warning and filters ( #32543 )
2024-10-23 09:47:23 +00:00
Claire
6281c4dedd
Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Upstream added a block of three environment variables, while glitch-soc
has a different version of the file overall.
Added upstream's changes.
- `app/helpers/application_helper.rb`:
Upstream added a helper, while glitch-soc had extra helpers.
Added upstream's helper.
2024-10-19 19:13:32 +02:00
Claire
8b56509625
Add more explicit explanations about author attribution and fediverse:creator ( #32383 )
2024-10-17 09:03:08 +00:00
Claire
25f8003d75
Fix only the first paragraph being displayed in some notifications ( #32348 )
2024-10-16 07:30:53 +00:00
Renaud Chaput
51345e5133
Fix back arrow pointing to the incorrect direction in RTL languages ( #32485 )
2024-10-15 09:15:25 +00:00
Claire
4d9b4ef72f
Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream
2024-10-14 19:46:52 +02:00
Michael Stanclift
cdf603239e
Restore list column border ( #32367 )
2024-10-09 19:33:28 +00:00
Claire
03dbebdfef
Fix list edition modal styling ( #32358 )
2024-10-09 17:24:22 +00:00
Claire
fda52b2a52
Fix 4 columns barely not fitting on 1920px screen ( #32361 )
2024-10-09 17:16:57 +00:00
Matt Jankowski
d20a899bb9
Bring icon vertical middle to applications list style ( #32293 )
2024-10-08 13:21:36 +00:00
Claire
7e06d724c9
Merge commit '4238da6ee3c93dfd5752e9133cbec958f8ebb18a' into glitch-soc/merge-upstream
2024-10-07 20:45:07 +02:00
Eugen Rochko
1f5bd571cd
Fix missing avatar fallback interfering with transparency in web UI ( #32270 )
2024-10-07 09:35:42 +00:00
Eugen Rochko
2c54b91dd1
Fix wrong width on logo in detailed link card in web UI ( #32271 )
2024-10-07 06:53:29 +00:00
Claire
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
forsamori
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
Claire
4c0e44ebbe
Fix recently-broken admin interface buttons ( #32240 )
2024-10-03 16:12:15 +00:00
Claire
b5006539c9
Fix media uploads in composer appearing over search results in advanced interface ( #32217 )
2024-10-02 13:28:36 +00:00
Matt Jankowski
f10d61bf86
Adjust spacing on setting sub-nav items when below mobile size ( #32137 )
2024-10-01 13:41:25 +00:00
Matt Jankowski
c009507912
Use button_to for method: :post links on account show page ( #32154 )
2024-10-01 11:14:12 +00:00
Matt Jankowski
f811fcb2b2
Improve alignment of icons on admin roles list ( #32153 )
2024-10-01 09:08:29 +00:00
Claire
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
Matt Jankowski
24d3ce7bab
Add no-toolbar state for "nothing here" batch table views ( #32128 )
2024-09-27 19:38:44 +00:00
Eugen Rochko
11a12e56b3
Change media reordering design in the compose form in web UI ( #32093 )
2024-09-27 15:09:39 +00:00
Matt Jankowski
106b22bd2d
Use 1 column layout for form ul on narrow widths ( #32112 )
2024-09-26 19:26:40 +00:00
Claire
89c39e7826
Fix scrollbar width ( #32091 )
2024-09-26 14:26:04 +00:00
Eugen Rochko
a04433f995
Add ability to view alt text by clicking the ALT badge in web UI ( #32058 )
2024-09-26 13:26:49 +00:00
Eugen Rochko
89df27a06c
Change design of media tab on profiles in web UI ( #31967 )
2024-09-26 12:31:32 +00:00
Eugen Rochko
3426ea2912
Add preview of followers removed in domain block modal in web UI ( #32032 )
2024-09-25 18:13:36 +00:00
Eugen Rochko
28c4eca0af
Change responsive break points on navigation panel in web UI ( #32034 )
2024-09-25 16:36:19 +00:00
Claire
633165ba9c
Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream
2024-09-25 17:41:37 +02:00
Renaud Chaput
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
Matt Jankowski
69aa5699ce
Use not-allowed for cursor on disabled buttons ( #32076 )
2024-09-25 07:43:12 +00:00
Claire
c6039f99ce
Merge commit '70988519df66f0b8edeb6ca95140f1d3e436fea8' into glitch-soc/merge-upstream
2024-09-24 19:34:30 +02:00
Renaud Chaput
f1b6a611aa
Fix wrapping in dashboard quick access buttons ( #32043 )
2024-09-24 16:47:45 +00:00
Eugen Rochko
d54ce67dc9
Change hide media button to be in top right corner in web UI ( #32048 )
2024-09-24 08:00:20 +00:00
Claire
c2c3a66478
Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream
2024-09-23 20:24:18 +02:00
Claire
b5bdc69f7b
Change mobile breakpoint back to old version and allow main column to shrink ( #32033 )
2024-09-23 12:53:35 +00:00
Claire
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
Eugen Rochko
e7fd0985c9
Change zoom icon in web UI ( #29683 )
2024-09-20 09:42:02 +00:00
Renaud Chaput
8b70834035
Fix the appearance of avatars when they do not load ( #31966 )
2024-09-18 17:39:15 +00:00
Claire
6de18bb475
Merge commit '3e91c101b3c4b5166dab778837e38bed424b4333' into glitch-soc/merge-upstream
2024-09-17 17:54:00 +02:00
Claire
d2f9075078
Increase no-gap-breakpoint by 32px to fix overflow ( #31889 )
2024-09-17 03:19:42 +00:00
Michael Stanclift
5a33a5658b
Fix background of text detection progress ( #31943 )
2024-09-17 03:19:04 +00:00
Claire
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
