Kristof De Langhe fb65aa84f3 Merge branch 'response-cache-refactoring' into w2p-54472_Create-community-and-collection-pages ...

Conflicts:
	src/app/core/auth/auth-response-parsing.service.ts
	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/cache/builders/remote-data-build.service.ts
	src/app/core/data/collection-data.service.ts
	src/app/core/data/comcol-data.service.spec.ts
	src/app/core/data/comcol-data.service.ts
	src/app/core/data/community-data.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.ts
	src/app/core/data/request.models.ts
	src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts
	src/app/core/shared/hal-endpoint.service.ts
	src/app/core/shared/operators.ts
	src/app/shared/testing/auth-request-service-stub.ts
	src/app/shared/testing/auth-service-stub.ts

2018-10-29 10:26:44 +01:00

..

app

Merge branch 'response-cache-refactoring' into w2p-54472_Create-community-and-collection-pages

2018-10-29 10:26:44 +01:00

backend

dependency upgrades, server and platform module updates, linting wip

2017-07-12 14:33:16 -05:00

config

Merge remote-tracking branch 'atmire-internal/responseMsToLive' into patch-support

2018-10-12 15:23:17 +02:00

modules

55143: fixed all tests

2018-10-11 12:02:40 +02:00

styles

Merge branch 'master' into search-features

2018-08-02 14:21:28 +02:00

config.ts

Remove unnecessary "as ServerConfig" statements

2018-05-15 15:14:23 -05:00

index.csr.html

50479: Google analytics only loaded when tracking id present

2018-03-23 13:52:45 +01:00

index.html

50479: Google analytics only loaded when tracking id present

2018-03-23 13:52:45 +01:00

main.browser.ts

50479: Make use of empty.util

2018-03-23 15:55:38 +01:00

main.server.aot.ts

Fixed AoT Build

2018-01-23 15:16:22 +01:00

main.server.ts

Fixed AoT Build

2018-01-23 15:16:22 +01:00

routes.ts

Finalized auth module

2018-02-22 15:47:15 +01:00

server.ts

intermediate commit

2018-10-17 13:18:01 +02:00

tsconfig.browser.json

include all modules in coverage

2017-10-09 08:18:28 -05:00

tsconfig.server.aot.json

Fixed AoT Build

2018-01-23 15:16:22 +01:00

tsconfig.server.json

include all modules in coverage

2017-10-09 08:18:28 -05:00

tsconfig.test.json

50632: Added tests for registry service and updated component tests

2018-04-04 17:17:57 +02:00