API minor changes commit before integrating cytoscape
Fixing conflicts
Added components to perform lookup of entities through jsonp.
Hypothesis tester working example with two proteins. Fixed layout bugs when added extjs 4.1. Fixed the interactions query to get interactions between two targets. Minor more fixes.
Merge branch 'feature/cytoscape' into develop
Fixed a bug when merging
Merge branch 'feature/cytoscape' into develop
Merge branch 'feature/cytoscape' into develop
Added a lookup target function to the API. Added js files for cytoscape web-ExtJs UI. All entities can be added to the cytoscape workspace now, ids varying among them.
Merge branch 'feature/cytoscape' into develop
Fixed processing when requesting activities for a target (api_proxy.activities4target)
Merge branch 'develop' into feature/tdapi
Added get_compound_activities from ChemBL to the API
Merge branch 'develop' into feature/tdapi
Bugfixes and added a new endpoint for the API to get diseases from genes or proteins from SwissVar
Merge branch 'feature/tdapi' into develop
Bugfixes and minor changes
Merge branch 'feature/tdapi' into develop
Minor bugfixes
Merge branch 'develop' into feature/tdapi