]>
cat aescling's git repositories - mastodon.git/log
ThibG [Tue, 23 Jun 2020 15:24:29 +0000 (17:24 +0200)]
[Glitch] Fix very wide media attachments resulting in too thin a thumbnail
Port
d469247083dbbe5d4f09cc9d13a3ebd400e6068e to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Takeshi Umeda [Sat, 20 Jun 2020 11:30:40 +0000 (20:30 +0900)]
[Glitch] Fix modifier key to keep the EmojiPicker on macOS
Port
434a6d0b15ff413c6e4d7e0c3763af6429ad25b6 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
fuyu [Sat, 20 Jun 2020 11:30:27 +0000 (20:30 +0900)]
[Glitch] Fix unnecessary gap under of video modal
Port
cb3c6d17804da67d3c0ff233a9ca1c1902f6926f to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Thibaut Girka [Wed, 24 Jun 2020 13:33:41 +0000 (15:33 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
Conflict due to glitch-soc's theming system.
Ported upstream changes.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
Conflict due to glitch-soc's theming system.
Ported upstream changes.
Eugen Rochko [Wed, 24 Jun 2020 08:25:32 +0000 (10:25 +0200)]
Fix audio/video/images/cards not reacting to window resizes in web UI (#14130)
* Fix audio/video/images/cards not reacting to window resizes in web UI
* Update app/javascript/mastodon/features/audio/index.js
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
ThibG [Tue, 23 Jun 2020 15:24:29 +0000 (17:24 +0200)]
Fix very wide media attachments resulting in too thin a thumbnail (#14127)
Fixes #14094
ThibG [Tue, 23 Jun 2020 14:40:01 +0000 (16:40 +0200)]
Fix crash in MergeWorker (#14129)
Similarly to #12324, the code is passing an Account object where an id
is expected.
Thibaut Girka [Tue, 23 Jun 2020 13:37:45 +0000 (15:37 +0200)]
Simplify filtering condition
ash lea [Sat, 20 Jun 2020 03:01:25 +0000 (20:01 -0700)]
never filter own posts from timeline
ThibG [Tue, 23 Jun 2020 14:01:34 +0000 (16:01 +0200)]
never filter own posts from timeline (#14128)
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Co-authored-by: ash lea <example@thisismyactual.email>
Eugen Rochko [Tue, 23 Jun 2020 10:20:14 +0000 (12:20 +0200)]
Change volume control and download buttons in web UI (#14122)
* Fix audio download button not starting download in web UI
* Fix volume controls on audio and video players in web UI
* Remove download button from video player in web UI
ThibG [Mon, 22 Jun 2020 17:24:16 +0000 (19:24 +0200)]
Fix audio player not working when media files are hosted on a different domain (#14118)
ThibG [Sun, 21 Jun 2020 10:41:38 +0000 (12:41 +0200)]
Fix unique username constraint for local users not being enforced in database (#14099)
This should not be an issue in practice because of the Rails-level uniqueness
check, but local accounts having a NULL domain means the uniqueness constraint
did not apply to them (since no two NULL values are considered equal).
Eugen Rochko [Sun, 21 Jun 2020 00:27:19 +0000 (02:27 +0200)]
Change design of audio players in web UI (#14095)
dependabot[bot] [Sat, 20 Jun 2020 23:32:23 +0000 (08:32 +0900)]
Bump eslint-import-resolver-node from 0.3.3 to 0.3.4 (#14081)
Bumps [eslint-import-resolver-node](https://github.com/benmosher/eslint-plugin-import) from 0.3.3 to 0.3.4.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/resolvers/node/v0.3.3...resolvers/node/v0.3.4)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Sat, 20 Jun 2020 23:32:02 +0000 (08:32 +0900)]
Bump fast-glob from 3.2.2 to 3.2.4 (#14079)
Bumps [fast-glob](https://github.com/mrmlnc/fast-glob) from 3.2.2 to 3.2.4.
- [Release notes](https://github.com/mrmlnc/fast-glob/releases)
- [Commits](https://github.com/mrmlnc/fast-glob/compare/3.2.2...3.2.4)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Sat, 20 Jun 2020 23:30:09 +0000 (08:30 +0900)]
Bump sass from 1.26.5 to 1.26.8 (#14078)
Bumps [sass](https://github.com/sass/dart-sass) from 1.26.5 to 1.26.8.
- [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.26.5...1.26.8)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Sat, 20 Jun 2020 23:28:45 +0000 (08:28 +0900)]
Bump aws-sdk-core from 3.99.2 to 3.100.0 (#14072)
Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby) from 3.99.2 to 3.100.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>
dependabot[bot] [Sat, 20 Jun 2020 23:27:50 +0000 (08:27 +0900)]
Bump nearley from 2.19.3 to 2.19.4 (#14075)
Bumps [nearley](https://github.com/hardmath123/nearley) from 2.19.3 to 2.19.4.
- [Release notes](https://github.com/hardmath123/nearley/releases)
- [Commits](https://github.com/hardmath123/nearley/commits)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Sat, 20 Jun 2020 23:26:21 +0000 (08:26 +0900)]
Bump electron-to-chromium from 1.3.448 to 1.3.475 (#14068)
Bumps [electron-to-chromium](https://github.com/kilian/electron-to-chromium) from 1.3.448 to 1.3.475.
- [Release notes](https://github.com/kilian/electron-to-chromium/releases)
- [Changelog](https://github.com/Kilian/electron-to-chromium/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kilian/electron-to-chromium/compare/v1.3.448...v1.3.475)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Sat, 20 Jun 2020 23:25:05 +0000 (08:25 +0900)]
Bump caniuse-lite from 1.0.
30001078 to 1.0.
30001084 (#14083)
Bumps [caniuse-lite](https://github.com/ben-eb/caniuse-lite) from 1.0.
30001078 to 1.0.
30001084 .
- [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.
30001078 ...v1.0.
30001084 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Takeshi Umeda [Sat, 20 Jun 2020 11:30:40 +0000 (20:30 +0900)]
Fix modifier key to keep the EmojiPicker on macOS (#14096)
fuyu [Sat, 20 Jun 2020 11:30:27 +0000 (20:30 +0900)]
Fix unnecessary gap under of video modal (#14098)
fuyu [Sat, 20 Jun 2020 11:30:13 +0000 (20:30 +0900)]
Fix not working I18n on 2FA and Sign in token page (#14087)
ThibG [Fri, 19 Jun 2020 17:18:47 +0000 (19:18 +0200)]
Fix functional user requirements in whitelist mode (#14093)
Fixes #14092
ThibG [Wed, 17 Jun 2020 16:28:28 +0000 (18:28 +0200)]
Merge pull request #1358 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Eugen Rochko [Sun, 14 Jun 2020 20:29:40 +0000 (22:29 +0200)]
[Glitch] Add hints about incomplete remote content to web UI
Port
3e9dc4044bb7e1ef6131fbd6430ed85b3cc2fcfa to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
ThibG [Mon, 15 Jun 2020 14:43:30 +0000 (16:43 +0200)]
[Glitch] Fix initial audio volume not corresponding to what's displayed
Port
755e8c76ab28a99905c66082757d892939e70c49 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
fuyu [Wed, 10 Jun 2020 19:56:14 +0000 (04:56 +0900)]
[Glitch] Fixed emoji detection problem to append border
Port
b1484cf3ceebe1f1f083e4c06872493dc0a68511 to glitch-soc
Co-authored-by: ThibG <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Thibaut Girka [Wed, 17 Jun 2020 15:10:15 +0000 (17:10 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`: not a real conflict, upstream update too close
to a glitch-soc-specific dependency
dependabot[bot] [Wed, 17 Jun 2020 11:18:43 +0000 (20:18 +0900)]
Bump parallel from 1.19.1 to 1.19.2 (#14069)
Bumps [parallel](https://github.com/grosser/parallel) from 1.19.1 to 1.19.2.
- [Release notes](https://github.com/grosser/parallel/releases)
- [Commits](https://github.com/grosser/parallel/compare/v1.19.1...v1.19.2)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
mayaeh [Wed, 17 Jun 2020 08:31:31 +0000 (17:31 +0900)]
Suppress Redis#exists(key) warning (#14067)
dependabot[bot] [Wed, 17 Jun 2020 04:31:30 +0000 (06:31 +0200)]
Bump capistrano from 3.14.0 to 3.14.1 (#14037)
* Bump capistrano from 3.14.0 to 3.14.1
Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.14.0 to 3.14.1.
- [Release notes](https://github.com/capistrano/capistrano/releases)
- [Commits](https://github.com/capistrano/capistrano/compare/v3.14.0...v3.14.1)
Signed-off-by: dependabot[bot] <support@github.com>
* Bump capistrano from 3.14.0 to 3.14.1
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
mayaeh [Wed, 17 Jun 2020 04:30:57 +0000 (13:30 +0900)]
[Security] Bump rack from 2.2.2 to 2.2.3 (#14064)
dependabot[bot] [Wed, 17 Jun 2020 01:15:54 +0000 (10:15 +0900)]
Bump sanitize from 5.2.0 to 5.2.1 (#14063)
Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.2.0 to 5.2.1.
- [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.2.0...v5.2.1)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Mon, 15 Jun 2020 16:00:56 +0000 (01:00 +0900)]
Bump parallel_tests from 2.32.0 to 3.0.0 (#14044)
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.32.0 to 3.0.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.32.0...v3.0.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Mon, 15 Jun 2020 15:57:20 +0000 (00:57 +0900)]
Bump bundler-audit from 0.6.1 to 0.7.0.1 (#14034)
Bumps [bundler-audit](https://github.com/postmodern/bundler-audit) from 0.6.1 to 0.7.0.1.
- [Release notes](https://github.com/postmodern/bundler-audit/releases)
- [Changelog](https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md)
- [Commits](https://github.com/postmodern/bundler-audit/compare/v0.6.1...v0.7.0.1)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Mon, 15 Jun 2020 14:48:15 +0000 (23:48 +0900)]
Bump jest from 25.4.0 to 26.0.1 (#14056)
Bumps [jest](https://github.com/facebook/jest) from 25.4.0 to 26.0.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v25.4.0...v26.0.1)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
ThibG [Mon, 15 Jun 2020 14:43:30 +0000 (16:43 +0200)]
Fix initial audio volume not corresponding to what's displayed (#14057)
dependabot[bot] [Mon, 15 Jun 2020 14:41:18 +0000 (23:41 +0900)]
Bump excon from 0.73.0 to 0.74.0 (#14046)
Bumps [excon](https://github.com/excon/excon) from 0.73.0 to 0.74.0.
- [Release notes](https://github.com/excon/excon/releases)
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt)
- [Commits](https://github.com/excon/excon/compare/v0.73.0...v0.74.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Mon, 15 Jun 2020 14:38:23 +0000 (23:38 +0900)]
Bump eslint-plugin-import from 2.20.2 to 2.21.2 (#14054)
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.20.2 to 2.21.2.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.20.2...v2.21.2)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Mon, 15 Jun 2020 14:37:30 +0000 (23:37 +0900)]
Bump css-loader from 3.5.3 to 3.6.0 (#14041)
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.5.3 to 3.6.0.
- [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.5.3...v3.6.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Mon, 15 Jun 2020 14:31:04 +0000 (23:31 +0900)]
Bump devise from 4.7.1 to 4.7.2 (#14045)
Bumps [devise](https://github.com/plataformatec/devise) from 4.7.1 to 4.7.2.
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/heartcombo/devise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/devise/compare/v4.7.1...v4.7.2)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Mon, 15 Jun 2020 14:28:56 +0000 (23:28 +0900)]
Bump net-ssh from 6.0.2 to 6.1.0 (#14050)
Bumps [net-ssh](https://github.com/net-ssh/net-ssh) from 6.0.2 to 6.1.0.
- [Release notes](https://github.com/net-ssh/net-ssh/releases)
- [Changelog](https://github.com/net-ssh/net-ssh/blob/master/CHANGES.txt)
- [Commits](https://github.com/net-ssh/net-ssh/compare/v6.0.2...v6.1.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Mon, 15 Jun 2020 14:26:27 +0000 (23:26 +0900)]
Bump rubocop-rails from 2.5.2 to 2.6.0 (#14047)
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.5.2 to 2.6.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.5.2...v2.6.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Mon, 15 Jun 2020 14:25:17 +0000 (23:25 +0900)]
Bump @babel/plugin-transform-react-inline-elements from 7.9.0 to 7.10.1 (#14048)
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements) 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-react-inline-elements)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Mon, 15 Jun 2020 14:22:01 +0000 (23:22 +0900)]
Bump httplog from 1.4.2 to 1.4.3 (#14043)
Bumps [httplog](https://github.com/trusche/httplog) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/trusche/httplog/releases)
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md)
- [Commits](https://github.com/trusche/httplog/compare/v1.4.2...v1.4.3)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Mon, 15 Jun 2020 14:20:20 +0000 (23:20 +0900)]
Bump merge2 from 1.3.0 to 1.4.1 (#14052)
Bumps [merge2](https://github.com/teambition/merge2) from 1.3.0 to 1.4.1.
- [Release notes](https://github.com/teambition/merge2/releases)
- [Commits](https://github.com/teambition/merge2/compare/v1.3.0...v1.4.1)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Mon, 15 Jun 2020 14:19:18 +0000 (23:19 +0900)]
Bump jsx-ast-utils from 2.3.0 to 2.4.1 (#14040)
Bumps [jsx-ast-utils](https://github.com/evcohen/jsx-ast-utils) from 2.3.0 to 2.4.1.
- [Release notes](https://github.com/evcohen/jsx-ast-utils/releases)
- [Changelog](https://github.com/jsx-eslint/jsx-ast-utils/blob/master/CHANGELOG.md)
- [Commits](https://github.com/evcohen/jsx-ast-utils/compare/2.3.0...v2.4.1)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Mon, 15 Jun 2020 14:17:43 +0000 (23:17 +0900)]
Bump node-releases from 1.1.57 to 1.1.58 (#14053)
Bumps [node-releases](https://github.com/chicoxyzzy/node-releases) from 1.1.57 to 1.1.58.
- [Release notes](https://github.com/chicoxyzzy/node-releases/releases)
- [Commits](https://github.com/chicoxyzzy/node-releases/compare/v1.1.57...v1.1.58)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Mon, 15 Jun 2020 14:16:25 +0000 (23:16 +0900)]
Bump opencollective-postinstall from 2.0.2 to 2.0.3 (#14042)
Bumps [opencollective-postinstall](https://github.com/opencollective/opencollective-postinstall) from 2.0.2 to 2.0.3.
- [Release notes](https://github.com/opencollective/opencollective-postinstall/releases)
- [Commits](https://github.com/opencollective/opencollective-postinstall/commits)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Mon, 15 Jun 2020 14:11:20 +0000 (23:11 +0900)]
Bump redis from 4.1.4 to 4.2.1 (#14038)
Bumps [redis](https://github.com/redis/redis-rb) from 4.1.4 to 4.2.1.
- [Release notes](https://github.com/redis/redis-rb/releases)
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v4.1.4...v4.2.1)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Mon, 15 Jun 2020 14:10:30 +0000 (23:10 +0900)]
Bump regenerate from 1.4.0 to 1.4.1 (#14051)
Bumps [regenerate](https://github.com/mathiasbynens/regenerate) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/mathiasbynens/regenerate/releases)
- [Commits](https://github.com/mathiasbynens/regenerate/compare/v1.4.0...v1.4.1)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Mon, 15 Jun 2020 13:46:37 +0000 (22:46 +0900)]
Bump ast from 2.4.0 to 2.4.1 (#14035)
Bumps [ast](https://github.com/whitequark/ast) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/whitequark/ast/releases)
- [Changelog](https://github.com/whitequark/ast/blob/master/CHANGELOG.md)
- [Commits](https://github.com/whitequark/ast/compare/v2.4.0...v2.4.1)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot[bot] [Mon, 15 Jun 2020 13:31:23 +0000 (22:31 +0900)]
Bump aws-sdk-s3 from 1.67.1 to 1.68.1 (#14033)
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.67.1 to 1.68.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>
fuyu [Sun, 14 Jun 2020 23:57:06 +0000 (08:57 +0900)]
Add a default DB_HOST to .env.vagrant for enable the streaming (#14030)
Eugen Rochko [Sun, 14 Jun 2020 20:29:40 +0000 (22:29 +0200)]
Add hints about incomplete remote content to web UI (#14031)
fuyu [Wed, 10 Jun 2020 19:56:14 +0000 (04:56 +0900)]
Fixed emoji detection problem to append border (#14020)
* Fixed emoji detection problem to append border
* Add tests
* Add missing semicolon
* Fixed wrong result when includes different variation selector
* Add missing semicolon
* Remove grapheme-splitter and Change emoji list to array from string
* Update comment
* Remove spaces
Co-authored-by: ThibG <thib@sitedethib.com>
Shlee [Wed, 10 Jun 2020 11:57:30 +0000 (19:57 +0800)]
Update Elasticsearch from 6.1 to 6.8 in docker-compose.yml (Fix glitch-soc#1348) (#14016)
* Update docker-compose.yml
* Update docker-compose.yml
* Update docker-compose.yml
* Update docker-compose.yml
* Update docker-compose.yml
ThibG [Wed, 10 Jun 2020 11:57:13 +0000 (13:57 +0200)]
Fix TL sometimes jumping when closing modals (#14019)
Fixes #14018
ThibG [Wed, 10 Jun 2020 10:12:14 +0000 (12:12 +0200)]
Merge pull request #1356 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Thibaut Girka [Wed, 10 Jun 2020 10:10:26 +0000 (12:10 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream
ThibG [Tue, 9 Jun 2020 18:53:20 +0000 (20:53 +0200)]
Fix WebUI crash when processing accounts before page is loaded (#14015)
Thibaut Girka [Tue, 9 Jun 2020 11:08:38 +0000 (13:08 +0200)]
Disable dependabot
ThibG [Tue, 9 Jun 2020 11:00:24 +0000 (13:00 +0200)]
Merge pull request #1350 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Thibaut Girka [Tue, 9 Jun 2020 09:55:07 +0000 (11:55 +0200)]
[Glitch] Fix WebUI crash when loading account data before page is loaded
Thibaut Girka [Tue, 9 Jun 2020 09:16:42 +0000 (11:16 +0200)]
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.
ThibG [Tue, 9 Jun 2020 08:32:32 +0000 (10:32 +0200)]
[Glitch] Add hotkey for toggling content warning composer field
Port
6b6a9d0ea362f4e301b56ae817f6c5d1761234b6 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Thibaut Girka [Tue, 9 Jun 2020 09:12:53 +0000 (11:12 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream
ThibG [Tue, 9 Jun 2020 08:28:23 +0000 (10:28 +0200)]
[Glitch] Improve rendering of emoji which do not contrast with background
Port
db319c0fdc8a81718a64e0ff905d5ba628551fd2 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Ben Lubar [Mon, 8 Jun 2020 22:11:42 +0000 (17:11 -0500)]
[Glitch] FIX: filters ignore media descriptions
Port
c66403b2579587d8c1448be3ad30dc388d5f29c3 to glitch-soc
Co-authored-by: Thibaut Girka <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
ThibG [Sat, 6 Jun 2020 15:41:56 +0000 (17:41 +0200)]
[Glitch] Hide sensitive preview cards with blurhash
Port
8e96510b2528056e84cf8d0ed68d2e686e566180 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Yamagishi Kazutoshi [Tue, 2 Jun 2020 01:24:04 +0000 (10:24 +0900)]
[Glitch] Fix ref attr for react-textarea-autozsize
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Thibaut Girka [Tue, 9 Jun 2020 08:39:20 +0000 (10:39 +0200)]
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.
ThibG [Tue, 9 Jun 2020 08:32:32 +0000 (10:32 +0200)]
Add hotkey for toggling content warning composer field (#13987)
ThibG [Tue, 9 Jun 2020 08:32:00 +0000 (10:32 +0200)]
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.
Bei Li [Tue, 9 Jun 2020 08:28:57 +0000 (16:28 +0800)]
Update “status” to “toot” for en.json (#13877)
ThibG [Tue, 9 Jun 2020 08:28:23 +0000 (10:28 +0200)]
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
Mélanie Chauvel [Tue, 9 Jun 2020 08:28:02 +0000 (10:28 +0200)]
Improve wording and add titles on moderated servers section in /about/more (#13930)
Takeshi Umeda [Tue, 9 Jun 2020 08:26:58 +0000 (17:26 +0900)]
Fix performance of follow import (#13836)
Eugen Rochko [Tue, 9 Jun 2020 08:23:06 +0000 (10:23 +0200)]
Add e-mail-based sign in challenge for users with disabled 2FA (#14013)
Takeshi Umeda [Mon, 8 Jun 2020 22:18:47 +0000 (07:18 +0900)]
Add limit parameter to rss (#13743)
Takeshi Umeda [Mon, 8 Jun 2020 22:16:30 +0000 (07:16 +0900)]
Add visibility parameter in share page (#13023)
* Add visibility parameter in share page
* Restrict to default privacy
leo60228 [Mon, 8 Jun 2020 22:12:20 +0000 (18:12 -0400)]
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;"
Ben Lubar [Mon, 8 Jun 2020 22:11:42 +0000 (17:11 -0500)]
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>
dependabot[bot] [Mon, 8 Jun 2020 06:57:07 +0000 (15:57 +0900)]
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>
dependabot[bot] [Mon, 8 Jun 2020 06:10:37 +0000 (15:10 +0900)]
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>
dependabot[bot] [Mon, 8 Jun 2020 06:03:45 +0000 (15:03 +0900)]
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>
dependabot[bot] [Mon, 8 Jun 2020 06:02:43 +0000 (15:02 +0900)]
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>
dependabot[bot] [Mon, 8 Jun 2020 06:02:10 +0000 (15:02 +0900)]
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>
dependabot[bot] [Mon, 8 Jun 2020 05:46:58 +0000 (14:46 +0900)]
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>
dependabot[bot] [Sun, 7 Jun 2020 16:26:52 +0000 (01:26 +0900)]
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>
dependabot[bot] [Sat, 6 Jun 2020 17:50:28 +0000 (02:50 +0900)]
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>
dependabot[bot] [Sat, 6 Jun 2020 17:50:01 +0000 (02:50 +0900)]
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>
dependabot[bot] [Sat, 6 Jun 2020 17:49:27 +0000 (02:49 +0900)]
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>
dependabot[bot] [Sat, 6 Jun 2020 17:48:18 +0000 (02:48 +0900)]
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>
dependabot[bot] [Sat, 6 Jun 2020 17:47:52 +0000 (02:47 +0900)]
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>
ThibG [Sat, 6 Jun 2020 15:41:56 +0000 (17:41 +0200)]
Hide sensitive preview cards with blurhash (#13985)
* Use preview card blurhash in WebUI
* Handle sensitive preview cards
dependabot[bot] [Sat, 6 Jun 2020 15:41:44 +0000 (17:41 +0200)]
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>
Shlee [Sat, 6 Jun 2020 15:41:31 +0000 (23:41 +0800)]
Update dependabot.yml (Fix #13939) (#13990)
* Update dependabot.yml
* Update dependabot.yml