731 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matthias Kretschmann	774f57a16f	render asset description with markdown	2019-04-08 15:59:02 +02:00
Troy McConaghy	af8480c389	Change sample data set/search to one w/ results	2019-04-08 15:57:16 +02:00
Matthias Kretschmann	f032a36e47	hotfix for search title	2019-04-08 13:37:57 +02:00
Matthias Kretschmann	26b663a09c	hotfix for returning actual first results page	2019-04-08 12:53:44 +02:00
Jernej Pregelj	bfd48fec79	Merge pull request #74 from oceanprotocol/feature/analytics ... analytics	2019-04-08 12:26:20 +02:00
Jernej Pregelj	f4a2ea56b3	Merge branch 'feature/analytics' of https://github.com/oceanprotocol/commons into feature/analytics	2019-04-08 12:08:17 +02:00
Jernej Pregelj	1725c3a8a0	tests	2019-04-08 12:07:09 +02:00
Jernej Pregelj	7e26d30fb2	Merge branch 'master' into feature/analytics	2019-04-08 11:44:02 +02:00
Jernej Pregelj	0bc47335e9	message fixes	2019-04-08 11:41:06 +02:00
Jernej Pregelj	f3db82b59d	analytics	2019-04-08 11:35:10 +02:00
Matthias Kretschmann	5a9f72ab3b	Merge pull request #73 from oceanprotocol/feature/about ... add initial about copy	2019-04-08 11:30:07 +02:00
Matthias Kretschmann	0b9039be05	Merge pull request #50 from oceanprotocol/feature/search-tweaks ... Make search more useful	2019-04-08 11:29:54 +02:00
Matthias Kretschmann	ca261e1025	add initial about copy	2019-04-08 11:19:13 +02:00
Matthias Kretschmann	10b9a50d81	bump packages, update library.json	2019-04-08 11:04:52 +02:00
Matthias Kretschmann	ae2911c689	Merge branch 'master' into feature/search-tweaks	2019-04-08 10:51:12 +02:00
Matthias Kretschmann	3a8ee145c7	Merge pull request #72 from oceanprotocol/feature/web3-noweb3-views ... web2 and web3	2019-04-08 10:50:56 +02:00
Matthias Kretschmann	a04b2553e5	web3message fixes, formatting fixes	2019-04-08 10:44:03 +02:00
Jernej Pregelj	00e69646ad	web2 and web3	2019-04-06 17:55:24 +02:00
Matthias Kretschmann	699b45da0e	readme updates	2019-04-05 18:11:42 +02:00
Matthias Kretschmann	e81e2c866b	Merge branch 'master' into feature/search-tweaks	2019-04-05 17:16:06 +02:00
Matthias Kretschmann	cfaa57f93d	Merge pull request #69 from oceanprotocol/feature/account-tweaks ... Account popover tweaks	2019-04-05 17:15:50 +02:00
Matthias Kretschmann	e01c258c07	Merge pull request #70 from oceanprotocol/datepicker ... fix dateCreated	2019-04-05 17:15:33 +02:00
Jernej Pregelj	b810c7ab32	Merge branch 'master' into datepicker	2019-04-05 16:43:02 +02:00
Jernej Pregelj	51a821a51d	date object change	2019-04-05 16:41:29 +02:00
Matthias Kretschmann	9ba5f7c12f	handle wrong network use case	2019-04-05 16:28:34 +02:00
Jernej Pregelj	2dedbc19e0	datepicker	2019-04-05 16:14:26 +02:00
Matthias Kretschmann	09281aa8e3	add isNile check	2019-04-05 16:07:46 +02:00
Matthias Kretschmann	50cafa5c72	style tweaks	2019-04-05 15:46:46 +02:00
Matthias Kretschmann	ec91010604	show message to non-Web3 users	2019-04-05 15:45:44 +02:00
Matthias Kretschmann	1e1dac4f8f	refactor popover	2019-04-05 15:39:32 +02:00
Matthias Kretschmann	27f02f3e03	ouput total results	2019-04-05 15:24:52 +02:00
Matthias Kretschmann	410a49f1dc	25 items per page, prepare dynamic updating of offset	2019-04-05 15:20:38 +02:00
Matthias Kretschmann	2b7be08d20	Merge branch 'master' into feature/search-tweaks	2019-04-05 15:03:01 +02:00
Matthias Kretschmann	25f8c80370	Merge pull request #67 from oceanprotocol/feature/category-fixes ... category fixes	2019-04-05 15:02:48 +02:00
Troy McConaghy	9da52a2ce2	Merge pull request #66 from oceanprotocol/change-ie-to-eg ... Change "i.e." to "e.g." in placeholders	2019-04-05 14:57:39 +02:00
Matthias Kretschmann	4bd455c1ae	category fixes ... * remove slugify from all select values * so categories defined in form-publish.json are stored when publishing * map categories to category images * add jellyfish background as fallback image	2019-04-05 14:55:01 +02:00
Troy McConaghy	6de784c730	Change "i.e." to "e.g." in placeholders	2019-04-05 14:27:43 +02:00
Matthias Kretschmann	ce502609ec	make pagination component work	2019-04-05 14:24:55 +02:00
Matthias Kretschmann	cf60cd070f	formatting	2019-04-05 13:55:51 +02:00
Matthias Kretschmann	21d6e6c277	Merge branch 'master' into feature/search-tweaks	2019-04-05 13:55:01 +02:00
Javier Cortejoso	cd0ca3045e	Merge pull request #62 from oceanprotocol/feature/docker ... Feature/docker	2019-04-05 13:54:36 +02:00
Javier Cortejoso	b0a8c61f6c	Merge branch 'master' into feature/docker	2019-04-05 13:37:25 +02:00
Matthias Kretschmann	830d3040b6	simplify grid layout for search results	2019-04-05 13:28:15 +02:00
Matthias Kretschmann	d2cadbff13	fix asset file display	2019-04-05 13:27:32 +02:00
Javier Cortejoso	534da80ed2	Updated react env variable names	2019-04-05 13:10:50 +02:00
Matthias Kretschmann	0985e8b4e6	add pagination component	2019-04-05 12:19:17 +02:00
Javier Cortejoso	64d59bcb6e	Command in compose not needed with entrypoint	2019-04-05 11:59:26 +02:00
Javier Cortejoso	6b5cb291aa	Removed main Dockerfile	2019-04-05 11:58:10 +02:00
Javier Cortejoso	8f41654f55	Merge branch 'feature/docker' of github.com:oceanprotocol/commons into feature/docker	2019-04-05 11:54:24 +02:00
Javier Cortejoso	56dcbbb6ff	Removed templates and use env variables directly	2019-04-05 11:53:02 +02:00