906 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Troy McConaghy	2bcf8d6c4b	Add help re/ whether to use Kovan, Nile or Spree	2019-04-08 11:19:16 +02:00
Matthias Kretschmann	6c0446341f	Merge pull request #203 from oceanprotocol/more-help-connecting-to-testnets ... Give more help with connecting to Nile Testnet	2019-04-05 17:29:42 +02:00
Troy McConaghy	a49200e0d6	Give more help with connecting to Nile Testnet	2019-04-05 15:48:35 +02:00
Troy McConaghy	41f0e97c11	Merge pull request #202 from oceanprotocol/bring-back-quickstart ... Bring back the Quickstart (in 2 places)	2019-04-05 14:08:57 +02:00
Troy McConaghy	58831e7245	Bring back the Quickstart (in 2 places)	2019-04-05 13:31:27 +02:00
Troy McConaghy	d7088c8876	Merge pull request #200 from oceanprotocol/separate-tools-and-examples ... Split Tools & Examples into separate pages	2019-04-04 14:44:23 +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
Troy McConaghy	f737adf45f	Merge pull request #199 from oceanprotocol/fix/squid-0.5.0 ... squid 0.5.0	2019-04-03 16:35:24 +02:00
Jernej Pregelj	698d25aca9	squid 0.5.0	2019-04-03 14:40:15 +02:00
Troy McConaghy	cc481aae28	Merge pull request #198 from oceanprotocol/feature/squid-js-module ... bump squid-js submodule	2019-04-02 17:46:15 +02:00
Troy McConaghy	80e20cb988	Merge branch 'master' into feature/squid-js-module	2019-04-02 17:38:54 +02:00
Troy McConaghy	be3ee6f791	Merge pull request #197 from oceanprotocol/minor-fixes-in-react-app-tutorial ... Minor fixes in the React App Tutorial	2019-04-02 17:34:01 +02:00
Matthias Kretschmann	12e96ab47d	bump squid-js	2019-04-02 16:58:46 +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	0de7da52f4	Merge pull request #196 from oceanprotocol/get-ocean-tokens-in-testnets ... Add docs: how to request Ocean Tokens in testnets	2019-04-02 13:25:31 +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
Troy McConaghy	fb86e854aa	Merge pull request #194 from oceanprotocol/feature/bump-submodules ... bump submodules	2019-04-01 15:42:07 +02:00
Matthias Kretschmann	dfc059b594	bump submodules	2019-04-01 15:12:19 +02:00
Jernej Pregelj	c1518d2674	Merge pull request #193 from oceanprotocol/fix/squidjs-0.4.1 ... squid fixes	2019-04-01 15:07:58 +02:00