Commit graph

24215 commits

Author SHA1 Message Date
Claire
7e06d724c9 Merge commit '4238da6ee3c93dfd5752e9133cbec958f8ebb18a' into glitch-soc/merge-upstream 2024-10-07 20:45:07 +02:00
Eugen Rochko
f669493d96 [Glitch] Fix missing avatar fallback interfering with transparency in web UI
Port cae93e79a4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-07 20:13:58 +02:00
Eugen Rochko
83b3c50778 [Glitch] Fix wrong width on logo in detailed link card in web UI
Port 889edc560a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-07 20:06:49 +02:00
Claire
dc7a42551f [Glitch] Fix media gallery items having incorrect borders when hidden
Port 3b4312476f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-07 20:06:14 +02:00
Claire
4a859140ec Merge commit 'edcf3d9234b03d6b1c4b29d1d15339f7f64040fb' into glitch-soc/backports-4.3 2024-10-07 20:03:53 +02:00
Claire
edcf3d9234
Bump version to v4.3.0 (#32283) 2024-10-07 17:37:05 +02:00
Eugen Rochko
cae93e79a4 Fix missing avatar fallback interfering with transparency in web UI (#32270) 2024-10-07 16:22:11 +02:00
Claire
83a98cb81a Add missing on_delete: :cascade on notification_permissions (#32281) 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
Leni Kadali
4238da6ee3
Add error message when user tries to follow their own account (#31910) 2024-10-07 12:05:46 +00:00
Matt Jankowski
bfabd6a2b8
Move account suspension-related methods to concern (#28351) 2024-10-07 12:02:04 +00:00
Eugen Rochko
1f5bd571cd
Fix missing avatar fallback interfering with transparency in web UI (#32270) 2024-10-07 09:35:42 +00:00
github-actions[bot]
2e0d918d7d
New Crowdin Translations for stable-4.3 (automated) (#32253)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-07 11:21:49 +02:00
Claire
3b4312476f Fix media gallery items having incorrect borders when hidden (#32257) 2024-10-07 10:54:23 +02:00
Claire
4fba4f8c82 Fix notification push notifications not including the author's username (#32254) 2024-10-07 10:54:23 +02:00
Matt Jankowski
25de2f57ee Add coverage for missing status scenario in NotificationMailer (#32256) 2024-10-07 10:54:23 +02:00
Claire
a59160cf01
Add missing on_delete: :cascade on notification_permissions (#32281) 2024-10-07 07:46:03 +00:00
renovate[bot]
0ce2db4f7d
Update dependency postcss-preset-env to v10.0.6 (#32260)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-07 07:07:07 +00:00
github-actions[bot]
498024558a
New Crowdin Translations (automated) (#32262)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-07 07:06:43 +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
6967031144 Fix video player's height in detailed status view 2024-10-06 19:19:28 +02:00
Claire
026643ab24 Fix video player's height in detailed status view 2024-10-06 19:19:14 +02:00
Claire
bbc7be1d95
Merge pull request #2867 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to c40ab43dc7
2024-10-06 19:18:59 +02:00
Christian Schmidt
c37daa11f2 [Glitch] Remove redundant title attribute
Port c40ab43dc7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 17:04:53 +02:00
Claire
7b40f14452 [Glitch] Fix media gallery items having incorrect borders when hidden
Port 51769e0670 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 17:04:53 +02:00
Claire
c720623dc7 [Glitch] Fix unsupported grouped notifications from streaming causing duplicate IDs
Port 77f5b127fa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 17:04:53 +02:00
forsamori
819abbdb2f [Glitch] Add margin-bottom to error.dialog to reduce whitespace
Port 63a959099b to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 17:04:53 +02:00
Claire
b22272fcdc [Glitch] Hide badges in media gallery when media are hidden
Port f768a6eb16 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 17:04:53 +02:00
Claire
299372babe [Glitch] Fix editing description of media uploads with custom thumbnails
Port f760899b04 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 17:04:53 +02:00
Claire
54b209243b [Glitch] Fix media uploads in composer appearing over search results in advanced interface
Port b5006539c9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 17:04:53 +02:00
Claire
ce3bedade3 [Glitch] Fix incorrect 'navigator' check
Port 4a737a948a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 17:04:53 +02:00
Nick Schonning
61a0c58dee [Glitch] Enable ESLlint no-case-declarations
Port f91f077985 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 17:04:53 +02:00
Matt Jankowski
af39ac6edc [Glitch] Adjust spacing on setting sub-nav items when below mobile size
Port f10d61bf86

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 16:44:22 +02:00
Matt Jankowski
edfa716a18 [Glitch] Improve alignment of icons on admin roles list
Port f811fcb2b2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 16:43:50 +02:00
Renaud Chaput
8572fa1452 [Glitch] Fix follow notifications from streaming being grouped
Port 1be55ce244 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 16:43:17 +02: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
Claire
61e3e81e28
Merge pull request #2865 from ClearlyClaire/glitch-soc/backports-4.3
Merge upstream changes (stable-4.3)
2024-10-06 15:56:56 +02:00
Claire
354f54907d [Glitch] Fix unsupported grouped notifications from streaming causing duplicate IDs
Port 6d5aa58f88 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-05 21:05:55 +02:00
Claire
4d611e94ee [Glitch] Hide badges in media gallery when media are hidden
Port 55b5364534 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-05 21:05:15 +02:00
Claire
a09a26da49 [Glitch] Fix editing description of media uploads with custom thumbnails
Port 404f467fcf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-05 21:04:52 +02:00
Claire
59a8066045 [Glitch] Fix media uploads in composer appearing over search results in advanced interface
Port 4a2d3929c5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-05 21:04:31 +02:00
Claire
3cad5095c9 [Glitch] Fix incorrect 'navigator' check
Port 931553844d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-05 21:04:09 +02:00
Matt Jankowski
e58d99a771 [Glitch] Adjust spacing on setting sub-nav items when below mobile size
Port 09cf617d7f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-05 21:03:45 +02:00
Matt Jankowski
69c76fd94a [Glitch] Improve alignment of icons on admin roles list
Port c828e7731c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-05 21:03:22 +02:00
Renaud Chaput
1b6bd585ab [Glitch] Fix follow notifications from streaming being grouped
Port 8ac00533ff to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-05 21:00:39 +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
Christian Schmidt
c40ab43dc7
Remove redundant title attribute (#32258) 2024-10-04 16:23:05 +00:00
Claire
6d5aa58f88 Fix unsupported grouped notifications from streaming causing duplicate IDs (#32243) 2024-10-04 17:48:03 +02:00
Claire
81cd489208 Fix Content-Security-Policy when using sso-redirect (#32241) 2024-10-04 17:48:03 +02:00
Claire
55b5364534 Hide badges in media gallery when media are hidden (#32224) 2024-10-04 17:48:03 +02:00