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>
5 years ago
2d35e4460a
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
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
5 years ago
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
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
6ab84c12a7
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
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>
5 years ago
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>
5 years ago
3922b518f7
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
e64e6a03dd
Add categories for custom emojis ( #11196 )
...
Fix #7940
5 years ago
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
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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
5 years ago
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>
6 years ago
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>
6 years ago
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>
6 years ago
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>
6 years ago
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>
6 years ago
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>
6 years ago
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>
6 years ago
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>
6 years ago
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>
6 years ago
02b56c7e1a
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
6 years ago
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 )
6 years ago
3e56f95c73
Replace from scss-lint to sass-lint ( #10958 )
6 years ago
da38c0a6b8
Replace from uglifyjs to terser ( #10956 )
6 years ago
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 )
6 years ago
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 )
6 years ago
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
6 years ago
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
6 years ago
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 )
6 years ago
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 )
6 years ago
76918554a6
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
6 years ago
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 )
6 years ago
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 )
6 years ago
ceddd2ad97
Revert "Bump react-redux-loading-bar from 4.0.8 to 4.2.0 ( #10897 )" ( #10927 )
...
This reverts commit 9ab053a4b4
6 years ago
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 )
6 years ago
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 )
6 years ago
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 )
6 years ago
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 )
6 years ago
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 )
6 years ago
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 )
6 years ago
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 )
6 years ago
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 )
6 years ago
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 )
6 years ago
acc74bed12
Remove dependency on fibers ( #10902 )
6 years ago
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 )
6 years ago
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 )
6 years ago
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 )
6 years ago
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 )
6 years ago
06036081a0
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
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 )
6 years ago
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 )
6 years ago
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 )
6 years ago
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 )
6 years ago
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 )
6 years ago
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 )
6 years ago
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 )
6 years ago
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`.
6 years ago
ca6c93a2f5
Migrate from uws to cws ( #10805 )
6 years ago
33c80e0783
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
6 years ago
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
6 years ago
8fb69f1366
Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 ( #10413 )
...
Fix #10315
This reverts commit db06b25376
6 years ago
3a2f646cb1
Revert "fix: update to emoji-mart 2.10.0 ( #10281 )"
...
This reverts commit db06b25376
6 years ago
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.
6 years ago
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
6 years ago
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.
6 years ago
8da5b8e669
perf: remove zopfli to speed up webpack ( #10288 )
6 years ago
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>
6 years ago
317c43b75b
Upgrade yargs to v12.0 ( #9862 )
6 years ago
5e0cf92fd1
Merge branch 'master' into glitch-soc/merge-upstream
...
No conflicts.
6 years ago
bc642ac24b
Redesign public hashtag page to use a masonry layout ( #9822 )
6 years ago
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.
6 years ago
5104b61b6b
Downgrade react-redux-loading-bar to 4.0.8 to fix media modal ( #9771 )
6 years ago
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
6 years ago
dc84899fff
Upgrade ESLint to v5.x ( #9694 )
6 years ago
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
6 years ago
bc8411ec87
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
3948b6fa52
Remove npm-run-all dependency ( #9401 )
...
Fix #9359
6 years ago
36dab188fd
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
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
6 years ago
611740ce81
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
2fb692ea45
i18n: Update Polish translation ( #8901 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
6 years ago
3d7f68c273
Revert Font Awesome 5 upgrade ( #8810 )
...
* Revert "Fix some icon names changed by the Font Awesome 5. (#8796 )"
This reverts commit 3f9ec3de82#8799 )"
This reverts commit 8bae14591b#8792 )"
This reverts commit b9c727a945#8776 )"
This reverts commit 17af4d27da#8484 )"
This reverts commit 4b794e134d
6 years ago
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
6 years ago
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
6 years ago
0ddbccf7e6
Upgrade Babel to version 7.0.0 ( #5925 )
6 years ago
0f155af32a
Add notification badge to favicon
6 years ago
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”.
6 years ago
bb71538bb5
Redesign public profiles and toots ( #8068 )
6 years ago
7dbed4dab9
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
3c3cf7e208
Update supported Node.js version ( #8041 )
6 years ago
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
6 years ago
af161e849d
Downgrade react-swipeable-views to v0.12.13 from v0.12.14 ( #8022 )
6 years ago
0eacf2b419
Upgrade Node.js to v8.x on Docker image ( #8019 )
6 years ago
e9b322d0a6
Upgrade webpack to version v4.x ( #6655 )
6 years ago
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
6 years ago
4d8d1fa129
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
a043f8d277
Ensure emoji-mart dependency is updated ( #7771 )
...
Regression from 85470ec
7 years ago
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
7 years ago
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
7 years ago
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.
7 years ago
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
7 years ago
c087738270
Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
13b60e6a14
Use URL polyfill ( #7664 )
7 years ago
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
7 years ago
1c9c0167b7
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
7 years ago
6832110af4
Correct rotate of image using EXIF ( #7422 )
7 years ago
0ce06657c0
Update react-redux to 5.0.7 to fix an issue with getDerivedStateFromProps
7 years ago
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
7 years ago
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
7 years ago
3ab6a8b8be
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
spec/views/about/show.html.haml_spec.rb
7 years ago
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
7 years ago
6611100480
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
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.
7 years ago
f0bb3ff533
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
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'
7 years ago
d2cdc2b5a3
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ca42f9b0eb
Cache media ( #6902 )
7 years ago
dependabot-preview[bot]
Thibaut Girka
PatOnTheBack
Eugen Rochko
dependabot-preview[bot]
Yamagishi Kazutoshi
abcang
Nolan Lawson
James Kiesel
Marcin Mikołajczak
Maciek Baron
Petko Bordjukov
Jenkins
Renato "Lond" Cerqueira
David Yip
Kaito Sinclaire
Emelia Smith
unarist
Yuto Tokunaga
Akihiko Odaki