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
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
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
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
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
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
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
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
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
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
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
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
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
acc74bed12
Remove dependency on fibers ( #10902 )
2019-05-30 19:27:19 +03:00
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
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
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
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
06036081a0
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-30 13:31:01 +02:00
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
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
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
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
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
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
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
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
ca6c93a2f5
Migrate from uws to cws ( #10805 )
2019-05-22 18:19:16 +02:00
33c80e0783
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
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
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
3a2f646cb1
Revert "fix: update to emoji-mart 2.10.0 ( #10281 )"
...
This reverts commit db06b25376
2019-03-27 14:04:58 +01:00
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
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
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
8da5b8e669
perf: remove zopfli to speed up webpack ( #10288 )
2019-03-16 04:02:30 +01:00
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
317c43b75b
Upgrade yargs to v12.0 ( #9862 )
2019-03-15 03:53:38 +01:00
5e0cf92fd1
Merge branch 'master' into glitch-soc/merge-upstream
...
No conflicts.
2019-01-19 18:28:37 +01:00
bc642ac24b
Redesign public hashtag page to use a masonry layout ( #9822 )
2019-01-16 19:47:46 +01:00
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
5104b61b6b
Downgrade react-redux-loading-bar to 4.0.8 to fix media modal ( #9771 )
2019-01-10 15:13:00 +01:00
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
dc84899fff
Upgrade ESLint to v5.x ( #9694 )
2019-01-02 07:28:53 +01:00
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
bc8411ec87
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-30 20:16:26 +01:00
3948b6fa52
Remove npm-run-all dependency ( #9401 )
...
Fix #9359
2018-11-30 19:16:32 +01:00
36dab188fd
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-06 15:22:44 +01:00
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
611740ce81
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-07 19:47:56 +02:00
Thibaut Girka