Merge remote-tracking branch 'origin/master' into frontend-refactor
Conflicts: annotation/src/main/java/lcsb/mapviewer/annotation/cache/WebPageDownloader.java web/src/main/webapp/resources/js/AliasInfoWindow.js web/src/main/webapp/resources/js/LayoutAlias.js
No related branches found
No related tags found
Showing
- CHANGELOG 4 additions, 1 deletionCHANGELOG
- annotation/src/main/java/lcsb/mapviewer/annotation/cache/WebPageDownloader.java 11 additions, 10 deletions...va/lcsb/mapviewer/annotation/cache/WebPageDownloader.java
- annotation/src/main/java/lcsb/mapviewer/annotation/services/PubmedParser.java 1 addition, 1 deletion...java/lcsb/mapviewer/annotation/services/PubmedParser.java
- annotation/src/main/java/lcsb/mapviewer/annotation/services/TaxonomyBackend.java 2 additions, 1 deletion...a/lcsb/mapviewer/annotation/services/TaxonomyBackend.java
- frontend-js/src/main/js/map/data/LayoutAlias.js 10 additions, 0 deletionsfrontend-js/src/main/js/map/data/LayoutAlias.js
- frontend-js/src/main/js/map/window/AliasInfoWindow.js 23 additions, 9 deletionsfrontend-js/src/main/js/map/window/AliasInfoWindow.js
- persist/src/test/java/lcsb/mapviewer/persist/dao/cache/CacheTypeDaoTest.java 0 additions, 5 deletions...va/lcsb/mapviewer/persist/dao/cache/CacheTypeDaoTest.java
- service/src/main/java/lcsb/mapviewer/services/utils/ColorSchemaReader.java 4 additions, 0 deletions...java/lcsb/mapviewer/services/utils/ColorSchemaReader.java
Loading
Please register or sign in to comment