merge 13.1.3 and master
Showing
- CHANGELOG 25 additions, 10 deletionsCHANGELOG
- annotation/src/main/java/lcsb/mapviewer/annotation/services/ChEMBLParser.java 36 additions, 19 deletions...java/lcsb/mapviewer/annotation/services/ChEMBLParser.java
- annotation/src/test/java/lcsb/mapviewer/annotation/services/ChEMBLParserTest.java 12 additions, 0 deletions.../lcsb/mapviewer/annotation/services/ChEMBLParserTest.java
- frontend-js/src/main/js/gui/AddOverlayDialog.js 3 additions, 4 deletionsfrontend-js/src/main/js/gui/AddOverlayDialog.js
- frontend-js/src/main/js/gui/admin/MapsAdminPanel.js 2 additions, 0 deletionsfrontend-js/src/main/js/gui/admin/MapsAdminPanel.js
- frontend-js/src/main/js/gui/admin/UsersAdminPanel.js 4 additions, 2 deletionsfrontend-js/src/main/js/gui/admin/UsersAdminPanel.js
- frontend-js/src/main/js/gui/export/AbstractExportPanel.js 1 addition, 1 deletionfrontend-js/src/main/js/gui/export/AbstractExportPanel.js
- frontend-js/src/main/js/gui/export/ElementExportPanel.js 1 addition, 1 deletionfrontend-js/src/main/js/gui/export/ElementExportPanel.js
- frontend-js/src/main/js/gui/export/NetworkExportPanel.js 2 additions, 4 deletionsfrontend-js/src/main/js/gui/export/NetworkExportPanel.js
- frontend-js/src/main/js/map/AbstractCustomMap.js 1 addition, 1 deletionfrontend-js/src/main/js/map/AbstractCustomMap.js
- frontend-js/src/main/js/map/canvas/OpenLayers/OpenLayerPolyline.js 4 additions, 1 deletion...js/src/main/js/map/canvas/OpenLayers/OpenLayerPolyline.js
- frontend-js/src/main/js/map/marker/MarkerSurfaceCollection.js 6 additions, 1 deletion...tend-js/src/main/js/map/marker/MarkerSurfaceCollection.js
- persist/src/main/resources/db/migration/13.1.4/V13.1.4.20190821__remove_chembl_cache.sql 1 addition, 0 deletions...igration/13.1.4/V13.1.4.20190821__remove_chembl_cache.sql
- service/src/main/java/lcsb/mapviewer/services/search/drug/DrugService.java 8 additions, 2 deletions...java/lcsb/mapviewer/services/search/drug/DrugService.java
- service/src/test/java/lcsb/mapviewer/services/search/drug/DrugServiceTest.java 11 additions, 0 deletions.../lcsb/mapviewer/services/search/drug/DrugServiceTest.java
Loading
Please register or sign in to comment