939034fe2a
Merge pull request #1650 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
b3d1cf4cfe
Revert "Change workflow to push to Docker Hub ( #16980 )"
...
This reverts commit fc187cefdf
3 years ago
77e23e2005
[Glitch] Change title of retention chart
...
Port 36347cf494
3 years ago
65987b3956
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
d8da1689c1
Add ability for admins to delete canonical email blocks ( #16644 )
...
* Add admin option to remove canonical email blocks from a deleted account
* Add tootctl canonical_email_blocks to inspect and remove canonical email blocks
3 years ago
44c8b6ff2f
Add ability to purge undeliverable domains from admin interface ( #16686 )
...
* Add ability to purge undeliverable domains from admin interface
* Add tests
3 years ago
36347cf494
Change title of retention chart ( #16909 )
...
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.
3 years ago
1e34cfabdd
Change list title input styling ( #17092 )
3 years ago
145680c2cd
Merge pull request #1648 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
8962f00ec8
[Glitch] ignore hashtag suggestions if they vary only in case
...
Port 65ee707755
3 years ago
a5d9a408e3
[Glitch] Show correct error message if chosen password is too long
...
Port 8143d127a4
3 years ago
ee4be446b6
[Glitch] Add batch suspend for accounts in admin UI
...
Port SCSS changes from 65ee707755
3 years ago
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.
3 years ago
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
3 years ago
794d9d267d
Fix follow recommendation biased towards older accounts ( #17126 )
3 years ago
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>
3 years ago
2c6be5dc9a
Change trending hashtags threshold back from 15 to 5 ( #17122 )
3 years ago
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
3 years ago
394b4e927b
Update .dockerignore/.gitignore for #16947 etc ( #17099 )
...
* Update .dockerignore
* Update .gitignore
3 years ago
2b292c44bc
Fix redirection when succeeded WebAuthn ( #17098 )
3 years ago
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
3 years ago
7bf5924339
Add batch suspend for accounts in admin UI ( #17009 )
3 years ago
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>
3 years ago
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>
3 years ago
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>
3 years ago
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>
3 years ago
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>
3 years ago
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>
3 years ago
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>
3 years ago
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>
3 years ago
4359fa92da
Fix unneeded outline around list name edition input
3 years ago
c56dd75d08
Prevent translations from accidentally becoming completely different from source strings on Crowdin without translators noticing. ( #17085 )
3 years ago
561fdb9d5d
Merge pull request #1643 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
efeabec5eb
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
f3966223bd
Fix error on trending mailer due to missing constant ( #17072 )
3 years ago
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>
3 years ago
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>
3 years ago
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>
3 years ago
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>
3 years ago
cb22372cd7
Fix server graph on admin/tags/:id ( #17066 )
3 years ago
777075f322
Update tootsuite/mastodon Docker tag to v3.4.4 ( #17065 )
...
Co-authored-by: Renovate Bot <bot@renovateapp.com>
3 years ago
30c2546463
Merge pull request #1640 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
b22b76a571
[Glitch] Fix searching for additional hashtags in hashtag column
...
Port 5305dada6c
3 years ago
9565dc366d
[Glitch] Fix color of hashtag column settings inputs
...
Port 986391cd19
3 years ago
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.
3 years ago
5ac17e3a77
Fix admin statuses order( #16937 ) ( #16969 )
...
* Fix #16937
* Add test for statuses order
3 years ago
5305dada6c
Fix searching for additional hashtags in hashtag column ( #17054 )
3 years ago
986391cd19
Fix color of hashtag column settings inputs ( #17058 )
...
Fixes #17057
3 years ago
3b1320f817
Fix performance of tootctl statuses remove ( #17052 )
...
* Fix performance of tootctl statuses remove
* Fix model class
3 years ago
ad3668eb5f
Fix opening wrong profile when clicking on username of boosting user in WebUI ( #17060 )
...
Fixes #16799
3 years ago
Claire
David Sterry
Rens Groothuijsen
Eugen Rochko
Takeshi Umeda
Shlee
heguro
dependabot[bot]
gunchleoc
Jeong Arm
Alexandra Catalina