Merge branch 'master' into w2p-54472_Create-community-and-collection-pages
Conflicts: resources/i18n/en.json src/app/+community-page/community-page.component.html src/app/+community-page/community-page.module.ts src/app/core/auth/server-auth.service.ts src/app/core/core.module.ts src/app/core/index/index.effects.ts src/app/core/index/index.reducer.spec.ts src/app/core/index/index.reducer.ts src/app/header/header.component.spec.ts
No related branches found
No related tags found
Showing
- package.json 2 additions, 1 deletionpackage.json
- resources/i18n/en.json 99 additions, 2 deletionsresources/i18n/en.json
- resources/images/dspace-logo-mini.svg 23 additions, 0 deletionsresources/images/dspace-logo-mini.svg
- resources/images/dspace-logo.svg 37 additions, 0 deletionsresources/images/dspace-logo.svg
- src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts 0 additions, 1 deletion...n-registries/metadata-schema/metadata-schema.component.ts
- src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html 11 additions, 0 deletions...dmin-sidebar-section/admin-sidebar-section.component.html
- src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.scss 1 addition, 0 deletions...dmin-sidebar-section/admin-sidebar-section.component.scss
- src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts 60 additions, 0 deletions...n-sidebar-section/admin-sidebar-section.component.spec.ts
- src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts 34 additions, 0 deletions.../admin-sidebar-section/admin-sidebar-section.component.ts
- src/app/+admin/admin-sidebar/admin-sidebar.component.html 52 additions, 0 deletionssrc/app/+admin/admin-sidebar/admin-sidebar.component.html
- src/app/+admin/admin-sidebar/admin-sidebar.component.scss 77 additions, 0 deletionssrc/app/+admin/admin-sidebar/admin-sidebar.component.scss
- src/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts 142 additions, 0 deletionssrc/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts
- src/app/+admin/admin-sidebar/admin-sidebar.component.ts 479 additions, 0 deletionssrc/app/+admin/admin-sidebar/admin-sidebar.component.ts
- src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html 27 additions, 0 deletions...r-section/expandable-admin-sidebar-section.component.html
- src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss 21 additions, 0 deletions...r-section/expandable-admin-sidebar-section.component.scss
- src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts 84 additions, 0 deletions...ection/expandable-admin-sidebar-section.component.spec.ts
- src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts 69 additions, 0 deletions...bar-section/expandable-admin-sidebar-section.component.ts
- src/app/+admin/admin.module.ts 1 addition, 1 deletionsrc/app/+admin/admin.module.ts
- src/app/+community-page/community-page.component.html 3 additions, 4 deletionssrc/app/+community-page/community-page.component.html
- src/app/+community-page/community-page.module.ts 2 additions, 0 deletionssrc/app/+community-page/community-page.module.ts
Loading
Please register or sign in to comment