124 Commits

Author	SHA1	Message	Date
Matthias Kretschmann	a41ca5534c	bump squid-js	2019-04-17 16:18:48 +02:00
Matthias Kretschmann	8e74f635ba	unify requirements, make code snippets more clear	2019-04-17 16:15:04 +02:00
Matthias Kretschmann	059f17f7f2	clarify consumption process	2019-04-17 15:23:00 +02:00
Matthias Kretschmann	fcd1c47154	add index to consume method	2019-04-17 14:40:25 +02:00
Matthias Kretschmann	e2f35d5455	move asset definition into its own file	2019-04-17 14:35:48 +02:00
Matthias Kretschmann	ce249176fa	setup updates, mention web3	2019-04-17 14:20:07 +02:00
Matthias Kretschmann	981ecf2422	simplify setup	2019-04-17 14:20:07 +02:00
Matthias Kretschmann	9b52bdf31b	tutorial updates	2019-04-17 14:20:07 +02:00
Matthias Kretschmann	38f2779935	update asset example	2019-04-17 14:20:07 +02:00
Matthias Kretschmann	509c816173	wording	2019-04-17 11:36:25 +02:00
Matthias Kretschmann	6191941dcd	mention faucet server	2019-04-16 20:40:16 +02:00
Matthias Kretschmann	f8351fb890	Update get-ether-and-ocean-tokens.md	2019-04-16 18:39:22 +02:00
Jernej Pregelj	3b778948bb	update to squid-0.5.5	2019-04-16 15:17:37 +02:00
Troy McConaghy	92c005bd20	Doc Commons Marketplace. Update mktplc setup guide	2019-04-10 15:19:00 +02:00
Troy McConaghy	f71f09b787	Update the OceanToken address in Nile	2019-04-08 13:52:37 +02:00
Troy McConaghy	a49200e0d6	Give more help with connecting to Nile Testnet	2019-04-05 15:48:35 +02:00
Troy McConaghy	b938310816	npm run format + manually tweak	2019-04-04 11:56:56 +02:00
Troy McConaghy	1494176392	Split Tools & Examples into separate pages	2019-04-04 11:16:39 +02:00
Jernej Pregelj	698d25aca9	squid 0.5.0	2019-04-03 14:40:15 +02:00
Troy McConaghy	18f939e65f	Add some tips when clicking the app's buttons	2019-04-02 13:58:39 +02:00
Troy McConaghy	d469a80c84	Merge branch 'master' into minor-fixes-in-react-app-tutorial	2019-04-02 13:25:43 +02:00
Troy McConaghy	2192a49827	Minor fixes in the React App Tutorial	2019-04-02 13:18:59 +02:00
Troy McConaghy	459efe29da	Link squid-js's OceanAccounts.requestTokens() docs	2019-04-02 10:18:29 +02:00
Troy McConaghy	a6641ab64e	Merge branch 'master' into get-ocean-tokens-in-testnets	2019-04-01 16:52:12 +02:00
Troy McConaghy	a4f2e57a22	Add docs: how to request Ocean Tokens in testnets	2019-04-01 16:48:37 +02:00
Jernej Pregelj	9e2daa09b3	export versions + npm version	2019-04-01 14:23:12 +02:00
Jernej Pregelj	19bab9a476	squid fixes	2019-04-01 12:27:52 +02:00
Troy McConaghy	77912fdd54	Remove old sentence about future Nile faucet	2019-04-01 11:05:19 +02:00
Aitor	7839d6f992	Details about how to get Ether in Nile	2019-03-30 11:51:20 +01:00
Troy McConaghy	aa8d6fbbbc	Copy-edit Option 2 for getting ETH in Spree	2019-03-29 10:21:55 +01:00
Troy McConaghy	3d9e669e3c	Add notice to Consume Flow page in React tut.	2019-03-22 10:14:54 +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	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