aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/package.json18
-rw-r--r--client/src/app/shared/shared.module.ts19
-rw-r--r--client/src/app/videos/video-watch/video-magnet.component.ts2
-rw-r--r--client/src/app/videos/video-watch/video-share.component.ts2
-rw-r--r--client/src/vendor.ts8
5 files changed, 25 insertions, 24 deletions
diff --git a/client/package.json b/client/package.json
index c31f04f7b..e9f41959d 100644
--- a/client/package.json
+++ b/client/package.json
@@ -18,14 +18,14 @@
18 }, 18 },
19 "license": "GPLv3", 19 "license": "GPLv3",
20 "dependencies": { 20 "dependencies": {
21 "@angular/common": "~2.3.0", 21 "@angular/common": "~2.4.1",
22 "@angular/compiler": "~2.3.0", 22 "@angular/compiler": "~2.4.1",
23 "@angular/core": "~2.3.0", 23 "@angular/core": "~2.4.1",
24 "@angular/forms": "~2.3.0", 24 "@angular/forms": "~2.4.1",
25 "@angular/http": "~2.3.0", 25 "@angular/http": "~2.4.1",
26 "@angular/platform-browser": "~2.3.0", 26 "@angular/platform-browser": "~2.4.1",
27 "@angular/platform-browser-dynamic": "~2.3.0", 27 "@angular/platform-browser-dynamic": "~2.4.1",
28 "@angular/router": "~3.3.0", 28 "@angular/router": "~3.4.1",
29 "@angularclass/hmr": "^1.2.0", 29 "@angularclass/hmr": "^1.2.0",
30 "@angularclass/hmr-loader": "^3.0.2", 30 "@angularclass/hmr-loader": "^3.0.2",
31 "@types/core-js": "^0.9.28", 31 "@types/core-js": "^0.9.28",
@@ -51,7 +51,7 @@
51 "ie-shim": "^0.1.0", 51 "ie-shim": "^0.1.0",
52 "intl": "^1.2.4", 52 "intl": "^1.2.4",
53 "json-loader": "^0.5.4", 53 "json-loader": "^0.5.4",
54 "ng2-bootstrap": "1.1.16", 54 "ng2-bootstrap": "1.1.16-10",
55 "ng2-file-upload": "^1.1.0", 55 "ng2-file-upload": "^1.1.0",
56 "ng2-meta": "^2.0.0", 56 "ng2-meta": "^2.0.0",
57 "node-sass": "^3.10.0", 57 "node-sass": "^3.10.0",
diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts
index 141922322..748c5d520 100644
--- a/client/src/app/shared/shared.module.ts
+++ b/client/src/app/shared/shared.module.ts
@@ -5,10 +5,10 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
5import { RouterModule } from '@angular/router'; 5import { RouterModule } from '@angular/router';
6 6
7import { BytesPipe } from 'angular-pipes/src/math/bytes.pipe'; 7import { BytesPipe } from 'angular-pipes/src/math/bytes.pipe';
8import { DropdownModule } from 'ng2-bootstrap/components/dropdown'; 8import { DropdownModule } from 'ng2-bootstrap/dropdown';
9import { ProgressbarModule } from 'ng2-bootstrap/components/progressbar'; 9import { ProgressbarModule } from 'ng2-bootstrap/progressbar';
10import { PaginationModule } from 'ng2-bootstrap/components/pagination'; 10import { PaginationModule } from 'ng2-bootstrap/pagination';
11import { ModalModule } from 'ng2-bootstrap/components/modal'; 11import { ModalModule } from 'ng2-bootstrap/modal';
12import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload'; 12import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload';
13 13
14import { AUTH_HTTP_PROVIDERS } from './auth'; 14import { AUTH_HTTP_PROVIDERS } from './auth';
@@ -23,11 +23,12 @@ import { SearchComponent, SearchService } from './search';
23 HttpModule, 23 HttpModule,
24 RouterModule, 24 RouterModule,
25 25
26 DropdownModule, 26 DropdownModule.forRoot(),
27 FileUploadModule, 27 ModalModule.forRoot(),
28 ModalModule, 28 PaginationModule.forRoot(),
29 PaginationModule, 29 ProgressbarModule.forRoot(),
30 ProgressbarModule 30
31 FileUploadModule
31 ], 32 ],
32 33
33 declarations: [ 34 declarations: [
diff --git a/client/src/app/videos/video-watch/video-magnet.component.ts b/client/src/app/videos/video-watch/video-magnet.component.ts
index 2894e7df6..8bee848a4 100644
--- a/client/src/app/videos/video-watch/video-magnet.component.ts
+++ b/client/src/app/videos/video-watch/video-magnet.component.ts
@@ -1,6 +1,6 @@
1import { Component, Input, ViewChild } from '@angular/core'; 1import { Component, Input, ViewChild } from '@angular/core';
2 2
3import { ModalDirective } from 'ng2-bootstrap/components/modal'; 3import { ModalDirective } from 'ng2-bootstrap/modal';
4 4
5import { Video } from '../shared'; 5import { Video } from '../shared';
6 6
diff --git a/client/src/app/videos/video-watch/video-share.component.ts b/client/src/app/videos/video-watch/video-share.component.ts
index 8e6de1294..0b85052cd 100644
--- a/client/src/app/videos/video-watch/video-share.component.ts
+++ b/client/src/app/videos/video-watch/video-share.component.ts
@@ -1,6 +1,6 @@
1import { Component, Input, ViewChild } from '@angular/core'; 1import { Component, Input, ViewChild } from '@angular/core';
2 2
3import { ModalDirective } from 'ng2-bootstrap/components/modal'; 3import { ModalDirective } from 'ng2-bootstrap/modal';
4 4
5import { Video } from '../shared'; 5import { Video } from '../shared';
6 6
diff --git a/client/src/vendor.ts b/client/src/vendor.ts
index 760fc8257..436c58f48 100644
--- a/client/src/vendor.ts
+++ b/client/src/vendor.ts
@@ -29,7 +29,7 @@ import 'angular-pipes/src/math/bytes.pipe';
29import 'ng2-file-upload'; 29import 'ng2-file-upload';
30import 'video.js'; 30import 'video.js';
31import 'ng2-meta'; 31import 'ng2-meta';
32import 'ng2-bootstrap/components/pagination'; 32import 'ng2-bootstrap/pagination';
33import 'ng2-bootstrap/components/dropdown'; 33import 'ng2-bootstrap/dropdown';
34import 'ng2-bootstrap/components/progressbar'; 34import 'ng2-bootstrap/progressbar';
35import 'ng2-bootstrap/components/modal'; 35import 'ng2-bootstrap/modal';