131 Commits

Author	SHA1	Message	Date
Ahmed Ali	d8dadf5495	add ownerAssets	2020-07-03 12:49:05 +02:00
Ahmed Ali	cd9f6295ed	cleaning	2020-07-03 11:29:41 +02:00
Ahmed Ali	8cfffd5976	Merge pull request #119 from oceanprotocol/feature/assets-download ... Feature/assets download	2020-07-02 17:23:38 +02:00
Ahmed Ali	5ee4b1e8ee	Merge pull request #116 from oceanprotocol/fix/unit-test ... Fix/unit test	2020-07-02 17:10:06 +02:00
Ahmed Ali	96e1bb1b84	fix unit test conflict	2020-07-02 17:02:30 +02:00
Ahmed Ali	34c1822128	fix download function	2020-07-02 16:40:40 +02:00
Ahmed Ali	32f8781c70	fix failed assertions	2020-07-02 09:55:40 +02:00
alexcos20	ea75d348ea	fix some bugs	2020-06-30 16:28:59 -07:00
Ahmed Ali	eb1966b769	fix initialize	2020-06-30 19:54:23 +02:00
Ahmed Ali	f9c5b7bd49	fix initialize	2020-06-30 11:37:03 +02:00
Ahmed Ali	2219d183f6	order asset	2020-06-30 09:58:24 +02:00
Ahmed Ali	2d2e41c7f3	download	2020-06-29 21:32:33 +02:00
Ahmed Ali	37d423b8d3	cleaning	2020-06-29 21:17:29 +02:00
Ahmed Ali	d5b6bb3221	add getService	2020-06-29 21:08:46 +02:00
Ahmed Ali	2f5025a659	minor fix	2020-06-29 19:21:14 +02:00
Ahmed Ali	5535305c5f	publishing services prior creating asset	2020-06-29 19:20:29 +02:00
Ahmed Ali	06933aa2fa	add resolve test	2020-06-29 18:48:14 +02:00
Ahmed Ali	5f95c67e3e	fix lint	2020-06-29 18:20:56 +02:00
Ahmed Ali	5ac2a05172	Merge branch 'feature/marketplace-flow' of https://github.com/oceanprotocol/ocean-lib-js into feature/marketplace-flow	2020-06-29 18:19:20 +02:00
Ahmed Ali	6adac7b6f5	fix allowance in datatoken	2020-06-29 18:18:57 +02:00
arsenyjin	db693c7331	move datatokens tests	2020-06-29 12:58:52 +02:00
arsenyjin	67453da19d	fix transferFrom	2020-06-29 12:30:37 +02:00
arsenyjin	3f933280d9	fix transferFrom	2020-06-29 12:20:37 +02:00
arsenyjin	94377bd3ab	add bob gets datatokens	2020-06-29 12:05:17 +02:00
Ahmed Ali	2025527f97	remove some stuff	2020-06-29 09:46:25 +02:00
Ahmed Ali	cf2072ecab	minor config fix	2020-06-26 20:32:08 +02:00
Ahmed Ali	574cd4f57b	fix provider URi	2020-06-26 19:47:13 +02:00
Ahmed Ali	a786c83373	integrate barge	2020-06-26 19:38:52 +02:00
Ahmed Ali	a770b45c95	cleaning	2020-06-26 19:32:01 +02:00
Ahmed Ali	5433d1e07f	fix singature	2020-06-26 11:31:56 +02:00
arsenyjin	c9de363919	wip encrypt error	2020-06-25 15:52:33 +02:00
Ahmed Ali	93e7c59118	Merge pull request #99 from oceanprotocol/feature/unit-testing ... Feature/unit-testing-beta [Part-1]	2020-06-25 15:52:17 +02:00
arsenyjin	712bb76dbc	wip ocean.assets.create	2020-06-25 00:18:47 +02:00
arsenyjin	4b4949126d	fix conflicts	2020-06-24 20:55:10 +02:00
Ahmed Ali	d751b47a5f	replace aquarius with metadatastore	2020-06-24 17:30:07 +02:00
Ahmed Ali	41ed1b576e	replae brizo with provider	2020-06-24 15:05:06 +02:00
arsenyjin	5ca06863c2	wip: add marketplace flow	2020-06-24 12:45:35 +02:00
Ahmed Ali	3a8e57e971	preparing unit tests	2020-06-24 10:11:21 +02:00
Ahmed Ali	1c6f91b861	fix more tests	2020-06-23 21:02:08 +02:00
arsenyjin	d9c478b71f	wip add assets.create	2020-06-23 19:13:55 +02:00
Ahmed Ali	76e2ba9507	mimic unit tests -- squid-js	2020-06-23 12:24:23 +02:00
arsenyjin	8193838a96	fix tests lint	2020-06-22 13:21:51 +02:00
arsenyjin	24c8a87623	add rinkeby test	2020-06-22 09:38:43 +02:00
arsenyjin	1454785e17	add rinkeby contracts deployment	2020-06-22 09:26:49 +02:00
arsenyjin	68f435a11d	add rinkeby test	2020-06-22 08:59:02 +02:00
arsenyjin	507f5f656d	fix remove console.log	2020-06-22 05:11:34 +02:00
arsenyjin	c16e277fde	add marketplace flow	2020-06-22 05:08:51 +02:00
arsenyjin	968f5038e9	add simple publish dataset	2020-06-21 13:57:59 +02:00
kin	6abd5f6685	Merge branch 'feature/marketplace-flow' into fix/integration-test-beta-firstcut	2020-06-20 12:48:02 +02:00
Ahmed Ali	c9799e271d	fix lint	2020-06-19 15:55:34 +02:00