monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,225 Commits 1 Branch 0 Tags 261 MiB
Commit Graph

751 Commits

Author SHA1 Message Date
Thibaut Girka 578553ba05 Merge branch 'master' into glitch-soc/merge-upstream 2020-01-07 16:28:59 +01:00
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>
 2020-01-06 23:03:26 +09:00
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>
 2020-01-06 22:44:42 +09:00
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>
 2020-01-06 22:44:02 +09:00
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>
 2020-01-06 22:30:00 +09:00
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>
 2020-01-06 19:42:03 +09:00
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>
 2020-01-06 19:41:02 +09:00
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>
 2020-01-06 19:39:37 +09:00
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.
 2020-01-04 23:04:42 +01:00
Bastien Durel 500276c99b fix unresolved external in @clusterws/cws by upgrading it (#12752) 2020-01-03 19:57:25 +09:00
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>
 2019-12-31 01:49:08 +09:00
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>
 2019-12-31 00:14:42 +09:00
dependabot-preview[bot] 6245075158 Bump is-nan from 1.2.1 to 1.3.0 (#12723) 
Bumps [is-nan](https://github.com/es-shims/is-nan) from 1.2.1 to 1.3.0.
- [Release notes](https://github.com/es-shims/is-nan/releases)
- [Changelog](https://github.com/es-shims/is-nan/blob/master/CHANGELOG.md)
- [Commits](https://github.com/es-shims/is-nan/compare/v1.2.1...v1.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-31 00:07:27 +09:00
dependabot-preview[bot] 3902b7677a Bump terser-webpack-plugin from 2.2.2 to 2.3.1 (#12722) 
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 2.2.2 to 2.3.1.
- [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/v2.2.2...v2.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-30 23:56:23 +09:00
dependabot-preview[bot] ed34c0401a Bump @babel/core from 7.7.5 to 7.7.7 (#12720) 
Bumps [@babel/core](https://github.com/babel/babel) from 7.7.5 to 7.7.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.5...v7.7.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-30 23:55:03 +09:00
dependabot-preview[bot] 0242f8ae8b Bump redux from 4.0.4 to 4.0.5 (#12719) 
Bumps [redux](https://github.com/reduxjs/redux) from 4.0.4 to 4.0.5.
- [Release notes](https://github.com/reduxjs/redux/releases)
- [Changelog](https://github.com/reduxjs/redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/redux/compare/v4.0.4...v4.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-30 23:54:43 +09:00
dependabot-preview[bot] 54e6c1c47e Bump eslint from 6.7.2 to 6.8.0 (#12717) 
Bumps [eslint](https://github.com/eslint/eslint) from 6.7.2 to 6.8.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v6.7.2...v6.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-30 21:54:04 +09:00
Thibaut Girka ad29279214 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`
- `package.json`
 2019-12-28 17:48:40 +01:00
dependabot-preview[bot] 7ff7ca8c7c [Security] Bump handlebars from 4.2.0 to 4.5.3 (#12694) 
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.2.0 to 4.5.3. **This update includes a security fix.**
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.2.0...v4.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-27 11:41:55 +09:00
dependabot-preview[bot] 8e2cbade79 Bump @babel/runtime from 7.7.6 to 7.7.7 (#12670) 
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.7.6 to 7.7.7.
- [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.7.7/packages/babel-runtime)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-25 09:15:31 +09:00
dependabot-preview[bot] 14cca940d9 Bump enzyme from 3.10.0 to 3.11.0 (#12675) 
Bumps [enzyme](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme) from 3.10.0 to 3.11.0.
- [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@3.11.0/packages/enzyme)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-25 09:15:03 +09:00
dependabot-preview[bot] 038a1246f5 Bump object.values from 1.1.0 to 1.1.1 (#12625) 
Bumps [object.values](https://github.com/es-shims/Object.values) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/es-shims/Object.values/releases)
- [Changelog](https://github.com/es-shims/Object.values/blob/master/CHANGELOG.md)
- [Commits](https://github.com/es-shims/Object.values/compare/v1.1.0...v1.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-25 03:15:44 +09:00
dependabot-preview[bot] 504763dd06 Bump @babel/preset-env from 7.7.6 to 7.7.7 (#12672) 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.6 to 7.7.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.6...v7.7.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-25 02:42:11 +09:00
dependabot-preview[bot] 530ac83cc1 Bump css-loader from 3.3.2 to 3.4.0 (#12673) 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.3.2 to 3.4.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.3.2...v3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-25 02:40:58 +09:00
dependabot-preview[bot] ec6de73001 Bump mini-css-extract-plugin from 0.8.0 to 0.9.0 (#12674) 
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 0.8.0 to 0.9.0.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v0.8.0...v0.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-25 02:38:44 +09:00
dependabot-preview[bot] d29655c495 Bump sass from 1.23.3 to 1.24.0 (#12676) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.23.3 to 1.24.0.
- [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.23.3...1.24.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-25 02:33:12 +09:00
dependabot-preview[bot] 41854528ee Bump array-includes from 3.1.0 to 3.1.1 (#12671) 
Bumps [array-includes](https://github.com/es-shims/array-includes) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/es-shims/array-includes/releases)
- [Changelog](https://github.com/es-shims/array-includes/blob/master/CHANGELOG.md)
- [Commits](https://github.com/es-shims/array-includes/compare/v3.1.0...v3.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-25 02:25:51 +09:00
Thibaut Girka ab5ff638f2 Merge branch 'master' into glitch-soc/master 
Conflicts:
- `config/locales/en.yml`
  No real conflict, upstream added a translatable string “too close” to
  one specific to glitch-soc
- `lib/mastodon/statuses_cli.rb`
  Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses
- `package.json`
  No real conflict, additional dependency in glitch-soc
 2019-12-19 13:52:54 +01:00
dependabot-preview[bot] 9dc2fc9ec6 Bump react-redux from 7.1.1 to 7.1.3 (#12626) 
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.1.1 to 7.1.3.
- [Release notes](https://github.com/reduxjs/react-redux/releases)
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/react-redux/compare/v7.1.1...v7.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 03:54:42 +09:00
dependabot-preview[bot] 08f48cbeb4 Bump eslint-plugin-import from 2.19.0 to 2.19.1 (#12622) 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.19.0 to 2.19.1.
- [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.19.0...v2.19.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 03:42:25 +09:00
dependabot-preview[bot] b6b2757fc7 Bump copy-webpack-plugin from 5.0.5 to 5.1.1 (#12621) 
Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin) from 5.0.5 to 5.1.1.
- [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/v5.0.5...v5.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 03:42:02 +09:00
dependabot-preview[bot] 80fb452446 Bump css-loader from 3.2.0 to 3.3.2 (#12624) 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.2.0 to 3.3.2.
- [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.2.0...v3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 03:41:49 +09:00
dependabot-preview[bot] 49d1190a97 Bump array-includes from 3.0.3 to 3.1.0 (#12627) 
Bumps [array-includes](https://github.com/es-shims/array-includes) from 3.0.3 to 3.1.0.
- [Release notes](https://github.com/es-shims/array-includes/releases)
- [Changelog](https://github.com/es-shims/array-includes/blob/master/CHANGELOG.md)
- [Commits](https://github.com/es-shims/array-includes/compare/v3.0.3...v3.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 03:40:34 +09:00
dependabot-preview[bot] 0aaedcd66f Bump @babel/preset-env from 7.7.4 to 7.7.6 (#12623) 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.4 to 7.7.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.4...v7.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 10:20:49 +09:00
dependabot-preview[bot] 7e736d77dd Bump compression-webpack-plugin from 3.0.0 to 3.0.1 (#12620) 
Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/v3.0.1/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v3.0.0...v3.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 10:19:58 +09:00
Thibaut Girka be4849c083 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb
  Minor conflict due to glitch-soc's theming system
 2019-12-12 15:40:06 +01:00
dependabot-preview[bot] c7a9e14c46 Bump yargs from 13.3.0 to 15.0.2 (#12574) 
Bumps [yargs](https://github.com/yargs/yargs) from 13.3.0 to 15.0.2.
- [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/v13.3.0...v15.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 20:37:37 +09:00
dependabot-preview[bot] 5ff2d8c247 Bump es6-symbol from 3.1.2 to 3.1.3 (#12577) 
Bumps [es6-symbol](https://github.com/medikoo/es6-symbol) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/medikoo/es6-symbol/releases)
- [Changelog](https://github.com/medikoo/es6-symbol/blob/master/CHANGELOG.md)
- [Commits](https://github.com/medikoo/es6-symbol/compare/v3.1.2...v3.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 20:37:08 +09:00
dependabot-preview[bot] c2fa1b9ca9 Bump eslint-plugin-import from 2.18.2 to 2.19.0 (#12580) 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.18.2 to 2.19.0.
- [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.18.2...v2.19.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 20:36:28 +09:00
dependabot-preview[bot] c89a686ea4 Bump @babel/core from 7.7.4 to 7.7.5 (#12578) 
Bumps [@babel/core](https://github.com/babel/babel) from 7.7.4 to 7.7.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.4...v7.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 20:32:52 +09:00
dependabot-preview[bot] cc87e9ec70 Bump @babel/runtime from 7.7.4 to 7.7.6 (#12579) 
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.7.4 to 7.7.6.
- [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.7.6/packages/babel-runtime)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 20:32:26 +09:00
dependabot-preview[bot] 5c0113b34e Bump @babel/plugin-transform-runtime from 7.7.4 to 7.7.6 (#12575) 
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.7.4 to 7.7.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.4...v7.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 20:31:53 +09:00
dependabot-preview[bot] a45ba1c701 Bump react from 16.10.2 to 16.12.0 (#12573) 
Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.10.2 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)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 20:31:03 +09:00
dependabot-preview[bot] fa8ce9da81 Bump terser-webpack-plugin from 2.2.1 to 2.2.2 (#12576) 
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 2.2.1 to 2.2.2.
- [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/v2.2.1...v2.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-11 01:03:00 +01:00
Thibaut Girka abcba5c198 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- package.json
  Not really a conflict, caused by an additional dependency in glitch-soc.
- yarn.lock
  Not really a conflict, caused by an additional dependency in glitch-soc.
 2019-12-07 12:28:59 +01:00
Shlee f92ed32df4 upgrade/replace websocket.js to @gamestdio/websocket v2 (#12543) 
* Update stream.js

* Update package.json

* Update yarn.lock

Co-authored-by: hina <hina@hinaloe.net>
 2019-12-04 20:45:49 +09:00
dependabot-preview[bot] 307f123808 Bump autoprefixer from 9.6.1 to 9.7.3 (#12519) 
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.6.1 to 9.7.3.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/9.6.1...9.7.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-03 02:37:22 +09:00
dependabot-preview[bot] c7da6db28d Bump eslint-plugin-react from 7.16.0 to 7.17.0 (#12524) 
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.16.0 to 7.17.0.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.16.0...v7.17.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-03 00:55:32 +09:00
dependabot-preview[bot] f61d8da9f4 Bump blurhash from 1.0.0 to 1.1.3 (#12411) 
Bumps [blurhash](https://github.com/woltapp/blurhash) from 1.0.0 to 1.1.3.
- [Release notes](https://github.com/woltapp/blurhash/releases)
- [Commits](https://github.com/woltapp/blurhash/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 23:18:59 +09:00
dependabot-preview[bot] c54e04d1b2 Bump arrow-key-navigation from 1.0.2 to 1.1.0 (#12523) 
Bumps [arrow-key-navigation](https://github.com/nolanlawson/arrow-key-navigation) from 1.0.2 to 1.1.0.
- [Release notes](https://github.com/nolanlawson/arrow-key-navigation/releases)
- [Commits](https://github.com/nolanlawson/arrow-key-navigation/compare/v1.0.2...v1.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 22:59:12 +09:00
dependabot-preview[bot] 4eb54e5e76 Bump rails-ujs from 5.2.3 to 5.2.4 (#12526) 
Bumps [rails-ujs](https://github.com/rails/rails) from 5.2.3 to 5.2.4.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.3...v5.2.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 22:55:08 +09:00
dependabot-preview[bot] ab1b6cf8b0 Bump eslint from 6.5.1 to 6.7.2 (#12522) 
Bumps [eslint](https://github.com/eslint/eslint) from 6.5.1 to 6.7.2.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v6.5.1...v6.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-02 22:53:03 +09:00
Yamagishi Kazutoshi 9e34cf9a86 Remove unnecessary dependencies (#12533) 2019-12-02 13:38:53 +01:00
Thibaut Girka 2b7158427f Merge branch 'master' into glitch-soc/merge-upstream 2019-11-30 17:29:44 +01:00
dependabot-preview[bot] b8f798db54 Bump @babel/plugin-transform-react-inline-elements from 7.2.0 to 7.7.4 (#12467) 
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel) from 7.2.0 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.2.0...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 13:13:55 +09:00
dependabot-preview[bot] c54002e520 Bump @babel/preset-env from 7.7.1 to 7.7.4 (#12471) 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.1 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.1...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 12:24:13 +09:00
dependabot-preview[bot] 5449da285c Bump @babel/plugin-transform-react-jsx-self from 7.2.0 to 7.7.4 (#12466) 
Bumps [@babel/plugin-transform-react-jsx-self](https://github.com/babel/babel) from 7.2.0 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.2.0...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 11:36:47 +09:00
dependabot-preview[bot] de662961df Bump @babel/plugin-syntax-dynamic-import from 7.2.0 to 7.7.4 (#12469) 
Bumps [@babel/plugin-syntax-dynamic-import](https://github.com/babel/babel) from 7.2.0 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.2.0...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 11:36:29 +09:00
dependabot-preview[bot] 257d816c99 Bump @babel/runtime from 7.7.2 to 7.7.4 (#12472) 
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.7.2 to 7.7.4.
- [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.7.4/packages/babel-runtime)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 11:36:09 +09:00
dependabot-preview[bot] c2441e4e1d Bump @babel/plugin-transform-runtime from 7.5.5 to 7.7.4 (#12473) 
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.5.5 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.5...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 11:35:39 +09:00
ThibG 00b8704a32 Revert "Bump tesseract.js from 2.0.0-alpha.16 to 2.0.0-beta.2 (#12311)" (#12454) 
This reverts commit 0c20442605.
 2019-11-24 12:16:41 +09:00
Thibaut Girka ff67385cfb Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
  discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
  finally merged upstream, some code style fixes
  and slightly changed pagination code
- app/controllers/application_controller.rb
  changed upstream to always return HTML error pages
  slight conflict caused by theming code
- app/models/bookmark.rb
  finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
  finally merged upstream, slightly changed pagination code
 2019-11-20 15:36:09 +01:00
dependabot-preview[bot] 5f0cba2561 Bump react-dom from 16.11.0 to 16.12.0 (#12415) 
Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) 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-dom)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-20 05:28:00 +09:00
dependabot-preview[bot] e8de558ee7 Bump glob from 7.1.5 to 7.1.6 (#12413) 
Bumps [glob](https://github.com/isaacs/node-glob) from 7.1.5 to 7.1.6.
- [Release notes](https://github.com/isaacs/node-glob/releases)
- [Changelog](https://github.com/isaacs/node-glob/blob/master/changelog.md)
- [Commits](https://github.com/isaacs/node-glob/compare/v7.1.5...v7.1.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-18 23:04:53 +09:00
dependabot-preview[bot] 6e8d6ba3b7 Bump babel-plugin-preval from 3.0.1 to 4.0.0 (#12414) 
Bumps [babel-plugin-preval](https://github.com/kentcdodds/babel-plugin-preval) from 3.0.1 to 4.0.0.
- [Release notes](https://github.com/kentcdodds/babel-plugin-preval/releases)
- [Changelog](https://github.com/kentcdodds/babel-plugin-preval/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/babel-plugin-preval/compare/v3.0.1...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-18 22:43:49 +09:00
dependabot-preview[bot] 258539b2c5 Bump react-textarea-autosize from 7.1.0 to 7.1.2 (#12412) 
Bumps [react-textarea-autosize](https://github.com/andreypopp/react-textarea-autosize) from 7.1.0 to 7.1.2.
- [Release notes](https://github.com/andreypopp/react-textarea-autosize/releases)
- [Commits](https://github.com/andreypopp/react-textarea-autosize/compare/v7.1.0...v7.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-18 22:30:10 +09:00
dependabot-preview[bot] 7f65eff6c3 Bump @babel/preset-react from 7.6.3 to 7.7.0 (#12410) 
Bumps [@babel/preset-react](https://github.com/babel/babel) from 7.6.3 to 7.7.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.3...v7.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-18 22:21:52 +09:00
dependabot-preview[bot] 88ef210af2 Bump copy-webpack-plugin from 5.0.4 to 5.0.5 (#12408) 
Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin) from 5.0.4 to 5.0.5.
- [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/v5.0.4...v5.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-18 22:10:46 +09:00
dependabot-preview[bot] 4bf2e080f4 Bump react-select from 3.0.5 to 3.0.8 (#12407) 
Bumps [react-select](https://github.com/JedWatson/react-select) from 3.0.5 to 3.0.8.
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/.sweet-changelogs.js)
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@3.0.5...react-select@3.0.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-18 22:07:31 +09:00
dependabot-preview[bot] c31bc41a02 Bump @babel/core from 7.4.5 to 7.7.2 (#12350) 
Bumps [@babel/core](https://github.com/babel/babel) from 7.4.5 to 7.7.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.5...v7.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-12 00:25:34 +09:00
dependabot-preview[bot] ee820caf97 Bump @babel/plugin-proposal-decorators from 7.6.0 to 7.7.0 (#12348) 
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel) from 7.6.0 to 7.7.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.0...v7.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-11 22:52:24 +09:00
dependabot-preview[bot] acf132b477 Bump @babel/runtime from 7.7.1 to 7.7.2 (#12351) 
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.7.1 to 7.7.2.
- [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.7.2/packages/babel-runtime)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-11 22:51:32 +09:00
dependabot-preview[bot] 4cade42b02 Bump enzyme-adapter-react-16 from 1.14.0 to 1.15.1 (#12353) 
Bumps [enzyme-adapter-react-16](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme-adapter-react-16) from 1.14.0 to 1.15.1.
- [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.1/packages/enzyme-adapter-react-16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-11 22:50:55 +09:00
dependabot-preview[bot] 58faefe0a5 Bump babel-plugin-react-intl from 3.1.3 to 3.4.1 (#12352) 
Bumps [babel-plugin-react-intl](https://github.com/formatjs/formatjs) from 3.1.3 to 3.4.1.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/babel-plugin-react-intl@3.1.3...babel-plugin-react-intl@3.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-11 22:45:58 +09:00
dependabot-preview[bot] bc1af899b1 Bump react-notification from 6.8.4 to 6.8.5 (#12349) 
Bumps [react-notification](https://github.com/pburtchaell/react-notification) from 6.8.4 to 6.8.5.
- [Release notes](https://github.com/pburtchaell/react-notification/releases)
- [Commits](https://github.com/pburtchaell/react-notification/compare/6.8.4...6.8.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-11 22:24:27 +09:00
dependabot-preview[bot] 6cbaaac270 Bump uuid from 3.3.2 to 3.3.3 (#12347) 
Bumps [uuid](https://github.com/kelektiv/node-uuid) from 3.3.2 to 3.3.3.
- [Release notes](https://github.com/kelektiv/node-uuid/releases)
- [Changelog](https://github.com/kelektiv/node-uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kelektiv/node-uuid/compare/v3.3.2...v3.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-11 22:22:06 +09:00
dependabot-preview[bot] 11cb5e6521 Bump @babel/plugin-proposal-class-properties from 7.5.5 to 7.7.0 (#12346) 
Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel) from 7.5.5 to 7.7.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.5...v7.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-11 22:17:22 +09:00
dependabot-preview[bot] ac1709c3e1 Bump @clusterws/cws from 0.15.2 to 0.16.0 (#12345) 
Bumps @clusterws/cws from 0.15.2 to 0.16.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-11 22:15:31 +09:00
Thibaut Girka 83774367d2 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
  conflict because of the poll option limit being different than upstream's
 2019-11-07 13:43:56 +01:00
dependabot-preview[bot] 699427777a Bump sass-loader from 7.1.0 to 8.0.0 (#12027) 
* Bump sass-loader from 7.1.0 to 8.0.0

Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 7.1.0 to 8.0.0.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v7.1.0...v8.0.0)

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

* bump webpack
 2019-11-07 01:15:20 +09:00
dependabot-preview[bot] 0e4e536036 Bump @babel/runtime from 7.6.0 to 7.7.1 (#12317) 
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.6.0 to 7.7.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.7.1/packages/babel-runtime)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-07 00:55:46 +09:00
dependabot-preview[bot] 2a08acac4a Bump @babel/preset-env from 7.6.0 to 7.7.1 (#12318) 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.6.0 to 7.7.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/compare/v7.6.0...v7.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-07 00:55:22 +09:00
dependabot-preview[bot] 0c20442605 Bump tesseract.js from 2.0.0-alpha.16 to 2.0.0-beta.2 (#12311) 
Bumps [tesseract.js](https://github.com/naptha/tesseract.js) from 2.0.0-alpha.16 to 2.0.0-beta.2.
- [Release notes](https://github.com/naptha/tesseract.js/releases)
- [Commits](https://github.com/naptha/tesseract.js/compare/v2.0.0-alpha.16...v2.0.0-beta.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-07 00:14:46 +09:00
dependabot-preview[bot] 4c86b1181d Bump glob from 7.1.4 to 7.1.5 (#12312) 
Bumps [glob](https://github.com/isaacs/node-glob) from 7.1.4 to 7.1.5.
- [Release notes](https://github.com/isaacs/node-glob/releases)
- [Changelog](https://github.com/isaacs/node-glob/blob/master/changelog.md)
- [Commits](https://github.com/isaacs/node-glob/compare/v7.1.4...v7.1.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-07 00:14:26 +09:00
dependabot-preview[bot] c4cf93f787 Bump sass from 1.23.1 to 1.23.3 (#12314) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.23.1 to 1.23.3.
- [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.23.1...1.23.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-07 00:12:48 +09:00
dependabot-preview[bot] 80b1a72742 Bump @babel/preset-react from 7.0.0 to 7.6.3 (#12315) 
Bumps [@babel/preset-react](https://github.com/babel/babel) from 7.0.0 to 7.6.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.0.0...v7.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-07 00:11:08 +09:00
Thibaut Girka 0ae7d84273 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`
 2019-11-06 14:38:28 +01:00
dependabot-preview[bot] 42d9ca21de Bump webpack-cli from 3.3.9 to 3.3.10 (#12297) 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.9 to 3.3.10.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.10/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.9...v3.3.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-05 00:28:47 +09:00
dependabot-preview[bot] d84aca66ea Bump react-overlays from 0.8.3 to 0.9.1 (#12298) 
Bumps [react-overlays](https://github.com/react-bootstrap/react-overlays) from 0.8.3 to 0.9.1.
- [Release notes](https://github.com/react-bootstrap/react-overlays/releases)
- [Changelog](https://github.com/react-bootstrap/react-overlays/blob/master/CHANGELOG.md)
- [Commits](https://github.com/react-bootstrap/react-overlays/compare/v0.8.3...v0.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-05 00:23:26 +09:00
dependabot-preview[bot] 674a630bf1 Bump @babel/plugin-proposal-object-rest-spread from 7.5.5 to 7.6.2 (#12296) 
Bumps [@babel/plugin-proposal-object-rest-spread](https://github.com/babel/babel) from 7.5.5 to 7.6.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.5...v7.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-04 23:33:05 +09:00
dependabot-preview[bot] 0a9c2db59b Bump webpack-dev-server from 3.8.1 to 3.9.0 (#12293) 
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.8.1 to 3.9.0.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.8.1...v3.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-04 23:27:50 +09:00
dependabot-preview[bot] 5c537401d8 Bump react-test-renderer from 16.10.2 to 16.11.0 (#12295) 
Bumps [react-test-renderer](https://github.com/facebook/react/tree/HEAD/packages/react-test-renderer) from 16.10.2 to 16.11.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.11.0/packages/react-test-renderer)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-04 23:27:07 +09:00
dependabot-preview[bot] c21c7a2b9b Bump wavesurfer.js from 3.0.0 to 3.2.0 (#12292) 
Bumps [wavesurfer.js](https://github.com/katspaugh/wavesurfer.js) from 3.0.0 to 3.2.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.0.0...3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-04 23:21:40 +09:00
dependabot-preview[bot] 086a9211f3 Bump react-toggle from 4.0.2 to 4.1.1 (#12291) 
Bumps [react-toggle](https://github.com/aaronshaf/react-toggle) from 4.0.2 to 4.1.1.
- [Release notes](https://github.com/aaronshaf/react-toggle/releases)
- [Changelog](https://github.com/aaronshaf/react-toggle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aaronshaf/react-toggle/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-04 23:15:23 +09:00
dependabot-preview[bot] a537d083dd Bump react-dom from 16.10.2 to 16.11.0 (#12289) 
Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) from 16.10.2 to 16.11.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.11.0/packages/react-dom)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-04 22:55:46 +09:00
Gabriel Rubens 3cc9ff872f Use inert polyfill (#12209) 
* Inserting wicg-inert in project

* Import wicg-inert in moda_root component

* Update yarn.lock

* Solving code style problems

* Removing package-lock
 2019-11-04 13:03:44 +01:00
Nolan Lawson 1e232e455c fix: support KaiOS arrow navigation on public pages (#12251) 2019-11-04 13:03:09 +01:00
dependabot-preview[bot] 52c9044ea9 Bump dotenv from 8.0.0 to 8.2.0 (#12235) 
Bumps [dotenv](https://github.com/motdotla/dotenv) from 8.0.0 to 8.2.0.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v8.0.0...v8.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-29 11:12:05 +09:00
dependabot-preview[bot] 008d15d2cd Bump terser-webpack-plugin from 1.4.1 to 2.2.1 (#12233) 
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 1.4.1 to 2.2.1.
- [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/v1.4.1...v2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-29 10:59:12 +09:00
dependabot-preview[bot] da67b1fa37 Bump webpack-bundle-analyzer from 3.5.2 to 3.6.0 (#12237) 
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 3.5.2 to 3.6.0.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases)
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v3.5.2...v3.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-28 20:46:31 +09:00
dependabot-preview[bot] 3565fc1a00 Bump eslint-plugin-react from 7.14.3 to 7.16.0 (#12234) 
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.14.3 to 7.16.0.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.14.3...v7.16.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-28 20:42:47 +09:00
dependabot-preview[bot] 91b02afe4a Bump sass from 1.23.0 to 1.23.1 (#12238) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.23.0 to 1.23.1.
- [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.23.0...1.23.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-28 20:37:40 +09:00
dependabot-preview[bot] 7be994e0a9 Bump @babel/plugin-proposal-decorators from 7.4.4 to 7.6.0 (#12232) 
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel) from 7.4.4 to 7.6.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.4...v7.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-28 20:04:24 +09:00
Thibaut Girka 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
  Upstream moved account helpers to their own file, we had extra
  helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
 2019-10-27 12:14:01 +01:00
dependabot-preview[bot] 6bee7b820d Bump react-dom from 16.8.6 to 16.10.2 (#12107) 
* Bump react-dom from 16.8.6 to 16.10.2

Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) from 16.8.6 to 16.10.2.
- [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.10.2/packages/react-dom)

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

* update react and react-test-renderer
 2019-10-22 01:51:05 +09:00
dependabot-preview[bot] 183fc9d3cb Bump react-select from 2.4.4 to 3.0.5 (#11930) 
* Bump react-select from 2.4.4 to 3.0.5

Bumps [react-select](https://github.com/JedWatson/react-select) from 2.4.4 to 3.0.5.
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/.sweet-changelogs.js)
- [Commits](https://github.com/JedWatson/react-select/commits)

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

* Change import path for react-select
 2019-10-22 01:31:27 +09:00
dependabot-preview[bot] bc9c116e60 Bump sass from 1.22.12 to 1.23.0 (#12108) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.22.12 to 1.23.0.
- [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.22.12...1.23.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 01:30:43 +09:00
dependabot-preview[bot] 13b6d5d01b Bump @clusterws/cws from 0.15.0 to 0.15.2 (#12109) 
Bumps @clusterws/cws from 0.15.0 to 0.15.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 19:32:43 +09:00
dependabot-preview[bot] 1ecd71c53e Bump eslint from 6.5.0 to 6.5.1 (#12110) 
Bumps [eslint](https://github.com/eslint/eslint) from 6.5.0 to 6.5.1.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v6.5.0...v6.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 19:16:24 +09:00
dependabot-preview[bot] ae945cb1f4 Bump cross-env from 5.2.0 to 6.0.3 (#12112) 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 5.2.0 to 6.0.3.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v5.2.0...v6.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 19:16:01 +09:00
Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
  conflicts caused by image URLs being different
- app/models/status.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
  some strings were changed upstream
- spec/models/status_spec.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
 2019-10-10 17:26:08 +02:00
dependabot-preview[bot] a20b492b75 Bump tesseract.js from 2.0.0-alpha.15 to 2.0.0-alpha.16 (#12013) 
Bumps [tesseract.js](https://github.com/naptha/tesseract.js) from 2.0.0-alpha.15 to 2.0.0-alpha.16.
- [Release notes](https://github.com/naptha/tesseract.js/releases)
- [Commits](https://github.com/naptha/tesseract.js/compare/v2.0.0-alpha.15...v2.0.0-alpha.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-04 10:23:32 +09:00
dependabot-preview[bot] d269b178a3 Bump eslint from 6.4.0 to 6.5.0 (#12017) 
Bumps [eslint](https://github.com/eslint/eslint) from 6.4.0 to 6.5.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v6.4.0...v6.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-04 10:21:22 +09:00
Thibaut Girka a84aedb7a7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
  Upstream raised max image size from 8MB to 10MB while our limit is
  configurable. Raised the default to 10MB.
 2019-10-03 11:10:12 +02:00
Eugen Rochko f7c146a9e1
Bump webpack from 4.35.3 to 4.41.0 (#12026) 
Fix #12023
 2019-10-01 01:19:36 +02:00
Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
 2019-09-30 12:23:57 +02:00
Eugen Rochko 3582fa5c17
Bump set-value from 2.0.0 to 2.0.1 (#11997) 2019-09-29 16:54:35 +02:00
dependabot-preview[bot] ce8ea58bde Bump eslint from 6.1.0 to 6.4.0 (#11929) 
Bumps [eslint](https://github.com/eslint/eslint) from 6.1.0 to 6.4.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v6.1.0...v6.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-23 19:53:30 +09:00
dependabot-preview[bot] 3708132631 Bump sass from 1.22.9 to 1.22.12 (#11928) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.22.9 to 1.22.12.
- [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.22.9...1.22.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-23 19:22:51 +09:00
dependabot-preview[bot] 9365956971 Bump mini-css-extract-plugin from 0.7.0 to 0.8.0 (#11927) 
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 0.7.0 to 0.8.0.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v0.7.0...v0.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-23 19:19:52 +09:00
dependabot-preview[bot] 695cbef0e3 Bump babel-jest from 24.8.0 to 24.9.0 (#11926) 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.8.0 to 24.9.0.
- [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/v24.9.0/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-23 19:19:13 +09:00
Thibaut Girka 5cadb47238 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code
 2019-09-18 17:25:56 +02:00
nzws✨ d0c2c52783 Fix eslint error of import/no-extraneous-dependencies (#11884) 
* Fix eslint error of import/no-extraneous-dependencies
- Add history dependency

* refactoring code
 2019-09-18 15:41:50 +02:00
dependabot-preview[bot] b2acbb62f6 Bump es6-symbol from 3.1.1 to 3.1.2 (#11851) 
Bumps [es6-symbol](https://github.com/medikoo/es6-symbol) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/medikoo/es6-symbol/releases)
- [Changelog](https://github.com/medikoo/es6-symbol/blob/master/CHANGELOG.md)
- [Commits](https://github.com/medikoo/es6-symbol/compare/v3.1.1...v3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 19:16:02 +09:00
dependabot-preview[bot] 08ba494578 Bump eslint-plugin-import from 2.18.0 to 2.18.2 (#11849) 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.18.0 to 2.18.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.18.0...v2.18.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-16 19:15:21 +09:00
Thibaut Girka 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
  Conflict because we changed the number of default results to be
  configurable
- app/lib/settings/scoped_settings.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
 2019-09-13 18:13:43 +02:00
dependabot-preview[bot] 4f3e183dc8 Bump jest from 24.8.0 to 24.9.0 (#11781) 
Bumps [jest](https://github.com/facebook/jest) from 24.8.0 to 24.9.0.
- [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/v24.8.0...v24.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 20:07:02 +09:00
dependabot-preview[bot] c12cdbe81c Bump @babel/preset-env from 7.5.5 to 7.6.0 (#11780) 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.5.5 to 7.6.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.5...v7.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 19:42:39 +09:00
dependabot-preview[bot] 9fa5c43d80 Bump tesseract.js from 2.0.0-alpha.13 to 2.0.0-alpha.15 (#11779) 
Bumps [tesseract.js](https://github.com/naptha/tesseract.js) from 2.0.0-alpha.13 to 2.0.0-alpha.15.
- [Release notes](https://github.com/naptha/tesseract.js/releases)
- [Commits](https://github.com/naptha/tesseract.js/compare/v2.0.0-alpha.13...v2.0.0-alpha.15)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-09 19:40:30 +09:00
Thibaut Girka 5088eb8388 Merge branch 'master' into glitch-soc/merge-upstream 2019-09-05 11:36:41 +02:00
dependabot-preview[bot] ac6935b629 Bump babel-eslint from 10.0.2 to 10.0.3 (#11723) 
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.2 to 10.0.3.
- [Release notes](https://github.com/babel/babel-eslint/releases)
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.2...v10.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-02 20:19:16 +09:00
dependabot-preview[bot] dd45df6630 Bump @babel/plugin-transform-runtime from 7.4.4 to 7.5.5 (#11725) 
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.4.4 to 7.5.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.4...v7.5.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-02 20:18:22 +09:00
Thibaut Girka 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb

All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.
 2019-08-29 12:07:50 +02:00
dependabot-preview[bot] 4500dc2385 [Security] Bump mixin-deep from 1.3.1 to 1.3.2 (#11683) 
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2. **This update includes a security fix.**
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-28 10:56:20 +09:00
dependabot-preview[bot] a033679eed [Security] Bump eslint-utils from 1.3.1 to 1.4.2 (#11675) 
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.3.1 to 1.4.2. **This update includes a security fix.**
- [Release notes](https://github.com/mysticatea/eslint-utils/releases)
- [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.3.1...v1.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-27 04:17:44 +09:00
dependabot-preview[bot] 49810ba1dc Bump webpack-cli from 3.3.6 to 3.3.7 (#11663) 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.6 to 3.3.7.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.7/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.6...v3.3.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 22:40:38 +09:00
dependabot-preview[bot] 8a39bde967 Bump @babel/plugin-proposal-class-properties from 7.5.0 to 7.5.5 (#11661) 
Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel) from 7.5.0 to 7.5.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.0...v7.5.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 22:39:42 +09:00
dependabot-preview[bot] 4b6978d556 Bump react-redux from 7.1.0 to 7.1.1 (#11664) 
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.1.0 to 7.1.1.
- [Release notes](https://github.com/reduxjs/react-redux/releases)
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/react-redux/compare/v7.1.0...v7.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 18:54:51 +09:00
Eugen Rochko 4190e31626
Add audio player (#11644) 2019-08-23 22:38:02 +02:00
Thibaut Girka df150da435 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/initializers/content_security_policy.rb
  (took our version)
 2019-08-20 10:33:24 +02:00
ThibG 97af209c31 Revert "Bump react-redux-loading-bar from 4.0.8 to 4.4.0 (#11609)" (#11625) 
This reverts commit 2e44b81166.
 2019-08-20 02:19:01 +02:00
Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json
 2019-08-19 21:49:35 +02:00
dependabot-preview[bot] 2e44b81166 Bump react-redux-loading-bar from 4.0.8 to 4.4.0 (#11609) 
Bumps [react-redux-loading-bar](https://github.com/mironov/react-redux-loading-bar) from 4.0.8 to 4.4.0.
- [Release notes](https://github.com/mironov/react-redux-loading-bar/releases)
- [Changelog](https://github.com/mironov/react-redux-loading-bar/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mironov/react-redux-loading-bar/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 22:30:01 +09:00
dependabot-preview[bot] 467b95d67c Bump redux from 4.0.1 to 4.0.4 (#11608) 
Bumps [redux](https://github.com/reduxjs/redux) from 4.0.1 to 4.0.4.
- [Release notes](https://github.com/reduxjs/redux/releases)
- [Changelog](https://github.com/reduxjs/redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/redux/compare/v4.0.1...v4.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 22:29:01 +09:00
dependabot-preview[bot] 20c368cd0b Bump file-loader from 4.1.0 to 4.2.0 (#11607) 
Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v4.1.0...v4.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 22:26:05 +09:00
dependabot-preview[bot] 173ebefe37 Bump rimraf from 2.6.3 to 3.0.0 (#11610) 
Bumps [rimraf](https://github.com/isaacs/rimraf) from 2.6.3 to 3.0.0.
- [Release notes](https://github.com/isaacs/rimraf/releases)
- [Commits](https://github.com/isaacs/rimraf/compare/v2.6.3...v3.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 22:24:31 +09:00
Eugen Rochko 28636f43e4
Add OCR tool to media editing modal (#11566) 2019-08-15 15:13:26 +02:00
Thibaut Girka c4ae7aab6f Merge branch 'master' into glitch-soc/merge-upstream 2019-08-12 16:24:22 +02:00
dependabot-preview[bot] 74111bbb1c Bump sass from 1.22.7 to 1.22.9 (#11545) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.22.7 to 1.22.9.
- [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.22.7...1.22.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 21:19:49 +09:00
dependabot-preview[bot] 4b21a9db2f Bump webpack-dev-server from 3.7.2 to 3.8.0 (#11546) 
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.7.2 to 3.8.0.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.7.2...v3.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 20:08:37 +09:00
dependabot-preview[bot] 0b28890357 Bump css-loader from 3.1.0 to 3.2.0 (#11544) 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.1.0 to 3.2.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.1.0...v3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 20:07:57 +09:00
dependabot-preview[bot] 8a2afb576d Bump terser-webpack-plugin from 1.3.0 to 1.4.1 (#11542) 
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 1.3.0 to 1.4.1.
- [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/v1.3.0...v1.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 20:06:04 +09:00
Thibaut Girka e50554391a Merge branch 'master' into glitch-soc/merge-upstream 2019-08-05 13:13:28 +02:00
dependabot-preview[bot] a954159781 Bump @babel/plugin-transform-react-jsx-source from 7.2.0 to 7.5.0 (#11482) 
Bumps [@babel/plugin-transform-react-jsx-source](https://github.com/babel/babel) from 7.2.0 to 7.5.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.2.0...v7.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-05 18:25:56 +09:00
dependabot-preview[bot] b5b33fbbeb Bump webpack-cli from 3.3.5 to 3.3.6 (#11481) 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.5 to 3.3.6.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.6/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.5...v3.3.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-05 18:00:15 +09:00
dependabot-preview[bot] f640f74c21 Bump eslint-plugin-react from 7.14.2 to 7.14.3 (#11480) 
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.14.2 to 7.14.3.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.14.2...v7.14.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-05 17:40:35 +09:00
Thibaut Girka 24968d20a0 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
 2019-07-30 12:22:33 +02:00
dependabot-preview[bot] 85b7b565de Bump yargs from 12.0.5 to 13.3.0 (#11434) 
Bumps [yargs](https://github.com/yargs/yargs) from 12.0.5 to 13.3.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/v12.0.5...v13.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 20:42:19 +02:00
dependabot-preview[bot] a586248f08 Bump sass from 1.20.3 to 1.22.7 (#11432) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.20.3 to 1.22.7.
- [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.20.3...1.22.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 22:30:43 +09:00
dependabot-preview[bot] 25731bafed Bump autoprefixer from 9.6.0 to 9.6.1 (#11431) 
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.6.0 to 9.6.1.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/9.6.0...9.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 22:06:15 +09:00
dependabot-preview[bot] 2f0820963d Bump @babel/preset-env from 7.4.5 to 7.5.5 (#11433) 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.5 to 7.5.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.5...v7.5.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 22:03:05 +09:00
dependabot-preview[bot] e9a7d721d8 Bump file-loader from 4.0.0 to 4.1.0 (#11430) 
Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v4.0.0...v4.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 21:54:14 +09:00
Thibaut Girka 2d35e4460a Merge branch 'master' into glitch-soc/merge-upstream 2019-07-24 16:23:53 +02:00
dependabot-preview[bot] 24367ef906 Bump css-loader from 2.1.1 to 3.1.0 (#11382) 
* Bump css-loader from 2.1.1 to 3.1.0

Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 2.1.1 to 3.1.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/v2.1.1...v3.1.0)

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

* localIdentName -> modules.localIdentName
 2019-07-23 11:07:47 +02:00
Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
 2019-07-23 10:51:07 +02:00
dependabot-preview[bot] fea903f574 Bump eslint from 5.16.0 to 6.1.0 (#11383) 
Bumps [eslint](https://github.com/eslint/eslint) from 5.16.0 to 6.1.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v5.16.0...v6.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-22 17:37:11 +09:00
dependabot-preview[bot] e2b3437a84 Bump babel-eslint from 10.0.1 to 10.0.2 (#11381) 
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.1 to 10.0.2.
- [Release notes](https://github.com/babel/babel-eslint/releases)
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.1...v10.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-22 17:36:55 +09:00
dependabot-preview[bot] 44b04358b3 Bump intl-relativeformat from 6.4.2 to 6.4.3 (#11380) 
Bumps [intl-relativeformat](https://github.com/formatjs/formatjs) from 6.4.2 to 6.4.3.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/intl-relativeformat@6.4.2...intl-relativeformat@6.4.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-22 16:27:44 +09:00
dependabot-preview[bot] 28a60cb04f Bump @clusterws/cws from 0.14.0 to 0.15.0 (#11379) 
Bumps @clusterws/cws from 0.14.0 to 0.15.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-22 16:27:16 +09:00
dependabot-preview[bot] 3598305460 Bump eslint-plugin-jsx-a11y from 6.2.1 to 6.2.3 (#11314) 
Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y) from 6.2.1 to 6.2.3.
- [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases)
- [Changelog](https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md)
- [Commits](https://github.com/evcohen/eslint-plugin-jsx-a11y/compare/v6.2.1...v6.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 16:10:20 +02:00
dependabot-preview[bot] bb7f3e4112 Bump webpack from 4.34.0 to 4.35.3 (#11309) 
Bumps [webpack](https://github.com/webpack/webpack) from 4.34.0 to 4.35.3.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.34.0...v4.35.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 16:10:20 +02:00
dependabot-preview[bot] 22f1ec1b1e Bump lodash from 4.17.13 to 4.17.14 (#11312) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.13 to 4.17.14.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.13...4.17.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 16:10:20 +02:00
dependabot-preview[bot] 3a1e124f5a Bump @babel/runtime from 7.4.5 to 7.5.4 (#11315) 
Bumps [@babel/runtime](https://github.com/babel/babel) from 7.4.5 to 7.5.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.5...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 16:10:19 +02:00
dependabot-preview[bot] f0d288619c Bump eslint-plugin-import from 2.17.3 to 2.18.0 (#11310) 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.17.3 to 2.18.0.
- [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.17.3...v2.18.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 16:10:19 +02:00
dependabot-preview[bot] 4562c3cb7e Bump eslint-plugin-jsx-a11y from 6.2.1 to 6.2.3 (#11314) 
Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y) from 6.2.1 to 6.2.3.
- [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases)
- [Changelog](https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md)
- [Commits](https://github.com/evcohen/eslint-plugin-jsx-a11y/compare/v6.2.1...v6.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 01:24:26 +09:00
dependabot-preview[bot] ae16820da8 Bump webpack from 4.34.0 to 4.35.3 (#11309) 
Bumps [webpack](https://github.com/webpack/webpack) from 4.34.0 to 4.35.3.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.34.0...v4.35.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 01:13:57 +09:00
dependabot-preview[bot] 7840d56c9d Bump lodash from 4.17.13 to 4.17.14 (#11312) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.13 to 4.17.14.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.13...4.17.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 01:06:30 +09:00
dependabot-preview[bot] 23b29f7df1 Bump @babel/runtime from 7.4.5 to 7.5.4 (#11315) 
Bumps [@babel/runtime](https://github.com/babel/babel) from 7.4.5 to 7.5.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.5...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 01:04:46 +09:00
dependabot-preview[bot] 851ad993e0 Bump eslint-plugin-import from 2.17.3 to 2.18.0 (#11310) 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.17.3 to 2.18.0.
- [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.17.3...v2.18.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 00:52:23 +09:00
PatOnTheBack 3ad8c9ea61 Bump handlebars from 4.1.0 to 4.1.2 (#11293) 
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.0 to 4.1.2.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.0...v4.1.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot] 9521cacd40 [Security] Bump lodash from 4.17.11 to 4.17.13 (#11287) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot] 16340cb6ef Bump eslint-plugin-react from 7.12.1 to 7.14.2 (#11253) 
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.12.1 to 7.14.2.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.12.1...v7.14.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot] 9699506dc4 Bump @babel/plugin-proposal-class-properties from 7.4.4 to 7.5.0 (#11254) 
Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel) from 7.4.4 to 7.5.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.4...v7.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot] ed43922483 Bump compression-webpack-plugin from 2.0.0 to 3.0.0 (#11224) 
Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin) from 2.0.0 to 3.0.0.
- [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v2.0.0...v3.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot] 2fa85ead32 Bump intl-relativeformat from 2.2.0 to 6.4.2 (#11255) 
Bumps [intl-relativeformat](https://github.com/formatjs/formatjs) from 2.2.0 to 6.4.2.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/intl-relativeformat@2.2.0...intl-relativeformat@6.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot] ea0c09e4fb Bump react-redux from 6.0.1 to 7.1.0 (#11256) 
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 6.0.1 to 7.1.0.
- [Release notes](https://github.com/reduxjs/react-redux/releases)
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/react-redux/compare/v6.0.1...v7.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
PatOnTheBack 2ea4dbb035 Bump handlebars from 4.1.0 to 4.1.2 (#11293) 
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.0 to 4.1.2.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.0...v4.1.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-07-14 14:05:11 +09:00
dependabot-preview[bot] a6dc6a242f [Security] Bump lodash from 4.17.11 to 4.17.13 (#11287) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-11 06:33:07 +02:00
dependabot-preview[bot] d0b40ae7dd Bump eslint-plugin-react from 7.12.1 to 7.14.2 (#11253) 
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.12.1 to 7.14.2.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.12.1...v7.14.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-08 18:25:20 +09:00
dependabot-preview[bot] 76d5fd1c5c Bump @babel/plugin-proposal-class-properties from 7.4.4 to 7.5.0 (#11254) 
Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel) from 7.4.4 to 7.5.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.4...v7.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-08 18:24:38 +09:00
dependabot-preview[bot] 1a8bbcdca4 Bump compression-webpack-plugin from 2.0.0 to 3.0.0 (#11224) 
Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin) from 2.0.0 to 3.0.0.
- [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v2.0.0...v3.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-08 16:49:47 +09:00
dependabot-preview[bot] 6a313f872a Bump intl-relativeformat from 2.2.0 to 6.4.2 (#11255) 
Bumps [intl-relativeformat](https://github.com/formatjs/formatjs) from 2.2.0 to 6.4.2.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/intl-relativeformat@2.2.0...intl-relativeformat@6.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-08 16:49:26 +09:00
dependabot-preview[bot] 239befc6e8 Bump react-redux from 6.0.1 to 7.1.0 (#11256) 
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 6.0.1 to 7.1.0.
- [Release notes](https://github.com/reduxjs/react-redux/releases)
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/react-redux/compare/v6.0.1...v7.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-08 16:48:44 +09:00
Thibaut Girka 6ab84c12a7 Merge branch 'master' into glitch-soc/merge-upstream 2019-07-04 16:21:39 +02:00
dependabot-preview[bot] 3936404911 Bump eslint-plugin-promise from 4.1.1 to 4.2.1 (#11223) 
Bumps [eslint-plugin-promise](https://github.com/xjamundx/eslint-plugin-promise) from 4.1.1 to 4.2.1.
- [Release notes](https://github.com/xjamundx/eslint-plugin-promise/releases)
- [Changelog](https://github.com/xjamundx/eslint-plugin-promise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/xjamundx/eslint-plugin-promise/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-01 21:29:56 +09:00
dependabot-preview[bot] d33a30377c Bump webpack-cli from 3.3.4 to 3.3.5 (#11221) 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.4 to 3.3.5.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.4...v3.3.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-01 21:23:40 +09:00
Thibaut Girka 3922b518f7 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-28 21:36:50 +02:00
Eugen Rochko e64e6a03dd
Add categories for custom emojis (#11196) 
Fix #7940
 2019-06-28 15:54:10 +02:00
Thibaut Girka aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml
 2019-06-26 23:19:22 +02:00
dependabot-preview[bot] 07508b2045 Bump stringz from 1.0.0 to 2.0.0 (#11168) 
Bumps [stringz](https://github.com/sallar/stringz) from 1.0.0 to 2.0.0.
- [Release notes](https://github.com/sallar/stringz/releases)
- [Changelog](https://github.com/sallar/stringz/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sallar/stringz/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 20:51:35 +02:00
dependabot-preview[bot] 8d57795608 Bump eslint from 5.11.1 to 5.16.0 (#11165) 
Bumps [eslint](https://github.com/eslint/eslint) from 5.11.1 to 5.16.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v5.11.1...v5.16.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 22:51:57 +09:00
dependabot-preview[bot] 99ade565b4 Bump mini-css-extract-plugin from 0.5.0 to 0.7.0 (#11167) 
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 0.5.0 to 0.7.0.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v0.5.0...v0.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 22:36:57 +09:00
dependabot-preview[bot] f1da937245 Bump webpack-dev-server from 3.5.1 to 3.7.2 (#11166) 
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.5.1 to 3.7.2.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.5.1...v3.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 22:32:58 +09:00
dependabot-preview[bot] e76d2c51c2 Bump babel-loader from 8.0.5 to 8.0.6 (#11164) 
Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.0.5 to 8.0.6.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel-loader/compare/v8.0.5...v8.0.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 22:24:49 +09:00
Thibaut Girka 356e9150df Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/lib/sanitize_config.rb
  Keep our version, we support the tags upstream transforms.
- package.json
- yarn.lock
 2019-06-19 18:36:16 +02:00
dependabot-preview[bot] 83dd4d4204 Bump enzyme-adapter-react-16 from 1.7.1 to 1.14.0 (#11105) 
Bumps [enzyme-adapter-react-16](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme-adapter-react-16) from 1.7.1 to 1.14.0.
- [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.14.0/packages/enzyme-adapter-react-16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-18 00:28:28 +09:00
dependabot-preview[bot] b403c33fb4 Bump webpack-cli from 3.3.2 to 3.3.4 (#11106) 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.2 to 3.3.4.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.2...v3.3.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-18 00:20:54 +09:00
dependabot-preview[bot] 7555a0017e Bump webpack from 4.29.6 to 4.34.0 (#11108) 
Bumps [webpack](https://github.com/webpack/webpack) from 4.29.6 to 4.34.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.29.6...v4.34.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-18 00:19:00 +09:00
dependabot-preview[bot] 85ec79cedf Bump enzyme from 3.8.0 to 3.10.0 (#11107) 
Bumps [enzyme](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme) from 3.8.0 to 3.10.0.
- [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@3.10.0/packages/enzyme)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-18 00:04:24 +09:00
dependabot-preview[bot] 119cb4d473 Bump file-loader from 3.0.1 to 4.0.0 (#11104) 
Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 3.0.1 to 4.0.0.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v3.0.1...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 23:14:52 +09:00
dependabot-preview[bot] 31eed31e37 Bump rellax from 1.7.1 to 1.10.0 (#11040) 
Bumps [rellax](https://github.com/dixonandmoe/rellax) from 1.7.1 to 1.10.0.
- [Release notes](https://github.com/dixonandmoe/rellax/releases)
- [Commits](https://github.com/dixonandmoe/rellax/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 21:17:32 +09:00
dependabot-preview[bot] efb07f177d Bump webpack-bundle-analyzer from 3.1.0 to 3.3.2 (#11039) 
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 3.1.0 to 3.3.2.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases)
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v3.1.0...v3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 21:17:11 +09:00
dependabot-preview[bot] bab2231470 Bump autoprefixer from 9.5.1 to 9.6.0 (#11038) 
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.5.1 to 9.6.0.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/9.5.1...9.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 21:17:02 +09:00
dependabot-preview[bot] a9ba6a880e Bump eslint-plugin-import from 2.14.0 to 2.17.3 (#11037) 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.14.0 to 2.17.3.
- [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.14.0...v2.17.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 21:16:47 +09:00
Thibaut Girka 02b56c7e1a Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 2019-06-04 20:40:19 +02:00
dependabot-preview[bot] 781179b823 Bump intersection-observer from 0.5.1 to 0.7.0 (#10953) 
Bumps [intersection-observer](https://github.com/w3c/IntersectionObserver) from 0.5.1 to 0.7.0.
- [Release notes](https://github.com/w3c/IntersectionObserver/releases)
- [Commits](https://github.com/w3c/IntersectionObserver/commits)
 2019-06-05 00:56:31 +09:00
Yamagishi Kazutoshi 3e56f95c73 Replace from scss-lint to sass-lint (#10958) 2019-06-04 17:23:18 +02:00
Yamagishi Kazutoshi da38c0a6b8 Replace from uglifyjs to terser (#10956) 2019-06-04 14:17:09 +02:00
dependabot-preview[bot] 7c682c4825 Bump babel-plugin-react-intl from 3.1.0 to 3.1.3 (#10944) 
Bumps [babel-plugin-react-intl](https://github.com/formatjs/babel-plugin-react-intl) from 3.1.0 to 3.1.3.
- [Release notes](https://github.com/formatjs/babel-plugin-react-intl/releases)
- [Commits](https://github.com/formatjs/babel-plugin-react-intl/commits)
 2019-06-04 20:52:48 +09:00
dependabot-preview[bot] c633d65e6f Bump react-swipeable-views from 0.13.0 to 0.13.3 (#10952) 
Bumps [react-swipeable-views](https://github.com/oliviertassinari/react-swipeable-views) from 0.13.0 to 0.13.3.
- [Release notes](https://github.com/oliviertassinari/react-swipeable-views/releases)
- [Changelog](https://github.com/oliviertassinari/react-swipeable-views/blob/master/CHANGELOG.md)
- [Commits](https://github.com/oliviertassinari/react-swipeable-views/compare/v0.13.0...v0.13.3)
 2019-06-04 20:28:58 +09:00
dependabot-preview[bot] 4e03e50c37 Bump @babel/* from 7.3.4 to 7.4.5 (#10936) 
* Bump @babel/plugin-proposal-object-rest-spread from 7.3.4 to 7.4.4

Bumps [@babel/plugin-proposal-object-rest-spread](https://github.com/babel/babel) from 7.3.4 to 7.4.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.3.4...v7.4.4)

* Bump @babel/core from 7.3.4 to 7.4.5

* Bump @babel/plugin-proposal-class-properties from 7.3.4 to 7.4.4

* Bump @babel/plugin-proposal-decorators from 7.3.0 to 7.4.4

* Bump @babel/preset-env from 7.3.4 to 7.4.5

* Bump @babel/runtime from 7.3.4 to 7.4.5
 2019-06-04 07:00:35 +09:00
dependabot-preview[bot] 716ea754e7 Bump react from 16.7.0 to 16.8.6 (#10935) 
* Bump react from 16.7.0 to 16.8.6

Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.7.0 to 16.8.6.
- [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.8.6/packages/react)

* Bump react-dom from 16.7.0 to 16.8.6

* Bump react-test-renderer from 16.7.0 to 16.8.6
 2019-06-04 06:59:54 +09:00
dependabot-preview[bot] 8bd2e4403e Bump sass from 1.20.1 to 1.20.3 (#10941) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.20.1 to 1.20.3.
- [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.20.1...1.20.3)
 2019-06-04 00:46:51 +09:00
dependabot-preview[bot] 8ca93c8654 Bump react-intl from 2.7.2 to 2.9.0 (#10940) 
Bumps [react-intl](https://github.com/yahoo/react-intl) from 2.7.2 to 2.9.0.
- [Release notes](https://github.com/yahoo/react-intl/releases)
- [Commits](https://github.com/yahoo/react-intl/compare/v2.7.2...v2.9.0)
 2019-06-04 00:14:17 +09:00
Thibaut Girka 76918554a6 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
 2019-06-03 14:54:30 +02:00
dependabot-preview[bot] f2f5c1bd6d Bump offline-plugin from 5.0.6 to 5.0.7 (#10937) 
Bumps [offline-plugin](https://github.com/NekR/offline-plugin) from 5.0.6 to 5.0.7.
- [Release notes](https://github.com/NekR/offline-plugin/releases)
- [Changelog](https://github.com/NekR/offline-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/NekR/offline-plugin/compare/v5.0.6...v5.0.7)
 2019-06-03 21:12:34 +09:00
dependabot-preview[bot] c58cf5c90e Bump babel-jest from 24.5.0 to 24.8.0 (#10938) 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.5.0 to 24.8.0.
- [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/v24.8.0/packages/babel-jest)
 2019-06-03 21:12:08 +09:00
Yamagishi Kazutoshi ceddd2ad97 Revert "Bump react-redux-loading-bar from 4.0.8 to 4.2.0 (#10897)" (#10927) 
This reverts commit 9ab053a4b4.
 2019-06-02 18:22:38 +02:00
dependabot-preview[bot] 2e13f2ac44 Bump eslint-plugin-jsx-a11y from 6.1.2 to 6.2.1 (#10923) 
Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y) from 6.1.2 to 6.2.1.
- [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases)
- [Changelog](https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md)
- [Commits](https://github.com/evcohen/eslint-plugin-jsx-a11y/compare/v6.1.2...v6.2.1)
 2019-06-02 03:09:53 +09:00
dependabot-preview[bot] 2b8919e448 Bump jest from 24.5.0 to 24.8.0 (#10925) 
Bumps [jest](https://github.com/facebook/jest) from 24.5.0 to 24.8.0.
- [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/v24.5.0...v24.8.0)
 2019-06-02 03:08:48 +09:00
dependabot-preview[bot] ced51d8878 Bump webpack-dev-server from 3.2.1 to 3.5.1 (#10924) 
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.2.1 to 3.5.1.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.2.1...v3.5.1)
 2019-06-02 02:46:11 +09:00
dependabot-preview[bot] 8e34b71c8a Bump eslint-plugin-promise from 4.0.1 to 4.1.1 (#10921) 
Bumps [eslint-plugin-promise](https://github.com/xjamundx/eslint-plugin-promise) from 4.0.1 to 4.1.1.
- [Release notes](https://github.com/xjamundx/eslint-plugin-promise/releases)
- [Changelog](https://github.com/xjamundx/eslint-plugin-promise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/xjamundx/eslint-plugin-promise/commits)
 2019-06-02 02:24:54 +09:00
dependabot-preview[bot] a77b143aa1 Bump autoprefixer from 9.4.10 to 9.5.1 (#10910) 
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.4.10 to 9.5.1.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/9.4.10...9.5.1)
 2019-05-31 21:33:38 +09:00
dependabot-preview[bot] dc56ea9614 Bump rails-ujs from 5.2.2 to 5.2.3 (#10907) 
Bumps [rails-ujs](https://github.com/rails/rails) from 5.2.2 to 5.2.3.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.2...v5.2.3)
 2019-05-31 20:52:05 +09:00
dependabot-preview[bot] 9b638309d5 Bump sass from 1.17.2 to 1.20.1 (#10908) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.17.2 to 1.20.1.
- [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.17.2...1.20.1)
 2019-05-31 20:51:16 +09:00
dependabot-preview[bot] fee473beb2 [Security] Bump axios from 0.18.0 to 0.19.0 (#10906) 
Bumps [axios](https://github.com/axios/axios) from 0.18.0 to 0.19.0. **This update includes security fixes.**
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.18.0...v0.19.0)
 2019-05-31 20:48:59 +09:00
dependabot-preview[bot] 81f1db4152 Bump dotenv from 6.2.0 to 8.0.0 (#10888) 
Bumps [dotenv](https://github.com/motdotla/dotenv) from 6.2.0 to 8.0.0.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v6.2.0...v8.0.0)
 2019-05-31 12:04:11 +09:00
Yamagishi Kazutoshi acc74bed12 Remove dependency on fibers (#10902) 2019-05-30 19:27:19 +03:00
dependabot-preview[bot] 7394652693 Bump webpack-cli from 3.2.3 to 3.3.2 (#10896) 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.2.3 to 3.3.2.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/V.3.2.3...v3.3.2)
 2019-05-30 23:55:25 +09:00
dependabot-preview[bot] 9ab053a4b4 Bump react-redux-loading-bar from 4.0.8 to 4.2.0 (#10897) 
Bumps [react-redux-loading-bar](https://github.com/mironov/react-redux-loading-bar) from 4.0.8 to 4.2.0.
- [Release notes](https://github.com/mironov/react-redux-loading-bar/releases)
- [Changelog](https://github.com/mironov/react-redux-loading-bar/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mironov/react-redux-loading-bar/commits)
 2019-05-30 21:39:52 +09:00
dependabot-preview[bot] d2af9a9a6d Bump react-select from 2.2.0 to 2.4.4 (#10895) 
Bumps [react-select](https://github.com/JedWatson/react-select) from 2.2.0 to 2.4.4.
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/.sweet-changelogs.js)
- [Commits](https://github.com/JedWatson/react-select/compare/v2.2.0...v2.4.4)
 2019-05-30 20:38:27 +09:00
dependabot-preview[bot] c9e5ce4eba Bump object.values from 1.0.4 to 1.1.0 (#10894) 
Bumps [object.values](https://github.com/es-shims/Object.values) from 1.0.4 to 1.1.0.
- [Release notes](https://github.com/es-shims/Object.values/releases)
- [Changelog](https://github.com/es-shims/Object.values/blob/master/CHANGELOG.md)
- [Commits](https://github.com/es-shims/Object.values/compare/v1.0.4...v1.1.0)
 2019-05-30 20:37:09 +09:00
Thibaut Girka 06036081a0 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-30 13:31:01 +02:00
dependabot-preview[bot] 32fc0777b1 Bump js-yaml from 3.12.0 to 3.13.1 (#10881) 
Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.12.0 to 3.13.1.
- [Release notes](https://github.com/nodeca/js-yaml/releases)
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/js-yaml/compare/3.12.0...3.13.1)
 2019-05-29 23:17:01 +09:00
dependabot-preview[bot] 1f3bc026f4 Bump express from 4.16.4 to 4.17.1 (#10889) 
Bumps [express](https://github.com/expressjs/express) from 4.16.4 to 4.17.1.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.16.4...4.17.1)
 2019-05-29 22:53:20 +09:00
dependabot-preview[bot] c2153c1a76 Bump intl-relativeformat from 2.1.0 to 2.2.0 (#10887) 
Bumps [intl-relativeformat](https://github.com/yahoo/intl-relativeformat) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/yahoo/intl-relativeformat/releases)
- [Commits](https://github.com/yahoo/intl-relativeformat/commits)
 2019-05-29 22:30:52 +09:00
dependabot-preview[bot] a2c0cf73b6 Bump babel-plugin-react-intl from 3.0.1 to 3.1.0 (#10877) 
Bumps [babel-plugin-react-intl](https://github.com/formatjs/babel-plugin-react-intl) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/formatjs/babel-plugin-react-intl/releases)
- [Commits](https://github.com/formatjs/babel-plugin-react-intl/commits)
 2019-05-29 19:03:31 +09:00
dependabot-preview[bot] 2c6948bb3f Bump react-redux from 6.0.0 to 6.0.1 (#10879) 
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/reduxjs/react-redux/releases)
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/react-redux/compare/v6.0.0...v6.0.1)
 2019-05-29 18:20:36 +09:00
dependabot-preview[bot] d0a87e4711 Bump @babel/plugin-transform-runtime from 7.3.4 to 7.4.4 (#10878) 
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.3.4 to 7.4.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.3.4...v7.4.4)
 2019-05-29 18:19:16 +09:00
dependabot-preview[bot] 60d768d346 Bump rimraf from 2.6.2 to 2.6.3 (#10880) 
Bumps [rimraf](https://github.com/isaacs/rimraf) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/isaacs/rimraf/releases)
- [Commits](https://github.com/isaacs/rimraf/compare/v2.6.2...v2.6.3)
 2019-05-29 18:12:53 +09:00
Thibaut Girka c0dc247bce Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
 2019-05-23 19:01:30 +02:00
abcang ca6c93a2f5 Migrate from uws to cws (#10805) 2019-05-22 18:19:16 +02:00
Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
 2019-05-04 16:37:26 +02:00
Eugen Rochko fba96c808d
Add blurhash (#10630) 
* Add blurhash

* Use fallback color for spoiler when blurhash missing

* Federate the blurhash and accept it as long as it's at most 5x5

* Display unknown media attachments as blurhash placeholders

* Improve style of embed actions and spoiler button

* Change blurhash resolution from 3x3 to 4x4

* Improve dependency definitions

* Fix code style issues
 2019-04-27 03:24:09 +02:00
Eugen Rochko 8fb69f1366
Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413) 
Fix #10315

This reverts commit db06b25376.
 2019-03-30 01:41:35 +01:00
Thibaut Girka 3a2f646cb1 Revert "fix: update to emoji-mart 2.10.0 (#10281)" 
This reverts commit db06b25376.
 2019-03-27 14:04:58 +01:00
Thibaut Girka 4aa6aba6ee Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/services/remove_status_service.rb
  Conflict because we still handle the direct timeline.
  Took upstream changes, with that one extra function call.
- config/locales/ca.yml
  Conflict because theme names were updated.
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
- config/locales/oc.yml
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
- config/locales/pl.yml
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
 2019-03-16 20:59:33 +01:00
Nolan Lawson db06b25376 fix: update to emoji-mart 2.10.0 (#10281) 
* fix: update to emoji-mart 2.10.0

* remove useless change

* fix CSS style of emoji picker, improve a11y

* fix missing newline in scss

* fix the title and input fonts
 2019-03-16 20:13:15 +01:00
Thibaut Girka 4df3b7cb06 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/follower_domains_controller.rb
  Removed upstream. Did the same here. Maybe we should not have?
- config/locales/en.yml
  Upstream removed the “Authorized followers” page and associated
  translations. This is too close in the file to our glitch-soc-specific
  “flavour” string. No actual conflict.
- config/locales/ja.yml
  Same as above.
- config/locales/pl.yml
  Same as above.
- config/navigation.rb
  No real conflict. New route added too close to the glitch-soc-specific
  “flavours” one.
- config/webpack/configuration.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- config/webpack/loaders/babel.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
  The contents of this file have been moved to package.json.
- config/webpack/shared.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- config/webpacker.yml
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- jest.config.js
  The contents of this file have been moved to package.json.
- package.json
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- yarn.lock
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
 2019-03-16 14:14:20 +01:00
Nolan Lawson 8da5b8e669 perf: remove zopfli to speed up webpack (#10288) 2019-03-16 04:02:30 +01:00
Yamagishi Kazutoshi 8347479f5d Bump webpacker from 3.5.5 to 4.0.2 (#10277) 
Bumps [webpacker](https://github.com/rails/webpacker) from 3.5.5 to 4.0.2.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v3.5.5...v4.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2019-03-15 15:05:31 +01:00
Yamagishi Kazutoshi 317c43b75b Upgrade yargs to v12.0 (#9862) 2019-03-15 03:53:38 +01:00
Thibaut Girka 5e0cf92fd1 Merge branch 'master' into glitch-soc/merge-upstream 
No conflicts.
 2019-01-19 18:28:37 +01:00
Eugen Rochko bc642ac24b
Redesign public hashtag page to use a masonry layout (#9822) 2019-01-16 19:47:46 +01:00
Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- .eslintrc.yml
  Removed, as upstream removed it.
- app/controllers/admin/statuses_controller.rb
  Minor code cleanup when porting one of our features.
- app/models/account.rb
  Note length validation has changed upstream.
  We now use upstream's validation (dropped legacy glitch-soc
  account metadata stuff) but with configurable limit.
- app/services/post_status_service.rb
  Upstream has added support for scheduled toots, refactoring
  the code a bit. Adapted our changes to this refactoring.
- app/views/stream_entries/_detailed_status.html.haml
  Not a real conflict, changes too close.
- app/views/stream_entries/_simple_status.html.haml
  Not a real conflict, changes too close.
 2019-01-10 21:00:30 +01:00
ThibG 5104b61b6b Downgrade react-redux-loading-bar to 4.0.8 to fix media modal (#9771) 2019-01-10 15:13:00 +01:00
Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
 2019-01-02 15:36:53 +01:00
Yamagishi Kazutoshi dc84899fff Upgrade ESLint to v5.x (#9694) 2019-01-02 07:28:53 +01:00
Yamagishi Kazutoshi 8f5fdab5bf Update dependencies for Node.js (2018-12-31) (#9669) 
* Update react-* to v16.7.0

* Upgrade react-hotkeys to v1.1.4

* Update react-intl to v2.7.2

* Update react-select to v2.2.0

* Update react-swipeable-views to v0.13.0

* Upgrade react-textarea-autosize to v7.1.0

* Upgrade redux to v4.0.1

* Upgrade reselect to v4.0.0

* Update raf to v3.4.1

* Update enzyme to v3.8.0

* Update rails-ujs to v5.2.2

* Update axios to v0.18.0

* Update http-link-header to v1.0.2

* Update rellax to v1.7.1

* Update intersection-observer to v0.5.1

* Update stringz to v1.0.0

* Upgrade babel-eslint to v10.0.1

* Update @babel/* to v7.2.x

* Update babel-plugin-react-intl to v3.0.1

* Update babel-plugin-transform-react-remove-prop-types to v0.4.21

* Upgrade dotenv to v6.2.0

* Update express to v4.16.4

* Update webpack to v4.28.3

* Upgrade autoprefixer to v9.4.3

* Update babel-loader to v8.0.4

* Upgrade css-loader to v2.1.0

* Upgrade file-loader to v3.0.1

* Update marky to v1.2.1

* Update mini-css-extract-plugin to v0.5.0

* Update offline-plugin to v5.0.6

* Update style-loader to v0.23.1

* Update eslint-plugin-jsx-a11y to v6.1.2

* yarn upgrade

* fix

* Replace webpack-manifest-plugin to webpack-assets-manifest

* Replace node-zopfli to @gfz/zopfli

* Remove monkey-patch for http-link-header
 2018-12-31 18:11:48 +01:00
Thibaut Girka bc8411ec87 Merge branch 'master' into glitch-soc/merge-upstream 2018-11-30 20:16:26 +01:00
Eugen Rochko 3948b6fa52
Remove npm-run-all dependency (#9401) 
Fix #9359
 2018-11-30 19:16:32 +01:00
Thibaut Girka 36dab188fd Merge branch 'master' into glitch-soc/merge-upstream 2018-11-06 15:22:44 +01:00
James Kiesel 4c03e05a4e Allow joining several hashtags in a single column (#8904) 
* Nascent tag menu on frontend

* Hook up frontend to search

* Tag intersection backend first pass

* Update yarnlock

* WIP

* Fix for tags not searching correctly

* Make radio buttons function

* Simplify radio buttons with modeOption

* Better naming

* Rearrange options

* Add all/any/none functionality on backend

* Small PR cleanup

* Move to service from scope

* Small cleanup, add proper service tests

* Don't use send with user input :D

* Set appropriate column header

* Handle auto updating timeline

* Fix up toggle function

* Use tag value correctly

* A bit more correct to use 'self' rather than 'all' in status scope

* Fix some style issues

* Fix more code style issues

* Style select dropdown more better

* Only use to_id'ed value to ensure no SQL injection

* Revamp frontend to allow for multiple selects

* Update backend / col header to account for more flexible tagging

* Update brakeman ignore

* Codeclimate suggestions

* Fix presenter tag_url

* Implement initial PR feedback

* Handle additional tag streaming

* CodeClimate tweak
 2018-11-05 18:53:25 +01:00
Thibaut Girka 611740ce81 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-07 19:47:56 +02:00
Marcin Mikołajczak 2fb692ea45 i18n: Update Polish translation (#8901) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-10-06 20:42:36 +09:00
Eugen Rochko 3d7f68c273
Revert Font Awesome 5 upgrade (#8810) 
* Revert "Fix some icon names changed by the Font Awesome 5. (#8796)"

This reverts commit 3f9ec3de82.

* Revert "Migrate to font-awesome 5.0. (#8799)"

This reverts commit 8bae14591b.

* Revert "Fix some icons names, unavailable in fontawesome5 (free license). (#8792)"

This reverts commit b9c727a945.

* Revert "Update the icon name changed by the Font Awesome 5. (#8776)"

This reverts commit 17af4d27da.

* Revert "Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484)"

This reverts commit 4b794e134d.
 2018-09-28 02:11:14 +02:00
Maciek Baron 4b794e134d Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484) 
* Migrate to newer version of Font Awesome

* Add bot icon to bot avatars
 2018-09-25 05:08:55 +02:00
Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js
 2018-09-19 21:46:01 +02:00
Yamagishi Kazutoshi 0ddbccf7e6 Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
Thibaut Girka 0f155af32a Add notification badge to favicon 2018-09-07 20:37:17 +02:00
Thibaut Girka c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream 
Manually-resolved conflicts:
	.circleci/config.yml
	app/controllers/accounts_controller.rb
	app/controllers/auth/passwords_controller.rb
	app/controllers/statuses_controller.rb
	app/javascript/packs/public.js
	app/models/media_attachment.rb
	app/views/stream_entries/_content_spoiler.html.haml
	app/views/stream_entries/_media.html.haml
	config/locales/en.yml
	config/locales/ja.yml
	config/locales/pl.yml
	lib/mastodon/version.rb

Some content from app/javascript/packs/public.js has been split to
app/javascript/core/settings.js.

Translation strings for glitch-soc's keyword mutes were dropped.

Everything else was mostly “take both”.
 2018-08-01 00:18:13 +02:00
Eugen Rochko bb71538bb5
Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
Thibaut Girka 7dbed4dab9 Merge branch 'master' into glitch-soc/merge-upstream 2018-07-17 22:05:25 +02:00
abcang 3c3cf7e208 Update supported Node.js version (#8041) 2018-07-17 15:29:33 +02:00
Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	Dockerfile
	app/javascript/packs/common.js
	config/webpack/loaders/sass.js
	config/webpack/shared.js
	db/schema.rb
	package.json
	yarn.lock

A lot of the conflicts come from updating webpack.

Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.

Ported glitch changes to webpack 4.x
 2018-07-16 14:50:42 +02:00
Yamagishi Kazutoshi af161e849d Downgrade react-swipeable-views to v0.12.13 from v0.12.14 (#8022) 2018-07-15 01:01:01 +02:00
Yamagishi Kazutoshi 0eacf2b419 Upgrade Node.js to v8.x on Docker image (#8019) 2018-07-14 15:12:27 +02:00
Yamagishi Kazutoshi e9b322d0a6 Upgrade webpack to version v4.x (#6655) 2018-07-14 03:56:41 +02:00
Petko Bordjukov 37d428dfaf Update uws dependency to 10.148.0 (#7448) 
This release fixes issues with open events, adds Node 10 support
and drops Node 4, 5, 6 and 7.

Changes: 6152fb6787...689c15c59e
 2018-07-14 01:46:27 +02:00
Jenkins 4d8d1fa129 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-06-12 13:17:21 +00:00
Eugen Rochko a043f8d277
Ensure emoji-mart dependency is updated (#7771) 
Regression from 85470ec since version string was not updated
 2018-06-09 21:10:53 +02:00
Renato "Lond" Cerqueira 85470ec872 Fix issues with updated emoji mart (#7761) 
* Changes behavior from search light to keep custom search
The new version of emoji-mart needs the search function to constantly
receive the custom emoji array. This changes the behavior back to the
previous one in the search light method to keep the emoji autocomplete
as before

* Change test order
The order was breaking the tests

* Fix codeclimate issues

* Update to emoji mart to version without issue in picker

Fixes #7760
 2018-06-08 13:28:04 +02:00
Renato "Lond" Cerqueira 0c3ce41031 Update to emojimart 2.6.1 (#7746) 
* Update to emojimart 2.6.1
WIP using local updated version. Sheet comes from emoji-data@4.0.4,
file sheet_twitter_32_indexed_256.png.

* Update to 2.6.1 and uncompress data if needed

* Remove changes that were not needed

* Fix yarn lock file

* Match emojiToShowFilter behavior to new version of emoji-mart

* Fix codeclimate issue

* Match custom emoji behavior to new version of emoji-mart

* Replace emoji without shortcode in tests

* Fix code climate issues
 2018-06-07 19:40:23 +02:00
David Yip 3550470c18
Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	app/javascript/mastodon/locales/en.json
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json

The above conflicts appear to be a text conflict introduced by
glitch-soc's additional level of columns (i.e. moving a bunch of columns
under the Misc option).  They were resolved via accept-ours.
 2018-06-02 16:15:36 -05:00
Yamagishi Kazutoshi bfa12239e8 Update ESLint for Code Climate (#7696) 
* Update babel-eslint to version 8.2.3

* Update eslint to version 4.19.1

* Update eslint-plugin-promise to version 3.8.0

* Update eslint-plugin-react to version 7.8.2

* Upgrade eslint-plugin-jsx-a11y to version 6.0.3

* yarn test:lint --fix
 2018-06-01 14:03:19 +02:00
Thibaut Girka c087738270 Merge branch 'master' into glitch-soc/merge-upstream 2018-05-29 13:52:26 +02:00
Yamagishi Kazutoshi 13b60e6a14 Use URL polyfill (#7664) 2018-05-29 13:33:20 +02:00
Eugen Rochko 9bd23dc4e5
Track trending tags (#7638) 
* Track trending tags

- Half-life of 1 day
- Historical usage in daily buckets (last 7 days stored)
- GET /api/v1/trends

Fix #271

* Add trends to web UI

* Don't render compose form on search route, adjust search results header

* Disqualify tag from trends if it's in disallowed hashtags setting

* Count distinct accounts using tag, ignore silenced accounts
 2018-05-27 21:45:30 +02:00
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master 
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
 2018-05-10 00:03:28 +02:00
Yamagishi Kazutoshi 6832110af4 Correct rotate of image using EXIF (#7422) 2018-05-09 08:41:07 +02:00
Thibaut Girka 0ce06657c0 Update react-redux to 5.0.7 to fix an issue with getDerivedStateFromProps 2018-04-27 01:24:55 +02:00
David Yip 16d5217502
Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	app/controllers/home_controller.rb
 	app/controllers/stream_entries_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
 2018-04-18 18:48:12 -05:00
Kaito Sinclaire 156b916caf Direct messages column (#4514) 
* Added a timeline for Direct statuses
* Lists all Direct statuses you've sent and received
* Displayed in Getting Started
* Streaming server support for direct TL

* Changes to match other timelines in 2.0
 2018-04-18 13:09:06 +02:00
David Yip 3ab6a8b8be
Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	spec/views/about/show.html.haml_spec.rb
 2018-04-04 13:56:58 -05:00
Emelia Smith 7a81082704 Revert "Add double-tap zoom functionary to `ZoomableImage` (#6944)" (#7035) 
Unfortunately the new hammer.js functionality wasn't correctly tested and didn't work across devices and browsers, as such, it's best to revert PR #6944 until we can revisit this functionality and make it work across all devices and browsers that are supported by Mastodon.

This reverts commit 5021c4e9ca.
 2018-04-04 11:58:15 +02:00
Jenkins 6611100480 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-03 19:17:20 +00:00
unarist 2c51bc0ca5 Add missing rejection handling for Promises (#7008) 
* Add eslint-plugin-promise to detect uncaught rejections

* Move alert generation for errors to actions/alert

* Add missing rejection handling for Promises

* Use catch() instead of onReject on then()

Then it will catches rejection from onFulfilled. This detection can be
disabled by `allowThen` option, though.
 2018-04-02 14:51:02 +02:00
Jenkins f0bb3ff533 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-30 19:17:17 +00:00
Yuto Tokunaga 5021c4e9ca Add double-tap zoom functionary to `ZoomableImage` (#6944) 
add <div.zoomable-image__margin/> to keep margin of the image on zooming
move setting `scrollLeft` and `scrollTop` of container from callback of
`setState` to `componentDidUpdate`
add 'hammerjs' package for touch gesture detection
rewrite `ZoomableImage` using 'hammerjs'
 2018-03-28 20:40:51 +02:00
David Yip d2cdc2b5a3
Merge remote-tracking branch 'origin/master' into gs-master 2018-03-27 10:44:12 -05:00
Akihiko Odaki ca42f9b0eb Cache media (#6902) 2018-03-27 12:32:30 +02:00
Jenkins 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-09 00:17:17 +00:00
Yamagishi Kazutoshi 83c982b458 Run tests with npm-run-all (#6688) 2018-03-08 04:43:57 +01:00
Jenkins aa2bf07281 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-17 16:17:10 +00:00
Yamagishi Kazutoshi 0a103c7749 Upgrade ESLint to version 4.x (#6276) 2018-01-17 16:57:15 +01:00
Jenkins 757f52ff2e Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-03 21:17:13 +00:00
Yamagishi Kazutoshi ac17309faf Update dependencies for Node.js (2017-12-03) (#5876) 
* Update babel-plugin-lodash to version 3.3.2

* Update enzyme to version 3.2.0

* Update enzyme-adapter-react-16 to version 1.1.0

* Update intersection-observer to version 0.5.0

* Update intl-messageformat to version 2.2.0

* Update node-sass to version 4.7.2

* Update postcss-loader to version 2.0.9

* Update React to version 16.2.0

* Update react-textarea-autosize to version 5.2.1

* Update stringz to version 0.3.0

* Update webpack to version 3.9.1

* Update webpack-bundle-analyzer to version 2.9.1

* Update webpack-dev-server to version 2.9.5

* Update webpack-merge to version 4.1.1

* Update fsevents to version 1.1.3

* yarn upgrade
 2017-12-03 16:55:53 +01:00
Jenkins 63d47e04c4 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-11-27 20:17:12 +00:00
Sorin Davidoi e20258a2e5 chore(yarn): Upgrade react-swipeable-views (smoother swiping) (#5830) 2017-11-27 20:22:47 +01:00
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936 2017-11-16 01:21:16 -06:00
Yamagishi Kazutoshi 8a588145d5 Update extract-text-webpack-plugin to version 3.0.2 (#5584) 2017-11-05 13:07:59 +01:00
Yamagishi Kazutoshi 0338c16f9f Remove babel-plugin-react-transform (#5582) 2017-11-01 17:49:46 +01:00
Yamagishi Kazutoshi 8ae9bd0eea Upgrade compression-webpack-plugin to version 1.0.1 (#5581) 2017-11-01 14:42:19 +01:00
Yamagishi Kazutoshi 763a2f8511
Replace react-router-scroll to react-router-scroll-4 (#5568) 2017-11-01 06:58:38 +09:00
Yamagishi Kazutoshi 6705463ed0 Update dependencies for Node.js (2017-10-30) (#5565) 
* Update autoprefixer to version 7.1.6

* Update babel-plugin-preval to version 1.6.1

* Update babel-plugin-transform-react-remove-prop-types to version 0.4.10

* Update babel-preset-env to version 1.6.1

* Update cross-env to version 5.1.1

* Update enzyme-adapter-react-16 to version 1.0.2

* Update eslint-plugin-import to version 2.8.0

* Update immutable to version 3.8.2

* Update express to 4.16.2

* Update intl-relativeformat to version 2.1.0

* Update postcss-loader to version 2.0.8

* Update react-immutable-pure-component to version 1.1.1

* Update react-motion to version 0.5.2

* Update react-notification to version 6.8.2

* Update react-overlays to version 0.8.3

* Update react-redux-loading-bar to version 2.9.3

* Update resolve-url-loader to version 2.2.0

* Update style-loader to version 0.19.0

* Update webpack to version 3.8.1

* Update webpack-dev-server to version 2.9.3

* yarn upgrade
 2017-10-31 12:23:24 +01:00
David Yip dbb1fce94d Merge remote-tracking branch 'upstream/master' into gs-master 2017-10-16 09:23:59 -05:00
Yamagishi Kazutoshi bf0ee1a25c Enable ESLint rules import/* (#5414) 
* Enable ESLint rules import/*

* fix
 2017-10-16 11:12:09 +02:00
Yamagishi Kazutoshi d5b767c374 Replace JavaScript Testing Framework from Mocha to Jest (#5412) 2017-10-16 09:33:08 +02:00
Ondřej Hruška 33e806217f
Initial doodle support 2017-10-13 18:07:01 +02:00
Eugen Rochko 9b3d8ee346 Fix #5281 - Fix tooltip/custom emoji/search interaction (#5310) 2017-10-11 01:33:29 +02:00
Eugen Rochko fd49d5603a Fix #5278 - Update emoji-mart so invalid emoji IDs don't crash it (#5290) 2017-10-09 20:52:40 +02:00
Eugen Rochko 488584bfc1 Track frequently used emojis in web UI (#5275) 
* Track frequently used emojis in web UI

* Persist emoji usage, but debounce commits to the settings API

* Fix #5144 - Add tooltips to picker

* Display only 2 lines of frequently used emojis
 2017-10-08 21:47:15 +02:00
Nolan Lawson 057db0ecd0 Update emoji-mart to v2.1.1 (#5256) 2017-10-07 12:17:02 +02:00
Eugen Rochko 7db0f8dcb2 Implement hotkeys for web UI (#5164) 
* Fix #2102 - Implement hotkeys

Hotkeys on status list:

- r to reply
- m to mention author
- f to favourite
- b to boost
- enter to open status
- p to open author's profile
- up or k to move up in the list
- down or j to move down in the list
- 1-9 to focus a status in one of the columns
- n to focus the compose textarea
- alt+n to start a brand new toot
- backspace to navigate back

* Add navigational hotkeys

The key g followed by:

- s: start
- h: home
- n: notifications
- l: local timeline
- t: federated timeline
- f: favourites
- u: own profile
- p: pinned toots
- b: blocked users
- m: muted users

* Add hotkey for focusing search, make escape un-focus compose/search

* Fix focusing notifications column, fix hotkeys in compose textarea
 2017-10-06 01:07:59 +02:00
Nolan Lawson 334a446313 Fix emoji sequence bug in substring-trie (#5191) 
Fixes #5188
 2017-10-03 13:11:22 +02:00
abcang cb3b0c1a0f Update react-router-scroll at yarn.lock (#5154) 2017-09-30 15:50:02 +02:00
Eugen Rochko ebb8c89207 Upgrade to React 16 (#5119) 
* Upgrade to React 16.0.0

* Disable some uncritical tests while chai-enzyme remains incompatible
 2017-09-30 04:29:56 +02:00
Nolan Lawson 0060f98847 Remove react-sizeme (#5143) 
* Remove react-sizeme

* Fix aspect ratio in "sensitive" mode
 2017-09-29 22:46:43 +02:00
Eugen Rochko 2f079573ed In detail status view, display attachment uncropped if there's only one (#5054) 
* In detail status view, display attachment uncropped if there's only one

* Make media spoiler the size of the media it hides, enable on static
 2017-09-24 05:58:30 +02:00
Eugen Rochko 846cd4e838 Switch from EmojiOne to Twemoji, different emoji picker (#5046) 
* Switch from EmojiOne to Twemoji, different emoji picker

* Make emoji-mart use a local spritesheet

* Fix emojify test

* yarn manage:translations
 2017-09-23 01:41:00 +02:00
Eugen Rochko 034fab39ab Make dropdowns render into portal, expand animation (#5018) 
* Make dropdowns render into portal, expand animation

* Improve actions modal style
 2017-09-22 04:59:17 +02:00
Yamagishi Kazutoshi e0cda4a851 Update react-intl to version 2.4.0 (#4820) 2017-09-06 16:25:19 +02:00
Yamagishi Kazutoshi c1633eeb0f Update webpack and related dependencies (without extract-text-webpack-plugin) (#4410) 2017-07-28 05:16:12 +02:00
Yamagishi Kazutoshi aa803153e2 Remove Storybook (#4397) 2017-07-27 22:30:27 +02:00
Yamagishi Kazutoshi f2233c3e25 Update intersection-observer to version 0.4.0 (#4398) 2017-07-27 16:20:48 +02:00
Sorin Davidoi ebf5a06084 fix(column): Use passive wheel listener (#4348) 
* chore(yarn): Install detect-passive-events

* fix(column): Use passive listener
 2017-07-25 01:05:51 +02:00
Ondřej Hruška 02f896c12e Fix broken CSS reload due to webpack upgrade (#4250) 2017-07-18 18:42:45 +02:00
Sorin Davidoi c1f201c49a 🎄🔨 Force tree shake emojione (#4202) 
* chore(yarn): Install babel-plugin-preval as development dependency

* feat(babel): Add preval as a plugin

* feat(emojione_light): Prevaled module what tree-shaked emojione

* refactor(emoji): Use emojione_light

* feat: Preload emojione_picker bundle

* fix(emojione_light): Do not use Object.entries

* fix(emojify): Update tests

* chore(emojione_light): Remove silly ascii art
 2017-07-14 20:30:12 +02:00
unarist eeb5923e89 Add object-fit polyfill for Edge (#4182) 2017-07-14 01:59:34 +02:00
Sorin Davidoi 0c7c188c45 Web Push Notifications (#3243) 
* feat: Register push subscription

* feat: Notify when mentioned

* feat: Boost, favourite, reply, follow, follow request

* feat: Notification interaction

* feat: Handle change of public key

* feat: Unsubscribe if things go wrong

* feat: Do not send normal notifications if push is enabled

* feat: Focus client if open

* refactor: Move push logic to WebPushSubscription

* feat: Better title and body

* feat: Localize messages

* chore: Fix lint errors

* feat: Settings

* refactor: Lazy load

* fix: Check if push settings exist

* feat: Device-based preferences

* refactor: Simplify logic

* refactor: Pull request feedback

* refactor: Pull request feedback

* refactor: Create /api/web/push_subscriptions endpoint

* feat: Spec PushSubscriptionController

* refactor: WebPushSubscription => Web::PushSubscription

* feat: Spec Web::PushSubscription

* feat: Display first media attachment

* feat: Support direction

* fix: Stuff broken while rebasing

* refactor: Integration with session activations

* refactor: Cleanup

* refactor: Simplify implementation

* feat: Set VAPID keys via environment

* chore: Comments

* fix: Crash when no alerts

* fix: Set VAPID keys in testing environment

* fix: Follow link

* feat: Notification actions

* fix: Delete previous subscription

* chore: Temporary logs

* refactor: Move migration to a later date

* fix: Fetch the correct session activation and misc bugs

* refactor: Move migration to a later date

* fix: Remove follow request (no notifications)

* feat: Send administrator contact to push service

* feat: Set time-to-live

* fix: Do not show sensitive images

* fix: Reducer crash in error handling

* feat: Add badge

* chore: Fix lint error

* fix: Checkbox label overlap

* fix: Check for payload support

* fix: Rename action "type" (crash in latest Chrome)

* feat: Action to expand notification

* fix: Lint errors

* fix: Unescape notification body

* fix: Do not allow boosting if the status is hidden

* feat: Add VAPID keys to the production sample environment

* fix: Strip HTML tags from status

* refactor: Better error messages

* refactor: Handle browser not implementing the VAPID protocol (Samsung Internet)

* fix: Error when target_status is nil

* fix: Handle lack of image

* fix: Delete reference to invalid subscriptions

* feat: Better error handling

* fix: Unescape HTML characters after tags are striped

* refactor: Simpify code

* fix: Modify to work with #4091

* Sort strings alphabetically

* i18n: Updated Polish translation

it annoys me that it's not fully localized :P

* refactor: Use current_session in PushSubscriptionController

* fix: Rebase mistake

* fix: Set cacheName to mastodon

* refactor: Pull request feedback

* refactor: Remove logging statements

* chore(yarn): Fix conflicts with master

* chore(yarn): Copy latest from master

* chore(yarn): Readd offline-plugin

* refactor: Use save! and update!

* refactor: Send notifications async

* fix: Allow retry when push fails

* fix: Save track for failed pushes

* fix: Minify sw.js

* fix: Remove account_id from fabricator
 2017-07-13 22:15:32 +02:00