533 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Anirudh2490	35a41dba8f	Update wallets.md	2019-02-07 13:06:09 +01:00
Anirudh2490	8921f66bb8	Updating wallets w/ formatting changes + grammar ... Last PR was closed because I couldn't figure out what the issue was	2019-02-07 11:58:52 +01:00
Matthias Kretschmann	5535813a29	Merge pull request #142 from oceanprotocol/fix-link-to-bounties-on-gitcoin ... Fix link for the O.P. bounties on Gitcoin	2019-02-06 17:23:03 +01:00
Troy McConaghy	b4ed53c9d7	Fix link for the O.P. bounties on Gitcoin	2019-02-06 16:50:43 +01:00
Troy McConaghy	ba025e871b	Merge pull request #141 from oceanprotocol/fix/inline-code ... Be more specific with inline code	2019-02-06 13:56:56 +01:00
Matthias Kretschmann	5743b8a71e	more specific with inline code	2019-02-06 13:47:17 +01:00
Troy McConaghy	6b9f8248ca	Merge pull request #140 from oceanprotocol/feature/packages ... bump packages	2019-02-06 13:43:46 +01:00
Matthias Kretschmann	2cff3eaaf6	bump dev-ocean	2019-02-06 13:35:16 +01:00
Matthias Kretschmann	b84d32bf23	bump packages	2019-02-06 13:34:52 +01:00
Troy McConaghy	f1595e3523	Merge pull request #137 from oceanprotocol/add-ask-a-question-on-gitter-to-footer ... Add "✋ Ask a question on Gitter" to the footer	2019-02-05 18:30:12 +01:00
Matthias Kretschmann	719307f7ce	doc footer layout tweaks	2019-02-05 18:08:51 +01:00
Troy McConaghy	60f1ddef0b	Merge branch 'master' into add-ask-a-question-on-gitter-to-footer	2019-02-05 17:44:13 +01:00
Troy McConaghy	73bdf7c186	Merge pull request #138 from oceanprotocol/retry-pr-136 ... Retry PR #136 and also do 'npm run format'	2019-02-05 17:41:14 +01:00
Troy McConaghy	eba0fdbc0c	Retry PR #136 and also do 'npm run format'	2019-02-05 17:33:30 +01:00
Troy McConaghy	fb5f34e177	npm run format	2019-02-05 17:17:19 +01:00
Troy McConaghy	66b097ec63	Change <br> to <br /> for JSX	2019-02-05 17:04:03 +01:00
Troy McConaghy	446df9fc1c	Add "✋ Ask a question on Gitter" to the footer	2019-02-05 16:45:10 +01:00
Manan Patel	e6792bb1c7	Merge pull request #133 from oceanprotocol/Anirudh2490-patch-1 ... This new tutorial includes how to setup metamask	2019-02-05 13:58:52 +01:00
Anirudh2490	504abf6668	Update wallets.md	2019-02-05 13:45:16 +01:00
Anirudh2490	933d73df6d	Update wallets.md	2019-02-05 13:31:41 +01:00