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
2,306 Commits 24 Branches 25 Tags
a1ac80e53a8b78c87fc89a42b67d24c88e2f5c5d
Commit Graph

76 Commits

Author SHA1 Message Date
Kristof De Langhe
bf039978be 62589: test environment comment 2019-09-06 14:30:57 +02:00
Kristof De Langhe
431d7e12b1 62589: Clean build folder pre-tests 2019-09-06 14:09:21 +02:00
Kristof De Langhe
6c4d461ade master travis test fixes 2019-09-05 18:24:03 +02:00
Tim Donohue
64c653feb9 Update environment.js with new demo site path 2019-07-25 10:53:19 -05:00
Tim Donohue
735408c336 Merge pull request #419 from atmire/selectable-themes 
Selectable themes
 2019-07-15 22:34:58 +02:00
lotte
d60ba8cb76 reversed to default theme 2019-07-15 13:20:37 +02:00
lotte
1c738ac276 renamed files from preview-release to mantis 2019-07-15 11:29:07 +02:00
Kristof De Langhe
1d98b8c29f 62063: Browse config refactoring property metadata to id 2019-07-11 13:59:23 +02:00
lotte
9f3997f103 reenabled default theme 2019-06-06 15:35:38 +02:00
lotte
20d15dab54 removed unnecessary config 2019-06-06 15:34:32 +02:00
lotte
ed128d1f17 removed node env variable 2019-06-05 14:25:58 +02:00
Art Lowel
c58e6f6239 use config to determine active theme 2019-06-04 17:12:12 +02:00
lotte
a8aea654a1 cleaned up theming code 2019-05-28 13:50:29 +02:00
lotte
a4a4be9983 added different themes, issue with ngrx 2019-05-28 13:42:20 +02:00
Kristof De Langhe
fca9b4d481 Merge branch 'master' into w2p-62063_Configurable-Browse-By 2019-05-24 14:13:24 +02:00
Tim Donohue
2d07cc1913 Reset URL to use DSpace 7 REST API Demo site. 2019-05-17 13:37:57 -05:00
Tim Donohue
6ba7fb34fa Reset URL to use DSpace 7 REST API Demo site. 2019-05-17 13:36:46 -05:00
Kristof De Langhe
369a6dfaea 62063: JSDocs and comments 2019-04-30 17:24:58 +02:00
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