Merge branch 'master' into improve-support-for-hal-links
Showing
- .travis.yml 0 additions, 2 deletions.travis.yml
- package.json 3 additions, 4 deletionspackage.json
- resources/i18n/en.json 9 additions, 0 deletionsresources/i18n/en.json
- src/app/app.component.scss 2 additions, 0 deletionssrc/app/app.component.scss
- src/app/app.module.ts 3 additions, 0 deletionssrc/app/app.module.ts
- src/app/collection-page/collection-page.component.html 3 additions, 7 deletionssrc/app/collection-page/collection-page.component.html
- src/app/collection-page/collection-page.component.ts 49 additions, 58 deletionssrc/app/collection-page/collection-page.component.ts
- src/app/core/cache/builders/remote-data-build.service.ts 8 additions, 0 deletionssrc/app/core/cache/builders/remote-data-build.service.ts
- src/app/core/footer/footer.component.scss 1 addition, 2 deletionssrc/app/core/footer/footer.component.scss
- src/app/core/shared/dspace-object.model.ts 2 additions, 1 deletionsrc/app/core/shared/dspace-object.model.ts
- src/app/header/header.component.html 4 additions, 4 deletionssrc/app/header/header.component.html
- src/app/home/home-news/home-news.component.scss 5 additions, 2 deletionssrc/app/home/home-news/home-news.component.scss
- src/app/home/home.component.html 1 addition, 0 deletionssrc/app/home/home.component.html
- src/app/home/top-level-community-list/top-level-community-list.component.html 1 addition, 5 deletions...el-community-list/top-level-community-list.component.html
- src/app/home/top-level-community-list/top-level-community-list.component.ts 17 additions, 35 deletions...evel-community-list/top-level-community-list.component.ts
- src/app/item-page/full/field-components/file-section/full-file-section.component.scss 2 additions, 2 deletions...-components/file-section/full-file-section.component.scss
- src/app/item-page/full/full-item-page.component.html 1 addition, 1 deletionsrc/app/item-page/full/full-item-page.component.html
- src/app/item-page/simple/field-components/file-section/file-section.component.html 1 addition, 1 deletion...field-components/file-section/file-section.component.html
- src/app/item-page/simple/item-page.component.html 1 addition, 1 deletionsrc/app/item-page/simple/item-page.component.html
- src/app/object-list/collection-list-element/collection-list-element.component.html 4 additions, 4 deletions...ction-list-element/collection-list-element.component.html
... | ... | @@ -79,7 +79,7 @@ |
"@angular/router": "4.3.1", | ||
"@angularclass/bootloader": "1.0.1", | ||
"@angularclass/idle-preload": "1.0.4", | ||
"@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.28", | ||
"@ng-bootstrap/ng-bootstrap": "^1.0.0-beta.1", | ||
"@ngrx/effects": "^4.0.5", | ||
"@ngrx/router-store": "^4.0.4", | ||
"@ngrx/store": "^4.0.3", | ||
... | ... | @@ -87,7 +87,7 @@ |
"@ngx-translate/core": "7.1.0", | ||
"@ngx-translate/http-loader": "0.1.0", | ||
"body-parser": "1.17.2", | ||
"bootstrap": "4.0.0-alpha.6", | ||
"bootstrap": "v4.0.0-beta", | ||
"cerialize": "0.1.15", | ||
"compression": "1.7.0", | ||
"cookie-parser": "1.4.3", | ||
... | ... | @@ -119,8 +119,7 @@ |
"@types/express": "4.0.36", | ||
"@types/express-serve-static-core": "4.0.49", | ||
"@types/hammerjs": "2.0.34", | ||
"@types/jasmine": "2.5.53", | ||
"@types/lodash": "ts2.0", | ||
"@types/jasmine": "^2.6.0", | ||
"@types/memory-cache": "0.0.29", | ||
"@types/mime": "1.3.1", | ||
"@types/node": "8.0.14", | ||
... | ... |
Please register or sign in to comment