976 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Troy McConaghy	3ebdc01d6b	Merge branch 'master' into add-how-to-contribute-service-integrations	2019-03-23 11:51:14 +01:00
Troy McConaghy	51fbe5b8c9	Merge pull request #185 from oceanprotocol/notice-re-consume-flow-tut-not-working ... Add notice to Consume Flow page in React tut.	2019-03-23 11:51:00 +01:00
Troy McConaghy	e8470f115f	Merge branch 'master' into add-how-to-contribute-service-integrations	2019-03-22 17:28:26 +01:00
Troy McConaghy	55660a2dcd	Merge branch 'master' into notice-re-consume-flow-tut-not-working	2019-03-22 17:26:25 +01:00
Troy McConaghy	78e25154ea	Merge pull request #188 from oceanprotocol/feature/gatsby-2.2 ... bump gatsby	2019-03-22 17:26:06 +01:00
Matthias Kretschmann	7d0abf4dc2	bump gatsby	2019-03-22 12:17:01 -03:00
Matthias Kretschmann	e18cb40475	Merge branch 'master' into notice-re-consume-flow-tut-not-working	2019-03-22 09:42:52 -03:00
Matthias Kretschmann	2195cfd91b	Merge pull request #184 from oceanprotocol/fix/builds ... Fix builds	2019-03-22 09:14:04 -03: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
Matthias Kretschmann	c935e77715	more updates	2019-03-21 15:09:10 -03:00
Matthias Kretschmann	0edff5bac4	bump dev-ocean	2019-03-21 15:04:26 -03:00
Matthias Kretschmann	70e35a60db	package updates, lock Gatsby to v2.1	2019-03-21 15:04:04 -03:00
Troy McConaghy	82cc7407e0	Merge pull request #171 from oceanprotocol/initial-docs-about-real-ocean-tokens ... New page re/ Ocean Tokens + edit related pages	2019-03-20 14:49:22 +01:00
Troy McConaghy	e7de6bb8b3	Merge branch 'master' into initial-docs-about-real-ocean-tokens	2019-03-20 14:42:09 +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	af484e2cf3	Merge pull request #182 from oceanprotocol/fix-publish-page-in-react-app-tutorial ... Fix the Publish page of the React App Tutorial	2019-03-20 12:53:01 +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	4c29cd4d8b	Merge pull request #180 from oceanprotocol/initial-update-of-react-tutorial ... (PR) Update the React App Tutorial	2019-03-19 12:04:50 +01:00
Troy McConaghy	34d7984e53	Update the setup page of the React App Tutorial	2019-03-19 11:34:52 +01:00
Troy McConaghy	7ce78d3eef	Merge branch 'master' into initial-docs-about-real-ocean-tokens	2019-03-18 16:23:19 +01:00
Aitor	37af34bd30	Merge pull request #179 from oceanprotocol/unlink-computing-services-page ... Unlink the "Computing Services" page (for now)	2019-03-18 16:21:09 +01:00
Troy McConaghy	160688d3b4	Unlink the "Computing Services" page (for now)	2019-03-18 15:58:17 +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	84f8c03c02	Merge pull request #178 from oceanprotocol/two-new-tutorial-pages ... Add two new tutorials re/ wallets	2019-03-18 14:59:42 +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	cbb948a7a3	Merge pull request #177 from oceanprotocol/feature/spree_seed_phrase ... added information about how to use the spree seed phrase to get acces…	2019-03-18 14:21:49 +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	c1cd598dac	Merge pull request #176 from oceanprotocol/more-wallet-help ... Further simplify & correct "Wallet Basics"	2019-03-15 15:34:27 +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	d5ed959c33	Merge pull request #175 from oceanprotocol/link-to-oep-11 ... Link from SEA definition to OEP-11	2019-03-15 09:50:38 +01:00
Troy McConaghy	a043b84d4e	Link from SEA def'n. to OEP-11	2019-03-15 09:33:30 +01:00
Troy McConaghy	875808df13	Merge pull request #174 from oceanprotocol/greenkeeper/monorepo.gatsby-20190314235920 ... Greenkeeper/monorepo.gatsby 20190314235920	2019-03-15 09:18:21 +01:00
greenkeeper[bot]	1cc8e4f2a5	chore(package): update gatsby to version 2.1.34	2019-03-15 00:00:37 +00:00
greenkeeper[bot]	b76ee5305e	chore(package): update gatsby-transformer-yaml to version 2.1.10	2019-03-15 00:00:34 +00:00
greenkeeper[bot]	9213422447	chore(package): update gatsby-transformer-sharp to version 2.1.17	2019-03-15 00:00:31 +00:00
greenkeeper[bot]	1a4526e4f1	chore(package): update gatsby-transformer-remark to version 2.3.4	2019-03-15 00:00:26 +00:00
greenkeeper[bot]	92216d2528	chore(package): update gatsby-source-graphql to version 2.0.14	2019-03-15 00:00:22 +00:00
greenkeeper[bot]	f2eaa409dc	chore(package): update gatsby-source-filesystem to version 2.0.26	2019-03-15 00:00:19 +00:00
greenkeeper[bot]	3e5e56a0b7	chore(package): update gatsby-remark-smartypants to version 2.0.9	2019-03-15 00:00:15 +00:00
greenkeeper[bot]	c5cb178599	chore(package): update gatsby-remark-responsive-iframe to version 2.1.0	2019-03-15 00:00:11 +00:00