232 Commits

Author	SHA1	Message	Date
Troy McConaghy	16669d2825	Clarify MetaMask can check Ocean bal & send tokens	2019-05-09 14:16:28 +02:00
Troy McConaghy	71808ca367	Consistent testnet-then-mainnet ordering	2019-05-07 15:41:47 +02:00
Troy McConaghy	49fe5c3d5f	Updates following the IEO	2019-05-07 15:39:35 +02:00
Matthias Kretschmann	58a160003b	add a note about failing consumption	2019-04-18 16:32:17 +02:00
Matthias Kretschmann	b3508565b5	add Docker to requirements	2019-04-18 13:56:36 +02:00
Matthias Kretschmann	4dd121f4cd	unify web3 imports	2019-04-18 12:45:45 +02:00
Matthias Kretschmann	f1b50746bd	simplify startup command, add faucet command	2019-04-18 11:31:58 +02:00
Matthias Kretschmann	0e5c7e8e9c	search updates	2019-04-17 16:48:37 +02:00
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
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
Matthias Kretschmann	c73f9bce0f	add final screenshot, code style fixes	2019-01-30 11:45:59 +01:00
Jernej Pregelj	429cdb1304	Merge branch 'master' into feature/get-consume-flow	2019-01-07 12:37:56 +01:00
Troy McConaghy	85122208c8	Resolve comments on the wallets page	2018-12-21 13:29:31 +01:00
Troy McConaghy	990bfd6df2	Merge branch 'master' into feature/add-wallets-page	2018-12-21 12:28:24 +01:00
Troy McConaghy	24b7117f28	Add tutorial about wallets for Ocean Tokens	2018-12-21 12:26:17 +01:00
Troy McConaghy	f86ab5d9a0	Add link to the first Manta Ray blog post	2018-12-19 17:41:22 +01:00
Matthias Kretschmann	637c91e0cb	Merge pull request #112 from oceanprotocol/feature/barge ... docker-images -> barge	2018-12-18 11:46:25 +01:00
Troy McConaghy	f986aa312f	Add link & explanation of Jupyter notebook tuts	2018-12-18 10:56:43 +01:00
Matthias Kretschmann	64aae489dd	docker-images -> barge	2018-12-17 17:18:29 +01:00
Jernej Pregelj	e013239e76	retrieve and consume flow	2018-12-17 14:02:35 +01:00
Troy McConaghy	a14d9dc156	npm run format	2018-12-10 10:55:19 +01:00
Troy McConaghy	54ed366c0a	local-kovan-node	2018-12-07 09:57:09 +01:00
Troy McConaghy	ef316b456b	Merge branch 'master' into react-tutorial-fixes	2018-12-07 09:50:54 +01:00
Troy McConaghy	3a3d0a0bb7	local-pond-node --> local-spree-node	2018-12-06 16:47:09 +01:00
Matthias Kretschmann	32cb354ccb	restructure React tutorials, add screenshots, code examples consistency	2018-12-06 16:39:40 +01:00
Troy McConaghy	47463c3403	Rename Ocean/Trilobite Testnet to Nile Testnet	2018-12-06 16:17:56 +01:00
Matthias Kretschmann	b4e6d395c7	little tutorial tweaks	2018-12-06 14:43:27 +01:00
Jernej Pregelj	654159741e	fixes from #92	2018-12-06 13:03:22 +01:00
Jernej Pregelj	031a540113	oceanprotocol/squid	2018-12-06 10:58:47 +01:00
Jernej Pregelj	b7dd8ed667	oceanprotocol/squid	2018-12-06 10:56:03 +01:00
Jernej Pregelj	9148f967f6	oceanprotocol/squid	2018-12-06 10:53:54 +01:00
Troy McConaghy	cd135ac557	Copy-edited react-publish-data-set.md	2018-12-06 10:46:27 +01:00
Matthias Kretschmann	a86f2473e2	Update content/tutorials/react-setup.md ... Co-Authored-By: jernejpregelj <jernej.pregelj88@gmail.com>	2018-12-06 09:59:24 +01:00
Matthias Kretschmann	176d82f858	Update content/tutorials/react-setup.md ... Co-Authored-By: jernejpregelj <jernej.pregelj88@gmail.com>	2018-12-06 09:57:45 +01:00
Matthias Kretschmann	9b06824919	Update content/tutorials/react-setup.md ... Co-Authored-By: jernejpregelj <jernej.pregelj88@gmail.com>	2018-12-06 09:57:16 +01:00
Troy McConaghy	6d417e205d	Even more edits to new react app tutorial	2018-12-05 18:53:28 +01:00
Troy McConaghy	7ae75865b8	More editing new React app tutorial, not done yet	2018-12-05 17:48:15 +01:00
Troy McConaghy	c1609f283e	Removed some tutorial stubs & started editing	2018-12-05 15:01:07 +01:00
Troy McConaghy	9d221294e7	Merge branch 'master' into publish-data-set-react	2018-12-05 12:21:58 +01:00
Jernej Pregelj	7b6a55d35a	react tutorial, publish asset tutorial	2018-12-05 12:08:47 +01:00
Jernej Pregelj	db01a5c94b	publish data set	2018-12-04 15:38:55 +01:00
Troy McConaghy	f18e80569a	Different instructions for Ganache & Parity	2018-12-04 11:12:42 +01:00
Troy McConaghy	5d636626fc	Rename and revise tut. re/ getting ether & tokens	2018-12-04 10:05:50 +01:00
Matthias Kretschmann	32f0848cfb	add title to placeholder tutorials	2018-11-29 14:05:48 +01:00
Troy McConaghy	30fddaa2aa	Got Kovan tutorial in a complete-enough state	2018-11-28 12:25:59 +01:00
Troy McConaghy	11b343f102	Add first draft of use-a-testnet.md	2018-11-27 13:59:37 +01:00
Troy McConaghy	8a2d4fc07d	Simplify nav by having Pleuston & Python together	2018-11-14 15:50:52 +01:00
Troy McConaghy	2eba9e893e	Set up detailed outline of initial tutorials	2018-11-14 14:46:26 +01:00
Matthias Kretschmann	0cd438fa97	use repository component in markdown	2018-11-11 01:32:05 +01:00
Matthias Kretschmann	28ad87ded1	auto generate github links for repos, more content updates	2018-11-09 20:23:24 +01:00
Troy McConaghy	e2e83ac71d	More docs: introduction, marketplace help, etc.	2018-11-08 16:50:33 +01:00
Troy McConaghy	7a47ddccc5	Some initial docs	2018-11-07 15:51:17 +01:00
Matthias Kretschmann	d401178ed5	drop da base 🍾	2018-11-07 12:33:32 +01:00