Commit Graph

31 Commits

Author SHA1 Message Date
Julius Gruber
52ef2acb08 Requested changes implemented - basic functionality working 2019-09-19 13:43:36 +02:00
Yana De Pauw
c325e6d61b Merge branch 'master' into w2p-62769_Bitstream-format-registry
Conflicts:
	src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
	src/app/core/core.module.ts
	src/app/core/registry/registry-bitstreamformats-response.model.ts
	src/app/core/registry/registry.service.ts
	src/app/core/shared/bitstream-format.model.ts
2019-08-06 17:22:03 +02:00
Yana De Pauw
279b80b4de 62769: Bitstream format registry 2019-08-05 13:14:03 +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
lotte
a5086b8d11 61949: replacing object factories with decorator 2019-04-24 16:51:46 +02:00
Giuseppe Digilio
c9cd9ce215 Merge remote-tracking branch 'remotes/upstreamatmire/Search-optimizations' into mydspace
# Conflicts:
#	resources/i18n/en.json
#	src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
#	src/app/+search-page/search-filters/search-filter/search-filter.component.ts
#	src/app/+search-page/search-filters/search-filters.component.html
#	src/app/+search-page/search-filters/search-filters.component.ts
#	src/app/+search-page/search-page.component.ts
#	src/app/+search-page/search-page.module.ts
#	src/app/+search-page/search-service/search.service.ts
#	src/app/core/cache/builders/remote-data-build.service.ts
#	src/app/core/core.module.ts
#	src/app/core/data/paginated-list.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/shared/services/route.service.ts
#	src/app/shared/shared.module.ts
2019-03-26 10:01:57 +01:00
Giuseppe Digilio
dee38f3043 Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
#	resources/i18n/en.json
#	src/app/core/cache/builders/remote-data-build.service.ts
#	src/app/core/data/request.service.spec.ts
#	src/app/core/data/request.service.ts
2019-03-21 15:10:15 +01:00
Giuseppe Digilio
52906e71c4 Intermediate commit 2019-03-08 19:49:07 +01:00
lotte
9f02f65a0a implemented edit popups and added actions 2019-03-07 14:24:51 +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
31b3a1fdaa Merge branch 'master' into w2p-58789_Metadata-Registry-UI-Part-2
Conflicts:
	src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
	src/app/+community-page/community-page.component.html
	src/app/app.reducer.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/core.module.ts
	src/app/core/data/item-data.service.spec.ts
	src/app/core/data/item-data.service.ts
	src/app/core/index/index.effects.ts
	src/app/core/index/index.reducer.spec.ts
	src/app/core/index/index.reducer.ts
	src/app/core/shared/operators.spec.ts
	src/app/core/shared/operators.ts
	src/app/header/header.component.spec.ts
2019-01-24 13:18:20 +01:00
Kristof De Langhe
552dce0960 58789: Fix AuthenticatedGuard and put on higher level route 2019-01-24 10:20:18 +01:00
Giuseppe Digilio
8cb86c392c Merge remote-tracking branch 'remotes/origin/master' into submission 2019-01-17 09:40:50 +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
Giuseppe
b27e3d9e2f Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
#	src/app/+search-page/search-service/search.service.spec.ts
#	src/app/app.component.spec.ts
#	src/app/app.component.ts
#	src/app/core/auth/auth-response-parsing.service.ts
#	src/app/core/cache/models/normalized-object-factory.ts
#	src/app/core/cache/models/normalized-resource-policy.model.ts
#	src/app/core/core.module.ts
#	src/app/core/data/base-response-parsing.service.ts
#	src/app/core/data/config-response-parsing.service.spec.ts
#	src/app/core/data/config-response-parsing.service.ts
#	src/app/core/data/dso-response-parsing.service.ts
#	src/app/core/data/request.models.ts
#	src/app/core/data/search-response-parsing.service.ts
#	src/app/core/integration/integration-response-parsing.service.spec.ts
#	src/app/core/integration/integration-response-parsing.service.ts
#	src/app/core/shared/item.model.ts
#	src/app/core/shared/resource-policy.model.ts
#	src/app/core/shared/resource-type.ts
#	src/app/shared/shared.module.ts
#	src/app/thumbnail/thumbnail.component.html
2018-10-15 19:21:01 +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
Giuseppe
6f60cd68e2 Merged submission module code 2018-07-26 18:36:36 +02:00
Kristof De Langhe
079b8b7679 Merge remote-tracking branch 'dspace/master' into w2p-50632_Replace-mock-registry-service-with-implementation
Conflicts:
	src/app/app-routing.module.ts
	src/app/core/cache/response-cache.models.ts
2018-07-09 14:09:24 +02:00
Kristof De Langhe
c40cefbef6 50434: Feedback 2018/03/16 2018-03-29 15:38:20 +02:00
Kristof De Langhe
70256c7f80 50434: Metadata Registry read-only 2018-03-29 15:38:19 +02:00
Giuseppe Digilio
19c9482009 Added first release of the authentication module 2018-02-06 15:48:05 +01:00
Giuseppe Digilio
2309c1be3b Added login page ang nav menu 2018-02-01 17:13:08 +01:00
courtneypattison
b257ca7033 re-export RouterModule in AppRoutingModule 2017-11-22 12:23:11 -08:00
William Welling
a9faab6833 refactor home to home-page 2017-10-04 10:51:48 -05:00
Lotte Hofstede
da881f7a30 Fixed and updated merge related issues for simple search 2017-10-03 11:05:42 +02:00
William Welling
bd25a489d0 use forRoot on app router, whitelist ngx on server 2017-09-26 15:13:36 -05:00
William Welling
3d02e660da fixed core and shared module usage, lazy loading modules 2017-09-26 11:44:07 -05:00
William Welling
c08f5c672b dependency upgrades, server and platform module updates, linting wip 2017-07-12 14:33:16 -05:00
William Welling
2974d8aab1 Build setting some configs. Configs used by server. 2017-03-24 20:56:14 -05:00
Lotte Hofstede
82a379df3c 38248: Added PageNotFound component 2017-01-12 15:18:15 +01:00
Art Lowel
28e23f0cdd removed universal demo components 2016-12-01 10:48:10 +01:00