- Nov 09, 2018
-
-
Piotr Gawron authored
-
Piotr Gawron authored
-
- Nov 08, 2018
-
-
Piotr Gawron authored
-
- Nov 07, 2018
-
-
Piotr Gawron authored
Conversion rest api scaling Closes #552 See merge request !494
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-
- Nov 06, 2018
-
-
Piotr Gawron authored
-
Piotr Gawron authored
-
David Hoksza authored
-
David Hoksza authored
-
Piotr Gawron authored
Stop the madness See merge request !492
-
Sascha Herzinger authored
-
Sascha Herzinger authored
# Conflicts: # model/src/main/java/lcsb/mapviewer/model/graphics/ArrowType.java # model/src/main/java/lcsb/mapviewer/model/map/MiriamType.java # model/src/main/java/lcsb/mapviewer/model/user/ConfigurationElementTypeGroup.java # model/src/test/java/lcsb/mapviewer/model/AllModelTests.java # model/src/test/java/lcsb/mapviewer/model/log/AllLogTests.java # persist/src/test/java/lcsb/mapviewer/persist/AllDbTests.java # persist/src/test/java/lcsb/mapviewer/persist/dao/AllDaoTests.java # persist/src/test/java/lcsb/mapviewer/persist/dao/log/AllLogTests.java # service/src/main/java/lcsb/mapviewer/services/utils/data/BuildInLayout.java # service/src/main/java/lcsb/mapviewer/services/utils/data/ColorSchemaColumn.java # service/src/test/java/lcsb/mapviewer/services/impl/LayoutServiceTest.java # service/src/test/java/lcsb/mapviewer/services/impl/ProjectServiceTest.java Comment: Resolved by "Accept Theirs". Will fix the comments again via regex rather than manual merging.
-
- Nov 05, 2018
-
-
Piotr Gawron authored
Resolve "change arrows for Transcription Starting Sites" Closes #553 See merge request !491
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
Merge branch '561-common-functionality-of-networkexportpanel-and-graphicsexportpanel-should-be-extracted-to-abstract-class' into 'master' Resolve "common functionality of NetworkExportPanel and GraphicsExportPanel should be extracted to abstract class" Closes #561 See merge request !490
-
Piotr Gawron authored
-
Piotr Gawron authored
-
Piotr Gawron authored
-