tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,781 Commits 10 Branches 0 Tags
a49707dacb9ceba552dc50f3d9f64b5dc81d501e
Commit Graph

17781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fusagiko / takayamaki
a49707dacb [Glitch] Rewrite Icon and IconWithBadge with typescript 
Port 81f75b1e0e to glitch-soc

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

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

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

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-08 15:41:17 +02:00
Claire
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
Claire
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
Claire
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
Claire
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
Claire
ed0a407888 Fix thread lines not being properly updated when new posts are received (#2210) 2023-05-07 20:06:10 +02:00
Plastikmensch
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
Claire
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
Claire
9b59748679 Fix rubocop warnings (#2206) 2023-05-07 15:06:15 +02:00
Claire
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
Claire
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
Eugen Rochko
0ad2413b35 Fix n+1 query in settings migration (#24783) 2023-05-02 10:26:39 +02:00
Eugen Rochko
f1c1fa1411 Fix transaction around settings migration (#24761) 2023-05-01 17:45:18 +02:00
Nick Schonning
fc56eda94b Bump stylelint-config-standard-scss from 7.0.1 to 9.0.0 (#24755) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-05-01 18:23:57 +09:00
fusagiko / takayamaki
15fd712464 Add type annotation for RelativeTimestamp component (#24749) 2023-05-01 00:51:31 +02:00
fusagiko / takayamaki
81f75b1e0e Rewrite Icon and IconWithBadge with typescript (#24747) 2023-05-01 00:51:00 +02:00
Matt Jankowski
c53fe9b753 Fix RSpec/BeforeAfterAll cop (#24737) 2023-05-01 04:16:08 +09:00
Matt Jankowski
d902a707a3 Fix Rails/CompactBlank cop (#24690) 2023-04-30 14:07:21 +02:00
Matt Jankowski
d00e45a7d3 Fix Rails/I18nLocaleAssignment cop (#24693) 2023-04-30 14:07:03 +02:00
Matt Jankowski
af824db398 Fix Rails/InverseOf cop (#24732) 2023-04-30 14:06:53 +02:00
Claire
c18884de32 Merge pull request #2198 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-04-30 13:06:50 +02:00
Nick Schonning
6b95aaaa65 Remove empty HTTP error translations (#24210) 2023-04-30 17:04:15 +09:00
Josh McKinney
89c01383f9 fix: remove port 80 mapping in devcontainer (#24658) 2023-04-30 17:03:28 +09:00
Eugen Rochko
0a08e9d3d3 New Crowdin updates (#24678) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-04-30 17:02:11 +09:00
Mark Roszko
c23d285b16 Remove the u in Favorite for non-gb english (#24667) 
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2023-04-30 16:33:37 +09:00
João Pedro Marques
8f6e290c7a Adds new follower/following routes (#24601) 2023-04-30 09:01:42 +02:00
dependabot[bot]
0669822ae8 Bump eslint from 8.38.0 to 8.39.0 (#24636) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-30 16:01:11 +09:00
dependabot[bot]
242d7864f1 Bump @types/jest from 29.4.2 to 29.5.1 (#24630) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-30 16:00:48 +09:00
dependabot[bot]
56cf092058 Bump @types/yargs from 17.0.22 to 17.0.24 (#24388) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-30 15:46:03 +09:00
dependabot[bot]
fa14976a5d Bump connection_pool from 2.3.0 to 2.4.0 (#24290) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-30 15:45:02 +09:00
dependabot[bot]
819daeb651 Bump @types/lodash from 4.14.191 to 4.14.194 (#24576) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-30 15:39:49 +09:00
dependabot[bot]
921bef6799 Bump stylelint from 15.3.0 to 15.6.0 (#24635) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-30 15:38:53 +09:00
Daniel M Brasil
e8fe941015 Fix tootctl accounts approve --number N not aproving N earliest registrations (#24605) 2023-04-30 06:50:58 +02:00
Matt Jankowski
2e43461100 Fix Rails/Output cop (#24687) 2023-04-30 06:48:16 +02:00
Matt Jankowski
5a2aa06a51 Fix Rails/Present cop (#24688) 2023-04-30 06:47:50 +02:00
Matt Jankowski
bdc74086e6 Fix Rails/ContentTag cop (#24691) 2023-04-30 06:47:15 +02:00
Matt Jankowski
6e226f5a32 Fix Rails/ActionOrder cop (#24692) 2023-04-30 06:46:39 +02:00
Nick Schonning
470b8abb69 Run Rubocop with lint-staged on commit (#24644) 2023-04-30 06:46:16 +02:00
Matt Jankowski
60ac9e8634 Fix Rails/SquishedSQLHeredocs cop (#24694) 2023-04-30 06:43:50 +02:00
Matt Jankowski
8dcfb6e0ea Fix Rails/HttpPositionalArguments cop (#24699) 2023-04-30 06:43:28 +02:00
Claire
678d836c7d Fix pop-in player placeholder layout in thread view (#24715) 2023-04-30 06:42:43 +02:00
Claire
cf1bc4bb93 Fix audio player width in thread view (#24713) 2023-04-30 06:42:22 +02:00
Nick Schonning
f22b4e556c Add eslint-plugin-jsdoc (#24719) 2023-04-30 02:29:54 +02:00
Christian Schmidt
bfeccf6748 Fix media description not being cleared (#24720) 2023-04-30 02:29:24 +02:00
Matt Jankowski
274d561430 Enable local account key generation spec (#24728) 2023-04-30 02:28:52 +02:00
mogaminsk
e0d075713f Change i18n-fallbacks to English (#24727) 2023-04-30 02:22:20 +02:00