Merge branch 'merge-14.0.6' into 'master'
Merge 14.0.6 into master See merge request !1039
Showing
- CHANGELOG 22 additions, 4 deletionsCHANGELOG
- converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/bioEntity/reaction/ReactionConverter.java 8 additions, 1 deletion...verter/graphics/bioEntity/reaction/ReactionConverter.java
- frontend-js/src/main/css/global.css 4 additions, 0 deletionsfrontend-js/src/main/css/global.css
- frontend-js/src/main/js/gui/topMenu/TopMenu.js 1 addition, 1 deletionfrontend-js/src/main/js/gui/topMenu/TopMenu.js
- frontend-js/src/main/js/map/overlay/SearchDbOverlay.js 1 addition, 1 deletionfrontend-js/src/main/js/map/overlay/SearchDbOverlay.js
- frontend-js/src/main/js/map/window/AliasInfoWindow.js 5 additions, 1 deletionfrontend-js/src/main/js/map/window/AliasInfoWindow.js
- model-command/src/main/java/lcsb/mapviewer/commands/ColorModelCommand.java 6 additions, 1 deletion.../main/java/lcsb/mapviewer/commands/ColorModelCommand.java
- model-command/src/test/java/lcsb/mapviewer/commands/ColorModelCommandTest.java 18 additions, 2 deletions...t/java/lcsb/mapviewer/commands/ColorModelCommandTest.java
- model/src/main/java/lcsb/mapviewer/model/Project.java 1 addition, 1 deletionmodel/src/main/java/lcsb/mapviewer/model/Project.java
- model/src/main/java/lcsb/mapviewer/model/map/model/ModelFullIndexed.java 4 additions, 2 deletions...java/lcsb/mapviewer/model/map/model/ModelFullIndexed.java
- model/src/test/java/lcsb/mapviewer/model/map/model/ModelTest.java 10 additions, 0 deletions...c/test/java/lcsb/mapviewer/model/map/model/ModelTest.java
- persist/src/main/java/lcsb/mapviewer/persist/dao/ProjectDao.java 16 additions, 1 deletion.../src/main/java/lcsb/mapviewer/persist/dao/ProjectDao.java
- persist/src/main/resources/db/migration/14.0.6/V14.0.6.20191218__project_with_invalid_file.sql 5 additions, 0 deletions...on/14.0.6/V14.0.6.20191218__project_with_invalid_file.sql
- service/src/main/java/lcsb/mapviewer/services/impl/SearchService.java 2 additions, 2 deletions...main/java/lcsb/mapviewer/services/impl/SearchService.java
- service/src/main/java/lcsb/mapviewer/services/utils/ColorSchemaReader.java 14 additions, 6 deletions...java/lcsb/mapviewer/services/utils/ColorSchemaReader.java
- service/src/test/java/lcsb/mapviewer/services/utils/ColorSchemaReaderTest.java 14 additions, 0 deletions.../lcsb/mapviewer/services/utils/ColorSchemaReaderTest.java
- service/testFiles/coloring/uniprot-identifiers.txt 9 additions, 0 deletionsservice/testFiles/coloring/uniprot-identifiers.txt
- web/src/test/java/lcsb/mapviewer/web/ProjectControllerIntegrationTestWithoutTransaction.java 72 additions, 0 deletions...b/ProjectControllerIntegrationTestWithoutTransaction.java
Loading
Please register or sign in to comment