Commit Graph

558 Commits

Author SHA1 Message Date
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
Matthias Kretschmann 79e37e965f
adapt to new search response 2019-04-05 11:18:30 +02:00
Javier Cortejoso a855bbea4a
Merge branch 'master' of github.com:oceanprotocol/commons into feature/docker 2019-04-05 11:07:59 +02:00
Matthias Kretschmann 5395767d12
Merge branch 'master' into feature/docker 2019-04-04 17:23:22 +02:00
Matthias Kretschmann 0c38b6caa3
Merge branch 'master' into feature/search-tweaks 2019-04-04 17:23:10 +02:00
Matthias Kretschmann a1ab653ffb
Merge pull request #59 from oceanprotocol/feature/style-tweaks
Style tweaks
2019-04-04 17:21:31 +02:00
Matthias Kretschmann d78b80a76b
bump squid-js 2019-04-04 16:49:15 +02:00
Matthias Kretschmann 7df93c89ad
switch to datePublished in asset history 2019-04-04 14:14:09 +02:00
Matthias Kretschmann 67f6d3f508
kick out prototyping stuff
* closes #58
2019-04-04 14:08:13 +02:00
Matthias Kretschmann 9b9cbfaff3
filter some menu items based on Web3 status 2019-04-04 14:07:16 +02:00
Matthias Kretschmann 2abeb466a5
fix category search from asset detail page 2019-04-04 13:34:03 +02:00
Javier Cortejoso b2be53183f
Merge branch 'master' of github.com:oceanprotocol/commons into feature/docker 2019-04-04 13:04:34 +02:00
Javier Cortejoso 1d7e309a3a
Fixed dockerfile 2019-04-04 13:01:59 +02:00
Javier Cortejoso 280b6e649f
Added dockerfile 2019-04-04 12:41:11 +02:00
Javier Cortejoso a5d6245519
Service parameters as env variables 2019-04-04 12:41:03 +02:00
Matthias Kretschmann dbb779ef49
switch to queryMetadata 2019-04-04 12:36:49 +02:00
Jernej Pregelj 20e5efe001
Merge pull request #61 from oceanprotocol/feature/dockerize
docker-compose + dockerfiles
2019-04-04 12:06:57 +02:00
Jernej Pregelj e062e87d24 Merge branch 'master' of https://github.com/oceanprotocol/commons into feature/dockerize 2019-04-04 11:34:50 +02:00
Jernej Pregelj 3d071161da docker-compose + dockerfiles 2019-04-04 11:30:31 +02:00
Matthias Kretschmann d42453a93e
Merge branch 'master' into feature/style-tweaks 2019-04-04 10:59:50 +02:00
Matthias Kretschmann f65d8cd406
Merge pull request #60 from oceanprotocol/feature/seo
add basic SEO
2019-04-04 10:58:44 +02:00
Matthias Kretschmann 066f446e87
add basic SEO 2019-04-03 19:07:17 +02:00
Matthias Kretschmann 519c2a887f
refactor to use one download per file 2019-04-03 18:41:39 +02:00
Matthias Kretschmann 3fb426413d
prepare outputting more status messages from network 2019-04-03 18:02:18 +02:00