813 Commits

Author	SHA1	Message	Date
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
Ahmed Ali	07449ed18d	fix tests	2020-06-19 15:34:45 +02:00
Ahmed Ali	f8ca995f7f	minor fix	2020-06-19 13:05:21 +02:00
Ahmed Ali	94dbfd190f	fix unit test	2020-06-19 13:01:06 +02:00
Ahmed Ali	20a1a75bf8	try to install mocha globally	2020-06-19 11:46:09 +02:00
Ahmed Ali	1a7799a2c5	fix more issues	2020-06-19 10:37:37 +02:00
Ahmed Ali	4554f420e3	fix more linting errors	2020-06-19 10:29:01 +02:00
Ahmed Ali	52260cdf7f	fix datatoken unit testing	2020-06-19 10:27:39 +02:00
arsenyjin	9511559b20	update simpleflow docs	2020-06-18 13:56:33 +02:00
Ahmed Ali	2c8e98f862	Merge branch 'feature/beta-version-phase-2' into feature/simple-flow	2020-06-18 13:17:23 +02:00
arsenyjin	0dd443fe0f	fix simpleflow	2020-06-18 13:13:09 +02:00
arsenyjin	9efbe00ba3	fix url	2020-06-18 11:45:44 +02:00
Ahmed Ali	b1d15163ba	fix merge	2020-06-17 18:41:39 +02:00
arsenyjin	b1c134df20	add clean up	2020-06-17 16:01:49 +02:00
arsenyjin	b29dbf1fd9	fix url	2020-06-17 15:43:14 +02:00
arsenyjin	653dcf5dda	add bob consumes	2020-06-17 12:18:02 +02:00
arsenyjin	84ba2144fd	wip add download function	2020-06-16 17:05:15 +02:00
arsenyjin	b8f2092f74	add simpleflow structure	2020-06-16 14:39:21 +02:00
arsenyjin	13fe64395a	add publish dataset step	2020-06-15 17:41:36 +02:00