Merge branch 'devel_11.0.x' (e74cd689) · Commits · minerva / core

Commit e74cd689 authored 7 years ago by Piotr Gawron

Browse files

Merge branch 'devel_11.0.x'

parents 7bd30279 2d738b4b

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 16 additions, 0 deletions

CHANGELOG
annotation/src/main/java/lcsb/mapviewer/annotation/data/Chemical.java 11 additions, 7 deletions

...rc/main/java/lcsb/mapviewer/annotation/data/Chemical.java
frontend-js/package.json 2 additions, 1 deletion

frontend-js/package.json
frontend-js/src/main/js/ConfigurationType.js 1 addition, 0 deletions

frontend-js/src/main/js/ConfigurationType.js
frontend-js/src/main/js/ServerConnector.js 7 additions, 0 deletions

frontend-js/src/main/js/ServerConnector.js
frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js 9 additions, 3 deletions

frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js 6 additions, 0 deletions

frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js
frontend-js/src/main/js/map/CustomMap.js 1177 additions, 1177 deletions

frontend-js/src/main/js/map/CustomMap.js
frontend-js/src/main/js/map/Submap.js 14 additions, 15 deletions

frontend-js/src/main/js/map/Submap.js
frontend-js/src/main/js/map/overlay/AbstractDbOverlay.js 3 additions, 2 deletions

frontend-js/src/main/js/map/overlay/AbstractDbOverlay.js
frontend-js/src/main/js/map/window/AbstractInfoWindow.js 3 additions, 1 deletion

frontend-js/src/main/js/map/window/AbstractInfoWindow.js
frontend-js/src/test/js/map/CustomMap-test.js 990 additions, 968 deletions

frontend-js/src/test/js/map/CustomMap-test.js
frontend-js/src/test/js/map/window/AliasInfoWindow-test.js 50 additions, 21 deletions

frontend-js/src/test/js/map/window/AliasInfoWindow-test.js
frontend-js/testFiles/apiCalls/projects/sample/models/all/bioEntities.search/count=100&perfectMatch=false&query=s1&token=MOCK_TOKEN_ID& 0 additions, 0 deletions

...ount=100&perfectMatch=false&query=s1&token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/sample/models/all/bioEntities.search/count=100&perfectMatch=true&query=s1&token=MOCK_TOKEN_ID& 0 additions, 0 deletions

...count=100&perfectMatch=true&query=s1&token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/sample/models/all/bioEntities.search/count=100&query=s1&token=MOCK_TOKEN_ID& 0 additions, 0 deletions

...ioEntities.search/count=100&query=s1&token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/sample/models/all/bioEntities.search/count=100&token=MOCK_TOKEN_ID& 0 additions, 0 deletions

...els/all/bioEntities.search/count=100&token=MOCK_TOKEN_ID&
persist/src/db/11.0.8/fix_db_20180118.sql 1 addition, 0 deletions

persist/src/db/11.0.8/fix_db_20180118.sql
rest-api/src/main/java/lcsb/mapviewer/api/projects/comments/CommentRestImpl.java 2 additions, 0 deletions

...lcsb/mapviewer/api/projects/comments/CommentRestImpl.java
rest-api/src/main/java/lcsb/mapviewer/api/users/UserController.java 11 additions, 15 deletions

...rc/main/java/lcsb/mapviewer/api/users/UserController.java

with 2303 additions and 2210 deletions

Please register or to comment