Merge remote-tracking branch 'remotes/origin/master' into shibboleth (7cf04800) · Commits · vtechworks / Dspace7 Angular

Commit 7cf04800 authored 4 years ago by

Giuseppe Digilio

Merge remote-tracking branch 'remotes/origin/master' into shibboleth

# Conflicts:
#	src/app/app-routing.module.ts
#	src/app/core/auth/auth.service.ts
#	src/app/shared/shared.module.ts

parents b2234e45 103605c3

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 0 deletions

.gitignore
resources/i18n/en.json5 216 additions, 11 deletions

resources/i18n/en.json5
resources/i18n/nl.json5 1 addition, 1 deletion

resources/i18n/nl.json5
src/app/+admin/admin-access-control/admin-access-control-routing.module.ts 17 additions, 0 deletions

...min-access-control/admin-access-control-routing.module.ts
src/app/+admin/admin-access-control/admin-access-control.module.ts 29 additions, 0 deletions

...admin/admin-access-control/admin-access-control.module.ts
src/app/+admin/admin-access-control/epeople-registry/epeople-registry.actions.ts 49 additions, 0 deletions

...cess-control/epeople-registry/epeople-registry.actions.ts
src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.html 90 additions, 0 deletions

...-control/epeople-registry/epeople-registry.component.html
src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.spec.ts 205 additions, 0 deletions

...ntrol/epeople-registry/epeople-registry.component.spec.ts
src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts 163 additions, 0 deletions

...ss-control/epeople-registry/epeople-registry.component.ts
src/app/+admin/admin-access-control/epeople-registry/epeople-registry.reducers.spec.ts 54 additions, 0 deletions

...ontrol/epeople-registry/epeople-registry.reducers.spec.ts
src/app/+admin/admin-access-control/epeople-registry/epeople-registry.reducers.ts 47 additions, 0 deletions

...ess-control/epeople-registry/epeople-registry.reducers.ts
src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.html 17 additions, 0 deletions

...epeople-registry/eperson-form/eperson-form.component.html
src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts 206 additions, 0 deletions

...ople-registry/eperson-form/eperson-form.component.spec.ts
src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.ts 344 additions, 0 deletions

...l/epeople-registry/eperson-form/eperson-form.component.ts
src/app/+admin/admin-routing.module.ts 14 additions, 1 deletion

src/app/+admin/admin-routing.module.ts
src/app/+admin/admin-search-page/admin-search-page.component.html 1 addition, 0 deletions

...+admin/admin-search-page/admin-search-page.component.html
src/app/+admin/admin-search-page/admin-search-page.component.scss 0 additions, 0 deletions

...+admin/admin-search-page/admin-search-page.component.scss
src/app/+admin/admin-search-page/admin-search-page.component.spec.ts 27 additions, 0 deletions

...min/admin-search-page/admin-search-page.component.spec.ts
src/app/+admin/admin-search-page/admin-search-page.component.ts 18 additions, 0 deletions

...p/+admin/admin-search-page/admin-search-page.component.ts
src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.html 13 additions, 0 deletions

...ollection-admin-search-result-grid-element.component.html

with 1513 additions and 13 deletions

Please register or to comment