1. 07 Nov, 2018 1 commit
  2. 06 Nov, 2018 3 commits
    • Piotr Gawron's avatar
      Merge branch 'stop-the-madness' into 'master' · dc6a6b4c
      Piotr Gawron authored
      Stop the madness
      
      See merge request !492
      dc6a6b4c
    • Sascha Herzinger's avatar
    • Sascha Herzinger's avatar
      Merge remote-tracking branch 'remotes/origin/master' into stop-the-madness · 8b5ebcb5
      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 ...
      8b5ebcb5
  3. 05 Nov, 2018 15 commits
  4. 02 Nov, 2018 21 commits