28 Commits

Author	SHA1	Message	Date
Sebastian Gerske	2194ae59c3	adapt changes from keeper 0.3.18	2018-11-07 09:35:47 +01:00
Sebastian Gerske	edb2d43d99	stop register asset in market on register	2018-11-06 16:23:48 +01:00
Sebastian Gerske	6ab85631ca	move template registration outside of asset registration again	2018-11-06 16:13:12 +01:00
Sebastian Gerske	86be0cc6d5	added search by text, added templates for fitchain and access	2018-11-05 17:50:56 +01:00
Sebastian Gerske	1874e24b61	expose both search methods	2018-11-05 14:58:58 +01:00
Sebastian Gerske	e1b4293125	use timeouts from template	2018-11-05 14:56:14 +01:00
Sebastian Gerske	7a3cc1e473	refactor value loading, added valuepair business object	2018-11-05 13:15:33 +01:00
Sebastian Gerske	6e2b270a1f	integrate DDO more	2018-11-05 10:01:58 +01:00
Sebastian Gerske	61d27e082e	optimize import	2018-10-26 13:46:47 +02:00
Sebastian Gerske	fb5dcaf522	added secret store	2018-10-26 13:37:09 +02:00
Sebastian Gerske	dd227e74ed	merge	2018-10-26 12:16:40 +02:00
Sebastian Gerske	ee1dd8e30b	Merge remote-tracking branch 'origin/feature/search' into feature/secret_store ... # Conflicts: # src/models/Config.ts # src/ocean/Ocean.ts # test/config.ts # test/keeper/ContractBase.test.ts # test/keeper/ContractHandler.test.ts # test/keeper/Keeper.test.ts # test/ocean/Account.test.ts # test/ocean/Asset.test.ts # test/ocean/Ocean.test.ts # test/ocean/Order.test.ts	2018-10-26 12:14:49 +02:00
Sebastian Gerske	33b642c2c3	resolve merge conflicts	2018-10-26 10:57:40 +02:00
Sebastian Gerske	300918e687	merge develop	2018-10-26 10:48:53 +02:00
Sebastian Gerske	2063530297	Merge remote-tracking branch 'origin/develop' into feature/secret_store ... # Conflicts: # src/ocean/Ocean.ts # test/ocean/Asset.test.ts	2018-10-26 10:46:32 +02:00
Sebastian Gerske	192eecc3ae	added searchAssets	2018-10-26 10:40:46 +02:00
Sebastian Gerske	b06cd5e303	rename provider -> aquarius	2018-10-25 17:26:26 +02:00
Sebastian Gerske	7eae00014e	added secret store	2018-10-25 17:18:57 +02:00
Sebastian Gerske	7f5f7606dc	adapted changes from squid discussion, updated interface definition	2018-10-18 13:06:52 +02:00
Sebastian Gerske	5719a667ea	added purchase functiuonality	2018-10-17 18:24:01 +02:00
Sebastian Gerske	9fb6f296f3	register returns string now instead of the asset again	2018-10-17 10:41:56 +02:00
Sebastian Gerske	0285c90d3c	optimize	2018-10-17 10:12:40 +02:00
Sebastian Gerske	19201ef6e7	new squid design	2018-10-16 14:56:18 +02:00
Sebastian Gerske	1cc9e2bcbf	removed obsolete config	2018-10-10 14:12:39 +02:00
Sebastian Gerske	df0e6b57a6	tried to fix caseing	2018-10-09 11:12:37 +02:00
Sebastian Gerske	8c95036d99	tried to fix caseing	2018-10-09 11:12:08 +02:00
Sebastian Gerske	06fd240e56	fixed unit test	2018-10-05 16:12:54 +02:00
Sebastian Gerske	bd06445b82	interface changes, web3 migration	2018-10-05 12:34:31 +02:00