Commit graph

12112 commits

Author SHA1 Message Date
ThibG cc6b8a9615
Fix WebUI crash when processing accounts before page is loaded (#14015) 2020-06-09 20:53:20 +02:00
Thibaut Girka 34d92e0233 Disable dependabot 2020-06-09 13:09:17 +02:00
ThibG 3287a10fe9
Merge pull request #1350 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2020-06-09 13:00:24 +02:00
Thibaut Girka e9d7ca7645 [Glitch] Fix WebUI crash when loading account data before page is loaded 2020-06-09 11:55:07 +02:00
Thibaut Girka b826e504b4 Disable E2EE-related routes
Not that I think they are an issue, but the API is likely to change, and
isn't versioned, so I don't want to that be an issue since we also don't
have clear versioning in glitch-soc.
2020-06-09 11:16:42 +02:00
ThibG 00cd919750 [Glitch] Add hotkey for toggling content warning composer field
Port 6b6a9d0ea3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09 11:14:20 +02:00
Thibaut Girka 5e07deefc1 Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 11:12:53 +02:00
ThibG 304721edc1 [Glitch] Improve rendering of emoji which do not contrast with background
Port db319c0fdc to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09 11:07:32 +02:00
Ben Lubar 4657c1a1ca [Glitch] FIX: filters ignore media descriptions
Port c66403b257 to glitch-soc

Co-authored-by: Thibaut Girka <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09 11:02:24 +02:00
ThibG 776aff9656 [Glitch] Hide sensitive preview cards with blurhash
Port 8e96510b25 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09 11:01:31 +02:00
Yamagishi Kazutoshi 2da2f7f7c2 [Glitch] Fix ref attr for react-textarea-autozsize
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09 10:55:52 +02:00
Thibaut Girka 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict due to glitch-soc having to take care of local-only
  pinned toots in that controller.
  Took upstream's changes and restored the local-only special
  handling.
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflicts due to the theming system, applied upstream
  changes, adapted the following two files for glitch-soc's
  theming system:
  - `app/controllers/concerns/sign_in_token_authentication_concern.rb`
  - `app/controllers/concerns/two_factor_authentication_concern.rb`
- `app/services/backup_service.rb`:
  Minor conflict due to glitch-soc having to handle local-only
  toots specially. Applied upstream changes and restored
  the local-only special handling.
- `app/views/admin/custom_emojis/index.html.haml`:
  Minor conflict due to the theming system.
- `package.json`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
- `yarn.lock`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
2020-06-09 10:39:20 +02:00
ThibG 6b6a9d0ea3
Add hotkey for toggling content warning composer field (#13987) 2020-06-09 10:32:32 +02:00
ThibG 89f40b6c3e
Make domain block/silence/reject-media code more robust (#13424)
* Split media cleanup from reject-media domain blocks to its own service

* Slightly improve ClearDomainMediaService error handling

* Lower DomainClearMediaWorker to lowest-priority queue

* Do not catch ActiveRecord::RecordNotFound in domain block workers

* Fix DomainBlockWorker spec labels

* Add some specs

* Change domain blocks to immediately mark accounts as suspended

Rather than doing so sequentially, account after account, while cleaning
their data. This doesn't change much about the time the block takes to
complete, but it immediately prevents interaction with the blocked domain,
while up to now, it would only be guaranteed when the process ends.
2020-06-09 10:32:00 +02:00
Bei Li 384d64894a
Update “status” to “toot” for en.json (#13877) 2020-06-09 10:28:57 +02:00
ThibG db319c0fdc
Improve rendering of emoji which do not contrast with background (#13772)
* Refactor list of emoji requiring added outlines so that it can be theme-specific

* Split inaccessible emoji to emoji requiring an outline and ones that can be inverted

* Drop the “silouhettes” from black emoji as they seem to have changed color

* Add inaccessible emojis list for the light theme

* Use bordered emoji variant instead of unreliable CSS
2020-06-09 10:28:23 +02:00
Mélanie Chauvel ac3c83ef6f
Improve wording and add titles on moderated servers section in /about/more (#13930) 2020-06-09 10:28:02 +02:00
Takeshi Umeda d890abfcab
Fix performance of follow import (#13836) 2020-06-09 10:26:58 +02:00
Eugen Rochko 72a7cfaa39
Add e-mail-based sign in challenge for users with disabled 2FA (#14013) 2020-06-09 10:23:06 +02:00
Takeshi Umeda 8b6d97fb7c
Add limit parameter to rss (#13743) 2020-06-09 00:18:47 +02:00
Takeshi Umeda 13f065da05
Add visibility parameter in share page (#13023)
* Add visibility parameter in share page

* Restrict to default privacy
2020-06-09 00:16:30 +02:00
leo60228 e0f55f374c
Add emojis:generate_borders Rake task (#13773)
* Add emojis:generate_borders Rake task

* Address review

* Border all dark emoji

* Combine stroke with filter to reduce artifacting

* Cleanup Camera with Flash

* Add stroke-linejoin="round"

The previous filter and tweaks were effectively a poor imitation of it.
There are no artifacts for any dark emoji now!

* Set stroke-width using property

This fixes old versions of Firefox.

* Store emoji in string instead of array

* Use separate arguments for each path segment

* Remove "background: black;"
2020-06-09 00:12:20 +02:00
Ben Lubar c66403b257
FIX: filters ignore media descriptions (#13837)
* FIX: filters ignore media descriptions

* remove parentheses to make codeclimate happy

* combine the text and run the regular expression only once.

https://github.com/tootsuite/mastodon/pull/13837#discussion_r431752581

* Fix use of “filter” instead of “compact”, fix coding style issues

Co-authored-by: Thibaut Girka <thib@sitedethib.com>
2020-06-09 00:11:42 +02:00
dependabot[bot] 5e6ec229b2
Bump rubocop from 0.85.0 to 0.85.1 (#14009)
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.85.0 to 0.85.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.85.0...v0.85.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-08 15:57:07 +09:00
dependabot[bot] fbc847db6e
Bump react-immutable-pure-component from 1.2.3 to 2.2.2 (#14010)
Bumps [react-immutable-pure-component](https://github.com/Monar/react-immutable-pure-component) from 1.2.3 to 2.2.2.
- [Release notes](https://github.com/Monar/react-immutable-pure-component/releases)
- [Commits](https://github.com/Monar/react-immutable-pure-component/compare/v1.2.3...v2.2.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-08 15:10:37 +09:00
dependabot[bot] f7263f436d
Bump regexp_parser from 1.7.0 to 1.7.1 (#14008)
Bumps [regexp_parser](https://github.com/ammar/regexp_parser) from 1.7.0 to 1.7.1.
- [Release notes](https://github.com/ammar/regexp_parser/releases)
- [Changelog](https://github.com/ammar/regexp_parser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ammar/regexp_parser/compare/v1.7.0...v1.7.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-08 15:03:45 +09:00
dependabot[bot] 014300001a
Bump pbkdf2 from 3.0.17 to 3.1.1 (#14007)
Bumps [pbkdf2](https://github.com/crypto-browserify/pbkdf2) from 3.0.17 to 3.1.1.
- [Release notes](https://github.com/crypto-browserify/pbkdf2/releases)
- [Commits](https://github.com/crypto-browserify/pbkdf2/compare/v3.0.17...v3.1.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-08 15:02:43 +09:00
dependabot[bot] eed3964207
Bump sanitize from 5.1.0 to 5.2.0 (#14006)
Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.1.0 to 5.2.0.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v5.1.0...v5.2.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-08 15:02:10 +09:00
dependabot[bot] c89dea3ba1
Bump fog-openstack from 0.3.7 to 0.3.10 (#13996)
Bumps [fog-openstack](https://github.com/fog/fog-openstack) from 0.3.7 to 0.3.10.
- [Release notes](https://github.com/fog/fog-openstack/releases)
- [Changelog](https://github.com/fog/fog-openstack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fog/fog-openstack/compare/v0.3.7...v0.3.10)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-08 14:46:58 +09:00
dependabot[bot] 4902ccc501
Bump @babel/plugin-transform-runtime from 7.9.0 to 7.10.1 (#14003)
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.9.0 to 7.10.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.10.1/packages/babel-plugin-transform-runtime)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-08 01:26:52 +09:00
dependabot[bot] 95af5cc91f
Bump aws-sdk-s3 from 1.66.0 to 1.67.1 (#14000)
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.66.0 to 1.67.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/commits)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-07 02:50:28 +09:00
dependabot[bot] 24e9357e4e
Bump copy-webpack-plugin from 6.0.1 to 6.0.2 (#13999)
Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/webpack-contrib/copy-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/copy-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/copy-webpack-plugin/compare/v6.0.1...v6.0.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-07 02:50:01 +09:00
dependabot[bot] b25c24b4f4
Bump is-regex from 1.0.5 to 1.1.0 (#13998)
Bumps [is-regex](https://github.com/ljharb/is-regex) from 1.0.5 to 1.1.0.
- [Release notes](https://github.com/ljharb/is-regex/releases)
- [Changelog](https://github.com/inspect-js/is-regex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ljharb/is-regex/compare/v1.0.5...v1.1.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-07 02:49:27 +09:00
dependabot[bot] 087fe5a25c
Bump aws-sdk-core from 3.96.1 to 3.98.0 (#13992)
Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby) from 3.96.1 to 3.98.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-07 02:48:18 +09:00
dependabot[bot] 1de63fe48a
Bump @babel/preset-react from 7.9.4 to 7.10.1 (#13995)
Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) from 7.9.4 to 7.10.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.10.1/packages/babel-preset-react)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-07 02:47:52 +09:00
ThibG 8e96510b25
Hide sensitive preview cards with blurhash (#13985)
* Use preview card blurhash in WebUI

* Handle sensitive preview cards
2020-06-06 17:41:56 +02:00
dependabot[bot] a3f22bd4ca
Bump websocket-extensions from 0.1.3 to 0.1.4 (#13988)
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06 17:41:44 +02:00
Shlee ef15aa43c7
Update dependabot.yml (Fix #13939) (#13990)
* Update dependabot.yml

* Update dependabot.yml
2020-06-06 17:41:31 +02:00
dependabot[bot] 795f61d66b
Bump jest-cli from 25.4.0 to 25.5.4 (#13977)
Bumps [jest-cli](https://github.com/facebook/jest/tree/HEAD/packages/jest-cli) from 25.4.0 to 25.5.4.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.5.4/packages/jest-cli)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06 09:31:45 +09:00
dependabot[bot] 80372cd54a
Bump babel-eslint from 10.0.3 to 10.1.0 (#13983)
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.3 to 10.1.0.
- [Release notes](https://github.com/babel/babel-eslint/releases)
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.3...v10.1.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06 08:29:20 +09:00
dependabot[bot] fc937d2d7a
Bump terser-webpack-plugin from 3.0.1 to 3.0.3 (#13978)
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 3.0.1 to 3.0.3.
- [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v3.0.1...v3.0.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06 07:27:29 +09:00
dependabot[bot] d914710f89
Bump react-event-listener from 0.6.5 to 0.6.6 (#13982)
Bumps [react-event-listener](https://github.com/oliviertassinari/react-event-listener) from 0.6.5 to 0.6.6.
- [Release notes](https://github.com/oliviertassinari/react-event-listener/releases)
- [Changelog](https://github.com/oliviertassinari/react-event-listener/blob/master/CHANGELOG.md)
- [Commits](https://github.com/oliviertassinari/react-event-listener/compare/v0.6.5...v0.6.6)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06 07:01:15 +09:00
dependabot[bot] 4456482d66
Bump caniuse-lite from 1.0.30001066 to 1.0.30001078 (#13981)
Bumps [caniuse-lite](https://github.com/ben-eb/caniuse-lite) from 1.0.30001066 to 1.0.30001078.
- [Release notes](https://github.com/ben-eb/caniuse-lite/releases)
- [Changelog](https://github.com/ben-eb/caniuse-lite/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ben-eb/caniuse-lite/compare/v1.0.30001066...v1.0.30001078)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06 06:59:37 +09:00
dependabot[bot] 3bca565cc3
Bump vm-browserify from 1.1.0 to 1.1.2 (#13979)
Bumps [vm-browserify](https://github.com/substack/vm-browserify) from 1.1.0 to 1.1.2.
- [Release notes](https://github.com/substack/vm-browserify/releases)
- [Changelog](https://github.com/browserify/vm-browserify/blob/master/CHANGELOG.md)
- [Commits](https://github.com/substack/vm-browserify/compare/v1.1.0...v1.1.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06 06:59:15 +09:00
dependabot[bot] a0ec2d76c7
Bump object.entries from 1.1.1 to 1.1.2 (#13974)
Bumps [object.entries](https://github.com/es-shims/Object.entries) from 1.1.1 to 1.1.2.
- [Release notes](https://github.com/es-shims/Object.entries/releases)
- [Changelog](https://github.com/es-shims/Object.entries/blob/master/CHANGELOG.md)
- [Commits](https://github.com/es-shims/Object.entries/compare/v1.1.1...v1.1.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06 06:58:41 +09:00
dependabot[bot] a9758a8e90
Bump ejs from 2.7.1 to 2.7.4 (#13973)
Bumps [ejs](https://github.com/mde/ejs) from 2.7.1 to 2.7.4.
- [Release notes](https://github.com/mde/ejs/releases)
- [Changelog](https://github.com/mde/ejs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mde/ejs/compare/v2.7.1...v2.7.4)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06 06:58:09 +09:00
dependabot[bot] 8ea9b348a7
Bump postcss-load-config from 2.0.0 to 2.1.0 (#13972)
Bumps [postcss-load-config](https://github.com/michael-ciniawsky/postcss-load-config) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/michael-ciniawsky/postcss-load-config/releases)
- [Changelog](https://github.com/michael-ciniawsky/postcss-load-config/blob/master/CHANGELOG.md)
- [Commits](https://github.com/michael-ciniawsky/postcss-load-config/compare/v2.0.0...v2.1.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06 06:57:57 +09:00
dependabot[bot] 385574ae82
Bump aws-partitions from 1.322.0 to 1.325.0 (#13968)
Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.322.0 to 1.325.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06 06:57:01 +09:00
dependabot[bot] 28d6bc3127
Bump websocket-extensions from 0.1.4 to 0.1.5 (#13967)
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-ruby) from 0.1.4 to 0.1.5.
- [Release notes](https://github.com/faye/websocket-extensions-ruby/releases)
- [Changelog](https://github.com/faye/websocket-extensions-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-ruby/compare/0.1.4...0.1.5)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06 06:56:06 +09:00
dependabot[bot] 4f263d3743
Bump jest-resolve-dependencies from 25.4.0 to 25.5.4 (#13965)
Bumps [jest-resolve-dependencies](https://github.com/facebook/jest/tree/HEAD/packages/jest-resolve-dependencies) from 25.4.0 to 25.5.4.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.5.4/packages/jest-resolve-dependencies)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06 06:50:28 +09:00