Merge branch 'master' into spring-config-update (2276e58f) · Commits · minerva / core

Commit 2276e58f authored 6 years ago by Sascha Herzinger

Browse files

Merge branch 'master' into spring-config-update

parents 57db797b 92591d63

No related branches found

No related tags found

2 merge requests!630WIP: Resolve "The privileges of a new user are not saved in some cases",!499Spring config update

Pipeline #7433 failed 6 years ago

Expand all Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 7 additions, 0 deletions

CHANGELOG
README.md 2 additions, 2 deletions

README.md
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/CellDesignerAliasConverter.java 8 additions, 0 deletions

...del/celldesigner/geometry/CellDesignerAliasConverter.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/geometry/helper/CellDesignerAnchor.java 132 additions, 132 deletions

...odel/celldesigner/geometry/helper/CellDesignerAnchor.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/reaction/ReactionFromXml.java 3 additions, 0 deletions

...onverter/model/celldesigner/reaction/ReactionFromXml.java
converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/reaction/ReactionToXml.java 31 additions, 16 deletions

.../converter/model/celldesigner/reaction/ReactionToXml.java
converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/CellDesignerXmlParserTest.java 32 additions, 0 deletions

...nverter/model/celldesigner/CellDesignerXmlParserTest.java
converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/geometry/AllGeometryTests.java 1 addition, 0 deletions

...nverter/model/celldesigner/geometry/AllGeometryTests.java
converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/geometry/ComplexConverterTest.java 70 additions, 0 deletions

...ter/model/celldesigner/geometry/ComplexConverterTest.java
converter-CellDesigner/testFiles/reaction_coords_different.xml 738 additions, 0 deletions

...rter-CellDesigner/testFiles/reaction_coords_different.xml
converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/AbstractImageGenerator.java 1080 additions, 1092 deletions

.../mapviewer/converter/graphics/AbstractImageGenerator.java
converter-graphics/src/test/java/lcsb/mapviewer/converter/graphics/PdfImageGeneratorTest.java 115 additions, 77 deletions

...b/mapviewer/converter/graphics/PdfImageGeneratorTest.java
converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/SbmlElementParser.java 1 addition, 1 deletion

...csb/mapviewer/converter/model/sbml/SbmlElementParser.java
converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/SbmlExporter.java 1 addition, 0 deletions

...ava/lcsb/mapviewer/converter/model/sbml/SbmlExporter.java
converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/SbmlParser.java 39 additions, 0 deletions

.../java/lcsb/mapviewer/converter/model/sbml/SbmlParser.java
converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/reaction/SbmlReactionExporter.java 2 additions, 2 deletions

...r/converter/model/sbml/reaction/SbmlReactionExporter.java
converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/reaction/SbmlReactionParser.java 21 additions, 12 deletions

...wer/converter/model/sbml/reaction/SbmlReactionParser.java
converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/species/SbmlSpeciesExporter.java 15 additions, 1 deletion

...wer/converter/model/sbml/species/SbmlSpeciesExporter.java
converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/species/SbmlSpeciesParser.java 13 additions, 0 deletions

...iewer/converter/model/sbml/species/SbmlSpeciesParser.java
converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/units/SbmlUnitExporter.java 13 additions, 2 deletions

...apviewer/converter/model/sbml/units/SbmlUnitExporter.java

with 2324 additions and 1337 deletions

Please register or to comment