Merge branch 'devel_13.1.x' into tair-fix (b306124f) · Commits · minerva / core

Commit b306124f authored 5 years ago by Piotr Gawron

Browse files

Merge branch 'devel_13.1.x' into tair-fix

parents 829b5269 eef024ad

No related branches found

No related tags found

2 merge requests!805Merge 13.1.0 beta.1,!774Tair fix

Pipeline #10269 failed 5 years ago

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 0 additions, 8 deletions

.gitlab-ci.yml
CHANGELOG 94 additions, 2 deletions

CHANGELOG
annotation/src/main/java/lcsb/mapviewer/annotation/cache/ApplicationLevelCache.java 0 additions, 1 deletion

...csb/mapviewer/annotation/cache/ApplicationLevelCache.java
annotation/src/main/java/lcsb/mapviewer/annotation/cache/CachableInterface.java 0 additions, 1 deletion

...va/lcsb/mapviewer/annotation/cache/CachableInterface.java
annotation/src/main/java/lcsb/mapviewer/annotation/services/ChemicalParser.java 8 additions, 8 deletions

...va/lcsb/mapviewer/annotation/services/ChemicalParser.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/annotators/ElementAnnotator.java 0 additions, 1 deletion

...ewer/annotation/services/annotators/ElementAnnotator.java
annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/EnsemblAnnotator.java 1 addition, 1 deletion

...ewer/annotation/services/annotators/EnsemblAnnotator.java
annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/EntrezAnnotator.java 3 additions, 5 deletions

...iewer/annotation/services/annotators/EntrezAnnotator.java
annotation/src/test/java/lcsb/mapviewer/annotation/services/DrugbankHTMLParserTest.java 0 additions, 1 deletion

...mapviewer/annotation/services/DrugbankHTMLParserTest.java
annotation/src/test/java/lcsb/mapviewer/annotation/services/annotators/EntrezAnnotatorTest.java 17 additions, 0 deletions

...r/annotation/services/annotators/EntrezAnnotatorTest.java
commons/src/main/java/lcsb/mapviewer/common/Comparator.java 4 additions, 1 deletion

commons/src/main/java/lcsb/mapviewer/common/Comparator.java
commons/src/main/java/lcsb/mapviewer/common/Configuration.java 13 additions, 0 deletions

...ns/src/main/java/lcsb/mapviewer/common/Configuration.java
commons/src/main/java/lcsb/mapviewer/common/XmlParser.java 37 additions, 2 deletions

commons/src/main/java/lcsb/mapviewer/common/XmlParser.java
commons/src/main/java/lcsb/mapviewer/common/comparator/CalendarComparator.java 29 additions, 0 deletions

.../lcsb/mapviewer/common/comparator/CalendarComparator.java
commons/src/main/java/lcsb/mapviewer/common/comparator/IntegerComparator.java 13 additions, 13 deletions

...a/lcsb/mapviewer/common/comparator/IntegerComparator.java
commons/src/main/resources/to_lowercase.xsl 20 additions, 0 deletions

commons/src/main/resources/to_lowercase.xsl
commons/src/test/java/lcsb/mapviewer/common/XmlParserTest.java 16 additions, 2 deletions

...ns/src/test/java/lcsb/mapviewer/common/XmlParserTest.java
converter-CellDesigner/pom.xml 2 additions, 1 deletion

converter-CellDesigner/pom.xml
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/CellDesignerXmlParser.java 17 additions, 4 deletions

...r/converter/model/celldesigner/CellDesignerXmlParser.java

with 275 additions and 52 deletions

Please register or to comment