771 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jernej Pregelj	3d10d53905	address already in use	2018-11-23 16:28:51 +01:00
Sebastian Gerske	66569ba353	Merge branch 'develop' into feature/clean_env	2018-11-23 16:12:01 +01:00
Jernej Pregelj	3d46574be1	Merge branch 'develop' of https://github.com/oceanprotocol/docker-images into secret-store-api-cors-proxy	2018-11-23 15:52:13 +01:00
Javier Cortejoso	08bbaea69f	Merge pull request #47 from oceanprotocol/secret-store-api-cors-proxy ... secret store api cors proxy	2018-11-23 09:52:49 +01:00
Sebastian Gerske	e516526418	Merge pull request #54 from oceanprotocol/fix/readme ... Added Parity client accounts to readme	2018-11-23 09:51:02 +01:00
Aitor	ad6c75f518	Merge pull request #55 from oceanprotocol/feature/adding-brizo-parity ... adding brizo to parity docker compose	2018-11-22 17:42:06 +01:00
aitor@oceanprotocol.com	d6418e746a	adding brizo to parity docker compose	2018-11-22 17:40:28 +01:00
Javier Cortejoso	4ad2f24017	Added Parity client accounts to readme	2018-11-21 17:30:05 +01:00
Jernej Pregelj	973654a648	Merge branch 'develop' of https://github.com/oceanprotocol/docker-images into secret-store-api-cors-proxy	2018-11-21 09:50:48 +01:00
Sebastian Gerske	9dc608a7d9	Merge pull request #48 from oceanprotocol/feature/update_balance ... Feature/update balance	2018-11-21 08:30:43 +01:00
Javier Cortejoso	2ea967e087	Merge pull request #52 from oceanprotocol/fix/networkId ... Changed networkId to avoid collision	2018-11-20 15:13:12 +01:00
Javier Cortejoso	614a7da2f5	Changed networkId to avoid collision	2018-11-20 14:43:48 +01:00
Sebastian Gerske	ccfcd64c28	Merge pull request #50 from oceanprotocol/fix/typo ... Fix typo in volume	2018-11-19 11:22:21 +01:00
Javier Cortejoso	e6d5fd9e80	Fix typo in volume	2018-11-19 11:20:44 +01:00
Javier Cortejoso	f4ffefdda6	Merge branch 'develop' of github.com:oceanprotocol/docker-images into feature/update_balance	2018-11-19 08:44:26 +01:00
Javier Cortejoso	11c4c6bb59	Increased balance of test accounts	2018-11-19 08:43:51 +01:00
Javier Cortejoso	fa2bc717a3	Merge pull request #45 from oceanprotocol/feature/copyedit-readme-md ... Copyedited README.md, fixed minor errors, added more examples	2018-11-16 16:46:57 +01:00
Jernej Pregelj	14dd4f8319	secret store api cors proxy	2018-11-16 16:37:58 +01:00
Enrique Ruiz	0548f4e36d	Merge pull request #46 from oceanprotocol/feature/keys_client ... Added account keys to client	2018-11-15 12:31:06 +01:00
Javier Cortejoso	b78e90b4e0	Added account keys to client	2018-11-15 12:20:39 +01:00
Troy McConaghy	d846c7a6fa	Copyedited README.md, fixed minor errors, added more examples	2018-11-15 11:34:21 +01:00
Enrique Ruiz	516424e142	Merge pull request #42 from oceanprotocol/feature/new_accounts ... Added new accounts with balance	2018-11-15 11:23:00 +01:00
Javier Cortejoso	1b058f812a	Added --clean-all option to clean volumes and network	2018-11-15 11:04:42 +01:00
aitor@oceanprotocol.com	8a7c0f24b1	adding secret store + parity doc	2018-11-15 10:30:28 +01:00
Javier Cortejoso	62967b7d39	Added new accounts with balance	2018-11-15 10:17:25 +01:00
Aitor	ef787f7777	Merge pull request #40 from oceanprotocol/feature/secret_store ... Feature/secret store	2018-11-15 09:38:03 +01:00
Javier Cortejoso	97fea262c7	Changes secretstore	2018-11-14 18:20:39 +01:00
Javier Cortejoso	9c02a0b2a7	Added secret store	2018-11-14 16:33:09 +01:00
Javier Cortejoso	794fba279e	Merge branch 'develop' of github.com:oceanprotocol/docker-images into fix/default_env	2018-11-14 15:30:04 +01:00
Javier Cortejoso	e758d716fa	Merge pull request #38 from oceanprotocol/fix/parity_mode ... Fix parity mode	2018-11-12 10:02:30 +01:00
Javier Cortejoso	79b38ec09a	Merge pull request #37 from oceanprotocol/feature/add-brizo-component ... Add brizo component to the docker-compose	2018-11-12 09:41:05 +01:00
Javier Cortejoso	bd5d060aaa	Minnor reference in doc	2018-11-12 09:39:11 +01:00
Javier Cortejoso	a42ed6fe6e	Include default environment file	2018-11-12 09:35:58 +01:00
Javier Cortejoso	5ef0382303	Fix parity mode	2018-11-12 09:12:49 +01:00
eruizgar91	5cf0750455	Add brizo component to the docker-compose	2018-11-07 09:49:46 +01:00
Sebastian Gerske	0e29c2a385	Merge pull request #36 from oceanprotocol/feature/aquarius ... Feature/aquarius	2018-10-26 10:00:29 +02:00
Sebastian Gerske	f2d37b4a00	update readme	2018-10-26 09:33:56 +02:00
Sebastian Gerske	d7c3db61a5	provider is now aquarius	2018-10-26 09:33:05 +02:00
Enrique Ruiz	87c5d4567a	Merge pull request #35 from oceanprotocol/fix/provider-boot-fail ... Fix boot of the provider	2018-10-19 10:17:49 +02:00
eruizgar91	44d4669285	Fix boot of the provider	2018-10-18 16:35:34 +02:00
Sebastian Gerske	70fbca857d	added reuse-database to readme and added log to start ocean	2018-10-11 14:33:30 +02:00
Sebastian Gerske	0966ac5ddc	Merge pull request #33 from oceanprotocol/feature/reuse_db ... moved reuse_database to own switch	2018-10-11 09:56:18 +02:00
Sebastian Gerske	2dc94460e9	moved reuse_database to own switch	2018-10-10 15:49:10 +02:00
Matthias Kretschmann	8f4701cd5e	Merge pull request #32 from oceanprotocol/feature/default-stable ... Dolphins and colors, default to stable components	2018-10-10 13:12:39 +02:00
Matthias Kretschmann	434d4c22d0	document script options & environment variables	2018-10-10 12:53:16 +02:00
Matthias Kretschmann	fa0e52d65f	add output screenshot	2018-10-10 12:34:02 +02:00
Matthias Kretschmann	d510167707	start script rewrite with options, banner, and colors	2018-10-10 12:21:56 +02:00
Matthias Kretschmann	3035d83273	Merge branch 'develop' into feature/default-stable	2018-10-10 11:21:19 +02:00
Sebastian Gerske	332911ba93	Merge pull request #31 from oceanprotocol/feature/project-name ... put back project name on docker-compose commands	2018-10-04 12:49:38 +02:00
Matthias Kretschmann	2e1f2cd5d5	yay, multiple arguments	2018-10-02 13:50:34 +02:00