Merge remote-tracking branch 'upstream/main' into split-eperson-administration-page_contribute-main

# Conflicts:
#	src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
This commit is contained in:
Alexandre Vryghem
2023-10-19 23:18:42 +02:00
168 changed files with 8399 additions and 2764 deletions

View File

@@ -36,7 +36,7 @@ import {
getFirstCompletedRemoteData,
getFirstSucceededRemoteDataPayload
} from '../../../core/shared/operators';
import { AlertType } from '../../../shared/alert/aletr-type';
import { AlertType } from '../../../shared/alert/alert-type';
import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
import { hasValue, isNotEmpty, hasValueOperator } from '../../../shared/empty.util';
import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';