93 Commits

Author	SHA1	Message	Date
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	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	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	84312cbb07	More revisions	2019-03-14 11:42:17 +01:00
Troy McConaghy	569c81b8ee	New page re/ Ocean Tokens + edit related pages	2019-03-13 13:44:30 +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	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	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	3b29eb310c	Update the Tools & Examples page	2019-03-01 13:30:51 +01:00
Troy McConaghy	eb441bb228	Merge branch 'master' into feature/squid-java-now-public	2019-02-22 15:55:42 +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	cbb470b28f	Revise + add docs bc now support 3 storage options	2019-02-21 17:00:28 +01:00
Troy McConaghy	99dac06b36	Merge branch 'master' into edit-wallet-docs	2019-02-20 15:28:30 +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
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
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	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
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
Troy McConaghy	dceba77f09	Merge branch 'master' into Anirudh2490-patch-1	2019-02-05 12:32:45 +01:00
Anirudh2490	edd946ba59	Update wallets.md	2019-02-05 12:20:09 +01:00
Anirudh2490	cd84f29022	Metamask_tutorial images ... Images used in Metamask tutorial	2019-02-05 11:32:39 +01:00
Anirudh2490	54c11508b6	Update wallets.md	2019-02-04 17:47:10 +01:00
Anirudh2490	a3684a652a	This new tutorial includes how to setup metamask ... Along with video links, setup of hardware wallets, etc. Please review and pull. One issue: The images in the Markdown are appearing too large. Please suggest a fix.	2019-02-04 17:25:51 +01:00
Matthias Kretschmann	6347c9cb0d	Update content/tutorials/react-get-use-data-set.md ... Co-Authored-By: jernejpregelj <jernej.pregelj88@gmail.com>	2019-01-30 11:49:02 +01:00
Matthias Kretschmann	294885bca8	Update content/tutorials/react-get-use-data-set.md ... Co-Authored-By: jernejpregelj <jernej.pregelj88@gmail.com>	2019-01-30 11:48:47 +01:00
Matthias Kretschmann	24f8845b1e	Update content/tutorials/react-get-use-data-set.md ... Co-Authored-By: jernejpregelj <jernej.pregelj88@gmail.com>	2019-01-30 11:48:38 +01:00