Merge remote-tracking branch 'remotes/origin/master' into mydspace
# Conflicts: # src/app/core/data/base-response-parsing.service.ts # src/app/core/data/request.service.ts
Showing
- package.json 1 addition, 1 deletionpackage.json
- src/app/core/auth/auth-object-factory.ts 5 additions, 0 deletionssrc/app/core/auth/auth-object-factory.ts
- src/app/core/auth/auth-request.service.ts 10 additions, 3 deletionssrc/app/core/auth/auth-request.service.ts
- src/app/core/auth/auth-response-parsing.service.ts 4 additions, 3 deletionssrc/app/core/auth/auth-response-parsing.service.ts
- src/app/core/auth/auth-type.ts 2 additions, 1 deletionsrc/app/core/auth/auth-type.ts
- src/app/core/auth/auth.service.spec.ts 20 additions, 15 deletionssrc/app/core/auth/auth.service.spec.ts
- src/app/core/auth/auth.service.ts 2 additions, 7 deletionssrc/app/core/auth/auth.service.ts
- src/app/core/auth/models/auth-status.model.ts 2 additions, 1 deletionsrc/app/core/auth/models/auth-status.model.ts
- src/app/core/auth/server-auth.service.ts 2 additions, 7 deletionssrc/app/core/auth/server-auth.service.ts
- src/app/core/cache/models/normalized-object-factory.ts 1 addition, 0 deletionssrc/app/core/cache/models/normalized-object-factory.ts
- src/app/core/cache/response.models.ts 2 additions, 1 deletionsrc/app/core/cache/response.models.ts
- src/app/core/data/base-response-parsing.service.ts 1 addition, 22 deletionssrc/app/core/data/base-response-parsing.service.ts
- src/app/core/data/request.service.ts 13 additions, 2 deletionssrc/app/core/data/request.service.ts
- src/app/core/dspace-rest-v2/dspace-rest-v2.service.spec.ts 61 additions, 16 deletionssrc/app/core/dspace-rest-v2/dspace-rest-v2.service.spec.ts
- src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts 42 additions, 11 deletionssrc/app/core/dspace-rest-v2/dspace-rest-v2.service.ts
- src/app/shared/mocks/mock-remote-data-build.service.ts 3 additions, 1 deletionsrc/app/shared/mocks/mock-remote-data-build.service.ts
- yarn.lock 5 additions, 5 deletionsyarn.lock
Please register or sign in to comment