Claire
9558de3b67
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream removed a dependency that was textually close to a glitch-soc-only
dependency.
Removed the dependency as upstream did, while keeping the glitch-soc-only
dependency.
2023-04-09 11:45:08 +02:00
Claire
ce12934f5b
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream removed a dependency that was textually close to a glitch-soc-only
dependency.
Removed the dependency as upstream did, while keeping the glitch-soc-only
dependency.
2023-04-09 11:45:08 +02:00
Claire
0cbf19affd
Fix most rubocop issues ( #2165 )
...
* Run rubocop --autocorrect on app/, config/ and lib/, also manually fix some remaining style issues
* Run rubocop --autocorrect-all on db/
* Run rubocop --autocorrect-all on `spec/` and fix remaining issues
2023-04-09 11:25:30 +02:00
Claire
ff168ef202
Fix most rubocop issues ( #2165 )
...
* Run rubocop --autocorrect on app/, config/ and lib/, also manually fix some remaining style issues
* Run rubocop --autocorrect-all on db/
* Run rubocop --autocorrect-all on `spec/` and fix remaining issues
2023-04-09 11:25:30 +02:00
Claire
4471b6de30
Fix glitch-soc Markdown linting issues ( #2168 )
2023-04-08 17:23:24 +02:00
Claire
29a91b871e
Fix glitch-soc Markdown linting issues ( #2168 )
2023-04-08 17:23:24 +02:00
Claire
69a94bf6e1
Move locale-data back to app/javascript/mastodon/locales/locale-data ( #2169 )
...
This reduces differences with upstream and fixes a bunch of locale-data
files having been forgotten.
2023-04-08 14:11:40 +02:00
Claire
10469a0b85
Move locale-data back to app/javascript/mastodon/locales/locale-data ( #2169 )
...
This reduces differences with upstream and fixes a bunch of locale-data
files having been forgotten.
2023-04-08 14:11:40 +02:00
Claire
172a4ad9f4
Fix crash in NotifyService when trying to send an email notification for post edits ( #24460 )
2023-04-08 12:51:14 +02:00
Claire
99e3e152cd
Fix crash in NotifyService when trying to send an email notification for post edits ( #24460 )
2023-04-08 12:51:14 +02:00
Claire
bfba1cc559
Fix migrating from upstream to glitch-soc messing with hide_notifications mute settings ( #2164 )
2023-04-07 20:56:11 +02:00
Claire
dc6befe1a4
Fix migrating from upstream to glitch-soc messing with hide_notifications mute settings ( #2164 )
2023-04-07 20:56:11 +02:00
Claire
2d9cb47a4b
Fix glitch-soc HAML linting issues ( #2166 )
2023-04-07 20:55:28 +02:00
Claire
c3a8f6a0a3
Fix glitch-soc HAML linting issues ( #2166 )
2023-04-07 20:55:28 +02:00
Christian Schmidt
07497b9956
Fix tooltip for dates without time ( #24244 )
2023-04-07 16:19:43 +02:00
Christian Schmidt
aa136cf2fa
Fix tooltip for dates without time ( #24244 )
2023-04-07 16:19:43 +02:00
Christian Schmidt
c9fed25d56
Fix loading spinner + infinite scroll for private mentions ( #24446 )
2023-04-07 15:44:31 +02:00
Christian Schmidt
9ef9974ff2
Fix loading spinner + infinite scroll for private mentions ( #24446 )
2023-04-07 15:44:31 +02:00
Matt Jankowski
e323372ebe
Expand coverage for "system checks" ( #24216 )
2023-04-07 14:39:34 +02:00
Matt Jankowski
9d39b111f1
Expand coverage for "system checks" ( #24216 )
2023-04-07 14:39:34 +02:00
Nick Schonning
0135b7c5cb
Update Node.js to 16.20.0 ( #24316 )
2023-04-07 14:26:11 +02:00
Nick Schonning
862861069d
Update Node.js to 16.20.0 ( #24316 )
2023-04-07 14:26:11 +02:00
Matt Jankowski
d30c48c975
Remove unused methods in 2FA OTP Auth Controller ( #24220 )
2023-04-07 14:13:53 +02:00
Matt Jankowski
d193bc8c5c
Remove unused methods in 2FA OTP Auth Controller ( #24220 )
2023-04-07 14:13:53 +02:00
Nick Schonning
4b95940968
Remove duplicate ca-certificates Docker install ( #24231 )
2023-04-07 14:10:12 +02:00
Nick Schonning
26682d4c22
Remove duplicate ca-certificates Docker install ( #24231 )
2023-04-07 14:10:12 +02:00
Nick Schonning
e9df65bad0
Remove Array.prototype.includes polyfill ( #24234 )
2023-04-07 13:03:42 +02:00
Nick Schonning
c0886dee14
Remove Array.prototype.includes polyfill ( #24234 )
2023-04-07 13:03:42 +02:00
Christian Schmidt
b2e306d3db
Fix account header image missing in low-res ( #24433 )
2023-04-07 11:57:43 +02:00
Christian Schmidt
d7b8c6db7e
Fix account header image missing in low-res ( #24433 )
2023-04-07 11:57:43 +02:00
Claire
eb30deb2e5
Fix user settings migration script failing in some cases ( #24453 )
2023-04-07 11:55:15 +02:00
Claire
369f239f7b
Fix user settings migration script failing in some cases ( #24453 )
2023-04-07 11:55:15 +02:00
Claire
f91018b5c2
Bump version to v4.1.2 ( #24427 )
2023-04-07 09:01:57 +02:00
Claire
3d8bd093b9
Bump version to v4.1.2 ( #24427 )
2023-04-07 09:01:57 +02:00
Eugen Rochko
66cbd18531
New Crowdin updates ( #24378 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-06 23:24:31 +09:00
Eugen Rochko
c9f3438efe
New Crowdin updates ( #24378 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-06 23:24:31 +09:00
Nick Schonning
a3a9fe9ed1
Fix DevContainer post-create warnings ( #23977 )
2023-04-05 23:58:44 +02:00
Nick Schonning
b8ff498781
Fix DevContainer post-create warnings ( #23977 )
2023-04-05 23:58:44 +02:00
Claire
0174059370
New Crowdin updates ( #2126 )
...
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* Fix Crowdin YAML export issue
* Fix i18n YAML normalization
2023-04-05 20:28:34 +02:00
Claire
02d5c69404
New Crowdin updates ( #2126 )
...
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* Fix Crowdin YAML export issue
* Fix i18n YAML normalization
2023-04-05 20:28:34 +02:00
Claire
caf209b28b
Fix user archive takeouts when using OpenStack Swift ( #24431 )
2023-04-05 19:31:49 +02:00
Claire
9d08b81193
Fix user archive takeouts when using OpenStack Swift ( #24431 )
2023-04-05 19:31:49 +02:00
Nick Schonning
0caef9ecfa
Check for missing JSON translations ( #24338 )
2023-04-05 16:33:55 +02:00
Nick Schonning
c76d19e00b
Check for missing JSON translations ( #24338 )
2023-04-05 16:33:55 +02:00
Christian Schmidt
2507c0a462
Fix height of announcements not being updated when using reduced animations ( #24354 )
2023-04-05 14:58:10 +02:00
Christian Schmidt
ffd5b2eea4
Fix height of announcements not being updated when using reduced animations ( #24354 )
2023-04-05 14:58:10 +02:00
dependabot[bot]
6f88776e9d
Bump rubocop from 1.48.1 to 1.49.0 ( #24387 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-05 14:01:23 +02:00
dependabot[bot]
966d7cff2a
Bump rubocop from 1.48.1 to 1.49.0 ( #24387 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-05 14:01:23 +02:00
dependabot[bot]
210b55a718
Bump puma from 6.1.1 to 6.2.1 ( #24402 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-05 13:57:21 +02:00
dependabot[bot]
4fcfeaba36
Bump puma from 6.1.1 to 6.2.1 ( #24402 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-05 13:57:21 +02:00
