333 Commits

Author	SHA1	Message	Date
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	dfe712516b	mention swaggerhub in intro	2019-04-17 13:09:36 +02:00
Matthias Kretschmann	8fef5459f7	update copy	2019-04-17 12:58:02 +02:00
Troy McConaghy	7579c9a100	Merge pull request #217 from oceanprotocol/feature/faucet ... Add faucet UI to Get Ether doc	2019-04-17 11:51:56 +02:00
Matthias Kretschmann	509c816173	wording	2019-04-17 11:36:25 +02:00
Troy McConaghy	e7e681e602	Fix two incorrect "localhost" URLs	2019-04-17 09:47:59 +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
Troy McConaghy	93b1f08429	Merge pull request #214 from oceanprotocol/feature/packages ... Package and submodule updates	2019-04-16 15:57:28 +02:00
Jernej Pregelj	3b778948bb	update to squid-0.5.5	2019-04-16 15:17:37 +02:00
Matthias Kretschmann	7158482761	bump submodules	2019-04-16 14:00:54 +02:00
Matthias Kretschmann	dcfa9df692	package updates, fix markdown lint test	2019-04-16 13:49:52 +02:00
Troy McConaghy	49f9c14df1	Merge branch 'master' into update-run-a-keeper-page	2019-04-11 10:54:08 +02:00
Troy McConaghy	6c6076e1ad	Delete single instance of the word "tribes" ... That word isn't used anywhere else in the docs so I see no need to use it here.	2019-04-11 10:53:34 +02:00
Troy McConaghy	69a833ffd4	Update the 'Run a Keeper' page	2019-04-10 16:52:59 +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	537d52b560	Add note re/ Ganache-based testnets	2019-04-08 12:05:14 +02:00
Troy McConaghy	2bcf8d6c4b	Add help re/ whether to use Kovan, Nile or Spree	2019-04-08 11:19:16 +02:00
Troy McConaghy	a49200e0d6	Give more help with connecting to Nile Testnet	2019-04-05 15:48:35 +02:00
Troy McConaghy	58831e7245	Bring back the Quickstart (in 2 places)	2019-04-05 13:31:27 +02:00
Troy McConaghy	eff7b896ae	Some edits to Tools page	2019-04-04 13:30:57 +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
Matthias Kretschmann	f3a216e935	Merge branch 'master' into feature/squid-java	2019-03-29 16:37:59 +01:00
Matthias Kretschmann	e5aa923dd3	remove javadoc prototype, link to external docs	2019-03-29 16:18:16 +01:00
Troy McConaghy	aa8d6fbbbc	Copy-edit Option 2 for getting ETH in Spree	2019-03-29 10:21:55 +01:00
Troy McConaghy	65cc4a3dd9	Add OceanDB & Osmosis subheadings	2019-03-27 14:47:28 +01:00
Troy McConaghy	dd05ffd118	Add more about the OceanDB & Osmosis drivers	2019-03-27 14:22:32 +01:00
Troy McConaghy	3ebdc01d6b	Merge branch 'master' into add-how-to-contribute-service-integrations	2019-03-23 11:51:14 +01:00
Troy McConaghy	0d6dc2aae8	+ "Develop a Service Integration Driver or Plugin"	2019-03-22 11:16:09 +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	6fe71851ef	Merge branch 'master' into two-new-tutorial-pages	2019-03-18 14:19:42 +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	8c7f3f2866	Add link to "An Ambassador's Tale" post	2019-03-16 17:14:11 +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	6a37de2d60	Merge branch 'master' into initial-docs-about-real-ocean-tokens	2019-03-15 11:58:31 +01:00
Troy McConaghy	a043b84d4e	Link from SEA def'n. to OEP-11	2019-03-15 09:33:30 +01:00
Troy McConaghy	80da5f780a	Merge branch 'master' into initial-docs-about-real-ocean-tokens	2019-03-14 17:11:49 +01:00
Troy McConaghy	864c725073	Add testnet notes on ChainID, local RPC URL, +	2019-03-14 17:02:15 +01:00
Troy McConaghy	84312cbb07	More revisions	2019-03-14 11:42:17 +01:00
Troy McConaghy	9e2bed6dc3	Revisions	2019-03-13 16:12:54 +01:00
Troy McConaghy	569c81b8ee	New page re/ Ocean Tokens + edit related pages	2019-03-13 13:44:30 +01:00
Troy McConaghy	8f4f8bf1ca	Merge branch 'master' into add-testnet-details-to-testnets-page	2019-03-13 09:27:01 +01:00
Troy McConaghy	0ca4a17036	Expand the instructions adding copyright notice	2019-03-13 09:26:44 +01:00
Troy McConaghy	9bd75976a5	Merge branch 'add-testnet-details-to-testnets-page' of github.com:oceanprotocol/docs into add-testnet-details-to-testnets-page	2019-03-13 09:18:58 +01:00
Troy McConaghy	ab2fda742d	OCEAN or SBT-OCN	2019-03-13 09:17:30 +01:00
Troy McConaghy	de9b10c186	Merge branch 'master' into add-testnet-details-to-testnets-page	2019-03-12 16:19:04 +01:00
Troy McConaghy	83ad6a7431	Remove two special/temporary OceanToken addresses	2019-03-12 16:17:17 +01:00
Troy McConaghy	6fa1994400	Simplify the 'Ways to Contribute' page	2019-03-12 15:59:08 +01:00
Troy McConaghy	68d36bc5f6	Update & add details to the "Testnets" page	2019-03-12 15:28:10 +01:00
Troy McConaghy	4602ff9d7f	Merge branch 'master' into update-page-re-getting-eth-or-tokens	2019-03-11 11:27:23 +01:00
Troy McConaghy	6e33e97491	Revise the legal reqs for external code contribs.	2019-03-09 15:16:40 +01:00
Troy McConaghy	b721b23de8	Merge branch 'master' into feature/accepting-code-from-external-contributors	2019-03-09 09:29:00 +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	79df00c34c	Merge branch 'master' into update-tools-and-examples-page	2019-03-07 09:56:39 +01:00
Troy McConaghy	83f5de6359	Merge branch 'master' into update-page-re-getting-eth-or-tokens	2019-03-07 09:56:36 +01:00
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	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
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