hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,478 Commits 24 Branches 25 Tags
e68e605211fa01678eaa4ce1f019ebba5d1777c1
Commit Graph

382 Commits

Author SHA1 Message Date
lotte
4c23d01567 Merge branch 'master' into reorder-name-variants 2020-01-16 09:30:31 +01:00
Kristof De Langhe
d8bdd768ca Merge branch 'w2p-67478_Search-external-sources-in-submission' into w2p-67611_Convert-external-source-to-entity 2020-01-14 13:07:24 +01:00
Kristof De Langhe
4ba3b01997 Merge branch 'master' into w2p-67478_Search-external-sources-in-submission 
Conflicts:
	src/app/core/data/data.service.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
 2020-01-14 12:46:55 +01:00
lotte
02802c0de1 Merge branch 'master' into reorder-name-variants 2020-01-14 12:40:39 +01:00
Kristof De Langhe
42d12a83ce Merge branch 'master' into w2p-65240_Community-and-collection-logos 
Conflicts:
	src/app/shared/shared.module.ts
 2020-01-07 16:11:24 +01:00
Giuseppe Digilio
fdd05d2fec Refactored components' name and added missing tests 2020-01-02 18:21:47 +01:00
Giuseppe Digilio
972f0dfd60 Merge remote-tracking branch 'remotes/origin/master' into shibboleth 
# Conflicts:
#	resources/i18n/de.json5
#	resources/i18n/en.json5
#	src/app/shared/shared.module.ts
 2020-01-02 11:43:19 +01:00
Kristof De Langhe
7a904f9bf7 67611: Refactored import button to separate component within object-collection + moved calling of import modal to external-source tab 2019-12-05 14:06:29 +01:00
Kristof De Langhe
0210be1a53 67611: External-Source-Entry import window 2019-12-04 17:54:01 +01:00
lotte
bc8e7d8fe6 reordering authors 2019-12-02 15:37:59 +01:00
Kristof De Langhe
de4b32dcad 67478: Intermediate commit - Basic components 2019-11-29 17:51:27 +01:00
lotte
d1ba3d9936 Merge branch 'master' into clean-relationships-in-submission 2019-11-29 08:52:10 +01:00
Kristof De Langhe
424089312b Merge branch 'master' into w2p-65240_Community-and-collection-logos 2019-11-28 11:39:26 +01:00
Tim Donohue
7f44c7751b Merge pull request #513 from atmire/sidebar-refactoring 
Sidebar refactoring
 2019-11-27 10:46:40 -06:00
Kristof De Langhe
4887353450 Merge branch 'master' into w2p-65240_Community-and-collection-logos 
Conflicts:
	resources/i18n/en.json5
 2019-11-18 14:42:58 +01:00
lotte
efc2c9933a autoselect + small fixes 2019-11-18 11:24:01 +01:00
lotte
3b4d8598d5 implementing auto select 2019-11-15 16:28:41 +01:00
Antoine Snyers
771041a3cf Implement sidebar filter and dropdown components 2019-11-14 13:14:47 +01:00
Antoine Snyers
4f7b7637cb Refactor search sidebar 2019-11-14 13:14:47 +01:00
lotte
190203cb48 add/remove subscriptions for name variants on init/destroy 2019-11-12 16:34:26 +01:00
Kristof De Langhe
bb5103518e Merge branch 'master' into w2p-65240_Community-and-collection-logos 
Conflicts:
	resources/i18n/en.json5
	src/app/shared/shared.module.ts
 2019-11-12 14:39:10 +01:00
lotte
f289c1353e fixed issues with sending name variant update requests to the server 2019-11-08 16:05:37 +01:00
lotte
d8a049c550 Merge branch 'w2p-65195_dynamic-component-refactoring' into clean-relationships-in-submission 2019-11-08 13:55:08 +01:00
lotte
7e62ce80c2 Merge branch 'refactor-submission-parsers' into clean-relationships-in-submission 2019-11-08 08:49:12 +01:00
lotte
36ec68fd33 Merge branch 'master' into w2p-65195_dynamic-component-refactoring 2019-11-07 14:23:36 +01:00
Tim Donohue
959134fc89 Merge pull request #496 from atmire/Name-variants-on-item-pages 
Name variants on item pages
 2019-11-05 09:55:13 -06:00
