339 Commits

Author	SHA1	Message	Date
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
Troy McConaghy	3b29eb310c	Update the Tools & Examples page	2019-03-01 13:30:51 +01:00
Troy McConaghy	41c29aa8e5	Point Quickstart option 2 to Barge repo for now	2019-03-01 11:11:01 +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	0f493c6bdf	Merge branch 'master' into edit-wallet-docs	2019-02-20 17:18:13 +01:00
MarcusJones	ce70d1ac55	Update tools.md	2019-02-20 16:59:15 +01:00
MarcusJones	a03f8c1625	Update tools.md	2019-02-20 16:56:38 +01:00
Troy McConaghy	56f62ebc4d	Document the existence of Plecos (the tool)	2019-02-20 16:50:48 +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
Troy McConaghy	ae5d490068	Add note re Spree Testnet on Testnets page	2019-02-13 16:22:19 +01:00
Matthias Kretschmann	c53ed7b173	Merge branch 'master' into Anirudh2490-patch-1	2019-02-08 15:02:34 +01:00
Troy McConaghy	77724b637d	Move mission blog post ref under Mission Statement	2019-02-08 10:01:35 +01:00
Matthias Kretschmann	874fe42527	update papers section	2019-02-07 18:32:05 +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	b4ed53c9d7	Fix link for the O.P. bounties on Gitcoin	2019-02-06 16:50:43 +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
Matthias Kretschmann	f07ded1e1f	Merge branch 'master' into feature/get-consume-flow	2019-01-30 11:13:00 +01:00
Jernej Pregelj	847ce38880	Merge branch 'master' into feature/get-consume-flow	2019-01-28 14:45:10 +01:00
Troy McConaghy	24e01791d2	Merge branch 'master' into feature/accepting-code-from-external-contributors	2019-01-23 15:47:47 +01:00
Matthias Kretschmann	cb5b805937	menu shuffling	2019-01-22 16:07:12 +01:00
Matthias Kretschmann	95b1aba1f9	Merge branch 'master' into feature/#45-squid-js-docs	2019-01-22 14:27:50 +01:00
Troy McConaghy	5dd14af751	Merge branch 'master' into fix/link-terminology-page-to-wallets-page	2019-01-22 13:16:19 +01:00
Troy McConaghy	a9f49fe7f9	In Terminology page, add link to Wallets page	2019-01-22 12:09:49 +01:00
Matthias Kretschmann	7913e6a065	typedoc styling updates, fix some props warnings	2019-01-21 16:39:16 +01:00
Troy McConaghy	ef72345f63	Add Manta Ray as an option in the Quickstart page	2019-01-21 14:12:21 +01:00
Troy McConaghy	8dde335419	rm homepage quickstart & fix Quickstart page	2019-01-21 12:40:31 +01:00
Pedro Gutiérrez	2a8d60739d	add squid-js documentation #45	2019-01-18 17:59:27 +01:00
Troy McConaghy	3b73a3ba96	Add links to more Squid code examples	2019-01-16 16:28:11 +01:00
Matthias Kretschmann	780b5310e1	Merge branch 'master' into feature/get-consume-flow	2019-01-09 20:16:56 +01:00
Matthias Kretschmann	13d7f96944	Merge branch 'master' into feature/accepting-code-from-external-contributors	2019-01-09 20:16:42 +01:00
Matthias Kretschmann	509b4aab38	Merge branch 'master' into feature/openwaters	2019-01-08 17:28:06 +01:00
Matthias Kretschmann	a08aa00d55	add openwaters repo	2019-01-08 11:25:51 +01:00
Jernej Pregelj	429cdb1304	Merge branch 'master' into feature/get-consume-flow	2019-01-07 12:37:56 +01:00
Troy McConaghy	8932155b06	npm run format	2018-12-24 12:24:35 +01:00
Troy McConaghy	35e614d447	Link to the squid-py API Reference Docs	2018-12-24 12:03:20 +01:00
Troy McConaghy	8aa90854af	Merge branch 'feature/accepting-code-from-external-contributors' of github.com:oceanprotocol/docs into feature/accepting-code-from-external-contributors	2018-12-24 11:06:25 +01:00
Troy McConaghy	df60cae17b	Revised legal-reqs page. Repo must have DCO copy.	2018-12-24 11:02:43 +01:00
Troy McConaghy	b7420fe401	Merge branch 'master' into feature/accepting-code-from-external-contributors	2018-12-21 17:36:32 +01:00
Troy McConaghy	108bbc9141	Added 'Legal Requirements when Contributing Code'	2018-12-21 17:22:33 +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	9d02833624	Revise Marketplace Setup Guide to point to React App Tutorial	2018-12-10 11:15:59 +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
Matthias Kretschmann	49bedb37b8	Merge branch 'master' into feature/api-docs	2018-12-04 12:11:55 +01:00
Troy McConaghy	f18e80569a	Different instructions for Ganache & Parity	2018-12-04 11:12:42 +01:00