Commit Graph

10848 Commits (bd2edc2d37b0047f7dea22a784dbea8f0a0e2381)

Author SHA1 Message Date
kouhai dev bd2edc2d37 th: Merge remote-tracking branch 'glitch/main' 2023-04-22 00:38:08 -07:00
kouhai dev 4be96df50b th: fix build 2023-04-22 00:38:08 -07:00
kouhai dev ac9104875b th: fix extension 2023-04-22 00:38:08 -07:00
kouhai dev ee1dc4a0d1 th: Merge remote-tracking branch 'glitch/main' 2023-04-22 00:38:08 -07:00
kouhai dev da1aa87c6f th: Merge remote-tracking branch 'glitch/main' 2023-04-22 00:38:08 -07:00
kouhai dev 228f9c72d4 th: update models, node/Gemfile state 2023-04-22 00:38:08 -07:00
kouhai dev 705fd6c182 th: Merge remote-tracking branch 'glitch/main' 2023-04-22 00:38:08 -07:00
kouhai dev a936e75d02 th: Merge remote-tracking branch 'glitch/main' 2023-04-22 00:38:08 -07:00
Plastikmensch c4708b54b5 Fix default content type setting not applying (#2176)
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-12 20:12:25 +02:00
Claire db3900bf4c Run `yarn manage:translations` 2023-04-09 15:56:31 +02:00
Claire ba8ba4f476 Move glitch-soc-only translation strings out of `app/javascript/mastodono/locales` 2023-04-09 15:53:45 +02:00
Nick Schonning 3237eb3759 [Glitch] Ensure tabIndex is number instead of string
Port 53376db94c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09 14:47:29 +02:00
Christian Schmidt 3e1e35b8ec [Glitch] Fix loading spinner + infinite scroll for private mentions
Port c9fed25d56 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09 12:10:01 +02:00
Nick Schonning 61e2fa8b76 [Glitch] Enable Stylelint property-no-unknown
Port 24919590a0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09 12:05:55 +02:00
Christian Schmidt b32dbd5500 [Glitch] Fix tooltip for dates without time
Port 07497b9956 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09 12:04:17 +02:00
Nick Schonning 8aafeb72cf [Glitch] Remove Array.prototype.includes polyfill
Port e9df65bad0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09 12:03:11 +02:00
Christian Schmidt 95a401efa4 [Glitch] Fix account header image missing in low-res
Port b2e306d3db to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09 12:01:55 +02:00
Christian Schmidt ba35f8f630 [Glitch] Fix height of announcements not being updated when using reduced animations
Port 2507c0a462 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09 12:01:11 +02:00
Nick Schonning e9fd7d9e02 [Glitch] Update display_media typing to string
Port a334f64652 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09 12:00:26 +02:00
Nick Schonning bd52e88774 [Glitch] Set marginRight as string
Port 37e98d9d56 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09 11:59:42 +02:00
Nick Schonning 499485585e [Glitch] SUBMIT doesn't exist on XMLHttpRequest
Port d5a6c93808 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09 11:58:45 +02:00
Nick Schonning 970001fd77 [Glitch] HTML string attributes set as booleans
Port 4ba81aa8dd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09 11:56:02 +02:00
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 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 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 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 2d9cb47a4b 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 c9fed25d56 Fix loading spinner + infinite scroll for private mentions (#24446) 2023-04-07 15:44:31 +02:00
Matt Jankowski d30c48c975 Remove unused methods in 2FA OTP Auth Controller (#24220) 2023-04-07 14:13:53 +02:00
Nick Schonning e9df65bad0 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
Eugen Rochko 66cbd18531 New Crowdin updates (#24378)
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-06 23:24:31 +09: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 caf209b28b Fix user archive takeouts when using OpenStack Swift (#24431) 2023-04-05 19:31:49 +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
Nick Schonning a334f64652 Update display_media typing to string (#24416) 2023-04-05 13:20:21 +02:00
Nick Schonning 37e98d9d56 Set marginRight as string (#24422) 2023-04-05 10:57:36 +02:00
Nick Schonning d5a6c93808 SUBMIT doesn't exist on XMLHttpRequest (#24423) 2023-04-05 10:56:55 +02:00
Nick Schonning 24919590a0 Enable Stylelint property-no-unknown (#24404) 2023-04-05 09:04:08 +02:00
Claire 0679fcd2f1 Fix styling regressions from RTL layout refactor (#24415) 2023-04-04 16:48:34 +02:00
Nick Schonning 53376db94c Ensure tabIndex is number instead of string (#24409) 2023-04-04 16:33:44 +02:00
Nick Schonning 4ba81aa8dd HTML string attributes set as booleans (#24408) 2023-04-04 16:33:33 +02:00
Rubicon Rowe f49d2ec5a3 [Glitch] Fix inconsistent radius in drawer
Port ffa9249c1e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-04 12:51:24 +02:00
Claire 8364f82281 Merge branch 'main' into glitch-soc/merge-upstream 2023-04-04 12:45:12 +02:00
Claire 6ccd12b521 Fix unescaped user input in LDAP query (#24379) 2023-04-04 12:42:38 +02:00
Rubicon Rowe ffa9249c1e Fix inconsistent radius in drawer (#24407) 2023-04-04 11:41:05 +02:00
Nick Schonning 72a1dd736a Align typings with installed versions (#24410) 2023-04-04 10:48:26 +02:00
Christian Schmidt 90ecb96dba [Glitch] Add colour to follow button when hashtag is being followed
Port d5da587d27 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-03 18:07:34 +02:00
Claire 5fbae7cb2a Merge branch 'main' into glitch-soc/merge-upstream 2023-04-03 17:40:59 +02:00