642 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matthias Kretschmann	ebef24ebdd	Merge pull request #222 from oceanprotocol/feature/update ... Bump components	2021-01-11 10:57:30 +01:00
Trent McConaghy	f9fcdff952	Update README.md	2021-01-05 10:24:47 +01:00
Alex Coseru	8267d21b64	Update README.md	2020-12-09 18:00:50 +02:00
Alex Coseru	856fb5a62b	bump components	2020-12-09 18:00:16 +02:00
alexcos20	2b7c3e2406	bump aqua	2020-11-13 06:52:55 -08:00
Alex Coseru	fe587a32f2	Merge pull request #219 from oceanprotocol/v3 ... v3	2020-10-27 13:20:51 +02:00
alexcos20	2c4f72c773	Merge branch 'v3' of https://github.com/oceanprotocol/barge into v3	2020-10-27 04:15:22 -07:00
alexcos20	f0041b0fde	update versions	2020-10-27 04:13:59 -07:00
Alex Coseru	ea9699a24b	Update start_ocean.sh	2020-10-22 15:40:07 +03:00
ssallam	c48be04c37	add option to allow skipping contract deployment.	2020-10-21 16:54:14 +02:00
Alex Coseru	10e3ebeaae	Update start_ocean.sh	2020-10-14 21:09:31 +03:00
Alex Coseru	efc24d9112	Merge pull request #221 from oceanprotocol/feature/v3-aquarius ... Consolidate Aquarius compose files	2020-10-13 17:23:56 +03:00
Matthias Kretschmann	444fb56ff4	cleanup	2020-10-13 10:47:00 +02:00
Matthias Kretschmann	ccc685f06d	remove mongodb option from script	2020-10-13 10:43:29 +02:00
Matthias Kretschmann	52d92797bf	update docs	2020-10-13 10:39:09 +02:00
Matthias Kretschmann	cb45cf7128	remove unused aquarius compose files	2020-10-13 10:37:49 +02:00
Alex Coseru	7c2174270f	Update start_ocean.sh	2020-10-12 19:16:34 +03:00
Alex Coseru	6bb045684a	Update aquarius_elasticsearch.yml	2020-10-12 17:36:53 +03:00
Alex Coseru	44ebd4f112	Update start_ocean.sh	2020-10-12 16:47:51 +03:00
Alex Coseru	5716076418	Update start_ocean.sh	2020-10-02 16:29:44 +03:00
Alex Coseru	adf74994ec	Update ganache.yml	2020-10-02 13:36:57 +03:00
Alex Coseru	9929cdf44b	Update ganache.yml	2020-10-02 13:30:06 +03:00
Alex Coseru	ce67c07d88	Update start_ocean.sh	2020-10-02 10:36:24 +03:00
Matthias Kretschmann	0519b8d8de	docs update	2020-09-24 22:38:39 +02:00
ssallam	f5691db303	Merge branch 'feature/did-datatoken' into v3 ... # Conflicts: # start_ocean.sh	2020-09-23 13:52:04 +02:00
ssallam	15ad93f887	update default versions	2020-09-23 13:49:36 +02:00
Alex Coseru	4c354e3667	Update start_ocean.sh	2020-09-23 08:06:22 +03:00
ssallam	05ec7c4a4c	set aquarius url for the provider container.	2020-09-22 14:50:46 +02:00
Alex Coseru	0c51bcc2dc	Update start_ocean.sh	2020-09-17 22:46:39 +03:00
Alex Coseru	5f894dcb8d	Merge pull request #220 from oceanprotocol/feature/ocean-contracts ... Feature/ocean contracts	2020-09-17 22:20:57 +03:00
Alex Coseru	5e215d6f75	Merge branch 'v3' into feature/ocean-contracts	2020-09-17 22:20:46 +03:00
ssallam	f35b318ee0	use provider v0.3.0	2020-09-17 13:36:13 +02:00
Alex Coseru	5e164c28ce	Update start_ocean.sh ... aquarius v2.0 is used only with feature/contracts branch	2020-09-17 07:14:40 +03:00
Matthias Kretschmann	cf8a149f83	lock Aquarius & Provider versions	2020-09-16 17:59:44 +02:00
alexcos20	5215ee5f0e	small fixes	2020-09-15 01:07:35 -07:00
ssallam	fc40685304	update aquarius default version.	2020-09-11 18:05:39 +02:00
ssallam	b61407d9c5	Update readme file, fix error in setting default ocean-contracts version.	2020-09-11 11:31:47 +02:00
ssallam	7ee85c9503	Use aquarius latest tag.	2020-09-11 11:19:41 +02:00
ssallam	da93e10841	set contracts version in start_ocean	2020-09-11 10:00:59 +02:00
ssallam	b4bd7bd2f2	use ocean-contracts:test docker image until it is merged to master.	2020-09-11 09:46:26 +02:00
ssallam	1b5deda9be	fix errors, remove ganache blockTime option.	2020-09-11 08:25:55 +02:00
ssallam	99640d206e	add ocean-contracts compose file.	2020-09-09 18:25:24 +02:00
Matthias Kretschmann	09c97c7d21	script cleanup, sync script and docs	2020-09-08 18:23:10 +02:00
Matthias Kretschmann	12d6e01a68	add discord link	2020-09-08 18:04:08 +02:00
ssallam	528df38607	Make ganache run persist with db cache	2020-09-08 11:29:54 +02:00
ssallam	07131ceddc	Support decentralized ddo	2020-09-08 10:39:52 +02:00
alexcos20	b623171cac	temporary provider will use one worker	2020-07-29 22:24:22 -07:00
ssallam	0299f33836	Remove extra line.	2020-07-15 10:29:53 +02:00
ssallam	a1d8c24b56	Merge remote-tracking branch 'origin/v3' into v3	2020-07-15 10:29:09 +02:00
ssallam	c148e447ca	Fix provider issue, remove references to keeper	2020-07-15 10:28:54 +02:00