hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-17 06:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,794 Commits 23 Branches 25 Tags
f136ea7d4fc7ace8bfe1c7bba3f440f4573d2bc1
Commit Graph

29 Commits

Author SHA1 Message Date
Yana De Pauw
f136ea7d4f 70504: New user registration 2020-05-28 09:41:16 +02:00
Art Lowel
07998a8c08 remove normalized models part 1 2020-02-17 18:22:42 +01:00
Kristof De Langhe
d2c2431c6c Merge branch 'master' into w2p-64503_Edit-collection-Content-Source-2 
Conflicts:
	resources/i18n/en.json5
	src/app/core/core.module.ts
	src/app/core/data/collection-data.service.ts
	src/app/shared/shared.module.ts
 2020-01-06 11:48:44 +01:00
lotte
4d67c98f04 Merge branch 'master' into w2p-62849_relationships-in-submission 2019-08-27 16:41:37 +02:00
Kristof De Langhe
764f532b99 64503: Content Source fetched from API 2019-08-20 16:25:40 +02:00
lotte
42c690dfd4 moved search module contents to shared 2019-07-10 13:17:28 +02:00
lotte
a0a0830e5f 61949: merged master, resolving conflicts 2019-05-24 16:57:38 +02:00
lotte
233909d6ca Merge branch 'master' into w2p-61949_object-factory-refactoring 
Conflicts:
	src/app/core/cache/models/normalized-object-factory.ts
	src/app/core/cache/response.models.ts
	src/app/core/core.module.ts
	src/app/core/data/base-response-parsing.service.ts
	src/app/core/shared/resource-type.ts
	src/app/core/submission/submission-response-parsing.service.ts
 2019-05-24 15:42:24 +02:00
Kristof De Langhe
0390f67d01 Merge branch 'master' into w2p-62372_Final-master-merge 
Conflicts:
	config/environment.default.js
	resources/i18n/en.json
	src/app/+search-page/paginated-search-options.model.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts
	src/app/+search-page/search-options.model.ts
	src/app/+search-page/search-page.component.spec.ts
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/+search-page/search-service/search-configuration.service.ts
	src/app/core/cache/response.models.ts
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
	src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
	src/app/shared/object-list/wrapper-list-element/wrapper-list-element.component.ts
	src/app/shared/services/route.service.ts
 2019-05-13 12:47:21 +02:00
Art Lowel
81e8c23cc5 Merge branch 'master' into entities_new_data_tweaks 2019-05-08 09:57:21 +02:00
lotte
6438c65381 continued refactoring resource type factories 2019-04-25 17:13:58 +02:00
Giuseppe Digilio
fe4ad007d2 Merge remote-tracking branch 'remotes/origin/master' into mydspace 
# Conflicts:
#	src/app/core/data/base-response-parsing.service.ts
#	src/app/core/data/request.service.ts
 2019-04-25 13:10:21 +02:00
Giuseppe Digilio
ea81a44e6d Merge remote-tracking branch 'remotes/origin/master' into mydspace 
# Conflicts:
#	src/app/core/data/base-response-parsing.service.ts
#	src/app/core/data/request.service.ts
 2019-04-25 13:09:58 +02:00
lotte
b443890848 61561: resolving second todo in auth srvice 2019-04-08 15:55:09 +02:00
Kristof De Langhe
9766a65c3a Merge branch 'master' into w2p-61493_Configurable-entities-master-merge 
Conflicts:
	src/app/+item-page/item-page.module.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.ts
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/core/shared/dspace-object.model.ts
	src/app/core/shared/item.model.ts
	src/app/core/shared/metadata.models.ts
	src/app/core/shared/resource-type.ts
	src/app/shared/services/route.service.spec.ts
	src/app/shared/services/route.service.ts
	src/app/thumbnail/thumbnail.component.html
 2019-04-01 15:52:53 +02:00
Kristof De Langhe
6c3fb556d8 Merge remote-tracking branch 'atmire/mixing-text-authority-entities' into w2p-61133_Merge-345-and-master 
Conflicts:
	src/app/+collection-page/collection-page.component.ts
	src/app/+collection-page/collection-page.module.ts
	src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
	src/app/+item-page/field-components/metadata-values/metadata-values.component.ts
	src/app/+item-page/simple/field-components/specific-field/item-page-field.component.html
	src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html
	src/app/+search-page/search-service/search.service.ts
	src/app/core/core.module.ts
	src/app/core/data/base-response-parsing.service.ts
	src/app/core/data/data.service.ts
	src/app/core/data/request.service.spec.ts
	src/app/core/metadata/metadata.service.spec.ts
	src/app/core/shared/dspace-object.model.ts
	src/app/core/shared/metadatum.model.ts
	src/app/core/shared/operators.ts
	src/app/core/shared/resource-type.ts
	src/app/shared/object-list/item-list-element/item-list-element.component.html
	src/app/shared/object-list/item-list-element/item-list-element.component.spec.ts
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
	src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
	src/app/shared/services/route.service.ts
	src/app/shared/shared.module.ts
 2019-03-15 09:59:30 +01:00
Giuseppe Digilio
11e77086ae Merge remote-tracking branch 'remotes/origin/submission' into mydspace 2019-03-11 20:06:42 +01:00
Giuseppe Digilio
f07aafaf15 Added services and models 2019-03-08 16:38:05 +01:00
Giuseppe Digilio
d351aaf95d Fixes after merge 2019-03-08 15:51:27 +01:00
Giuseppe Digilio
a42dd19624 Merge remote-tracking branch 'remotes/origin/master' into submission 
# Conflicts:
#	src/app/core/cache/models/normalized-object-factory.ts
#	src/app/core/cache/response.models.ts
#	src/app/core/data/registry-metadatafields-response-parsing.service.ts
#	src/app/core/data/registry-metadataschemas-response-parsing.service.ts
#	src/app/core/data/request.models.ts
#	src/app/core/data/request.service.ts
#	src/app/core/shared/collection.model.ts
#	src/app/core/shared/dspace-object.model.ts
#	src/app/core/shared/resource-type.ts
 2019-02-22 12:20:28 +01:00
Kristof De Langhe
3d1e6e63fb Added JDocs 2019-02-21 15:09:44 +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
Kristof De Langhe
fe44146291 58789: Metadata field create/edit/delete feature 2019-01-22 17:15:14 +01:00
Kristof De Langhe
52a440c9f2 58789: TSLint error fixing 2019-01-21 12:32:55 +01:00
Samuel
962bafcce2 taskid 58789 Metadata Registry UI Part 2 2019-01-19 20:53:15 +01:00
lotte
01b4a7ff01 Merge branch 'response-cache-refactoring' into w2p-54472_Create-community-and-collection-pages 
Conflicts:
	src/app/core/metadata/metadata.service.spec.ts
 2018-12-17 12:50:33 +01:00
lotte
e2a6db3679 Merge branch 'master' into response-cache-refactoring 
Conflicts:
	src/app/core/data/comcol-data.service.ts
	src/server.ts
 2018-12-17 12:49:31 +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