- 04 Oct, 2016 2 commits
-
-
Matija Obreza authored
-
Matija Obreza authored
Squashed commits: [f43788b] Crop may not exist
-
- 28 Sep, 2016 1 commit
-
-
Taisiya Glushko authored
-
- 26 Sep, 2016 2 commits
-
-
Taisiya Glushko authored
-
Taisiya Glushko authored
-
- 25 Sep, 2016 1 commit
-
-
Matija Obreza authored
* master: Handle null crop shortName Switch to latest database # Conflicts: # src/main/webapp/WEB-INF/jsp/wiews/details.jsp
-
- 23 Sep, 2016 8 commits
-
-
Taisiya Glushko authored
-
Taisiya Glushko authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Taisiya Glushko authored
-
Matija Obreza authored
# Conflicts: # .gitignore # src/main/java/org/genesys2/server/model/elastic/AccessionDetails.java # src/main/java/org/genesys2/server/model/genesys/AccessionId.java # src/main/java/org/genesys2/server/persistence/domain/AccessionIdRepository.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/worker/ElasticUpdaterAspect.java # src/main/java/org/genesys2/server/servlet/controller/admin/AdminController.java # src/main/resources/content/language.properties
-
Matija Obreza authored
-
Matija Obreza authored
-
- 22 Sep, 2016 10 commits
-
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
# Conflicts: # src/main/java/org/genesys2/server/model/elastic/AccessionDetails.java # src/main/java/org/genesys2/server/persistence/domain/AccessionRepository.java # src/main/java/org/genesys2/server/service/GenesysService.java # src/main/java/org/genesys2/server/service/impl/GenesysServiceImpl.java # src/main/webapp/WEB-INF/jsp/accession/details.jsp # src/main/webapp/WEB-INF/jsp/crop/index.jsp
-
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
- 21 Sep, 2016 5 commits
-
-
-
Matija Obreza authored
* forages: Reassign accession#crop based on #cropName # Conflicts: # src/main/java/org/genesys2/server/persistence/domain/AccessionRepository.java # src/main/java/org/genesys2/server/service/GenesysService.java # src/main/java/org/genesys2/server/service/impl/CropServiceImpl.java # src/main/java/org/genesys2/server/service/impl/GenesysServiceImpl.java # src/main/webapp/WEB-INF/jsp/crop/index.jsp
-
Matija Obreza authored
-
-
Taisiya Glushko authored
-
- 20 Sep, 2016 1 commit
-
-
- 19 Sep, 2016 3 commits
-
-
-
Taisiya Glushko authored
-
Matija Obreza authored
* commit '47cb4f78': institute-page-ui # Conflicts: # src/main/sourceapp/1/styles/genesys.scss
-
- 16 Sep, 2016 2 commits
-
-
Taisiya Glushko authored
-
Matija Obreza authored
-
- 14 Sep, 2016 1 commit
-
-
Maxim authored
-
- 13 Sep, 2016 1 commit
-
-
- 09 Sep, 2016 3 commits
-
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-