resolved merge conflicts
Showing
- package.json 1 addition, 1 deletionpackage.json
- resources/i18n/en.json 9 additions, 0 deletionsresources/i18n/en.json
- 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/+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/item-page.component.html 1 addition, 1 deletionsrc/app/+item-page/simple/item-page.component.html
- src/app/app.component.scss 2 additions, 0 deletionssrc/app/app.component.scss
- src/app/core/cache/builders/remote-data-build.service.ts 15 additions, 10 deletionssrc/app/core/cache/builders/remote-data-build.service.ts
- src/app/core/shared/dspace-object.model.ts 2 additions, 1 deletionsrc/app/core/shared/dspace-object.model.ts
- src/app/footer/footer.component.scss 1 addition, 2 deletionssrc/app/footer/footer.component.scss
- src/app/header/header.component.html 4 additions, 4 deletionssrc/app/header/header.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
- src/app/object-list/collection-list-element/collection-list-element.component.ts 5 additions, 7 deletions...lection-list-element/collection-list-element.component.ts
- src/app/object-list/community-list-element/community-list-element.component.html 4 additions, 4 deletions...munity-list-element/community-list-element.component.html
- src/app/object-list/community-list-element/community-list-element.component.ts 5 additions, 7 deletions...ommunity-list-element/community-list-element.component.ts
... | ... | @@ -87,7 +87,7 @@ |
"@ngx-translate/core": "8.0.0", | ||
"@ngx-translate/http-loader": "2.0.0", | ||
"body-parser": "1.18.2", | ||
"bootstrap": "4.0.0-alpha.6", | ||
"bootstrap": "v4.0.0-beta", | ||
"cerialize": "0.1.16", | ||
"compression": "1.7.1", | ||
"cookie-parser": "1.4.3", | ||
... | ... |
Please register or sign in to comment