1
0

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

# Conflicts:
#	src/app/core/auth/auth.service.ts
#	src/app/core/auth/models/auth-status.model.ts
#	src/app/core/auth/models/normalized-auth-status.model.ts
#	src/app/core/auth/server-auth.service.ts
#	src/app/core/core.module.ts
#	src/app/shared/shared.module.ts
This commit is contained in:
Giuseppe Digilio
2020-02-25 17:31:07 +01:00
446 changed files with 8024 additions and 6657 deletions

View File

@@ -1,6 +1,7 @@
import { Observable, of as observableOf, throwError as observableThrowError } from 'rxjs';
import { distinctUntilChanged, filter, map, mergeMap, tap } from 'rxjs/operators';
import { Inject, Injectable } from '@angular/core';
import { EPersonDataService } from '../eperson/eperson-data.service';
import { HALEndpointService } from '../shared/hal-endpoint.service';
import { RequestService } from '../data/request.service';
import { GLOBAL_CONFIG } from '../../../config';