Merge branch 'master' into w2p-63469_Relations-delete-feedback-2
Conflicts: src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- config/environment.default.js 30 additions, 2 deletionsconfig/environment.default.js
- package.json 13 additions, 7 deletionspackage.json
- resources/i18n/en.json 43 additions, 2 deletionsresources/i18n/en.json
- resources/images/banner.jpg 0 additions, 0 deletionsresources/images/banner.jpg
- resources/images/dspace-logo-monochrome.svg 37 additions, 0 deletionsresources/images/dspace-logo-monochrome.svg
- scripts/sync-build-dir.js 22 additions, 0 deletionsscripts/sync-build-dir.js
- scripts/webpack.js 0 additions, 0 deletionsscripts/webpack.js
- src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.scss 0 additions, 2 deletions...stries/metadata-registry/metadata-registry.component.scss
- src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.scss 0 additions, 2 deletions...registries/metadata-schema/metadata-schema.component.scss
- src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.scss 0 additions, 1 deletion...dmin-sidebar-section/admin-sidebar-section.component.scss
- src/app/+admin/admin-sidebar/admin-sidebar.component.html 1 addition, 1 deletionsrc/app/+admin/admin-sidebar/admin-sidebar.component.html
- src/app/+admin/admin-sidebar/admin-sidebar.component.scss 2 additions, 3 deletionssrc/app/+admin/admin-sidebar/admin-sidebar.component.scss
- src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss 0 additions, 2 deletions...r-section/expandable-admin-sidebar-section.component.scss
- src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.ts 9 additions, 6 deletions...-by/+browse-by-date-page/browse-by-date-page.component.ts
- src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html 1 addition, 1 deletion...e-by-metadata-page/browse-by-metadata-page.component.html
- src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts 9 additions, 7 deletions...wse-by-metadata-page/browse-by-metadata-page.component.ts
- src/app/+browse-by/+browse-by-switcher/browse-by-decorator.spec.ts 12 additions, 0 deletions...browse-by/+browse-by-switcher/browse-by-decorator.spec.ts
- src/app/+browse-by/+browse-by-switcher/browse-by-decorator.ts 37 additions, 0 deletions...app/+browse-by/+browse-by-switcher/browse-by-decorator.ts
- src/app/+browse-by/+browse-by-switcher/browse-by-switcher.component.html 1 addition, 0 deletions...-by/+browse-by-switcher/browse-by-switcher.component.html
Please register or sign in to comment