1
0
mirror of https://github.com/oceanprotocol/barge.git synced 2024-10-31 23:55:18 +01:00
Commit Graph

136 Commits

Author SHA1 Message Date
Javier Cortejoso
cfc4ca2b0b
Fix keeper-contracts/brizo as ethereum rpc provider 2018-11-30 10:36:55 +01:00
Javier Cortejoso
d62df2afc0
Merge branch 'develop' of github.com:oceanprotocol/docker-images into feature/refactor 2018-11-30 10:31:38 +01:00
Javier Cortejoso
a1c0d6e6d7
Merge pull request #69 from oceanprotocol/feature/improved-brizo-docker
Update for brizo docker env vars.
2018-11-30 10:22:43 +01:00
Javier Cortejoso
c8d6660b9b
Added note about Brizo azure vars 2018-11-30 10:21:34 +01:00
ssallam
73ff958e90 Group brizo's env vars in its own .env file and load it into the docker-compose file. 2018-11-30 02:27:10 +01:00
aitor@oceanprotocol.com
b965e9977a making latest default option 2018-11-29 14:51:15 +01:00
Javier Cortejoso
565fe241c9
Added individual compose files 2018-11-29 12:32:38 +01:00
Jernej Pregelj
baab74af40
Merge pull request #67 from oceanprotocol/fix/pleuston-hosts
Browser needs localhost services
2018-11-28 16:43:22 +01:00
Jernej Pregelj
48f478cda8 browser needs localhost services 2018-11-28 16:40:42 +01:00
Jernej Pregelj
23ee0b14ee
Merge pull request #66 from oceanprotocol/fix/pleuston-env
update pleuston env vars
2018-11-28 11:23:48 +01:00
Jernej Pregelj
2e9eeebabc update pleuston env vars 2018-11-28 11:20:18 +01:00
Sebastian Gerske
3721b5dcd3
Merge pull request #63 from oceanprotocol/feature/docs
add docs to script banner, remove unused images folder
2018-11-27 14:32:17 +01:00
560badd6fd
add docs to script banner, remove unused images folder 2018-11-27 12:27:01 +01:00
Aitor
9486209b05
Merge pull request #61 from oceanprotocol/fix/brizo
Added aquarius url to brizo
2018-11-26 14:02:45 +01:00
Javier Cortejoso
69aee67993 Added aquarius url to brizo 2018-11-26 13:45:18 +01:00
Sebastian Gerske
3c5999fe9a
Merge pull request #58 from oceanprotocol/fix/address-already-in-use
Fix/address already in use / keeper URL
2018-11-26 09:04:40 +01:00
Jernej Pregelj
bceba2ba0a fix brizo keeper URL 2018-11-23 16:54:11 +01:00
Jernej Pregelj
3d10d53905 address already in use 2018-11-23 16:28:51 +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
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