Kristof De Langhe
5fa2827d1b Merge branch 'master' into w2p-65717_Bundles-in-edit-item 
Conflicts:
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/core/core.module.ts
	src/app/core/data/item-data.service.ts
	src/app/shared/shared.module.ts
 2019-10-18 12:42:11 +02:00
Julius Gruber
8d939cd35c Shared module import fixed 2019-10-18 09:12:15 +02:00
Julius Gruber
8fbe6ade81 Merge conflicts resolved 2019-10-18 09:11:22 +02:00
lotte
99517c084c fixed issues after merge 2019-10-17 13:57:10 +02:00
lotte
bc358ec954 Merge branch 'master' into w2p-65195_dynamic-component-refactoring 2019-10-17 12:49:50 +02:00
lotte
f79e210959 Merge branch 'w2p-65195_dynamic-component-refactoring' into clean-relationships-in-submission 2019-10-17 12:49:22 +02:00
lotte
437dce9b15 Merge branch 'master' into w2p-65195_dynamic-component-refactoring 2019-10-16 15:48:39 +02:00
lotte
d962e40c58 added TypeDoc 2019-10-16 11:21:25 +02:00
L. Henze
8f2a942536 Merge branch 'master' into 460-coll-pages 2019-10-15 10:57:35 -04:00
Kristof De Langhe
f1b4b57cdb 65529: AoT build error fixes 2019-10-15 13:58:03 +02:00
lotte
0fb12c4274 refactored mydspace/listelements etc 2019-10-08 15:51:31 +02:00
Julius Gruber
95239e0590 upToDate - ready to be worked on 2019-10-08 10:13:46 +02:00
Julius Gruber
46878a7875 Branch update merge 2019-10-08 09:44:37 +02:00
lotte
a1f144aa0b replaced type input by getRenderType method 2019-10-04 16:06:59 +02:00
lotte
9badabade6 Split typed list/grid elements into normal and search result 2019-10-03 16:26:58 +02:00
Kristof De Langhe
97de2b8ef3 Merge branch 'master' into w2p-63669_Edit-Col/Com-Tabs 
Conflicts:
	resources/i18n/en.json
	src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts
	src/app/shared/shared.module.ts
 2019-10-03 13:46:11 +02:00
lotte
5b6aa951ad continued refactoring listable objects 2019-10-02 15:43:19 +02:00
Julius Gruber
9844e9eff7 Prototype ready 2019-09-20 11:41:01 +02:00
Julius Gruber
52ef2acb08 Requested changes implemented - basic functionality working 2019-09-19 13:43:36 +02:00
L. Henze
01212750bf handle component 2019-09-17 17:08:09 -04:00
Kristof De Langhe
e76579ee00 Merge branch 'master' into w2p-64961_Edit-bitstream-page 
Conflicts:
	resources/i18n/en.json5
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/core/data/item-data.service.ts
	src/app/shared/shared.module.ts
 2019-09-17 15:38:02 +02:00
Kristof De Langhe
4f6c3c0a9b Merge branch 'master' into w2p-62589_Item-mapper-update 
Conflicts:
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
	src/app/+item-page/item-page.module.ts
	src/app/core/data/item-data.service.ts
	src/app/shared/shared.module.ts
 2019-09-16 13:36:42 +02:00
Kristof De Langhe
91c6b76230 64961: Edit bitstream page foundations 2019-09-12 17:49:45 +02:00
Kristof De Langhe
a1ac80e53a Merge branch 'master' into w2p-64961_Edit-bitstream-page 
Conflicts:
	src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts
	src/app/app-routing.module.ts
	src/app/shared/shared.module.ts
 2019-09-12 13:21:08 +02:00