me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
18076 commits 2 branches 0 tags 429 MiB
Commit graph

18076 commits

This branch
This branch
All branches
Author SHA1 Message Date
Claire
64240e5dcd Merge pull request #2213 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-05-08 17:59:28 +02:00
Eugen Rochko
b4845bcfaa [Glitch] Fix n+1 query in settings migration 
Port d548faf693 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-08 16:15:10 +02:00
Eugen Rochko
2946b30779 [Glitch] Fix transaction around settings migration 
Port 140e0f0bb7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-08 16:12:05 +02:00
fusagiko / takayamaki
dd098625f0 [Glitch] Add type annotation for RelativeTimestamp component 
Port 90e4ab9f8f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-08 16:02:59 +02:00
fusagiko / takayamaki
c17c65aa57 [Glitch] Rewrite Icon and IconWithBadge with typescript 
Port 27a750cc04 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-08 15:59:27 +02:00
Eugen Rochko
5bfff5807a [Glitch] Fix icons having an image role 
Port c7924acf16 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-08 15:57:35 +02:00
Claire
acc7cdc664 [Glitch] Fix audio player width in thread view 
Port 9cf043f63a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-08 15:50:05 +02:00
Nick Schonning
55561098c4 [Glitch] Add eslint-plugin-jsdoc 
Port 0224c3c0d9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-08 15:48:08 +02:00
Christian Schmidt
a9089a2458 [Glitch] Fix media description not being cleared 
Port 6ccea199ca to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-08 15:41:17 +02:00
Claire
2aaf3528ca Merge commit 'd548faf69321260ab4c2a16759ca77773189126a' 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
Claire
c90f09d36f 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
fusagiko / takayamaki
4ab18dee50 Rewrite Domain component as function component (#24896) 2023-05-08 15:12:12 +02:00
fusagiko / takayamaki
01caf92d80 Use LayoutType from is_mobile in actions/app (#24863) 2023-05-08 15:10:21 +02:00
Claire
db240323f6 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
たいち ひ
5f709b1601 Add TypeScript support for mastodon alias and image imports (#24895) 2023-05-08 11:28:36 +02:00
たいち ひ
13a16f3054 Rewrite RadioButton component as FC (#24897) 2023-05-08 11:12:53 +02:00
たいち ひ
c1ccb55a59 Rewrite Image component as function component (#24893) 2023-05-08 11:12:44 +02:00
たいち ひ
23a97effdb Rewrite <NotSignedInIndicator /> as FC (#24903) 2023-05-08 11:12:13 +02:00
たいち ひ
daecca565e Rewrite <Check /> as FC (#24901) 2023-05-08 08:26:02 +02:00
Claire
12e8bcac9d 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
Claire
43c40b5df8 Fix thread lines not being properly updated when new posts are received (#2210) 2023-05-07 20:06:10 +02:00
Plastikmensch
ef5df7fc66 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
Claire
e390c26429 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
Claire
6dbd28c763 Fix rubocop warnings (#2206) 2023-05-07 15:06:15 +02:00
Claire
b80dc7d2ed 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
Claire
481aed8061 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
fusagiko / takayamaki
2c894915dc Rewrite VerifiedBadge component as function component (#24892) 2023-05-07 09:10:58 +02:00
Matt Jankowski
0d919f27be Use released version 4.1.0 of devise-two-factor (#24875) 2023-05-05 19:48:23 +02:00
Claire
f18f692f65 Fix compose textarea scroll behavior (#24872) 2023-05-05 18:58:58 +02:00
Tim Campbell
ddb1c3c0f7 Fixed mastodon version injection into containers via github actions (#24873) 2023-05-05 18:58:35 +02:00
mogaminsk
3ea6c679cf Fix import data field type (#24874) 2023-05-05 18:10:10 +02:00
S.H
2a651be35a Fix column back button error (#24867) 2023-05-05 15:13:28 +02:00
zunda
458f6d0afb Make it possible to upload audio and video to Heroku app (#24866) 2023-05-05 14:41:07 +02:00
Nick Schonning
f6c345338b Add production asset compile (#24839) 2023-05-05 09:06:51 +02:00
Tim Campbell
ceaf8f2fa5 Fixed mastodon version injection into containers via github actions (#24858) 2023-05-04 21:33:32 +02:00
Daniel M Brasil
a82a6882ad Add test coverage for Mastodon::SettingsCLI (#24856) 2023-05-04 20:37:42 +02:00
dependabot[bot]
a0b5e9a1b1 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
Matt Jankowski
d65d954409 Extract StatusSafeReblogInsert concern from Status (#24821) 2023-05-04 14:06:20 +02:00
Renaud Chaput
5569c64150 Add version suffixes to nightly & edge image builds (#24823) 2023-05-04 13:45:39 +02:00
Nick Schonning
833076d6bf Bump rubocop-rails 2.19.1 with update .rubocop_todo.yml (#24469) 2023-05-04 11:56:24 +02:00
dependabot[bot]
08eacf6837 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
dependabot[bot]
7eadc801fe 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
dependabot[bot]
4bcf64b437 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
Claire
53e3a1b06d Fix infinite loop in AccountsStatusesCleanupScheduler (#24840) 2023-05-04 10:13:00 +02:00
Nick Schonning
c366c93cfd Fail ESLint for Warnings in CI (#24836) 2023-05-04 09:48:50 +02:00
Florin
1421a8efbd Fix Back button going outside the app (#24835) 2023-05-04 08:14:04 +02:00
Nick Schonning
62d5bb52cc Regenerate rubocop-todo (#24834) 2023-05-04 07:43:54 +02:00
Nick Schonning
f6fd5e4ad0 Autofix Rubocop Style/ConcatArrayLiterals (#23755) 2023-05-04 05:57:40 +02:00
Nick Schonning
2f2c8f671b Autofix Rubocop Style/HashSyntax (#23754) 2023-05-04 05:54:26 +02:00
Nick Schonning
54d59b8ee0 Autofix Rubocop Style/CaseLikeIf (#23756) 2023-05-04 05:51:18 +02:00