Merge branch 'master' of https://git-r3lab.uni.lu/piotr.gawron/minerva
# Conflicts: # model/src/main/java/lcsb/mapviewer/model/map/MiriamType.java
Showing
- .gitlab-ci.yml 40 additions, 4 deletions.gitlab-ci.yml
- CHANGELOG 15 additions, 0 deletionsCHANGELOG
- annotation/src/main/java/lcsb/mapviewer/annotation/cache/PermanentDatabaseLevelCache.java 79 additions, 71 deletions...pviewer/annotation/cache/PermanentDatabaseLevelCache.java
- annotation/src/main/java/lcsb/mapviewer/annotation/cache/WebPageDownloader.java 23 additions, 23 deletions...va/lcsb/mapviewer/annotation/cache/WebPageDownloader.java
- annotation/src/main/java/lcsb/mapviewer/annotation/services/ChemicalParser.java 16 additions, 13 deletions...va/lcsb/mapviewer/annotation/services/ChemicalParser.java
- annotation/src/main/java/lcsb/mapviewer/annotation/services/DrugAnnotation.java 3 additions, 0 deletions...va/lcsb/mapviewer/annotation/services/DrugAnnotation.java
- annotation/src/main/java/lcsb/mapviewer/annotation/services/PubmedParser.java 7 additions, 5 deletions...java/lcsb/mapviewer/annotation/services/PubmedParser.java
- annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/EnsemblAnnotator.java 5 additions, 5 deletions...ewer/annotation/services/annotators/EnsemblAnnotator.java
- annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/HgncAnnotator.java 57 additions, 51 deletions...pviewer/annotation/services/annotators/HgncAnnotator.java
- annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/ReconAnnotator.java 1 addition, 1 deletion...viewer/annotation/services/annotators/ReconAnnotator.java
- annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/UniprotAnnotator.java 1 addition, 1 deletion...ewer/annotation/services/annotators/UniprotAnnotator.java
- annotation/src/test/java/lcsb/mapviewer/annotation/services/ChemicalParserTest.java 21 additions, 3 deletions...csb/mapviewer/annotation/services/ChemicalParserTest.java
- annotation/src/test/java/lcsb/mapviewer/annotation/services/DrugbankHTMLParserTest.java 18 additions, 0 deletions...mapviewer/annotation/services/DrugbankHTMLParserTest.java
- annotation/src/test/java/lcsb/mapviewer/annotation/services/MiriamConnectorTest.java 15 additions, 0 deletions...sb/mapviewer/annotation/services/MiriamConnectorTest.java
- annotation/src/test/resources/log4j.properties 2 additions, 0 deletionsannotation/src/test/resources/log4j.properties
- converter-CellDesigner/.classpath 6 additions, 0 deletionsconverter-CellDesigner/.classpath
- debian/template/postinst 1 addition, 1 deletiondebian/template/postinst
- frontend-js/src/main/js/GuiConnector.js 27 additions, 21 deletionsfrontend-js/src/main/js/GuiConnector.js
- frontend-js/src/main/js/gui/leftPanel/AbstractDbPanel.js 13 additions, 1 deletionfrontend-js/src/main/js/gui/leftPanel/AbstractDbPanel.js
- frontend-js/src/main/js/gui/leftPanel/GenericSearchPanel.js 8 additions, 1 deletionfrontend-js/src/main/js/gui/leftPanel/GenericSearchPanel.js
Loading
Please register or sign in to comment