398 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Enrique Ruiz	74794763cb	Merge pull request #18 from oceanprotocol/develop ... Update versions	2018-09-07 10:44:23 +02:00
Enrique Ruiz	bc57d3ee05	Merge pull request #17 from oceanprotocol/fix/change-version ... Fix/change version	2018-09-07 10:42:21 +02:00
eruizgar91	c299aed9df	Update docker-compose version to be sure that is compatible	2018-09-07 10:28:13 +02:00
Enrique Ruiz	567aa8a072	Merge pull request #11 from oceanprotocol/develop ... Develop	2018-08-16 21:57:56 +02:00
aitor@oceanprotocol.com	89ff4a36ed	Merge branch 'master' into develop	2018-08-16 12:25:03 +02:00
Aitor	892f941c12	Merge pull request #10 from oceanprotocol/bugfix/disclaimer ... disclaimer added	2018-08-16 12:24:42 +02:00
aitor@oceanprotocol.com	91dced34d5	Merge branch 'develop' of github.com:oceanprotocol/docker-images into develop	2018-08-16 12:24:15 +02:00
aitor@oceanprotocol.com	f731159be7	disclaimer added	2018-08-16 12:20:54 +02:00
Aitor	a56a312845	Merge pull request #9 from oceanprotocol/feature/provider_backend_rename ... renamed provider-backend -> provider in docker and compose	2018-08-16 10:56:24 +02:00
Sebastian Gerske	5313477ee4	renamed provider-backend -> provider in docker and compose	2018-08-16 10:20:10 +02:00
Don Gossen	26ca27011d	Update README.md	2018-08-16 09:47:43 +02:00
Don Gossen	b644a98dfb	Merge pull request #8 from oceanprotocol/bugfix/readme-copy ... Update README.md	2018-08-15 17:34:23 +02:00
Aitor	a0ef708879	Update README.md	2018-08-15 17:30:06 +02:00
Aitor	232aaba5b7	Merge pull request #7 from oceanprotocol/develop ... Plankton release 0.1	2018-08-15 15:30:06 +02:00
Sebastian Gerske	14b2343ba4	updated docker compose to use read only volumes for provider-backend	2018-08-15 11:25:01 +02:00
Sebastian Gerske	57fcc7712d	Merge pull request #6 from oceanprotocol/fix/typo-in-network ... Fix typo in network	2018-08-14 16:32:24 +02:00
eruizgar91	d3cf6ded7a	Fix typo in network	2018-08-14 16:30:17 +02:00
Sebastian Gerske	36b057976e	better version of volumes	2018-08-14 16:00:23 +02:00
Sebastian Gerske	a2bc91be8c	adapted path to artifacts	2018-08-14 08:26:02 +02:00
Sebastian Gerske	e136c31047	Merge pull request #5 from oceanprotocol/feature/ocean_docker_refactoring ... updated artifacts folder for provider backend	2018-08-13 15:37:30 +02:00
Sebastian Gerske	3500e4136e	updated artifacts folder for provider backend	2018-08-13 15:32:59 +02:00
Sebastian Gerske	98b8c0e984	Merge pull request #4 from oceanprotocol/feature/readme-doc-improved ... Feature/readme doc improved	2018-08-13 15:18:53 +02:00
aitor@oceanprotocol.com	c718fa7bcb	adding details	2018-08-13 15:12:21 +02:00
Aitor	c23e08b9a9	Merge pull request #3 from oceanprotocol/feature/ocean_docker_refactoring ... Feature/ocean docker refactoring	2018-08-13 14:33:02 +02:00
Sebastian Gerske	04d7b03d37	fixed deps on tendermint and bigchaindb	2018-08-13 14:16:15 +02:00
Sebastian Gerske	0761c88791	fixed contracts path for provider-backend	2018-08-13 13:48:08 +02:00
Aitor	6536d99693	Merge pull request #2 from oceanprotocol/feature/ocean_docker_refactoring ... cleanup, networks, putting it all together	2018-08-13 12:13:27 +02:00
Sebastian Gerske	0aed865232	cleanup, networks, putting it all together	2018-08-13 12:10:17 +02:00
Sebastian Gerske	5e7494ca7f	fixed readme, my fault sorry	2018-08-13 11:22:36 +02:00
Sebastian Gerske	0f72b472c9	added project name to doc	2018-08-13 11:08:40 +02:00
Sebastian Gerske	c0e8f96936	added contract artifacts to docker compose for provider-backend	2018-08-10 16:11:35 +02:00
Sebastian Gerske	061d896e7f	added repo banner	2018-08-10 14:44:12 +02:00
Sebastian Gerske	71e8b0dc3d	updated readme	2018-08-10 14:30:25 +02:00
Sebastian Gerske	080335ba72	moved main docker-compose to main folder	2018-08-10 14:30:17 +02:00
Sebastian Gerske	95b95cd59a	added export of artifacts to docker compose	2018-08-10 14:15:07 +02:00
Sebastian Gerske	5f5bcf201e	added pleuston	2018-08-10 13:20:16 +02:00
Sebastian Gerske	c8045ce75e	added gitignore	2018-08-10 12:39:07 +02:00
Sebastian Gerske	b69f4d48bd	remoed .idea	2018-08-10 12:38:42 +02:00
Sebastian Gerske	50299049ae	deleted old stuff	2018-08-10 12:34:16 +02:00
Sebastian Gerske	e685a8bbda	added docker-compose for a full ocean	2018-08-10 11:52:29 +02:00
ssallam	db3a3f5934	Update documentation	2018-06-28 16:40:14 +02:00
ssallam	56f7e024df	Fix smart contract issue, update documentation.	2018-06-27 15:51:32 +02:00
ssallam	ce4136f86b	Clean up and unlock account.	2018-06-18 17:11:02 +02:00
ssallam	b28fe99f07	Running proof of authority network.	2018-05-22 16:29:54 +02:00
ssallam	60e58ebb99	Basic composer.	2018-05-18 16:32:42 +02:00
aitor@oceanprotocol.com	9c2c1dcdcf	removing not necessary files	2018-04-26 17:39:32 +01:00
aitor@oceanprotocol.com	8d933ec72a	Ocean DB script	2018-04-26 17:38:23 +01:00
Aitor	713fd4aa0c	Initial commit	2018-04-26 16:40:15 +01:00