diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-01-12 15:20:03 +0100 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-01-12 15:20:03 +0100 |
commit | 99fe265a5fc077cb66c322e7f3d191ff7110aea0 (patch) | |
tree | c9e04ccfcc5496d2300d7c26db5833e494b4cdad /client/src/app/shared/shared.module.ts | |
parent | fcc5f77b95d330bfcb439c172b7fcc58f3162e4d (diff) | |
parent | 91cc839af88730ba55f84997c56b85ea100070a7 (diff) | |
download | PeerTube-99fe265a5fc077cb66c322e7f3d191ff7110aea0.tar.gz PeerTube-99fe265a5fc077cb66c322e7f3d191ff7110aea0.tar.zst PeerTube-99fe265a5fc077cb66c322e7f3d191ff7110aea0.zip |
Merge branch 'postgresql'
Diffstat (limited to 'client/src/app/shared/shared.module.ts')
-rw-r--r-- | client/src/app/shared/shared.module.ts | 19 |
1 files changed, 10 insertions, 9 deletions
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'; | |||
5 | import { RouterModule } from '@angular/router'; | 5 | import { RouterModule } from '@angular/router'; |
6 | 6 | ||
7 | import { BytesPipe } from 'angular-pipes/src/math/bytes.pipe'; | 7 | import { BytesPipe } from 'angular-pipes/src/math/bytes.pipe'; |
8 | import { DropdownModule } from 'ng2-bootstrap/components/dropdown'; | 8 | import { DropdownModule } from 'ng2-bootstrap/dropdown'; |
9 | import { ProgressbarModule } from 'ng2-bootstrap/components/progressbar'; | 9 | import { ProgressbarModule } from 'ng2-bootstrap/progressbar'; |
10 | import { PaginationModule } from 'ng2-bootstrap/components/pagination'; | 10 | import { PaginationModule } from 'ng2-bootstrap/pagination'; |
11 | import { ModalModule } from 'ng2-bootstrap/components/modal'; | 11 | import { ModalModule } from 'ng2-bootstrap/modal'; |
12 | import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload'; | 12 | import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload'; |
13 | 13 | ||
14 | import { AUTH_HTTP_PROVIDERS } from './auth'; | 14 | import { 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: [ |