ThibG
817d4a9372
Add --remote-only option to emoji purge ( #12810 )
Fixes #12804
4 years ago
ThibG
51eb111503
Allow blocking TLDs, and fix TLD blocks not being editable ( #12805 )
Fixes #12795
It was already possible to create domain blocks for TLDs, but those
weren't enforced, nor editable. This commit changes it so that they
are enforced and editable.
4 years ago
Thibaut Girka
180f138394
Make prepending “re: ” to CWs on reply optional
4 years ago
ThibG
9871466958
Merge pull request #1261 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
4 years ago
ThibG
5636c94fe9
[Glitch] Fix reuse of detailed status components
Port 12a9813a0c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
4 years ago
Thibaut Girka
578553ba05
Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
Sasha Sorokin
345dd93310
Little improvements to filters settings page ( #12793 )
When you have many filters, it may be hard for you to reach the button
to create yet another one. This commit moves creation button to the
heading, leaving the page just for the list.
On the other hand, when there are no filters, page looks kind of
strange with the empty table. So text stating obvious fact that user
has no filters was added in this commit too.
Closes #11020
Closes #12790
4 years ago
ThibG
12a9813a0c
Fix reuse of detailed status components ( #12792 )
Fixes #12770
4 years ago
dependabot-preview[bot]
7c57c3d2ff
Bump pg from 1.2.0 to 1.2.1 ( #12783 )
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/ged/ruby-pg/releases )
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc )
- [Commits](https://github.com/ged/ruby-pg/compare/v1.2.0...v1.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years ago
dependabot-preview[bot]
74c99e8b18
Bump sass from 1.24.0 to 1.24.2 ( #12778 )
Bumps [sass](https://github.com/sass/dart-sass ) from 1.24.0 to 1.24.2.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.24.0...1.24.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years ago
dependabot-preview[bot]
746c4131ec
Bump aws-sdk-s3 from 1.59.0 to 1.60.1 ( #12784 )
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.59.0 to 1.60.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.59.0...v1.60.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years ago
dependabot-preview[bot]
1d039c27f8
Bump bullet from 6.0.2 to 6.1.0 ( #12782 )
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.0.2 to 6.1.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/6.0.2...6.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years ago
dependabot-preview[bot]
974a015d95
Bump capybara from 3.29.0 to 3.30.0 ( #12781 )
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.29.0 to 3.30.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.29.0...3.30.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years ago
dependabot-preview[bot]
7dcecdfcbd
Bump wavesurfer.js from 3.2.0 to 3.3.0 ( #12775 )
Bumps [wavesurfer.js](https://github.com/katspaugh/wavesurfer.js ) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/katspaugh/wavesurfer.js/releases )
- [Changelog](https://github.com/katspaugh/wavesurfer.js/blob/master/CHANGES.md )
- [Commits](https://github.com/katspaugh/wavesurfer.js/compare/3.2.0...3.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years ago
dependabot-preview[bot]
061233d35d
Bump @clusterws/cws from 0.16.1 to 0.17.3 ( #12776 )
Bumps @clusterws/cws from 0.16.1 to 0.17.3.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years ago
dependabot-preview[bot]
531afaef0f
Bump webpack-dev-server from 3.9.0 to 3.10.1 ( #12773 )
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server ) from 3.9.0 to 3.10.1.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases )
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/v3.10.1/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.9.0...v3.10.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years ago
dependabot-preview[bot]
7a7ef7fb0a
Bump enzyme-adapter-react-16 from 1.15.1 to 1.15.2 ( #12777 )
Bumps [enzyme-adapter-react-16](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme-adapter-react-16 ) from 1.15.1 to 1.15.2.
- [Release notes](https://github.com/airbnb/enzyme/releases )
- [Changelog](https://github.com/airbnb/enzyme/blob/master/CHANGELOG.md )
- [Commits](https://github.com/airbnb/enzyme/commits/enzyme-adapter-react-16@1.15.2/packages/enzyme-adapter-react-16 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years ago
dependabot-preview[bot]
862ba3afad
Bump yargs from 15.0.2 to 15.1.0 ( #12771 )
Bumps [yargs](https://github.com/yargs/yargs ) from 15.0.2 to 15.1.0.
- [Release notes](https://github.com/yargs/yargs/releases )
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yargs/yargs/compare/v15.0.2...v15.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years ago
dependabot-preview[bot]
e6fc490011
Bump css-loader from 3.4.0 to 3.4.1 ( #12772 )
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases )
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.4.0...v3.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years ago
ThibG
bcfd6e3bb4
Merge pull request #1259 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
4 years ago
mayaeh
bd42608be2
Update lockfile for #12758 ( #12762 )
4 years ago
Takeshi Umeda
83359fef2b
[Glitch] Fix shortNumberFormat to within 3 chars without units
Port 0e8c0287d0
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
4 years ago
Thibaut Girka
01eaeab56d
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/application_controller.rb`:
Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
Conflict due to theming system.
4 years ago
Shlee
2ecc7802ca
Gemfile Updates - Others ( #12761 )
* Update Gemfile.lock
* Update Gemfile
* Update Gemfile.lock
* Update Gemfile.lock
* Update Gemfile
* Update Gemfile.lock
4 years ago
Shlee
3537bb1b52
Gemfile Updates - Ruby 2.7 prep ( #12758 )
* Update Gemfile
* Update Gemfile
4 years ago
Shlee
882a7d3d14
Gemfile Updates - fixes warnings ( #12759 )
* Update Gemfile.lock
* Update Gemfile.lock
* Update Gemfile
4 years ago
Eugen Rochko
49b2f7c0a2
Fix base64-encoded file uploads not being possible ( #12748 )
Fix #3804 , Fix #5776
4 years ago
Bastien Durel
500276c99b
fix unresolved external in @clusterws/cws by upgrading it ( #12752 )
4 years ago
Eugen Rochko
59c697a30c
Fix resource_owner_from_credentials in Doorkeeper initializer ( #12743 )
- Nil error when e-mail not found
- LDAP authentication used in place of PAM authentication
4 years ago
Eugen Rochko
4729341903
Fix missing authentication call in filters controller ( #12746 )
4 years ago
Eugen Rochko
83deae5bd7
Fix uncaught unknown format errors in host meta controller ( #12747 )
4 years ago
ThibG
e4d75f238b
Fix URL search not returning private toots user has access to ( #12742 )
4 years ago
Eugen Rochko
6a8c8dc6fb
Fix cache digesting log noise on status embeds ( #12750 )
4 years ago
Bèr Kessels
6c1ba513ee
Add feature test that tests behaviour of profile name and bio ( #12658 )
* Add feature test that tests behaviour of profile name and bio
* Fix rubocop style errors in Login Spec.
* DRY log_in_spec by reusing the stories helper
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
4 years ago
Matt Panaro
9cbbc50fcd
Fix 12661 ( #12744 )
* Revert "persist last-intersected status update and restore when ScrollableList is restored"
This reverts commit 07e26142ef
.
accidentally merged spurious code in https://github.com/tootsuite/mastodon/pull/12661 . https://github.com/tootsuite/mastodon/pull/12735 removes the slowdown that this code was trying to solve; and other functionality successfully restores the view state of the list
* Revert "cache currently-viewing status id to avoid calling redux with identical value"
This reverts commit c93df2159f
.
accidentally merged spurious code in https://github.com/tootsuite/mastodon/pull/12661 . https://github.com/tootsuite/mastodon/pull/12735 removes the slowdown that this code was trying to solve; and other functionality successfully restores the view state of the list
4 years ago
ThibG
aa138ea350
Fix RefollowWorker not keeping show_reblogs setting ( #12707 )
* Fix RefollowWorker not keeping show_reblogs setting
* Fix RefollowWorker
4 years ago
Eugen Rochko
09d54d1f62
Fix uncaught query param encoding errors ( #12741 )
4 years ago
Sasha Sorokin
9edab7afaf
Add translation project promotion link ( #12736 )
This commit adds promotional notice on appearance settings about
translation project if any other locale than English is used. It
allows users to learn and contribute translations to Mastodon.
Step ahead, in this commit one unusual string is added - link to a
guide. By default it refers to Crowdin project itself, but if any of
Mastodon localization teams established their own guide, they can
refer it. Or, if Crowdin supports localized domain for language, it
can also be put there (e.g. https://fr.crowdin.com/ ...).
4 years ago
Matt Panaro
2a5da8c961
refactor IntersectionObserver to observe viewport in single-column mode ( #12735 )
4 years ago
ThibG
3b3bdc7293
Hide blocked users from more places ( #12733 )
* Hide blocked, muted, and blocked-by users from toot favourite lists
* Hide blocked, muted, and blocked-by users from toot reblog lists
* Hide blocked, muted, and blocked-by users from followers/following (API)
* Fix tests
* Hide blocked, muted, and blocked-by users from followers/following on public pages
4 years ago
Eugen Rochko
2999c95596
Fix error when fetching followers/following from REST API when user has network hidden ( #12716 )
Fix #12510
4 years ago
Eugen Rochko
f86ee4b59f
Fix IDN mentions not being processed, IDN domains not being rendered ( #12715 )
This changes the REST API to return unicode domains in the `acct`
attribute instead of punycode, and to render unicode instead of
punycode on public HTML pages as well.
Fix #7812 , fix #12246
4 years ago
ThibG
b2f81060b7
Remove unused AccountRelationshipsPresenter call in public pages ( #12734 )
Those were used to show a “follow” or “unfollow” button on account grid on
public pages, but that got removed a while ago.
4 years ago
Eugen Rochko
bb27ca14ef
Fix error when searching for empty phrase ( #12711 )
Fix #12619
4 years ago
dependabot-preview[bot]
108e390d23
Bump webpack from 4.41.2 to 4.41.5 ( #12724 )
Bumps [webpack](https://github.com/webpack/webpack ) from 4.41.2 to 4.41.5.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.41.2...v4.41.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years ago
dependabot-preview[bot]
5c8a8bf798
Bump stackprof from 0.2.14 to 0.2.15 ( #12726 )
Bumps [stackprof](https://github.com/tmm1/stackprof ) from 0.2.14 to 0.2.15.
- [Release notes](https://github.com/tmm1/stackprof/releases )
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md )
- [Commits](https://github.com/tmm1/stackprof/compare/v0.2.14...v0.2.15 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years ago
dependabot-preview[bot]
d5f93ea618
Bump pg from 1.1.4 to 1.2.0 ( #12725 )
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.1.4 to 1.2.0.
- [Release notes](https://github.com/ged/ruby-pg/releases )
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc )
- [Commits](https://github.com/ged/ruby-pg/compare/v1.1.4...v1.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years ago
dependabot-preview[bot]
a439fc7f72
Bump redis-namespace from 1.6.0 to 1.7.0 ( #12727 )
Bumps [redis-namespace](https://github.com/resque/redis-namespace ) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/resque/redis-namespace/releases )
- [Changelog](https://github.com/resque/redis-namespace/blob/master/CHANGELOG.md )
- [Commits](https://github.com/resque/redis-namespace/compare/v1.6.0...v1.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years ago
dependabot-preview[bot]
333009d8b1
Bump faker from 2.9.0 to 2.10.0 ( #12728 )
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.9.0 to 2.10.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.9.0...v2.10.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years ago
dependabot-preview[bot]
a2fe2e98ee
Bump react-test-renderer from 16.11.0 to 16.12.0 ( #12721 )
Bumps [react-test-renderer](https://github.com/facebook/react/tree/HEAD/packages/react-test-renderer ) from 16.11.0 to 16.12.0.
- [Release notes](https://github.com/facebook/react/releases )
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/react/commits/v16.12.0/packages/react-test-renderer )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years ago