lotte
|
d89e639e76
|
61561: clean up
|
2019-04-08 17:17:12 +02:00 |
|
lotte
|
2330e96158
|
intermediate commit
|
2018-10-17 13:18:01 +02:00 |
|
lotte
|
1928da8c32
|
Merge branch 'resolvers-branch-angular6' into patch-support
Conflicts:
src/app/core/auth/auth-response-parsing.service.spec.ts
src/app/core/auth/auth.service.ts
src/app/core/auth/models/auth-status.model.ts
src/app/core/auth/server-auth.service.ts
src/app/core/data/data.service.spec.ts
src/app/core/data/data.service.ts
src/app/core/data/dspace-object-data.service.ts
src/app/core/data/item-data.service.spec.ts
src/app/core/data/item-data.service.ts
src/app/core/data/request.models.ts
src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
src/app/shared/mocks/mock-form-service.ts
src/app/shared/mocks/mock-remote-data-build.service.ts
src/app/shared/mocks/mock-store.ts
|
2018-10-11 12:51:10 +02:00 |
|
lotte
|
3a8f7754fa
|
55143: fixed all tests
|
2018-10-11 12:02:40 +02:00 |
|
lotte
|
e025f3bc4d
|
Merge branch 'master' into resolvers-branch-angular6
Conflicts:
package.json
src/app/+search-page/search-filters/search-filters.component.ts
src/app/core/auth/auth.effects.ts
src/app/core/auth/auth.service.ts
src/app/core/auth/server-auth.service.ts
src/app/core/data/comcol-data.service.ts
src/app/core/data/community-data.service.ts
src/app/core/data/data.service.ts
src/app/core/data/item-data.service.ts
src/app/core/shared/dspace-object.model.ts
src/app/header/header.component.spec.ts
src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
src/app/shared/testing/auth-service-stub.ts
yarn.lock
|
2018-10-08 12:28:08 +02:00 |
|
lotte
|
1680f67744
|
finalized put/patch requests
|
2018-09-27 16:56:27 +02:00 |
|
lotte
|
dc5747982b
|
Merge remote-tracking branch 'atmire-internal/w2p-55565_authorization-issue' into patch-support
Conflicts:
package.json
src/app/+search-page/search-filters/search-filters.component.ts
src/app/core/auth/auth.effects.ts
src/app/core/auth/auth.service.ts
src/app/core/auth/server-auth.service.ts
src/app/core/data/data.service.ts
src/app/header/header.component.spec.ts
src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
src/app/shared/testing/auth-service-stub.ts
yarn.lock
|
2018-09-27 16:54:59 +02:00 |
|
lotte
|
caf9194f36
|
Fixes for authentication (awaiting fixes in EPerson REST endpoint)
|
2018-09-12 11:38:08 +02:00 |
|
lotte
|
2cbe6a6d91
|
upgrade to angular6
|
2018-08-24 13:26:43 +02:00 |
|
Art Lowel
|
44b031a234
|
#255 Fetching and parsing browse entries
|
2018-05-17 14:52:09 +02:00 |
|