61f3e0e95e
Merge pull request #2213 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-05-08 17:59:28 +02:00
8bf9bd5ac8
[Glitch] Fix n+1 query in settings migration
...
Port 0ad2413b35
2023-05-08 16:15:10 +02:00
75e28731a5
[Glitch] Fix transaction around settings migration
...
Port f1c1fa1411
2023-05-08 16:12:05 +02:00
aff2d55b80
[Glitch] Add type annotation for RelativeTimestamp component
...
Port 15fd712464
2023-05-08 16:02:59 +02:00
a49707dacb
[Glitch] Rewrite Icon and IconWithBadge with typescript
...
Port 81f75b1e0e
2023-05-08 15:59:27 +02:00
7835f8fd22
[Glitch] Fix icons having an image role
...
Port 24b2c60beb
2023-05-08 15:57:35 +02:00
e9eab013e7
[Glitch] Fix audio player width in thread view
...
Port cf1bc4bb93
2023-05-08 15:50:05 +02:00
51479f5c28
[Glitch] Add eslint-plugin-jsdoc
...
Port f22b4e556c
2023-05-08 15:48:08 +02:00
09054f5485
[Glitch] Fix media description not being cleared
...
Port bfeccf6748
2023-05-08 15:41:17 +02:00
2d029dedd9
Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
Code style changes but we have a different version.
Kept our version.
- `streaming/index.js`:
Upstream fixed a typo close to glitch-soc-only code.
Applied upstream's changes.
2023-05-08 15:28:36 +02:00
5d18840ab9
Fix more JS linting issues ( #2212 )
...
* Fix uses of intl.formatMessages without default messages
* Ignore lint issue for ColumnLink button
2023-05-08 15:16:55 +02:00
9818f34273
Rewrite Domain component as function component ( #24896 )
2023-05-08 15:12:12 +02:00
5bc8e2d1fd
Use LayoutType from is_mobile in actions/app ( #24863 )
2023-05-08 15:10:21 +02:00
16c5354b8c
Fix some more JS linting issues ( #2211 )
...
* Minor refactor and linting fixup in `flavours/glitch/actions/accounts.js`
This is some added boilerplate but it's much more consistent with the remaining
of the code, and avoids the linting issue.
* Fix missing /privacy-policy link in DM warning because of wrongly-named import
* Fix unnecessary import
* Fix regexp in flavours/glitch/utils/hashtag.js
2023-05-08 14:02:41 +02:00
7c1305b3a4
Add TypeScript support for `mastodon` alias and image imports ( #24895 )
2023-05-08 11:28:36 +02:00
76264e3fe8
Rewrite RadioButton component as FC ( #24897 )
2023-05-08 11:12:53 +02:00
a65d2d1045
Rewrite Image component as function component ( #24893 )
2023-05-08 11:12:44 +02:00
490ccbf40b
Rewrite <NotSignedInIndicator /> as FC ( #24903 )
2023-05-08 11:12:13 +02:00
6fdbee240c
Rewrite <Check /> as FC ( #24901 )
2023-05-08 08:26:02 +02:00
de74acbe0c
Fix some more Javascript linting issues and discrepancies with upstream ( #2209 )
...
* Fix typo in flavours/glitch/features/video/index.js
* Fix various linting issues and discrepancies with upstream
2023-05-07 21:43:25 +02:00
ed0a407888
Fix thread lines not being properly updated when new posts are received ( #2210 )
2023-05-07 20:06:10 +02:00
179e38cf15
Reset language to default when cancelling a reply ( #2114 )
...
When cancelling a reply, the language was still set to the language of the replied to toot.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-05-07 18:45:10 +02:00
3fb7fe14c6
Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream ( #2208 )
...
* Run eslint --fix
* Fix linting issues in video player and reduce divergences with upstream
This includes a behavior change of not auto-looping videos anymore. I don't
remember loops being ever intended, and they have been removed from upstream
a while ago, but we somehow missed the change.
* Fix lint issues in `app/javascript/flavours/glitch/selectors/index.js`
Those were basically caused by dead code that isn't present upstream, so
that brings us closer to upstream as well.
* Fix linting issue and bug in streaming/index.js
* Fix linting issues in config/webpack/shared.js
* Fix unused import in flavours/glitch/features/ui/index.js
* Fix linting issues and reduce divergences from upstream in flavours/glitch/features/ui/components/video_modal.jsx
* Fix linting issues in flavours/glitch/reducers
* Fix linting issues in glitch-soc onboarding modal
* Fix linting issues in flavours/glitch/features/ui/components/navigation_panel.jsx
* Remove dead code for unused local setting navbar_under
* Fix various linting issues
* Fix linting issues in flavours/glitch/components/scrollable_list.jsx and reduce divergences with upstream
2023-05-07 18:22:25 +02:00
9b59748679
Fix rubocop warnings ( #2206 )
2023-05-07 15:06:15 +02:00
6f64c79ca4
Fix SCSS linting issues ( #2207 )
...
* Disable font-family-no-missing-generic-family-keyword for font-awesome accessibility icons
* Run stylelint --fix
* Avoid `@extend` directives with doodle modal CSS
* Drop use of `@extend` for notification cleanup buttons SCSS
* Run prettier on SCSS
2023-05-07 15:04:59 +02:00
a6207d243b
New Crowdin updates ( #2202 )
...
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
2023-05-07 13:37:47 +02:00
140aa6b054
Rewrite VerifiedBadge component as function component ( #24892 )
2023-05-07 09:10:58 +02:00
f877aa9d70
Use released version 4.1.0 of devise-two-factor ( #24875 )
2023-05-05 19:48:23 +02:00
746979f75d
Fix compose textarea scroll behavior ( #24872 )
2023-05-05 18:58:58 +02:00
f258478395
Fixed mastodon version injection into containers via github actions ( #24873 )
2023-05-05 18:58:35 +02:00
c9e040fb24
Fix import data field type ( #24874 )
2023-05-05 18:10:10 +02:00
5811ccc611
Fix column back button error ( #24867 )
2023-05-05 15:13:28 +02:00
c0ea33e3fc
Make it possible to upload audio and video to Heroku app ( #24866 )
2023-05-05 14:41:07 +02:00
e675c10d19
Add production asset compile ( #24839 )
2023-05-05 09:06:51 +02:00
ac41a9712e
Fixed mastodon version injection into containers via github actions ( #24858 )
2023-05-04 21:33:32 +02:00
c9210af3ee
Add test coverage for `Mastodon::SettingsCLI` ( #24856 )
2023-05-04 20:37:42 +02:00
64fae0efb5
Bump @babel/core from 7.21.5 to 7.21.8 ( #24831 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-04 14:14:02 +02:00
0b249ebdb0
Extract StatusSafeReblogInsert concern from Status ( #24821 )
2023-05-04 14:06:20 +02:00
830e6cefae
Add version suffixes to nightly & edge image builds ( #24823 )
2023-05-04 13:45:39 +02:00
569b39256b
Bump rubocop-rails 2.19.1 with update .rubocop_todo.yml ( #24469 )
2023-05-04 11:56:24 +02:00
880e661d53
Bump stylelint from 15.6.0 to 15.6.1 ( #24829 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-04 11:30:58 +02:00
ff974395c2
Bump react-select from 5.7.2 to 5.7.3 ( #24830 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-04 11:16:39 +02:00
849d93e50a
Bump json-ld from 3.2.4 to 3.2.5 ( #24832 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-04 11:06:23 +02:00
c3c7d59072
Fix infinite loop in AccountsStatusesCleanupScheduler ( #24840 )
2023-05-04 10:13:00 +02:00
f95125bd04
Fail ESLint for Warnings in CI ( #24836 )
2023-05-04 09:48:50 +02:00
27bafabb64
Fix Back button going outside the app ( #24835 )
2023-05-04 08:14:04 +02:00
e1ebcc007d
Regenerate rubocop-todo ( #24834 )
2023-05-04 07:43:54 +02:00
ff3b7069cf
Autofix Rubocop Style/ConcatArrayLiterals ( #23755 )
2023-05-04 05:57:40 +02:00
da3bd913ae
Autofix Rubocop Style/HashSyntax ( #23754 )
2023-05-04 05:54:26 +02:00
d5a185d721
Autofix Rubocop Style/CaseLikeIf ( #23756 )
2023-05-04 05:51:18 +02:00
Claire
Eugen Rochko
fusagiko / takayamaki
Nick Schonning
Christian Schmidt
たいち ひ
Plastikmensch
Matt Jankowski
Tim Campbell
mogaminsk
S.H
zunda
Daniel M Brasil
dependabot[bot]
Renaud Chaput
Florin