Merge remote-tracking branch 'atmire/master' into Browse-by-links
Conflicts: src/app/core/browse/browse.service.spec.ts src/app/core/data/dso-response-parsing.service.ts src/app/shared/shared.module.ts
No related branches found
No related tags found
Showing
- config/environment.default.js 9 additions, 2 deletionsconfig/environment.default.js
- package.json 1 addition, 0 deletionspackage.json
- resources/i18n/en.json 62 additions, 0 deletionsresources/i18n/en.json
- src/app/+collection-page/collection-form/collection-form.component.ts 71 additions, 0 deletions...lection-page/collection-form/collection-form.component.ts
- src/app/+collection-page/collection-page-routing.module.ts 29 additions, 0 deletionssrc/app/+collection-page/collection-page-routing.module.ts
- src/app/+collection-page/collection-page.component.ts 6 additions, 5 deletionssrc/app/+collection-page/collection-page.component.ts
- src/app/+collection-page/collection-page.module.ts 8 additions, 0 deletionssrc/app/+collection-page/collection-page.module.ts
- src/app/+collection-page/create-collection-page/create-collection-page.component.html 8 additions, 0 deletions...ate-collection-page/create-collection-page.component.html
- src/app/+collection-page/create-collection-page/create-collection-page.component.scss 1 addition, 0 deletions...ate-collection-page/create-collection-page.component.scss
- src/app/+collection-page/create-collection-page/create-collection-page.component.spec.ts 46 additions, 0 deletions...-collection-page/create-collection-page.component.spec.ts
- src/app/+collection-page/create-collection-page/create-collection-page.component.ts 29 additions, 0 deletions...reate-collection-page/create-collection-page.component.ts
- src/app/+collection-page/create-collection-page/create-collection-page.guard.spec.ts 67 additions, 0 deletions...eate-collection-page/create-collection-page.guard.spec.ts
- src/app/+collection-page/create-collection-page/create-collection-page.guard.ts 46 additions, 0 deletions...ge/create-collection-page/create-collection-page.guard.ts
- src/app/+collection-page/delete-collection-page/delete-collection-page.component.html 19 additions, 0 deletions...ete-collection-page/delete-collection-page.component.html
- src/app/+collection-page/delete-collection-page/delete-collection-page.component.scss 1 addition, 0 deletions...ete-collection-page/delete-collection-page.component.scss
- src/app/+collection-page/delete-collection-page/delete-collection-page.component.spec.ts 41 additions, 0 deletions...-collection-page/delete-collection-page.component.spec.ts
- src/app/+collection-page/delete-collection-page/delete-collection-page.component.ts 33 additions, 0 deletions...elete-collection-page/delete-collection-page.component.ts
- src/app/+collection-page/edit-collection-page/edit-collection-page.component.html 11 additions, 0 deletions.../edit-collection-page/edit-collection-page.component.html
- src/app/+collection-page/edit-collection-page/edit-collection-page.component.scss 1 addition, 0 deletions.../edit-collection-page/edit-collection-page.component.scss
- src/app/+collection-page/edit-collection-page/edit-collection-page.component.spec.ts 39 additions, 0 deletions...it-collection-page/edit-collection-page.component.spec.ts
Loading
Please register or sign in to comment