Commit Graph

1218 Commits

Author SHA1 Message Date
Kristof De Langhe
1c013bc85b Merge branch 'w2p-55693_Item-mapping-to-collections' into w2p-55946_Item-mapping-on-item-level
Conflicts:
	src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
2018-11-16 14:30:01 +01:00
Kristof De Langhe
904ee2cab4 55693: Search box inside Map tab 2018-11-16 14:21:48 +01:00
Kristof De Langhe
8d396f3832 55946: Multi-list object select support 2018-11-16 13:55:00 +01:00
Kristof De Langhe
08063154e7 55946: object-select store lists intermediate commit 2018-11-15 14:13:16 +01:00
Kristof De Langhe
b11a168e72 55946: CollectionItemMapper test fixes after merge 2018-11-14 10:54:47 +01:00
Kristof De Langhe
512b678b73 Merge branch 'w2p-55693_Item-mapping-to-collections' into w2p-55946_Item-mapping-on-item-level 2018-11-14 10:38:50 +01:00
Kristof De Langhe
e61467bb7f 55693: JSDocs and Test fixes 2018-11-14 10:37:27 +01:00
Kristof De Langhe
31fe5efaa1 Merge branch 'w2p-55693_Item-mapping-to-collections' into w2p-55946_Item-mapping-on-item-level 2018-11-13 17:57:55 +01:00
Kristof De Langhe
469b424cfe 55693: Map tab excludes already mapped items 2018-11-13 17:50:02 +01:00
Kristof De Langhe
2a4eebcfc4 Merge branch 'w2p-55693_Item-mapping-to-collections' into w2p-55946_Item-mapping-on-item-level
Conflicts:
	src/app/core/data/item-data.service.ts
2018-11-13 16:03:31 +01:00
Kristof De Langhe
7bd8fae72a 55693: Fixed getMappedItems to use object cache instead of response 2018-11-13 15:31:32 +01:00
Kristof De Langhe
0d89eb6cce 55693: TODO location query 2018-11-07 14:39:49 +01:00
Kristof De Langhe
9902209fb9 55946: Small import fix 2018-11-07 13:09:00 +01:00
Kristof De Langhe
dd36913496 55693: Functionality for removing mappings 2018-11-06 16:38:00 +01:00
Kristof De Langhe
3d9e4a66ff 55693: Mapped items using new REST endpoint + item-select component 2018-11-06 16:18:25 +01:00
Kristof De Langhe
fc96700475 55946: Fixed search query not working 2018-10-11 11:16:47 +02:00
Kristof De Langhe
8f0d7b6a4e 55946: ItemCollectionMapperComponent tests 2018-10-11 10:10:45 +02:00
Kristof De Langhe
497f089c2f 55946: Improvement on mapping by excluding already existing mapped collections 2018-10-10 17:31:18 +02:00
Kristof De Langhe
378fbe86f4 55946: Functionality for removing mappings 2018-10-10 16:15:53 +02:00
Kristof De Langhe
dd38e61230 55946: Functional item-collection-mapper 2018-10-10 15:31:58 +02:00
Kristof De Langhe
0cf91fb05e 55946: Removal of unnecessary scss files and test fixes 2018-10-10 13:51:02 +02:00
Kristof De Langhe
0b3b5d3965 55946: Refactoring of object-select and collection-select component 2018-10-10 13:30:29 +02:00
Kristof De Langhe
c4203f25d5 55946: Refactored item-select to object-select to allow for easier implementation of collection-select 2018-10-09 17:16:43 +02:00
Kristof De Langhe
7021527f5c 55946: Fixed api calls for fetching collections with/without item 2018-10-09 16:33:33 +02:00
Kristof De Langhe
c25340fca0 erge branch 'w2p-55946_Item-mapping-on-item-level-old' into w2p-55946_Item-mapping-on-item-level
Conflicts:
	resources/i18n/en.json
	src/app/+item-page/edit-item-page/edit-item-page.component.ts
	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/edit-item-page/item-status/item-status.component.html
	src/app/+item-page/edit-item-page/item-status/item-status.component.ts
2018-10-09 16:01:32 +02:00
Kristof De Langhe
7d9afeefea 55946: Removed unnecessary files and created tests 2018-10-09 15:32:55 +02:00
Kristof De Langhe
fb0e1d81e4 55946: Edit item page cleanup 2018-10-09 14:30:40 +02:00
Kristof De Langhe
05a4918ef0 55946: Finished edit-item-page and start of collection mapper 2018-10-09 14:15:59 +02:00
Kristof De Langhe
ec96962a87 55946: Start of Edit Item Page
Conflicts:
	resources/i18n/en.json
2018-10-09 14:15:56 +02:00
Kristof De Langhe
6bc4d061f1 55946: Intermediate commit 2018-10-09 14:09:56 +02:00
Kristof De Langhe
3a809cc671 55946: Finished edit-item-page and start of collection mapper 2018-10-09 11:51:52 +02:00
Kristof De Langhe
ba4d2861f5 55946: Start of Edit Item Page 2018-10-08 17:50:52 +02:00
Art Lowel
1a20cec41c Merge pull request #300 from cjuergen/german-translation
Initial German Translation
2018-10-08 11:25:20 +02:00
cjuergen
c8ab655b4c Initial German Translation 2018-10-08 10:49:59 +02:00
Art Lowel
da4593a287 Merge pull request #296 from bram-atmire/issue-295-dutch-translation
Issue #295 Dutch translation
2018-10-05 11:45:58 +02:00
Art Lowel
c0e32457eb Merge pull request #297 from helix84/czech-l10n
Czech translation
2018-10-05 11:40:37 +02:00
helix84
a83c6c05df minor fixes in en.json 2018-10-04 09:25:38 +02:00
helix84
b2fef4d60a Create cs.json 2018-10-04 09:22:46 +02:00
Bram Luyten
031c4c0cf5 Dutch translation 2018-10-04 08:39:53 +02:00
Kristof De Langhe
24f6f982e9 55693: Authentication Guard and TSDocs 2018-10-01 14:14:26 +02:00
Kristof De Langhe
5f56d5959d 55693: ItemSelectReducer tests 2018-10-01 13:40:29 +02:00
Kristof De Langhe
199e6c7299 55693: Empty ItemSelectReducer test file 2018-10-01 11:43:37 +02:00
Kristof De Langhe
7934b87336 55693: ItemSelectService tests 2018-10-01 11:38:13 +02:00
Kristof De Langhe
8b99ea44b2 ItemSelectComponent tests 2018-10-01 10:30:05 +02:00
Kristof De Langhe
c3add84d86 55693: ItemSelectComponent tests intermediate + ItemSelectServiceStub 2018-09-28 17:31:05 +02:00
Kristof De Langhe
95b4635291 55693: CollectionItemMapperComponent tests 2018-09-28 16:02:39 +02:00
Kristof De Langhe
44caed878c Merge branch 'master' into w2p-55693_Item-mapping-to-collections
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/shared/testing/auth-request-service-stub.ts
	src/app/shared/testing/auth-service-stub.ts
2018-09-28 13:26:24 +02:00
Kristof De Langhe
e1c734e113 55693: CollectionItemMapperComponent test intermediate 2018-09-28 12:43:38 +02:00
Kristof De Langhe
0a8a6bb720 55693: Messages improvement 2018-09-28 11:27:53 +02:00
Kristof De Langhe
ba8be3f57d 55693: Temporary pagination fix (remove url params on tab change) 2018-09-28 10:56:17 +02:00