Commit Graph

1434 Commits

Author SHA1 Message Date
Siph d45e85cbf2
Merge tag 'v4.3.2' 2024-12-03 21:56:55 +01:00
Claire 0d69cc068c Merge commit '26f25ef4bafd5ad84d03d8cb7ad0d868360175e5' into glitch-soc/stable-4.3
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/trends/statuses.rb`:
  Upstream added a date restriction to trendable posts, while glitch-soc had
  slightly different conditions.
  Added the date restriction to glitch-soc's conditions.
2024-12-02 21:49:12 +01:00
Claire c634da32cf Redesign Content Warning and filters (#32543) 2024-12-02 16:20:32 +01:00
Claire 931870ca34 Fix preview cards with long titles erroneously causing layout changes (#32678) 2024-12-02 16:20:32 +01:00
Nathan Sparrow 7f9b0f36ba Embed modal mobile fix (#32641) 2024-12-02 16:20:32 +01:00
Siph 763fab2ec2
Merge tag 'v4.3.1' 2024-11-06 10:27:50 +01:00
Claire 2b0410f903 Merge commit 'f7aab0cc2ff47337021d50ed52428abcb7a9b518' into glitch-soc/backports-4.3
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper, while glitch-soc had extra helpers.
  Added upstream's helper.
2024-10-18 17:19:57 +02:00
Claire 7388a6ce9a Add more explicit explanations about author attribution and `fediverse:creator` (#32383) 2024-10-18 09:14:13 +02:00
Claire 198283a188 Merge commit '36452845d78f6c3501af1e39391d06ab88a45a5a' into glitch-soc/backports-4.3
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.
2024-10-16 12:42:12 +02:00
Claire a20f38c930 Fix only the first paragraph being displayed in some notifications (#32348) 2024-10-16 12:40:58 +02:00
Claire b091e531a5 Merge commit '49b3d5692e6f217e6506674ad8a623a4ba8d0c5f' into glitch-soc/backports-4.3 2024-10-15 17:42:22 +02:00
Renaud Chaput ca68a3cacb Fix back arrow pointing to the incorrect direction in RTL languages (#32485) 2024-10-15 17:37:14 +02:00
Claire b40adb4a89 Merge commit 'f99da81ef8b14a851347503d4177f83322c16d9a' into glitch-soc/stable-4.3 2024-10-14 19:18:08 +02:00
Michael Stanclift de4f7859b4 Restore list column border (#32367) 2024-10-14 13:14:38 +02:00
Claire 45a520603b Fix list edition modal styling (#32358) 2024-10-14 13:14:38 +02:00
Claire 6ac78ead52 Fix 4 columns barely not fitting on 1920px screen (#32361) 2024-10-14 13:14:38 +02:00
Matt Jankowski fa4a82326d Bring icon vertical middle to applications list style (#32293) 2024-10-14 13:14:38 +02:00
Siph c424034186
Merge tag 'v4.3.0' into glitch-soc-release 2024-10-08 18:59:10 +02:00
Claire 4a859140ec Merge commit 'edcf3d9234b03d6b1c4b29d1d15339f7f64040fb' into glitch-soc/backports-4.3 2024-10-07 20:03:53 +02:00
Eugen Rochko cae93e79a4 Fix missing avatar fallback interfering with transparency in web UI (#32270) 2024-10-07 16:22:11 +02:00
Eugen Rochko 889edc560a Fix wrong width on logo in detailed link card in web UI (#32271) 2024-10-07 16:22:11 +02:00
Claire dfe851b476 Merge branch 'stable-4.3' into glitch-soc/backports-4.3
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
2024-10-05 20:45:05 +02:00
Claire 4a2d3929c5 Fix media uploads in composer appearing over search results in advanced interface (#32217) 2024-10-04 17:48:03 +02:00
Matt Jankowski 09cf617d7f Adjust spacing on setting sub-nav items when below mobile size (#32137) 2024-10-04 17:48:03 +02:00
Matt Jankowski c828e7731c Improve alignment of icons on admin roles list (#32153) 2024-10-04 17:48:03 +02:00
Siph ceea3e1f73
fix unresolved conflict 2024-09-30 22:25:30 +02:00
Siph 21fc9033f6
merge upstream 2024-09-30 22:02:02 +02: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