Kristof De Langhe dd7f34e541 Merge branch 'main' into w2p-71764_Features-support-part-2 ...

Conflicts:
	src/app/+collection-page/collection-page-routing.module.ts
	src/app/+community-page/community-page-routing.module.ts
	src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
	src/app/+item-page/edit-item-page/item-status/item-status.component.ts
	src/app/+item-page/item-page-routing.module.ts
	src/app/app-routing.module.ts
	src/app/core/core.module.ts
	src/app/shared/log-in/log-in.component.html
	src/app/shared/log-in/log-in.component.spec.ts
	src/app/shared/log-in/log-in.component.ts

2020-09-22 08:36:16 +02:00

..

bitstreams/upload

remove circular dependencies

2020-08-28 11:34:17 +02:00

edit-item-page

Merge branch 'main' into w2p-71764_Features-support-part-2

2020-09-22 08:36:16 +02:00

field-components

angular cli

2020-03-18 16:03:40 +01:00

full

Fixed tslint issues

2020-08-17 16:29:57 +02:00

simple

Fixed tslint issues

2020-08-17 16:29:57 +02:00

item-page-administrator.guard.ts

71764: Refactor DsoPageAdministratorGuard to more abstract DsoPageFeatureGuard and add implementations for WithdrawItem / ReinstateItem guards

2020-07-10 13:14:55 +02:00

item-page-routing-paths.ts

remove circular dependencies

2020-08-28 11:34:17 +02:00

item-page-routing.module.ts

Merge branch 'main' into w2p-71764_Features-support-part-2

2020-09-22 08:36:16 +02:00

item-page.module.ts

Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates

2020-03-20 17:22:58 +01:00

item-page.resolver.ts

Intermediate commit

2020-04-06 20:36:56 +02:00