931 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Troy McConaghy	7345625799	Merge pull request #221 from oceanprotocol/feature/spree-node ... omit node option from Spree explanation	2019-04-18 12:12:06 +02:00
Troy McConaghy	19b3ce69e3	Merge pull request #220 from oceanprotocol/fix/footer-links ... use capitalized writing for social key names	2019-04-18 11:41:38 +02:00
Matthias Kretschmann	f1b50746bd	simplify startup command, add faucet command	2019-04-18 11:31:58 +02:00
Matthias Kretschmann	5c74477ff8	omit node option from Spree explanation	2019-04-18 11:12:25 +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	f6bfb76bd7	use capitalized writing for social key names	2019-04-17 14:06:35 +02:00
Troy McConaghy	39d6d1ead4	Merge pull request #219 from oceanprotocol/feature/swagger ... Fetch Swagger specs remotely	2019-04-17 13:41:49 +02:00
Matthias Kretschmann	c5c143f2ae	add past versions linking to swaggerhub	2019-04-17 13:36:30 +02:00
Matthias Kretschmann	dfe712516b	mention swaggerhub in intro	2019-04-17 13:09:36 +02:00
Matthias Kretschmann	78f91aea44	API & Library References -> API References	2019-04-17 13:05:56 +02:00
Matthias Kretschmann	8fef5459f7	update copy	2019-04-17 12:58:02 +02:00
Matthias Kretschmann	880dcc8fc7	fetch remote swagger specs	2019-04-17 12:57:43 +02:00
Matthias Kretschmann	f126896b76	update local spec files	2019-04-17 12:01:59 +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	d5bf8c9506	Merge pull request #218 from oceanprotocol/fix-urls ... Fix two incorrect "localhost" URLs	2019-04-17 11:39:39 +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
Matthias Kretschmann	60b095e63d	Merge pull request #215 from oceanprotocol/fix/squid-0.5.5 ... update to squid-0.5.5	2019-04-16 15:47:42 +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
Matthias Kretschmann	63e943f604	Merge pull request #209 from oceanprotocol/update-run-a-keeper-page ... Update the 'Run a Keeper' page	2019-04-16 13:17:04 +02:00
Troy McConaghy	a604b504b6	Merge branch 'master' into update-run-a-keeper-page	2019-04-16 10:27:06 +02:00
Matthias Kretschmann	863a15c7c2	Merge pull request #213 from oceanprotocol/greenkeeper/stylelint-10.0.0 ... Update stylelint to the latest version 🚀	2019-04-14 04:17:28 +02:00
greenkeeper[bot]	6577e1385e	chore(package): update stylelint to version 10.0.0	2019-04-13 12:58:54 +00: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	acd2975e3e	Merge pull request #211 from oceanprotocol/feature/bump-submodules ... submodule updates	2019-04-11 10:48:40 +02:00
Matthias Kretschmann	7900e7a2fe	bump submodules	2019-04-11 10:32:29 +02:00
Troy McConaghy	69a833ffd4	Update the 'Run a Keeper' page	2019-04-10 16:52:59 +02:00
Troy McConaghy	943985325b	Merge pull request #208 from oceanprotocol/document-commons-marketplace ... Document Commons Marketplace and Update Marketplace Setup Guide	2019-04-10 15:57:04 +02:00
Troy McConaghy	92c005bd20	Doc Commons Marketplace. Update mktplc setup guide	2019-04-10 15:19:00 +02:00
Troy McConaghy	15204c4db8	Merge pull request #206 from oceanprotocol/update-oceantoken-addresses ... Update the OceanToken address in Nile	2019-04-08 14:04:58 +02:00
Troy McConaghy	f71f09b787	Update the OceanToken address in Nile	2019-04-08 13:52:37 +02:00
Troy McConaghy	a547db0070	Merge pull request #204 from oceanprotocol/clarify-who-testnets-are-for ... Add help re/ whether to use Kovan, Nile or Spree	2019-04-08 12:31:51 +02:00
Troy McConaghy	537d52b560	Add note re/ Ganache-based testnets	2019-04-08 12:05:14 +02:00