treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
14,791 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

14791 Commits (5718a2e2808b2166904cb7a6e79042f9b64dae2f)

Author SHA1 Message Date
Rens Groothuijsen a5d9a408e3 [Glitch] Show correct error message if chosen password is too long 
Port 8143d127a4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-12-16 16:26:04 +01:00
Eugen Rochko ee4be446b6 [Glitch] Add batch suspend for accounts in admin UI 
Port SCSS changes from 65ee707755 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-12-16 16:25:21 +01:00
Claire 179f1d3a78 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
  Removed upstream, while it had glitch-soc-specific changes to accomodate
  for glitch-soc's theming system.
  Removed the file.

Additional changes:
- `app/views/admin/accounts/index.html.haml':
  Accomodate for glitch-soc's theming system.
 2021-12-16 16:20:44 +01:00
David Sterry 65ee707755 ignore hashtag suggestions if they vary only in case (#16460) 
* ignore hashtag suggestions if they vary only in case

* remove console.logs and unused args

* consistently add space when dismissing suggestions

* linting
 2021-12-15 23:47:19 +01:00
Takeshi Umeda 794d9d267d Fix follow recommendation biased towards older accounts (#17126) 2021-12-13 23:21:14 +01:00
Claire 58178dca25 Fix incorrect singular version of some translation strings (#17124) 
Fixes #17120

Co-authored-by: Mélanie Chauvel <perso@hack-libre.org>

Co-authored-by: Mélanie Chauvel <perso@hack-libre.org>
 2021-12-13 18:25:25 +01:00
Eugen Rochko 2c6be5dc9a Change trending hashtags threshold back from 15 to 5 (#17122) 2021-12-13 05:32:29 +01:00
Takeshi Umeda 6546346818 Add remove orphans to tootctl statuses remove (#17067) 
* Add remove orphans to tootctl statuses remove

* Add REINDEX and change option from vacuum to compression-database

* Changed to extract the deletion target of conversations to a temporary table

* Support progress bar and exceptions when media remove

* Add continue option

* Fix compression to compress

* Remove skip_remove_orphans
 2021-12-12 06:09:14 +01:00
Shlee 394b4e927b Update .dockerignore/.gitignore for #16947 etc (#17099) 
* Update .dockerignore

* Update .gitignore
 2021-12-06 18:04:04 +01:00
heguro 2b292c44bc Fix redirection when succeeded WebAuthn (#17098) 2021-12-05 21:50:12 +01:00
Rens Groothuijsen 8143d127a4 Show correct error message if chosen password is too long (#17082) 
* Add correct error message for exceeding max length on password confirmation field

* Code style fixes
 2021-12-05 21:49:50 +01:00
Eugen Rochko 7bf5924339 Add batch suspend for accounts in admin UI (#17009) 2021-12-05 21:48:39 +01:00
dependabot[bot] 967ca7ed03 Bump jest from 27.3.1 to 27.4.3 (#17094) 
Bumps [jest](https://github.com/facebook/jest) from 27.3.1 to 27.4.3.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.3.1...v27.4.3)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-12-04 23:53:39 +09:00
dependabot[bot] c48ef48f28 Bump @testing-library/jest-dom from 5.15.1 to 5.16.0 (#17095) 
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.15.1 to 5.16.0.
- [Release notes](https://github.com/testing-library/jest-dom/releases)
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.15.1...v5.16.0)

---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-12-04 23:53:26 +09:00
dependabot[bot] e86821413f Bump reselect from 4.1.4 to 4.1.5 (#17075) 
Bumps [reselect](https://github.com/reduxjs/reselect) from 4.1.4 to 4.1.5.
- [Release notes](https://github.com/reduxjs/reselect/releases)
- [Changelog](https://github.com/reduxjs/reselect/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/reselect/compare/v4.1.4...v4.1.5)

---
updated-dependencies:
- dependency-name: reselect
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-12-04 23:41:40 +09:00
dependabot[bot] d6d16006d3 Bump redux-thunk from 2.4.0 to 2.4.1 (#17074) 
Bumps [redux-thunk](https://github.com/reduxjs/redux-thunk) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/reduxjs/redux-thunk/releases)
- [Commits](https://github.com/reduxjs/redux-thunk/compare/v2.4.0...v2.4.1)

---
updated-dependencies:
- dependency-name: redux-thunk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-12-04 23:41:12 +09:00
dependabot[bot] 4d31bf6140 Bump ws from 8.2.3 to 8.3.0 (#17076) 
Bumps [ws](https://github.com/websockets/ws) from 8.2.3 to 8.3.0.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/8.2.3...8.3.0)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-12-04 23:40:19 +09:00
dependabot[bot] f2af31f0fd Bump @testing-library/jest-dom from 5.15.0 to 5.15.1 (#17081) 
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.15.0 to 5.15.1.
- [Release notes](https://github.com/testing-library/jest-dom/releases)
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.15.0...v5.15.1)

---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-12-04 23:39:18 +09:00
dependabot[bot] d44dc3d69f Bump sass from 1.43.4 to 1.43.5 (#17080) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.43.4 to 1.43.5.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.43.4...1.43.5)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-12-04 23:39:00 +09:00
dependabot[bot] 5c906b2d43 Bump babel-jest from 27.3.1 to 27.4.0 (#17078) 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 27.3.1 to 27.4.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v27.4.0/packages/babel-jest)

---
updated-dependencies:
- dependency-name: babel-jest
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-12-04 23:38:38 +09:00
Claire 4359fa92da Fix unneeded outline around list name edition input 2021-12-03 21:03:40 +01:00
gunchleoc c56dd75d08 Prevent translations from accidentally becoming completely different from source strings on Crowdin without translators noticing. (#17085) 2021-12-01 19:03:35 +01:00
Claire 561fdb9d5d Merge pull request #1643 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2021-11-30 17:34:22 +01:00
Claire efeabec5eb Merge branch 'main' into glitch-soc/merge-upstream 2021-11-30 12:13:54 +01:00
Eugen Rochko f3966223bd Fix error on trending mailer due to missing constant (#17072) 2021-11-29 17:39:40 +01:00
dependabot[bot] 6cd74a3a9d Bump @babel/plugin-transform-runtime from 7.16.0 to 7.16.4 (#17023) 
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.16.0 to 7.16.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.16.4/packages/babel-plugin-transform-runtime)

---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-runtime"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2021-11-29 15:41:17 +09:00
dependabot[bot] ece9b8ca90 Bump cld3 from 3.4.2 to 3.4.3 (#17047) 
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.4.2 to 3.4.3.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases)
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.4.2...v3.4.3)

---
updated-dependencies:
- dependency-name: cld3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-11-29 15:19:22 +09:00
dependabot[bot] 2acf4775b8 Bump aws-sdk-s3 from 1.106.0 to 1.107.0 (#17048) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.106.0 to 1.107.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-11-29 15:18:59 +09:00
dependabot[bot] f21982093f Bump @babel/preset-env from 7.16.0 to 7.16.4 (#17024) 
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.16.0 to 7.16.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.16.4/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-11-29 15:18:41 +09:00
Jeong Arm cb22372cd7 Fix server graph on admin/tags/:id (#17066) 2021-11-28 23:13:07 +01:00
Alexandra Catalina 777075f322 Update tootsuite/mastodon Docker tag to v3.4.4 (#17065) 
Co-authored-by: Renovate Bot <bot@renovateapp.com>
 2021-11-27 03:06:39 +01:00
Claire 30c2546463 Merge pull request #1640 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2021-11-26 23:41:01 +01:00
Claire b22b76a571 [Glitch] Fix searching for additional hashtags in hashtag column 
Port 5305dada6c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-11-26 22:58:46 +01:00
Claire 9565dc366d [Glitch] Fix color of hashtag column settings inputs 
Port 986391cd19 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-11-26 22:58:13 +01:00
Claire 759226e116 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
  Minor conflict due to an optimization that wasn't shared between
  the two versions. Copied upstream's version.
 2021-11-26 22:53:55 +01:00
Jeong Arm 5ac17e3a77 Fix admin statuses order(#16937) (#16969) 
* Fix #16937

* Add test for statuses order
 2021-11-26 22:12:27 +01:00
Claire 5305dada6c Fix searching for additional hashtags in hashtag column (#17054) 2021-11-26 22:11:09 +01:00
Claire 986391cd19 Fix color of hashtag column settings inputs (#17058) 
Fixes #17057
 2021-11-26 22:09:11 +01:00
Takeshi Umeda 3b1320f817 Fix performance of tootctl statuses remove (#17052) 
* Fix performance of tootctl statuses remove

* Fix model class
 2021-11-26 22:08:47 +01:00
Claire ad3668eb5f Fix opening wrong profile when clicking on username of boosting user in WebUI (#17060) 
Fixes #16799
 2021-11-26 22:04:09 +01:00
zunda 9270b90d38 Upgrade bootsnap for Ruby 3.0.3 (#17064) 
https://github.com/Shopify/bootsnap/blob/v1.9.3/CHANGELOG.md#193
 2021-11-26 22:03:35 +01:00
Jeong Arm 849a007a2c [Glitch] Port upstream changes about trending links 2021-11-26 11:36:22 +01:00
Takeshi Umeda 8b87566072 Fix ElasticSearch to Elasticsearch (#17050) 2021-11-26 08:30:02 +01:00
OSAMU SATO 20ad635c3c Add batch_size option to bin/tootctl search deploy (#17049) 2021-11-26 08:29:53 +01:00
dependabot[bot] 8b8da5c8f3 Bump sprockets-rails from 3.4.0 to 3.4.1 (#17021) 
Bumps [sprockets-rails](https://github.com/rails/sprockets-rails) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/rails/sprockets-rails/releases)
- [Commits](https://github.com/rails/sprockets-rails/compare/v3.4.0...v3.4.1)

---
updated-dependencies:
- dependency-name: sprockets-rails
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-11-26 14:06:23 +09:00
dependabot[bot] 7c5b119453 Bump eslint-plugin-react from 7.27.0 to 7.27.1 (#17022) 
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.27.0 to 7.27.1.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.27.0...v7.27.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-react
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-11-26 14:06:12 +09:00
dependabot[bot] cc64f5f48f Bump reselect from 4.1.2 to 4.1.4 (#17025) 
Bumps [reselect](https://github.com/reduxjs/reselect) from 4.1.2 to 4.1.4.
- [Release notes](https://github.com/reduxjs/reselect/releases)
- [Changelog](https://github.com/reduxjs/reselect/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/reselect/compare/v4.1.2...v4.1.4)

---
updated-dependencies:
- dependency-name: reselect
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-11-26 14:01:53 +09:00
dependabot[bot] 56e58ef522 Bump @babel/plugin-proposal-decorators from 7.16.0 to 7.16.4 (#17027) 
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators) from 7.16.0 to 7.16.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.16.4/packages/babel-plugin-proposal-decorators)

---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-11-26 14:01:31 +09:00
Eugen Rochko 4375813ea7 Remove Keybase integration (#17045) 2021-11-26 05:58:18 +01:00
Claire 975d5f138e Merge pull request #1637 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2021-11-26 01:25:29 +01:00