diff options
-rw-r--r-- | client/package.json | 2 | ||||
-rw-r--r-- | package.json | 4 | ||||
-rw-r--r-- | server/controllers/api/requests.js | 1 | ||||
-rw-r--r-- | server/controllers/api/videos.js | 1 | ||||
-rw-r--r-- | server/controllers/static.js | 1 | ||||
-rw-r--r-- | server/lib/base-request-scheduler.js | 1 | ||||
-rw-r--r-- | server/lib/request-scheduler.js | 1 | ||||
-rw-r--r-- | server/lib/request-video-event-scheduler.js | 1 | ||||
-rw-r--r-- | server/lib/request-video-qadu-scheduler.js | 1 | ||||
-rw-r--r-- | server/tests/api/check-params/pods.js | 2 | ||||
-rw-r--r-- | server/tests/api/check-params/remotes.js | 2 | ||||
-rw-r--r-- | server/tests/api/check-params/requests.js | 2 | ||||
-rw-r--r-- | server/tests/api/check-params/users.js | 2 | ||||
-rw-r--r-- | server/tests/api/check-params/video-abuses.js | 2 | ||||
-rw-r--r-- | server/tests/api/check-params/videos.js | 2 | ||||
-rw-r--r-- | server/tests/api/friends-advanced.js | 2 | ||||
-rw-r--r-- | server/tests/api/friends-basic.js | 2 | ||||
-rw-r--r-- | server/tests/api/multiple-pods.js | 2 | ||||
-rw-r--r-- | server/tests/api/requests.js | 2 | ||||
-rw-r--r-- | server/tests/api/single-pod.js | 2 | ||||
-rw-r--r-- | server/tests/api/users.js | 2 | ||||
-rw-r--r-- | server/tests/api/video-abuse.js | 2 |
22 files changed, 29 insertions, 10 deletions
diff --git a/client/package.json b/client/package.json index 666a3f37d..41189231f 100644 --- a/client/package.json +++ b/client/package.json | |||
@@ -88,7 +88,7 @@ | |||
88 | "devDependencies": { | 88 | "devDependencies": { |
89 | "add-asset-html-webpack-plugin": "^1.0.2", | 89 | "add-asset-html-webpack-plugin": "^1.0.2", |
90 | "codelyzer": "^2.0.0", | 90 | "codelyzer": "^2.0.0", |
91 | "standard": "^8.0.0", | 91 | "standard": "^9.0.0", |
92 | "webpack-bundle-analyzer": "^2.2.1", | 92 | "webpack-bundle-analyzer": "^2.2.1", |
93 | "webpack-dll-bundles-plugin": "^1.0.0-beta.5" | 93 | "webpack-dll-bundles-plugin": "^1.0.0-beta.5" |
94 | } | 94 | } |
diff --git a/package.json b/package.json index 4197f919a..c4c56ebdd 100644 --- a/package.json +++ b/package.json | |||
@@ -41,7 +41,7 @@ | |||
41 | "dependencies": { | 41 | "dependencies": { |
42 | "async": "^2.0.0", | 42 | "async": "^2.0.0", |
43 | "bcrypt": "^1.0.2", | 43 | "bcrypt": "^1.0.2", |
44 | "bittorrent-tracker": "^8.0.0", | 44 | "bittorrent-tracker": "^9.0.0", |
45 | "body-parser": "^1.12.4", | 45 | "body-parser": "^1.12.4", |
46 | "concurrently": "^3.1.0", | 46 | "concurrently": "^3.1.0", |
47 | "config": "^1.14.0", | 47 | "config": "^1.14.0", |
@@ -77,7 +77,7 @@ | |||
77 | "chai": "^3.3.0", | 77 | "chai": "^3.3.0", |
78 | "commander": "^2.9.0", | 78 | "commander": "^2.9.0", |
79 | "mocha": "^3.0.1", | 79 | "mocha": "^3.0.1", |
80 | "standard": "^8.0.0", | 80 | "standard": "^9.0.0", |
81 | "supertest": "^3.0.0", | 81 | "supertest": "^3.0.0", |
82 | "webtorrent": "^0.98.0" | 82 | "webtorrent": "^0.98.0" |
83 | }, | 83 | }, |
diff --git a/server/controllers/api/requests.js b/server/controllers/api/requests.js index be352113e..6fd5753ac 100644 --- a/server/controllers/api/requests.js +++ b/server/controllers/api/requests.js | |||
@@ -3,7 +3,6 @@ | |||
3 | const express = require('express') | 3 | const express = require('express') |
4 | const parallel = require('async/parallel') | 4 | const parallel = require('async/parallel') |
5 | 5 | ||
6 | const constants = require('../../initializers/constants') | ||
7 | const friends = require('../../lib/friends') | 6 | const friends = require('../../lib/friends') |
8 | const middlewares = require('../../middlewares') | 7 | const middlewares = require('../../middlewares') |
9 | const admin = middlewares.admin | 8 | const admin = middlewares.admin |
diff --git a/server/controllers/api/videos.js b/server/controllers/api/videos.js index d64ed4e4e..dfd8699e6 100644 --- a/server/controllers/api/videos.js +++ b/server/controllers/api/videos.js | |||
@@ -443,4 +443,3 @@ function reportVideoAbuse (req, res, finalCallback) { | |||
443 | return finalCallback(null) | 443 | return finalCallback(null) |
444 | }) | 444 | }) |
445 | } | 445 | } |
446 | |||
diff --git a/server/controllers/static.js b/server/controllers/static.js index a91ff044d..810b752af 100644 --- a/server/controllers/static.js +++ b/server/controllers/static.js | |||
@@ -43,4 +43,3 @@ router.use( | |||
43 | // --------------------------------------------------------------------------- | 43 | // --------------------------------------------------------------------------- |
44 | 44 | ||
45 | module.exports = router | 45 | module.exports = router |
46 | |||
diff --git a/server/lib/base-request-scheduler.js b/server/lib/base-request-scheduler.js index 1c6b78297..4709c7960 100644 --- a/server/lib/base-request-scheduler.js +++ b/server/lib/base-request-scheduler.js | |||
@@ -8,7 +8,6 @@ const logger = require('../helpers/logger') | |||
8 | const requests = require('../helpers/requests') | 8 | const requests = require('../helpers/requests') |
9 | 9 | ||
10 | module.exports = class BaseRequestScheduler { | 10 | module.exports = class BaseRequestScheduler { |
11 | |||
12 | constructor (options) { | 11 | constructor (options) { |
13 | this.lastRequestTimestamp = 0 | 12 | this.lastRequestTimestamp = 0 |
14 | this.timer = null | 13 | this.timer = null |
diff --git a/server/lib/request-scheduler.js b/server/lib/request-scheduler.js index 6b6535519..f6020e746 100644 --- a/server/lib/request-scheduler.js +++ b/server/lib/request-scheduler.js | |||
@@ -6,7 +6,6 @@ const db = require('../initializers/database') | |||
6 | const logger = require('../helpers/logger') | 6 | const logger = require('../helpers/logger') |
7 | 7 | ||
8 | module.exports = class RequestScheduler extends BaseRequestScheduler { | 8 | module.exports = class RequestScheduler extends BaseRequestScheduler { |
9 | |||
10 | constructor () { | 9 | constructor () { |
11 | super() | 10 | super() |
12 | 11 | ||
diff --git a/server/lib/request-video-event-scheduler.js b/server/lib/request-video-event-scheduler.js index 5ea5631b0..f178df49e 100644 --- a/server/lib/request-video-event-scheduler.js +++ b/server/lib/request-video-event-scheduler.js | |||
@@ -5,7 +5,6 @@ const constants = require('../initializers/constants') | |||
5 | const db = require('../initializers/database') | 5 | const db = require('../initializers/database') |
6 | 6 | ||
7 | module.exports = class RequestVideoEventScheduler extends BaseRequestScheduler { | 7 | module.exports = class RequestVideoEventScheduler extends BaseRequestScheduler { |
8 | |||
9 | constructor () { | 8 | constructor () { |
10 | super() | 9 | super() |
11 | 10 | ||
diff --git a/server/lib/request-video-qadu-scheduler.js b/server/lib/request-video-qadu-scheduler.js index 33b1c6d28..bfccc5234 100644 --- a/server/lib/request-video-qadu-scheduler.js +++ b/server/lib/request-video-qadu-scheduler.js | |||
@@ -6,7 +6,6 @@ const db = require('../initializers/database') | |||
6 | const logger = require('../helpers/logger') | 6 | const logger = require('../helpers/logger') |
7 | 7 | ||
8 | module.exports = class RequestVideoQaduScheduler extends BaseRequestScheduler { | 8 | module.exports = class RequestVideoQaduScheduler extends BaseRequestScheduler { |
9 | |||
10 | constructor () { | 9 | constructor () { |
11 | super() | 10 | super() |
12 | 11 | ||
diff --git a/server/tests/api/check-params/pods.js b/server/tests/api/check-params/pods.js index 22cbdb30f..2567fff5f 100644 --- a/server/tests/api/check-params/pods.js +++ b/server/tests/api/check-params/pods.js | |||
@@ -1,3 +1,5 @@ | |||
1 | /* eslint-disable no-unused-expressions */ | ||
2 | |||
1 | 'use strict' | 3 | 'use strict' |
2 | 4 | ||
3 | const request = require('supertest') | 5 | const request = require('supertest') |
diff --git a/server/tests/api/check-params/remotes.js b/server/tests/api/check-params/remotes.js index f6a49d6e2..96361c643 100644 --- a/server/tests/api/check-params/remotes.js +++ b/server/tests/api/check-params/remotes.js | |||
@@ -1,3 +1,5 @@ | |||
1 | /* eslint-disable no-unused-expressions */ | ||
2 | |||
1 | 'use strict' | 3 | 'use strict' |
2 | 4 | ||
3 | const series = require('async/series') | 5 | const series = require('async/series') |
diff --git a/server/tests/api/check-params/requests.js b/server/tests/api/check-params/requests.js index 08f58db43..0ce5582d6 100644 --- a/server/tests/api/check-params/requests.js +++ b/server/tests/api/check-params/requests.js | |||
@@ -1,3 +1,5 @@ | |||
1 | /* eslint-disable no-unused-expressions */ | ||
2 | |||
1 | 'use strict' | 3 | 'use strict' |
2 | 4 | ||
3 | const request = require('supertest') | 5 | const request = require('supertest') |
diff --git a/server/tests/api/check-params/users.js b/server/tests/api/check-params/users.js index debf63cf6..6edb54660 100644 --- a/server/tests/api/check-params/users.js +++ b/server/tests/api/check-params/users.js | |||
@@ -1,3 +1,5 @@ | |||
1 | /* eslint-disable no-unused-expressions */ | ||
2 | |||
1 | 'use strict' | 3 | 'use strict' |
2 | 4 | ||
3 | const request = require('supertest') | 5 | const request = require('supertest') |
diff --git a/server/tests/api/check-params/video-abuses.js b/server/tests/api/check-params/video-abuses.js index 8cb4ccdc1..7308637e2 100644 --- a/server/tests/api/check-params/video-abuses.js +++ b/server/tests/api/check-params/video-abuses.js | |||
@@ -1,3 +1,5 @@ | |||
1 | /* eslint-disable no-unused-expressions */ | ||
2 | |||
1 | 'use strict' | 3 | 'use strict' |
2 | 4 | ||
3 | const request = require('supertest') | 5 | const request = require('supertest') |
diff --git a/server/tests/api/check-params/videos.js b/server/tests/api/check-params/videos.js index fac903715..f8549a95b 100644 --- a/server/tests/api/check-params/videos.js +++ b/server/tests/api/check-params/videos.js | |||
@@ -1,3 +1,5 @@ | |||
1 | /* eslint-disable no-unused-expressions */ | ||
2 | |||
1 | 'use strict' | 3 | 'use strict' |
2 | 4 | ||
3 | const chai = require('chai') | 5 | const chai = require('chai') |
diff --git a/server/tests/api/friends-advanced.js b/server/tests/api/friends-advanced.js index 708138bc9..15ca1a37c 100644 --- a/server/tests/api/friends-advanced.js +++ b/server/tests/api/friends-advanced.js | |||
@@ -1,3 +1,5 @@ | |||
1 | /* eslint-disable no-unused-expressions */ | ||
2 | |||
1 | 'use strict' | 3 | 'use strict' |
2 | 4 | ||
3 | const chai = require('chai') | 5 | const chai = require('chai') |
diff --git a/server/tests/api/friends-basic.js b/server/tests/api/friends-basic.js index 62c40df7b..658e54829 100644 --- a/server/tests/api/friends-basic.js +++ b/server/tests/api/friends-basic.js | |||
@@ -1,3 +1,5 @@ | |||
1 | /* eslint-disable no-unused-expressions */ | ||
2 | |||
1 | 'use strict' | 3 | 'use strict' |
2 | 4 | ||
3 | const chai = require('chai') | 5 | const chai = require('chai') |
diff --git a/server/tests/api/multiple-pods.js b/server/tests/api/multiple-pods.js index 94b62e27a..e02b6180b 100644 --- a/server/tests/api/multiple-pods.js +++ b/server/tests/api/multiple-pods.js | |||
@@ -1,3 +1,5 @@ | |||
1 | /* eslint-disable no-unused-expressions */ | ||
2 | |||
1 | 'use strict' | 3 | 'use strict' |
2 | 4 | ||
3 | const chai = require('chai') | 5 | const chai = require('chai') |
diff --git a/server/tests/api/requests.js b/server/tests/api/requests.js index 933ed29b4..215c2a8f3 100644 --- a/server/tests/api/requests.js +++ b/server/tests/api/requests.js | |||
@@ -1,3 +1,5 @@ | |||
1 | /* eslint-disable no-unused-expressions */ | ||
2 | |||
1 | 'use strict' | 3 | 'use strict' |
2 | 4 | ||
3 | const chai = require('chai') | 5 | const chai = require('chai') |
diff --git a/server/tests/api/single-pod.js b/server/tests/api/single-pod.js index 40c33686f..87d0e9a71 100644 --- a/server/tests/api/single-pod.js +++ b/server/tests/api/single-pod.js | |||
@@ -1,3 +1,5 @@ | |||
1 | /* eslint-disable no-unused-expressions */ | ||
2 | |||
1 | 'use strict' | 3 | 'use strict' |
2 | 4 | ||
3 | const chai = require('chai') | 5 | const chai = require('chai') |
diff --git a/server/tests/api/users.js b/server/tests/api/users.js index df075f48a..bd95e78c2 100644 --- a/server/tests/api/users.js +++ b/server/tests/api/users.js | |||
@@ -1,3 +1,5 @@ | |||
1 | /* eslint-disable no-unused-expressions */ | ||
2 | |||
1 | 'use strict' | 3 | 'use strict' |
2 | 4 | ||
3 | const chai = require('chai') | 5 | const chai = require('chai') |
diff --git a/server/tests/api/video-abuse.js b/server/tests/api/video-abuse.js index 58db17c42..0c4341860 100644 --- a/server/tests/api/video-abuse.js +++ b/server/tests/api/video-abuse.js | |||
@@ -1,3 +1,5 @@ | |||
1 | /* eslint-disable no-unused-expressions */ | ||
2 | |||
1 | 'use strict' | 3 | 'use strict' |
2 | 4 | ||
3 | const chai = require('chai') | 5 | const chai = require('chai') |