865 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Troy McConaghy	3fd0ec57d5	npm run format	2019-06-12 13:38:58 +02:00
Troy McConaghy	51eb86a5ea	Change instances of 'the ocean (protocol) network'	2019-06-12 13:36:56 +02:00
Troy McConaghy	52a3969fdc	Merge pull request #269 from oceanprotocol/production-ready-ocean-network ... "The Production-Ready Ocean Network"	2019-06-11 11:06:28 +02:00
Troy McConaghy	6d1a98f70e	"The Production-Ready Ocean Network"	2019-06-11 09:26:34 +02:00
Matthias Kretschmann	760e26e81e	Merge pull request #265 from oceanprotocol/feature/forks ... Label forks	2019-06-07 15:39:34 +02:00
Troy McConaghy	b32919751b	Merge pull request #266 from oceanprotocol/feature/tools-repos ... split up repos list, add Osmosis, add parity fork	2019-06-07 15:18:27 +02:00
Matthias Kretschmann	55db546394	update Travis caching	2019-06-07 14:52:55 +02:00
Matthias Kretschmann	db9ef03547	formatting fix	2019-06-07 14:41:53 +02:00
Matthias Kretschmann	3472917318	split up libraries repos list, add Osmosis, add parity fork	2019-06-07 14:35:59 +02:00
Matthias Kretschmann	5502ba86ad	label forks	2019-06-07 14:23:58 +02:00
Troy McConaghy	83b3399754	Merge pull request #264 from oceanprotocol/feature/submodules ... bump submodules	2019-06-07 14:22:38 +02:00
Matthias Kretschmann	71eee0a2e0	fix node-sass	2019-06-07 14:00:31 +02:00
Matthias Kretschmann	f78d069b38	remove deprecated option	2019-06-07 14:00:05 +02:00
Matthias Kretschmann	6b9877a3ed	package updates	2019-06-07 13:55:55 +02:00
Matthias Kretschmann	4ba869d371	bump submodules	2019-06-07 13:52:33 +02:00
Matthias Kretschmann	e7a871a080	properly cancel axios requests	2019-06-07 13:51:33 +02:00
Troy McConaghy	a900be9992	Merge pull request #263 from oceanprotocol/Resources ... Update resource with the new event link	2019-06-07 10:22:27 +02:00
daneklustig	6893431932	Update resource with the new event link	2019-06-07 09:54:07 +02:00
Troy McConaghy	4a3bc8ef5b	Merge pull request #260 from oceanprotocol/update-tools-and-examples ... Update the Tools and Example-Code Pages	2019-06-06 15:46:53 +02:00
Troy McConaghy	b445332ab8	Allow for repos that are forks	2019-06-06 14:41:22 +02:00
Troy McConaghy	2335405615	Update the example-code page	2019-06-06 14:13:25 +02:00
Troy McConaghy	c310785b3c	Update the "Tools" page	2019-06-06 14:06:51 +02:00
Troy McConaghy	768d99377e	Merge pull request #259 from oceanprotocol/fix/typo ... typo correction	2019-06-05 10:15:10 +02:00
Matthias Kretschmann	20514021b9	typo	2019-06-04 19:10:10 +02:00
Troy McConaghy	14ed301e42	Merge pull request #258 from oceanprotocol/some-new-stuff ... How to check your OCEAN balance, and...	2019-06-03 15:33:44 +02:00
Troy McConaghy	8ccf5e792e	How to check your OCEAN balance, and ... the URLs of the Aquarius & Brizo used by Commons Marketplace.	2019-06-03 15:16:27 +02:00
Troy McConaghy	ff5dc7b0bc	Merge pull request #255 from oceanprotocol/terminology-of-ocean-production-network ... Update terminology re/ Ocean Production Network	2019-05-31 12:58:22 +02:00
Troy McConaghy	a870fada07	Reorg Ocean Token docs. Add KuCoin & DutchX.	2019-05-31 12:50:16 +02:00
Matthias Kretschmann	1c59fa3a53	Merge pull request #257 from oceanprotocol/greenkeeper/axios-0.19.0 ... Update axios to the latest version 🚀	2019-05-31 11:54:48 +02:00
greenkeeper[bot]	eece9c6446	fix(package): update axios to version 0.19.0	2019-05-30 16:20:14 +00:00
Troy McConaghy	fc4be076e8	npm run format	2019-05-23 11:32:22 +02:00
Troy McConaghy	55c2eb0343	Remove TODO line	2019-05-23 11:27:20 +02:00
Troy McConaghy	ff3e53997b	Update terminiolgy re/ Ocean Production Network	2019-05-23 11:20:15 +02:00
Matthias Kretschmann	9d0c5c4a3a	Merge pull request #254 from oceanprotocol/sjvallon-patch-1 ... Update config.js	2019-05-20 13:06:41 +02:00
sjvallon	446241cd72	Update config.js	2019-05-20 13:01:44 +02:00
Troy McConaghy	67402683df	Merge pull request #253 from oceanprotocol/feature/bump ... bump submodules	2019-05-17 16:56:11 +02:00
Matthias Kretschmann	dab7f32eb6	bump submodules	2019-05-17 15:51:37 +02:00
Matthias Kretschmann	58d90c9001	Merge pull request #251 from oceanprotocol/update-example-code-links ... Update the page with links to example squid code	2019-05-16 12:39:36 +02:00
Matthias Kretschmann	655190c9ce	Merge pull request #250 from oceanprotocol/add-duero-subsection ... Add subsection about the Duero Testnet	2019-05-16 12:39:24 +02:00
Troy McConaghy	2a3c9b55fa	Update the links to squid-js tests	2019-05-16 10:58:29 +02:00
Troy McConaghy	952e2f0609	Add subsection about the Duero Testnet	2019-05-16 10:22:24 +02:00
Troy McConaghy	ed161887b1	Merge pull request #248 from oceanprotocol/tidy-brizo-aquarius-docs ... Tidy up the API Refs intro page	2019-05-16 09:58:17 +02:00
Matthias Kretschmann	54709a6e6c	Merge pull request #249 from oceanprotocol/roadmap-update ... Mention roadmap on resources page	2019-05-15 17:54:27 +02:00
daneklustig	600c746022	Update resources.md	2019-05-15 17:30:31 +02:00
Matthias Kretschmann	aa7946219d	Merge pull request #245 from oceanprotocol/greenkeeper/intersection-observer-0.7.0 ... Update intersection-observer to the latest version 🚀	2019-05-15 17:28:48 +02:00
Troy McConaghy	14731f9632	Tidy up the API Refs intro page	2019-05-15 17:00:09 +02:00
Troy McConaghy	f8fc70302b	Merge pull request #247 from oceanprotocol/feature/toc-levels ... restrict depth of table of contents	2019-05-13 15:18:42 +02:00
Matthias Kretschmann	99008b6182	restrect depth of table of contents	2019-05-13 14:25:06 +02:00
Matthias Kretschmann	c572f2d2c7	Merge pull request #246 from oceanprotocol/greenkeeper/markdownlint-cli-0.16.0 ... Update markdownlint-cli to the latest version 🚀	2019-05-13 10:27:47 +02:00
greenkeeper[bot]	24fb295575	chore(package): update markdownlint-cli to version 0.16.0	2019-05-11 23:19:44 +00:00