24 Commits

Author	SHA1	Message	Date
Giuseppe Digilio	ab42f4b190	Merge remote-tracking branch 'remotes/origin/master' into submission ... # Conflicts: # src/app/+item-page/edit-item-page/item-status/item-status.component.spec.ts # src/app/core/cache/builders/remote-data-build.service.ts # src/app/core/core.effects.ts # src/app/core/core.reducers.ts # src/app/core/data/comcol-data.service.spec.ts # src/app/core/data/data.service.spec.ts # src/app/core/data/data.service.ts # src/app/core/shared/dspace-object.model.ts # src/app/shared/shared.module.ts # src/styles/_custom_variables.scss	2019-03-08 09:52:47 +01:00
Giuseppe Digilio	880d9ed069	Merge remote-tracking branch 'remotes/origin/master' into submission ... # Conflicts: # package.json # src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts # src/app/+item-page/edit-item-page/item-private/item-private.component.spec.ts # src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts # src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts # src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts # src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts # src/app/+search-page/search-service/search.service.spec.ts # src/app/core/auth/auth-response-parsing.service.spec.ts # src/app/core/auth/auth-response-parsing.service.ts # src/app/core/cache/builders/remote-data-build.service.ts # src/app/core/cache/response-cache.reducer.spec.ts # src/app/core/cache/response-cache.service.spec.ts # src/app/core/cache/response.models.ts # src/app/core/config/config-response-parsing.service.ts # src/app/core/core.effects.ts # src/app/core/core.module.ts # src/app/core/core.reducers.ts # src/app/core/data/base-response-parsing.service.ts # src/app/core/data/data.service.ts # src/app/core/data/item-data.service.spec.ts # src/app/core/data/request.models.ts # src/app/core/data/request.service.spec.ts # src/app/core/data/request.service.ts # src/app/core/integration/integration-response-parsing.service.spec.ts # src/app/core/integration/integration-response-parsing.service.ts # src/app/core/integration/integration.service.ts # src/app/core/metadata/metadata.service.spec.ts # src/app/core/registry/registry.service.spec.ts # src/app/core/shared/hal-endpoint.service.ts # src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control.component.ts # src/app/shared/mocks/mock-response-cache.service.ts # src/app/shared/shared.module.ts	2019-02-19 17:30:33 +01:00
lotte	0050f58bf0	got rid of TNormalized everywhere	2019-01-29 16:03:50 +01:00
lotte	a733eb5834	Merge branch 'community-and-collection-forms' into w2p-58522_delete-collections-and-communities ... Conflicts: src/app/core/data/data.service.ts src/app/shared/shared.module.ts	2019-01-24 12:58:05 +01:00
Art Lowel	586a4ac35b	add docs, rename classes for clarity	2019-01-17 14:59:48 +01:00
lotte	ab5cc1c961	58522: implemented delete for coll and comms	2019-01-04 16:30:25 +01:00
lotte	d37a2e051d	Started fixing tests	2018-12-21 16:22:59 +01:00
lotte	7a12332d70	Edit and create communities	2018-12-20 15:54:47 +01:00
Giuseppe Digilio	ff97a4cc8b	Merge remote-tracking branch 'remotes/origin/master' into submission ... # Conflicts: # package.json # src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts # src/app/+search-page/search-service/search.service.spec.ts # src/app/app.module.ts # src/app/core/auth/auth.interceptor.ts # src/app/core/cache/response-cache.service.spec.ts # src/app/core/data/browse-response-parsing.service.spec.ts # src/app/core/data/data.service.spec.ts # src/app/core/data/request.service.spec.ts # src/app/core/data/request.service.ts # src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts # src/app/core/integration/integration.service.ts # src/app/core/metadata/metadata.service.spec.ts # src/app/core/registry/registry.service.spec.ts # src/app/core/shared/collection.model.ts # src/app/core/shared/item.model.ts # src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.component.spec.ts # src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.components.ts # src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts # src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts # src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts # src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts # src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts # src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts # src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.ts # src/app/shared/form/builder/form-builder.service.spec.ts # src/app/shared/form/form.service.spec.ts # src/app/shared/notifications/notification/notification.component.spec.ts # src/app/shared/services/route.service.spec.ts # src/app/shared/services/route.service.ts # src/app/shared/shared.module.ts # yarn.lock	2018-12-13 20:28:11 +01:00
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
lotte	2330e96158	intermediate commit	2018-10-17 13:18:01 +02:00
Giuseppe	7b483ce052	Fixed merge issues	2018-10-17 12:25:46 +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
Kristof De Langhe	6973c66d79	54472: Intermediate commit	2018-09-12 10:49:31 +02:00
Kristof De Langhe	0197b4a9dc	54472: Passing parent as parameter and fixed duplicate collection created	2018-09-12 08:11:33 +02:00
Kristof De Langhe	758127e409	54472: Working post request with form-data (contains test code)	2018-09-11 16:23:57 +02:00
Kristof De Langhe	ad9852f194	54472: form-data intermediate commit	2018-09-11 14:50:23 +02:00
Kristof De Langhe	dfb4a3bd9c	54472: Notification errors	2018-09-11 09:21:35 +02:00
Kristof De Langhe	7a2e0ae851	54472: Post-merge error fixes	2018-09-07 14:32:43 +02:00
Kristof De Langhe	4590264d5a	Merge branch 'master' into browse-by-features ... Conflicts: src/app/core/core.module.ts src/app/core/shared/operators.ts src/app/shared/object-grid/item-grid-element/item-grid-element.component.html src/app/shared/object-list/item-list-element/item-list-element.component.html src/app/shared/shared.module.ts	2018-08-29 14:24:45 +02:00
lotte	2cbe6a6d91	upgrade to angular6	2018-08-24 13:26:43 +02:00
lotte	9a410d02d9	scope now uses DSO endpoint instead of PID	2018-08-23 15:38:10 +02:00