Troy McConaghy
dd05ffd118
Add more about the OceanDB & Osmosis drivers
2019-03-27 14:22:32 +01:00
Troy McConaghy
3ebdc01d6b
Merge branch 'master' into add-how-to-contribute-service-integrations
2019-03-23 11:51:14 +01:00
Troy McConaghy
0d6dc2aae8
+ "Develop a Service Integration Driver or Plugin"
2019-03-22 11:16:09 +01:00
Troy McConaghy
3d9e669e3c
Add notice to Consume Flow page in React tut.
2019-03-22 10:14:54 +01:00
Troy McConaghy
6cda490023
Make changes suggested by Patty
2019-03-20 14:32:57 +01:00
Troy McConaghy
4adc17c25e
Merge branch 'master' into initial-docs-about-real-ocean-tokens
2019-03-20 12:54:49 +01:00
Troy McConaghy
4627294ac2
Update the example asset in React App Tutorial
2019-03-20 11:30:00 +01:00
Troy McConaghy
ff6cdb8745
Merge branch 'master' into initial-docs-about-real-ocean-tokens
2019-03-19 12:06:49 +01:00
Troy McConaghy
34d7984e53
Update the setup page of the React App Tutorial
2019-03-19 11:34:52 +01:00
Troy McConaghy
88cb3019b4
Add more cautionary language re/ Ocean Tokens
2019-03-18 15:20:17 +01:00
Troy McConaghy
e4fc46dfe7
Merge branch 'master' into initial-docs-about-real-ocean-tokens
2019-03-18 15:00:32 +01:00
Troy McConaghy
bbc3ad09c4
Merge branch 'master' into initial-docs-about-real-ocean-tokens
2019-03-18 14:23:45 +01:00
Troy McConaghy
515e1f5b77
Merge branch 'master' into two-new-tutorial-pages
2019-03-18 14:23:23 +01:00
Troy McConaghy
6fe71851ef
Merge branch 'master' into two-new-tutorial-pages
2019-03-18 14:19:42 +01:00
Troy McConaghy
e7dc8b41f5
Add 2 new tutorials re/ wallets
2019-03-18 14:14:40 +01:00
Sebastian Gerske
71e8cfa8c4
added information about how to use the spree seed phrase to get access to accounts that contain ether
2019-03-18 11:04:13 +01:00
Troy McConaghy
8c7f3f2866
Add link to "An Ambassador's Tale" post
2019-03-16 17:14:11 +01:00
Troy McConaghy
b11d2d136b
Merge branch 'master' into initial-docs-about-real-ocean-tokens
2019-03-15 15:35:47 +01:00
Troy McConaghy
0003a13a9b
Further simplify & correct "Wallet Basics"
2019-03-15 15:28:44 +01:00
Troy McConaghy
6a37de2d60
Merge branch 'master' into initial-docs-about-real-ocean-tokens
2019-03-15 11:58:31 +01:00
Troy McConaghy
a043b84d4e
Link from SEA def'n. to OEP-11
2019-03-15 09:33:30 +01:00
Troy McConaghy
80da5f780a
Merge branch 'master' into initial-docs-about-real-ocean-tokens
2019-03-14 17:11:49 +01:00
Troy McConaghy
864c725073
Add testnet notes on ChainID, local RPC URL, +
2019-03-14 17:02:15 +01:00
Troy McConaghy
84312cbb07
More revisions
2019-03-14 11:42:17 +01:00
Troy McConaghy
9e2bed6dc3
Revisions
2019-03-13 16:12:54 +01:00
Troy McConaghy
569c81b8ee
New page re/ Ocean Tokens + edit related pages
2019-03-13 13:44:30 +01:00
Troy McConaghy
8f4f8bf1ca
Merge branch 'master' into add-testnet-details-to-testnets-page
2019-03-13 09:27:01 +01:00
Troy McConaghy
0ca4a17036
Expand the instructions adding copyright notice
2019-03-13 09:26:44 +01:00
Troy McConaghy
9bd75976a5
Merge branch 'add-testnet-details-to-testnets-page' of github.com:oceanprotocol/docs into add-testnet-details-to-testnets-page
2019-03-13 09:18:58 +01:00
Troy McConaghy
ab2fda742d
OCEAN or SBT-OCN
2019-03-13 09:17:30 +01:00
Troy McConaghy
de9b10c186
Merge branch 'master' into add-testnet-details-to-testnets-page
2019-03-12 16:19:04 +01:00
Troy McConaghy
83ad6a7431
Remove two special/temporary OceanToken addresses
2019-03-12 16:17:17 +01:00
Troy McConaghy
6fa1994400
Simplify the 'Ways to Contribute' page
2019-03-12 15:59:08 +01:00
Troy McConaghy
68d36bc5f6
Update & add details to the "Testnets" page
2019-03-12 15:28:10 +01:00
Troy McConaghy
4602ff9d7f
Merge branch 'master' into update-page-re-getting-eth-or-tokens
2019-03-11 11:27:23 +01:00
Troy McConaghy
6e33e97491
Revise the legal reqs for external code contribs.
2019-03-09 15:16:40 +01:00
Troy McConaghy
b721b23de8
Merge branch 'master' into feature/accepting-code-from-external-contributors
2019-03-09 09:29:00 +01:00
Troy McConaghy
f336c4c5ef
Remove mention of the "Pacific" label
2019-03-07 10:22:38 +01:00
Troy McConaghy
4abea9c73c
Merge branch 'master' into update-page-re-getting-eth-or-tokens
2019-03-07 10:16:17 +01:00
Troy McConaghy
79df00c34c
Merge branch 'master' into update-tools-and-examples-page
2019-03-07 09:56:39 +01:00
Troy McConaghy
83f5de6359
Merge branch 'master' into update-page-re-getting-eth-or-tokens
2019-03-07 09:56:36 +01:00
Troy McConaghy
79ee8a7b84
Remove mention of token bridge in production
...
I guess we don't want to commit to there being a token bridge between the Ethereum mainnet and the Ocean mainnet. There are other options and it seems we're reviewing them again.
2019-03-06 11:06:54 +01:00
Troy McConaghy
31a5bee631
Merge branch 'master' into update-page-re-getting-eth-or-tokens
2019-03-06 10:54:00 +01:00
Troy McConaghy
2403e059a2
Merge branch 'master' into update-tools-and-examples-page
2019-03-06 10:53:50 +01:00
Troy McConaghy
df506b3a68
Bring back option 2 but add initial warning
2019-03-05 11:57:27 +01:00
Troy McConaghy
294104a614
Merge branch 'master' into revise-quickstart-page-for-now
2019-03-05 11:53:19 +01:00
Troy McConaghy
e6acfb0326
Merge branch 'master' into update-page-re-getting-eth-or-tokens
2019-03-05 11:39:11 +01:00
Troy McConaghy
d2eafa9538
Merge branch 'master' into update-tools-and-examples-page
2019-03-05 11:38:59 +01:00
Troy McConaghy
d05c10d5a2
Add another row to wallet combinations table
2019-03-04 15:13:31 +01:00
Troy McConaghy
188d8e18d9
Repair the list of wallets that works with Ocean
2019-03-04 11:08:18 +01:00