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.
This commit is contained in:
Thibaut Girka
2019-01-10 19:12:10 +01:00
239 changed files with 3222 additions and 1433 deletions

View File

@@ -10,8 +10,8 @@
"build:production": "cross-env RAILS_ENV=production NODE_ENV=production ./bin/webpack",
"manage:translations": "node ./config/webpack/translationRunner.js",
"start": "node ./streaming/index.js",
"test": "npm run test:lint && npm run test:jest",
"test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ streaming/",
"test": "${npm_execpath} run test:lint && ${npm_execpath} run test:jest",
"test:lint": "eslint --ext=js .",
"test:jest": "cross-env NODE_ENV=test jest --coverage"
},
"repository": {
@@ -21,7 +21,8 @@
"browserslist": [
"last 2 versions",
"IE >= 11",
"iOS >= 9"
"iOS >= 9",
"not dead"
],
"private": true,
"dependencies": {
@@ -103,7 +104,7 @@
"react-notification": "^6.8.4",
"react-overlays": "^0.8.3",
"react-redux": "^6.0.0",
"react-redux-loading-bar": "^4.1.0",
"react-redux-loading-bar": "^4.0.8",
"react-router-dom": "^4.1.1",
"react-router-scroll-4": "^1.0.0-beta.1",
"react-select": "^2.2.0",