about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2021-12-18Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-12-17Add ability for admins to delete canonical email blocks (#16644)Claire
* Add admin option to remove canonical email blocks from a deleted account * Add tootctl canonical_email_blocks to inspect and remove canonical email blocks
2021-12-17Add ability to purge undeliverable domains from admin interface (#16686)Claire
* Add ability to purge undeliverable domains from admin interface * Add tests
2021-12-17Change title of retention chart (#16909)Claire
Changes from “Retention” to “User retention rate by month after sign-up”. This should make it much clearer to people not familiar with retention charts what it actually means.
2021-12-17Change list title input styling (#17092)Claire
2021-12-16Merge pull request #1648 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2021-12-16[Glitch] ignore hashtag suggestions if they vary only in caseDavid Sterry
Port 2aafa5b4e7a83ce8195cd739f1233a52ab060db7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-12-16[Glitch] Show correct error message if chosen password is too longRens Groothuijsen
Port 66baa629ea1c3890d5c631099d41e6af14974d7e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-12-16[Glitch] Add batch suspend for accounts in admin UIEugen Rochko
Port SCSS changes from 2aafa5b4e7a83ce8195cd739f1233a52ab060db7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-12-16Merge branch 'main' into glitch-soc/merge-upstreamClaire
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-15ignore hashtag suggestions if they vary only in case (#16460)David Sterry
* ignore hashtag suggestions if they vary only in case * remove console.logs and unused args * consistently add space when dismissing suggestions * linting
2021-12-13Fix follow recommendation biased towards older accounts (#17126)Takeshi Umeda
2021-12-13Fix incorrect singular version of some translation strings (#17124)Claire
Fixes #17120 Co-authored-by: Mélanie Chauvel <perso@hack-libre.org> Co-authored-by: Mélanie Chauvel <perso@hack-libre.org>
2021-12-13Change trending hashtags threshold back from 15 to 5 (#17122)Eugen Rochko
2021-12-12Add remove orphans to tootctl statuses remove (#17067)Takeshi Umeda
* 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-06Update .dockerignore/.gitignore for #16947 etc (#17099)Shlee
* Update .dockerignore * Update .gitignore
2021-12-05Fix redirection when succeeded WebAuthn (#17098)heguro
2021-12-05Show correct error message if chosen password is too long (#17082)Rens Groothuijsen
* Add correct error message for exceeding max length on password confirmation field * Code style fixes
2021-12-05Add batch suspend for accounts in admin UI (#17009)Eugen Rochko
2021-12-04Bump jest from 27.3.1 to 27.4.3 (#17094)dependabot[bot]
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-04Bump @testing-library/jest-dom from 5.15.1 to 5.16.0 (#17095)dependabot[bot]
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-04Bump reselect from 4.1.4 to 4.1.5 (#17075)dependabot[bot]
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-04Bump redux-thunk from 2.4.0 to 2.4.1 (#17074)dependabot[bot]
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-04Bump ws from 8.2.3 to 8.3.0 (#17076)dependabot[bot]
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-04Bump @testing-library/jest-dom from 5.15.0 to 5.15.1 (#17081)dependabot[bot]
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-04Bump sass from 1.43.4 to 1.43.5 (#17080)dependabot[bot]
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-04Bump babel-jest from 27.3.1 to 27.4.0 (#17078)dependabot[bot]
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-03Fix unneeded outline around list name edition inputClaire
2021-12-01Prevent translations from accidentally becoming completely different from ↵gunchleoc
source strings on Crowdin without translators noticing. (#17085)
2021-11-30Merge pull request #1643 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2021-11-30Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-11-29Fix error on trending mailer due to missing constant (#17072)Eugen Rochko
2021-11-29Bump @babel/plugin-transform-runtime from 7.16.0 to 7.16.4 (#17023)dependabot[bot]
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-29Bump cld3 from 3.4.2 to 3.4.3 (#17047)dependabot[bot]
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-29Bump aws-sdk-s3 from 1.106.0 to 1.107.0 (#17048)dependabot[bot]
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-29Bump @babel/preset-env from 7.16.0 to 7.16.4 (#17024)dependabot[bot]
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-28Fix server graph on admin/tags/:id (#17066)Jeong Arm
2021-11-27Update tootsuite/mastodon Docker tag to v3.4.4 (#17065)Alexandra Catalina
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-11-26Merge pull request #1640 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2021-11-26[Glitch] Fix searching for additional hashtags in hashtag columnClaire
Port 3f382e337d5c40db18995a88c0bf6b1b34f031b7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-11-26[Glitch] Fix color of hashtag column settings inputsClaire
Port 1630807ee2517e7a9dbb66cbd532a0c46e01abcf to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-11-26Merge branch 'main' into glitch-soc/merge-upstreamClaire
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-26Fix admin statuses order(#16937) (#16969)Jeong Arm
* Fix #16937 * Add test for statuses order
2021-11-26Fix searching for additional hashtags in hashtag column (#17054)Claire
2021-11-26Fix color of hashtag column settings inputs (#17058)Claire
Fixes #17057
2021-11-26Fix performance of tootctl statuses remove (#17052)Takeshi Umeda
* Fix performance of tootctl statuses remove * Fix model class
2021-11-26Fix opening wrong profile when clicking on username of boosting user in ↵Claire
WebUI (#17060) Fixes #16799
2021-11-26Upgrade bootsnap for Ruby 3.0.3 (#17064)zunda
https://github.com/Shopify/bootsnap/blob/v1.9.3/CHANGELOG.md#193
2021-11-26[Glitch] Port upstream changes about trending linksJeong Arm
2021-11-26Fix ElasticSearch to Elasticsearch (#17050)Takeshi Umeda