Commit Graph

16 Commits

Author SHA1 Message Date
lotte
b8252a1a8e Fixed feedback 2019-01-24 14:13:22 +01:00
lotte
c4004eaaa2 fixes for conflicts with master 2019-01-22 09:46:55 +01:00
lotte
6dba02ca67 Merge branch 'master' into community-and-collection-forms
Conflicts:
	src/app/core/data/item-data.service.spec.ts
	src/app/core/data/item-data.service.ts
	src/app/core/shared/operators.spec.ts
	src/app/core/shared/operators.ts
	src/app/shared/shared.module.ts
2019-01-22 08:34:51 +01:00
Art Lowel
586a4ac35b add docs, rename classes for clarity 2019-01-17 14:59:48 +01:00
lotte
d37a2e051d Started fixing tests 2018-12-21 16:22:59 +01:00
Yana De Pauw
d9a393c8e6 Add Item Status Edit Actions
Add the Item Withdraw and Reistate action
Add the make Item Private and Public action
Add the Permanently Delete action
2018-12-18 16:52:11 +01: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
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
e959542e2d implemented applying of a patch 2018-09-19 13:10:23 +02:00
lotte
f11d486d14 updated angular/rxjs to v6 successfully 2018-08-31 15:40:39 +02:00
lotte
2cbe6a6d91 upgrade to angular6 2018-08-24 13:26:43 +02:00
Kristof De Langhe
072507b293 improved coverage, type docs, removed startsWith option and general refactoring 2018-08-09 12:37:09 +02:00
Kristof De Langhe
883a1d8881 Issues 252,253: Browse by title and browse by metadata (author) 2018-08-08 11:36:42 +02:00
Lotte Hofstede
a232127422 fixed some tests 2018-04-04 14:25:57 +02:00
Art Lowel
91c6c60de8 added HalEndpointService spec 2017-10-19 13:30:13 +02:00