1. 20 Sep, 2013 3 commits
    • Matija Obreza's avatar
      Merge branch 'tests-to-migrate-to-head' · b2e4975f
      Matija Obreza authored
      * tests-to-migrate-to-head:
        Removed old runners
        SGSV data import
        Added SvalbardData entity
        Multiple "crops" possible
        Update In_Svalbard status from SGSV data
      
      Conflicts:
      	src/main/java/org/genesys2/rest/common/persistence/domain/SvalbardRepository.java
      	src/main/java/org/genesys2/server/service/GenesysService.java
      	src/main/java/org/genesys2/server/service/impl/GenesysServiceImpl.java
      	src/main/java/org/genesys2/server/service/impl/TaxonomyServiceImpl.java
      	src/main/java/org/genesys2/server/servlet/controller/AdminController.java
      	src/main/webapp/WEB-INF/jsp/admin/index.jsp
      	src/test/java/org/crophub/rest/test/RestTest.java
      	src/test/java/org/genesys2/server/test/RestTest.java
      	src/test/java/org/genesys2/test/RestTest.java
      b2e4975f
    • Matija Obreza's avatar
      Removed old runners · b93886bc
      Matija Obreza authored
      b93886bc
    • Matija Obreza's avatar
      SGSV data import · 939f841b
      Matija Obreza authored
      939f841b
  2. 19 Sep, 2013 2 commits
  3. 18 Sep, 2013 10 commits
  4. 17 Sep, 2013 7 commits
  5. 16 Sep, 2013 13 commits
  6. 15 Sep, 2013 2 commits
  7. 14 Sep, 2013 3 commits