hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-17 23:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Login-as-EPerson

Browse Source 
Conflicts:
	src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
	src/app/core/auth/auth.service.spec.ts
	src/app/profile-page/profile-page.component.spec.ts
This commit is contained in:
Kristof De Langhe
2020-05-12 16:54:40 +02:00
parent df2cc22172 33be8a4a91
commit f548d5bf20
565 changed files with 31292 additions and 13539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/core/auth/auth.reducer.spec.ts
View File

@@ -26,7 +26,7 @@ import {
SetRedirectUrlAction
} from './auth.actions';
import { AuthTokenInfo } from './models/auth-token-info.model';
import { EPersonMock } from '../../shared/testing/eperson-mock';
import { EPersonMock } from '../../shared/testing/eperson.mock';
import { AuthStatus } from './models/auth-status.model';
import { AuthMethod } from './models/auth.method';
import { AuthMethodType } from './models/auth.method-type';