Commit Graph

15 Commits

Author SHA1 Message Date
lotte
8ffbd13242 finished tests and docs 2018-10-12 11:55:52 +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
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
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
a2bcdfbea9 disabled reloads 2018-09-20 15:24:16 +02:00
lotte
e96eeeaa83 fixed redirect after login 2018-09-18 16:29:55 +02:00
lotte
1f336f29fd small fixes for authentication 2018-09-12 16:11:04 +02:00
lotte
caf9194f36 Fixes for authentication (awaiting fixes in EPerson REST endpoint) 2018-09-12 11:38:08 +02:00
lotte
777facf5cd intermediate commit 2018-08-29 15:12:01 +02:00
lotte
2cbe6a6d91 upgrade to angular6 2018-08-24 13:26:43 +02:00
Giuseppe Digilio
6b7c748251 Added a fallback for x-forwarded-for header 2018-07-05 09:25:35 +02:00
Giuseppe Digilio
3126a96554 Added x-forwarded-for header to pass server ip check 2018-06-28 11:51:52 +02:00
Giuseppe Digilio
e0efa5f8e5 changes based on review comments 2018-05-23 18:13:34 +02:00
Giuseppe Digilio
b0b4342f24 Fixed an issue with redirect url 2018-05-08 10:34:46 +02:00
Giuseppe Digilio
c8a1fe0860 Removed use of platform service and created different service for SSR and CSR 2018-05-03 19:08:07 +02:00