710 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Troy McConaghy	d2eafa9538	Merge branch 'master' into update-tools-and-examples-page	2019-03-05 11:38:59 +01:00
Manan Patel	5af4ff8e51	Merge pull request #159 from oceanprotocol/simplify-wallets-page ... Simplify Wallet Basics + Metamask Tutorial pages	2019-03-05 11:30:32 +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
Troy McConaghy	3791ff6cfc	Simplify Wallet Basics + Metamask Tutorial pages	2019-03-02 20:52:33 +01:00
Troy McConaghy	0a8182a627	Updated page re getting Ether or Ocean tokens	2019-03-01 16:00:14 +01:00
Troy McConaghy	eb9b87669f	Merge branch 'master' into update-tools-and-examples-page	2019-03-01 13:36:22 +01:00
Troy McConaghy	3b29eb310c	Update the Tools & Examples page	2019-03-01 13:30:51 +01:00
Troy McConaghy	a65930b757	Merge branch 'master' into revise-quickstart-page-for-now	2019-03-01 11:44:49 +01:00
Troy McConaghy	21a65f5790	Merge pull request #153 from oceanprotocol/greenkeeper/markdownlint-cli-0.14.0 ... Update markdownlint-cli to the latest version 🚀	2019-03-01 11:44:08 +01:00
Troy McConaghy	41c29aa8e5	Point Quickstart option 2 to Barge repo for now	2019-03-01 11:11:01 +01:00
greenkeeper[bot]	5ec156518a	chore(package): update markdownlint-cli to version 0.14.0	2019-02-25 01:52:37 +00:00
Troy McConaghy	45e907a198	Merge pull request #147 from oceanprotocol/feature/squid-java-now-public ... Make changes now that squid-java is public	2019-02-22 16:27:06 +01:00
Troy McConaghy	eb441bb228	Merge branch 'master' into feature/squid-java-now-public	2019-02-22 15:55:42 +01:00
Troy McConaghy	bbfb57d49c	Merge pull request #152 from oceanprotocol/feature/now-support-many-storage-options ... Revise & add docs now that we support three storage options	2019-02-22 13:43:38 +01:00
Troy McConaghy	fc5709c431	Revise the def'n of Assets & link to it more	2019-02-22 13:24:46 +01:00
Troy McConaghy	97af514a1c	Merge branch 'master' into feature/now-support-many-storage-options	2019-02-22 10:00:30 +01:00
Troy McConaghy	f6ae70943e	Merge pull request #148 from oceanprotocol/edit-wallet-docs ... Revised "Wallet Basics", Made MetaMask Tutorial Its Own Page	2019-02-22 10:00:10 +01:00
Matthias Kretschmann	b18bef898d	add client redirect ... * ref #151	2019-02-21 17:30:47 +01:00
Matthias Kretschmann	2924a6c746	bump squid-js	2019-02-21 17:28:04 +01:00
Troy McConaghy	bb4e0eb1f3	git submodule update --remote --recursive	2019-02-21 17:03:38 +01:00
Troy McConaghy	cbb470b28f	Revise + add docs bc now support 3 storage options	2019-02-21 17:00:28 +01:00
Troy McConaghy	0f493c6bdf	Merge branch 'master' into edit-wallet-docs	2019-02-20 17:18:13 +01:00
Troy McConaghy	25eea910c8	Merge pull request #150 from oceanprotocol/feature/note-plecos ... Add some documentation about Plecos (the metadata validation tool)	2019-02-20 17:16:55 +01:00
MarcusJones	ce70d1ac55	Update tools.md	2019-02-20 16:59:15 +01:00
MarcusJones	a03f8c1625	Update tools.md	2019-02-20 16:56:38 +01:00
Troy McConaghy	56f62ebc4d	Document the existence of Plecos (the tool)	2019-02-20 16:50:48 +01:00
Troy McConaghy	99dac06b36	Merge branch 'master' into edit-wallet-docs	2019-02-20 15:28:30 +01:00
Jernej Pregelj	da8b279b8c	Merge pull request #149 from oceanprotocol/fix/secret-store-address ... Updated address and password	2019-02-20 15:23:38 +01:00
Jernej Pregelj	295de9faaf	updated address and password	2019-02-20 15:11:48 +01:00
Troy McConaghy	288e9410d4	mv wallets to /concepts, make MetaMask tut. stand-alone	2019-02-20 14:21:03 +01:00
Troy McConaghy	3a3425ab9e	Make changes now that squid-java is public.	2019-02-18 13:47:41 +01:00
Troy McConaghy	57e431b7da	Merge pull request #146 from oceanprotocol/feature/note-re-spree-testnet ... Add note re/ Spree Testnet on Testnets page	2019-02-14 09:07:34 +01:00
Troy McConaghy	ae5d490068	Add note re Spree Testnet on Testnets page	2019-02-13 16:22:19 +01:00
Matthias Kretschmann	878e7ad496	Merge pull request #144 from oceanprotocol/Anirudh2490-patch-1 ... Updating wallets w/ formatting changes + grammar	2019-02-08 15:22:25 +01:00
Matthias Kretschmann	c53ed7b173	Merge branch 'master' into Anirudh2490-patch-1	2019-02-08 15:02:34 +01:00
Troy McConaghy	5808398fc2	Merge pull request #145 from oceanprotocol/feature/papers-updates ... update papers section	2019-02-08 10:12:37 +01:00
Troy McConaghy	77724b637d	Move mission blog post ref under Mission Statement	2019-02-08 10:01:35 +01:00
Matthias Kretschmann	874fe42527	update papers section	2019-02-07 18:32:05 +01:00
Matthias Kretschmann	fe62b37ad4	more copy reshuffling	2019-02-07 15:51:10 +01:00
Matthias Kretschmann	89a4d457f4	content merging	2019-02-07 15:41:18 +01:00
Matthias Kretschmann	629a75aec7	formatting updates, table style tweak	2019-02-07 15:11:30 +01:00
Anirudh2490	0dcffd711a	Changes to video tutorial links ... Linked now to just a playlist with all the steps	2019-02-07 13:35:33 +01:00