diff options
Diffstat (limited to 'client')
-rw-r--r-- | client/package.json | 2 | ||||
-rw-r--r-- | client/src/app/+admin/users/user-edit/user-edit.component.html | 2 | ||||
-rw-r--r-- | client/src/tsconfig.app.json | 7 | ||||
-rw-r--r-- | client/webpack.config.js | 16 | ||||
-rw-r--r-- | client/yarn.lock | 2 |
5 files changed, 9 insertions, 20 deletions
diff --git a/client/package.json b/client/package.json index 2d86d91fe..ad07f31b0 100644 --- a/client/package.json +++ b/client/package.json | |||
@@ -57,7 +57,7 @@ | |||
57 | "markdown-it": "^8.4.0", | 57 | "markdown-it": "^8.4.0", |
58 | "ngx-bootstrap": "2.0.0-rc.0", | 58 | "ngx-bootstrap": "2.0.0-rc.0", |
59 | "ngx-chips": "1.6.2", | 59 | "ngx-chips": "1.6.2", |
60 | "ngx-clipboard": "^9.0.0", | 60 | "ngx-clipboard": "9.0.1", |
61 | "ngx-infinite-scroll": "0.7.2", | 61 | "ngx-infinite-scroll": "0.7.2", |
62 | "ngx-pipes": "^2.0.5", | 62 | "ngx-pipes": "^2.0.5", |
63 | "node-sass": "^4.1.1", | 63 | "node-sass": "^4.1.1", |
diff --git a/client/src/app/+admin/users/user-edit/user-edit.component.html b/client/src/app/+admin/users/user-edit/user-edit.component.html index a69ffee77..a68dd231b 100644 --- a/client/src/app/+admin/users/user-edit/user-edit.component.html +++ b/client/src/app/+admin/users/user-edit/user-edit.component.html | |||
@@ -64,7 +64,7 @@ | |||
64 | 64 | ||
65 | <div class="transcoding-information" *ngIf="isTranscodingInformationDisplayed()"> | 65 | <div class="transcoding-information" *ngIf="isTranscodingInformationDisplayed()"> |
66 | Transcoding is enabled on server. The video quota only take in account <strong>original</strong> video. <br /> | 66 | Transcoding is enabled on server. The video quota only take in account <strong>original</strong> video. <br /> |
67 | In maximum, this user could use ~ {{ computeQuotaWithTranscoding() | bytes: 0 }}. | 67 | At most, this user could use ~ {{ computeQuotaWithTranscoding() | bytes: 0 }}. |
68 | </div> | 68 | </div> |
69 | </div> | 69 | </div> |
70 | 70 | ||
diff --git a/client/src/tsconfig.app.json b/client/src/tsconfig.app.json index 39ba8dbac..4339f4d4b 100644 --- a/client/src/tsconfig.app.json +++ b/client/src/tsconfig.app.json | |||
@@ -8,6 +8,11 @@ | |||
8 | }, | 8 | }, |
9 | "exclude": [ | 9 | "exclude": [ |
10 | "test.ts", | 10 | "test.ts", |
11 | "**/*.spec.ts" | 11 | "**/*.spec.ts", |
12 | "../node_modules/ngx-clipboard/**/*.spec.ts" | ||
13 | ], | ||
14 | "include": [ | ||
15 | "**/*.ts", | ||
16 | "../node_modules/ngx-clipboard/*/**.ts" | ||
12 | ] | 17 | ] |
13 | } | 18 | } |
diff --git a/client/webpack.config.js b/client/webpack.config.js deleted file mode 100644 index b51057c65..000000000 --- a/client/webpack.config.js +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | switch (process.env.NODE_ENV) { | ||
2 | case 'prod': | ||
3 | case 'production': | ||
4 | module.exports = require('./webpack/webpack.prod')({env: 'production'}) | ||
5 | break | ||
6 | |||
7 | case 'test': | ||
8 | case 'testing': | ||
9 | module.exports = require('./webpack/webpack.test')({env: 'test'}) | ||
10 | break | ||
11 | |||
12 | case 'dev': | ||
13 | case 'development': | ||
14 | default: | ||
15 | module.exports = require('./webpack/webpack.dev')({env: 'development'}) | ||
16 | } | ||
diff --git a/client/yarn.lock b/client/yarn.lock index 062893f90..44d84beaa 100644 --- a/client/yarn.lock +++ b/client/yarn.lock | |||
@@ -4444,7 +4444,7 @@ ngx-chips@1.6.2: | |||
4444 | dependencies: | 4444 | dependencies: |
4445 | ng2-material-dropdown "~0.8.2" | 4445 | ng2-material-dropdown "~0.8.2" |
4446 | 4446 | ||
4447 | ngx-clipboard@^9.0.0: | 4447 | ngx-clipboard@9.0.1: |
4448 | version "9.0.1" | 4448 | version "9.0.1" |
4449 | resolved "https://registry.yarnpkg.com/ngx-clipboard/-/ngx-clipboard-9.0.1.tgz#3829ef67d00a447303af4faf96c705de435d80f8" | 4449 | resolved "https://registry.yarnpkg.com/ngx-clipboard/-/ngx-clipboard-9.0.1.tgz#3829ef67d00a447303af4faf96c705de435d80f8" |
4450 | dependencies: | 4450 | dependencies: |