Giuseppe Digilio
|
84840678d2
|
Several fixes after merge with main
|
2020-12-04 14:16:40 +01:00 |
|
Giuseppe Digilio
|
948e002225
|
Merge remote-tracking branch 'remotes/origin/main' into upgrade_angular10
# Conflicts:
# package.json
# server.ts
# src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts
# src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts
# src/app/+admin/admin-access-control/group-registry/groups-registry.component.spec.ts
# src/app/+admin/admin-access-control/group-registry/groups-registry.component.ts
# src/app/+collection-page/collection-page.component.ts
# src/app/+item-page/edit-item-page/item-page-reinstate.guard.ts
# src/app/+item-page/edit-item-page/item-page-withdraw.guard.ts
# src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
# src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts
# src/app/+item-page/item-page-administrator.guard.ts
# src/app/app-routing.module.ts
# src/app/community-list-page/community-list-service.ts
# src/app/core/data/entity-type.service.ts
# src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-feature.guard.spec.ts
# src/app/core/data/feature-authorization/feature-authorization-guard/feature-authorization.guard.spec.ts
# src/app/core/data/feature-authorization/feature-authorization-guard/feature-authorization.guard.ts
# src/app/core/data/feature-authorization/feature-authorization-guard/site-administrator.guard.ts
# src/app/core/data/feature-authorization/feature-authorization-guard/site-register.guard.ts
# src/app/core/data/object-updates/object-updates.reducer.ts
# src/app/core/shared/operators.ts
# src/app/process-page/detail/process-detail.component.ts
# src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts
# src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
# src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
# src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts
# src/app/shared/shared.module.ts
# yarn.lock
|
2020-12-04 11:36:48 +01:00 |
|
Giuseppe Digilio
|
20b5721e3c
|
Fixed lint errors and add lint fix script
|
2020-12-04 10:32:46 +01:00 |
|
Marie Verdonck
|
dfd7468b88
|
74179/PR#925: Groups with linked dso (workflow groups) => No edit/delete possible + alert on edit page with link to edit roles on comcol page
|
2020-12-01 13:43:15 +01:00 |
|
Art Lowel
|
21e8879f77
|
remove circular dependencies
|
2020-08-28 11:34:17 +02:00 |
|