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
342789a80f
Merge pull request #169 from oceanprotocol/simplify-ways-to-contribute
...
Simplify the 'Ways to Contribute' page
2019-03-12 16:18:42 +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
2c63cf480c
Merge pull request #167 from oceanprotocol/try-to-enforce-py3-in-travis-deploy
...
Try to enforce py3 & pip3 in Travis deploy
2019-03-11 14:57:34 +01:00
Troy McConaghy
cef2568598
Don't worry about Python version for Travis deploy
2019-03-11 14:50:08 +01:00
Troy McConaghy
b78d5f3142
.travis.yml ignores alias; use something else
2019-03-11 14:28:49 +01:00
Troy McConaghy
4e2c8ccc39
Try to enforce py3 & pip3 in Travis deploy
2019-03-11 14:14:43 +01:00
Troy McConaghy
bddde7e5bd
Merge pull request #166 from oceanprotocol/use-newer-python-in-travis
...
Get Travis to use python3 and pip3
2019-03-11 13:50:57 +01:00
Troy McConaghy
3d363610cb
Get Travis to use python3 and pip3
2019-03-11 13:39:53 +01:00
Troy McConaghy
471c86ca70
Merge pull request #158 from oceanprotocol/update-page-re-getting-eth-or-tokens
...
Updated page re/ getting Ether or Ocean tokens
2019-03-11 11:49:12 +01:00
Troy McConaghy
afee683849
Merge branch 'master' into update-page-re-getting-eth-or-tokens
2019-03-11 11:40:17 +01:00
Troy McConaghy
ab396900f6
Merge pull request #164 from oceanprotocol/greenkeeper/monorepo.gatsby-20190311101705
...
Greenkeeper/monorepo.gatsby 20190311101705
2019-03-11 11:39:44 +01:00
Troy McConaghy
4602ff9d7f
Merge branch 'master' into update-page-re-getting-eth-or-tokens
2019-03-11 11:27:23 +01:00
greenkeeper[bot]
1b997fb40d
chore(package): update gatsby to version 2.1.29
2019-03-11 10:19:04 +00:00
greenkeeper[bot]
ad266d899e
chore(package): update gatsby-transformer-sharp to version 2.1.15
2019-03-11 10:19:00 +00:00
greenkeeper[bot]
40b0c54833
chore(package): update gatsby-transformer-remark to version 2.3.1
2019-03-11 10:18:57 +00:00
greenkeeper[bot]
33682c0940
chore(package): update gatsby-source-graphql to version 2.0.13
2019-03-11 10:18:53 +00:00
greenkeeper[bot]
abac17f909
chore(package): update gatsby-source-filesystem to version 2.0.23
2019-03-11 10:18:50 +00:00
greenkeeper[bot]
b7f7c2b3c3
chore(package): update gatsby-remark-images to version 3.0.6
2019-03-11 10:18:47 +00:00
greenkeeper[bot]
17c6c63057
chore(package): update gatsby-remark-autolink-headers to version 2.0.15
2019-03-11 10:18:43 +00:00
greenkeeper[bot]
158f2fc472
chore(package): update gatsby-plugin-sitemap to version 2.0.6
2019-03-11 10:18:40 +00:00
greenkeeper[bot]
4544e3e779
chore(package): update gatsby-plugin-sharp to version 2.0.25
2019-03-11 10:18:36 +00:00
greenkeeper[bot]
1c386f9ddc
chore(package): update gatsby-plugin-react-helmet to version 3.0.8
2019-03-11 10:18:32 +00:00
greenkeeper[bot]
27dbef5a75
chore(package): update gatsby-plugin-offline to version 2.0.24
2019-03-11 10:18:28 +00:00
greenkeeper[bot]
6e508a214b
chore(package): update gatsby-plugin-manifest to version 2.0.22
2019-03-11 10:18:24 +00:00
greenkeeper[bot]
e2faaf9387
chore(package): update gatsby-plugin-google-analytics to version 2.0.16
2019-03-11 10:18:20 +00:00
greenkeeper[bot]
dd8a9d9ff5
chore(package): update gatsby-plugin-catch-links to version 2.0.12
2019-03-11 10:18:16 +00:00
greenkeeper[bot]
ffb87a4ab2
chore(package): update gatsby-image to version 2.0.31
2019-03-11 10:18:11 +00:00
Aitor
5392381eaa
Merge pull request #118 from oceanprotocol/feature/accepting-code-from-external-contributors
...
Added 'Legal Requirements when Contributing Code'
2019-03-11 10:08:58 +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
f001a36cfd
Merge pull request #157 from oceanprotocol/update-tools-and-examples-page
...
Updated the Tools & Examples page
2019-03-07 10:15:45 +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
75af74df76
Merge pull request #160 from oceanprotocol/remove-mention-of-token-bridge-in-production
...
Remove mention of token bridge in production
2019-03-06 11:24:16 +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
eaff0c15d4
Merge pull request #156 from oceanprotocol/revise-quickstart-page-for-now
...
Point Quickstart option 2 to Barge repo for now
2019-03-06 10:53:30 +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
