Noa Himesaka
0e5dd35e84
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-10-08 23:58:28 +09:00
Claire
d04e2e9104
Merge pull request #2874 from ClearlyClaire/glitch-soc/fixes/crowdin-download-stable-glitch
...
Fix download of stable translation files in glitch-soc
2024-10-08 13:42:11 +02:00
Claire
1de6d511f4
Fix download of stable translation files in glitch-soc
2024-10-08 13:41:40 +02:00
Claire
fd75087534
Merge pull request #2872 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 4238da6ee3
2024-10-07 21:25:06 +02:00
Eugen Rochko
ee17081793
[Glitch] Fix missing avatar fallback interfering with transparency in web UI
...
Port cae93e79a406a1156b51091784e35f8f0126ea12 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-07 20:46:30 +02:00
Eugen Rochko
9ca99b7dc1
[Glitch] Fix wrong width on logo in detailed link card in web UI
...
Port 889edc560ae94b0663bab0e4cdb7cbad7e3cc6f8 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-07 20:46:30 +02:00
Claire
7e06d724c9
Merge commit '4238da6ee3c93dfd5752e9133cbec958f8ebb18a' into glitch-soc/merge-upstream
2024-10-07 20:45:07 +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
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
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
2024-10-06 17:04:53 +02:00
Claire
7b40f14452
[Glitch] Fix media gallery items having incorrect borders when hidden
...
Port 51769e0670
2024-10-06 17:04:53 +02:00
Claire
c720623dc7
[Glitch] Fix unsupported grouped notifications from streaming causing duplicate IDs
...
Port 77f5b127fa
2024-10-06 17:04:53 +02:00
forsamori
819abbdb2f
[Glitch] Add margin-bottom to error.dialog to reduce whitespace
...
Port 63a959099b
2024-10-06 17:04:53 +02:00
Claire
b22272fcdc
[Glitch] Hide badges in media gallery when media are hidden
...
Port f768a6eb16
2024-10-06 17:04:53 +02:00
Claire
299372babe
[Glitch] Fix editing description of media uploads with custom thumbnails
...
Port f760899b04
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
2024-10-06 17:04:53 +02:00
Claire
ce3bedade3
[Glitch] Fix incorrect 'navigator' check
...
Port 4a737a948a
2024-10-06 17:04:53 +02:00
Nick Schonning
61a0c58dee
[Glitch] Enable ESLlint no-case-declarations
...
Port f91f077985
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
2024-10-06 16:44:22 +02:00
Matt Jankowski
edfa716a18
[Glitch] Improve alignment of icons on admin roles list
...
Port f811fcb2b2
2024-10-06 16:43:50 +02:00
Renaud Chaput
8572fa1452
[Glitch] Fix follow notifications from streaming being grouped
...
Port 1be55ce244
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
Christian Schmidt
c40ab43dc7
Remove redundant title attribute ( #32258 )
2024-10-04 16:23:05 +00:00
Claire
51769e0670
Fix media gallery items having incorrect borders when hidden ( #32257 )
2024-10-04 14:55:44 +00:00
Claire
1f720366e9
Fix notification push notifications not including the author's username ( #32254 )
2024-10-04 14:29:23 +00:00
Matt Jankowski
ebdeac0731
Add coverage for missing status scenario in NotificationMailer ( #32256 )
2024-10-04 14:15:14 +00:00
Matt Jankowski
e4e07b1c34
Reduce factory usage across spec/services area ( #32098 )
2024-10-04 14:11:15 +00:00
Matt Jankowski
4fe7f213a6
Use async_count in more view locations ( #32086 )
2024-10-04 12:29:43 +00:00
Claire
77f5b127fa
Fix unsupported grouped notifications from streaming causing duplicate IDs ( #32243 )
2024-10-04 12:23:30 +00:00
Matt Jankowski
463f9197d8
Add regression coverage for admin reports resolution button within form ( #32248 )
2024-10-04 12:21:55 +00:00
Claire
49407e7623
Fix Content-Security-Policy when using sso-redirect ( #32241 )
2024-10-04 08:50:36 +00:00
Matt Jankowski
cf28104317
Rename preloaded models constant in cli media ( #30531 )
2024-10-04 08:30:08 +00:00
Matt Jankowski
82e7d53d54
Rename transformer constant in sanitizer ( #30532 )
2024-10-04 08:29:23 +00:00
gunchleoc
160917e718
Pluralize csv imports ( #27094 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-10-04 08:19:01 +00: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
renovate[bot]
12a8ac1f85
Update dependency node to 20.18 ( #32244 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-04 07:57:41 +00:00
github-actions[bot]
1b247a1dc2
New Crowdin Translations (automated) ( #32249 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-04 07:29:53 +00:00
renovate[bot]
aba888c4a6
Update dependency ffmpeg to v7.1 ( #32239 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-04 07:18:38 +00:00
Claire
4c0e44ebbe
Fix recently-broken admin interface buttons ( #32240 )
2024-10-03 16:12:15 +00:00
Matt Jankowski
cc8d723e71
Register an XML encoder for response tests ( #32220 )
2024-10-03 13:10:27 +00:00
Matt Jankowski
d95f6f4410
Extract ExportSummary class for account object counts ( #32227 )
2024-10-03 13:09:58 +00:00
Matt Jankowski
52afa94f1c
Use print_table to wrap storage output CLI ( #32230 )
2024-10-03 12:13:54 +00:00
renovate[bot]
1db91ab8d9
Update dependency typescript to v5.6.2 ( #32165 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-03 09:34:04 +00:00
