hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,914 Commits 24 Branches 25 Tags
2b0cc82b12e669ac5d722e8fd9171eb550fa2a84
Commit Graph

208 Commits

Author SHA1 Message Date
Kristof De Langhe
67e5578bba 62063: Configurable browse-by 2019-04-30 16:24:22 +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
Tim Donohue
f396da34b4 Merge branch 'master' into configurable_entities 2019-03-15 15:11:53 -05: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
2009ee566c Merge remote-tracking branch 'remotes/origin/master' into submission 
# Conflicts:
#	src/app/core/data/browse-items-response-parsing-service.ts
#	src/app/shared/shared.module.ts
 2019-03-08 16:30:39 +01:00
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
Kristof De Langhe
d5fe5c432b Merge branch 'master' into Browse-By-Date 
Conflicts:
	config/environment.default.js
	src/config/global-config.interface.ts
 2019-03-04 11:15:49 +01:00
lotte
27180c5960 Applied feedback 2019-03-01 09:31:03 +01:00
Kristof De Langhe
fe5f436654 Merge branch 'master' into w2p-60168_Alphabetic-browse-widget 
Conflicts:
	src/app/core/browse/browse.service.spec.ts
	src/app/core/browse/browse.service.ts
	src/app/core/data/dso-response-parsing.service.ts
	src/app/shared/shared.module.ts
 2019-02-21 13:35:21 +01:00
lotte
3c104a460b 59334: removed unnecessary config entry 2019-02-21 11:59:04 +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
cdcacedfae 59695: Starts-with implementation for browse-by date 2019-02-12 10:40:47 +01:00
lotte
ace523ed14 intermediate commit for tests 2019-02-08 14:42:34 +01:00
Giuseppe Digilio
a33f2c2136 Merge remote-tracking branch 'remotes/origin/master' into submission 
# Conflicts:
#	src/app/shared/shared.module.ts
 2019-01-25 10:00:52 +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
Tim Donohue
2e53c3e3cf Merge branch 'master' into configurable_entities 2019-01-21 14:26:47 -06:00
Bram Luyten
17be7a34e0 Issue 298 Language switch 2019-01-16 20:01:14 +01:00
Art Lowel
f51ac8086d remove exportToZip config property that was added accidentally 2019-01-10 13:32:42 +01:00
Giuseppe Digilio
e6ea2667eb Fix fontawesome icons 2018-12-27 17:48:35 +01:00
Giuseppe Digilio
2d20d524de Manage different level of confidence in the submission 2018-12-13 15:36:09 +01:00
Kristof De Langhe
ec6124035d Default REST API server set to dspace7-entities.atmire.com for testing purposes 2018-11-08 09:58:31 +01:00
lotte
b1c6d68cc5 Merge remote-tracking branch 'atmire-internal/responseMsToLive' into patch-support 
Conflicts:
	src/app/core/data/request.models.ts
	src/config/cache-config.interface.ts
 2018-10-12 15:23:17 +02:00
Art Lowel
b308df201d add responseMsToLive to requests 2018-09-28 16:11:22 +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
8c05ed86ef intermediate bug commit 2018-09-26 15:31:26 +02:00
lotte
17ad62c172 implementation of server synchronization 2018-09-14 09:26:30 +02:00
lotte
9fbbf53661 undo REST server config 2018-08-23 16:00:46 +02:00
lotte
7985ad9644 start of resolvers 2018-08-06 15:09:32 +02:00
Giuseppe
6f60cd68e2 Merged submission module code 2018-07-26 18:36:36 +02:00
Giuseppe Digilio
4d89674cda Fixed server side form validation 2018-07-09 19:02:09 +02:00
Giuseppe Digilio
ada577c2be Merge remote-tracking branch 'remotes/origin/master' into notifications 
# Conflicts:
#	src/app/app.component.ts
#	src/app/core/core.module.ts
 2018-05-07 16:10:17 +02:00
Giuseppe Digilio
bafa46bb24 Adjusted CSS and added default notification options in the environment config files 2018-05-07 15:49:03 +02:00
Art Lowel
99f8d4f24d Merge pull request #235 from LotteHofstede/search-backend 
Search service implementation
 2018-05-03 11:20:33 +02:00
Lotte Hofstede
86fcf44977 facet, filter, pagination implementation using rest api 2018-03-29 15:30:46 +02:00
Kristof De Langhe
35cbedf6fe 50479: Added google analytics support 2018-03-20 15:29:05 +01:00
Lotte Hofstede
e374f9ec1f reinstated 4Science rest API 2018-03-08 15:40:29 +01:00
Lotte Hofstede
acf85577ee fixed AoT build and search settings 2018-03-08 15:40:29 +01:00
Lotte Hofstede
b8f4769f1e reinstated 4science test server 2018-03-08 15:40:29 +01:00
Lotte Hofstede
2435b484ce search backend fixes #1 2018-03-08 15:40:28 +01:00
Andrea Chiapparelli - 4Science
6397e6fae8 notification options in configuration 2018-03-07 14:55:02 +01:00
Art Lowel
78574df60b removed the concept of prerender strategies. rehydrate is the default now 2018-02-01 13:57:24 +01:00
Art Lowel
f70cf51310 switch rest demo to https in the default config 2017-08-24 11:32:53 +02:00
William Welling
1c2818002f added CSR fallback and optionally disable SSR 2017-07-19 12:11:15 -05:00
William Welling
583f6e96ac have prod, test, and dev environment config files override default 2017-07-19 11:07:26 -05:00
William Welling
35e8bbf105 turn off debug for default config 2017-07-13 11:41:21 -05:00
William Welling
41cda802ec have default config use rehydrate pre-render strategy 2017-07-13 11:38:30 -05:00
William Welling
8ba69590c8 updated environment config comments 2017-07-13 07:32:42 -05:00
William Welling
c08f5c672b dependency upgrades, server and platform module updates, linting wip 2017-07-12 14:33:16 -05:00
Art Lowel
0677bc38ee switch to live rest-backend, still issue with bitstreams on item page 2017-06-07 18:25:52 +02:00
William Welling
9c46ec1564 Ensure correct environment file used. 2017-03-27 08:31:12 -05:00