Merge remote-tracking branch 'remotes/origin/master' into submission-miscellaneous-fixes
# Conflicts: # src/app/submission/form/collection/submission-form-collection.component.spec.ts # src/app/submission/form/collection/submission-form-collection.component.ts
No related branches found
No related tags found
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- config/environment.default.js 3 additions, 0 deletionsconfig/environment.default.js
- package.json 13 additions, 7 deletionspackage.json
- resources/i18n/en.json 42 additions, 1 deletionresources/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/+collection-page/collection-page.component.scss 0 additions, 1 deletionsrc/app/+collection-page/collection-page.component.scss
- src/app/+community-page/community-page.component.scss 0 additions, 1 deletionsrc/app/+community-page/community-page.component.scss
- src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.scss 0 additions, 1 deletion...on-list/community-page-sub-collection-list.component.scss
- src/app/+community-page/sub-community-list/community-page-sub-community-list.component.scss 0 additions, 1 deletion...ity-list/community-page-sub-community-list.component.scss
- src/app/+home-page/home-news/home-news.component.scss 7 additions, 9 deletionssrc/app/+home-page/home-news/home-news.component.scss
- src/app/+home-page/home-page.component.default.scss 0 additions, 0 deletionssrc/app/+home-page/home-page.component.default.scss
Loading
Please register or sign in to comment