Commits · 22b8384ceb27b82b21f68b32e411bf89a0d7727b · Genesys PGR / Genesys Backend

04 Oct, 2016 2 commits
- Update due to file-repository-0.8-SNAPSHOT change · 22b8384c
  Matija Obreza authored Oct 04, 2016
  
  22b8384c
- Cherry picked overview-ui (+1 squashed commit) · 02da7540
  Matija Obreza authored Oct 04, 2016
```
Squashed commits:
[f43788b] Crop may not exist
```
  02da7540
28 Sep, 2016 1 commit
- map page ui · 48344362
  Taisiya Glushko authored Sep 28, 2016
  
  48344362
26 Sep, 2016 2 commits
- List and Form update UI, selected list blurp text fixes · e301c312
  Taisiya Glushko authored Sep 26, 2016
  
  e301c312
- request page ui, table accessions mobile view · ff585672
  Taisiya Glushko authored Sep 26, 2016
  
  ff585672
25 Sep, 2016 1 commit

Merge branch 'master' into staging · a25516d9

Matija Obreza authored Sep 25, 2016

* master:
  Handle null crop shortName
  Switch to latest database

# Conflicts:
#	src/main/webapp/WEB-INF/jsp/wiews/details.jsp

a25516d9

23 Sep, 2016 8 commits
- login-form-fixes · e6ed530a
  Taisiya Glushko authored Sep 23, 2016
  
  e6ed530a
- statistics blocks space fixes, span width fixes · 7b04e0a0
  Taisiya Glushko authored Sep 23, 2016
  
  7b04e0a0
- Handle null crop shortName · b8c0b8ff
  Matija Obreza authored Sep 23, 2016
  
  b8c0b8ff
- Switch to latest database · 39e7e832
  Matija Obreza authored Sep 23, 2016
  
  39e7e832
- remove not(#loginForm) · a9016d61
  Taisiya Glushko authored Sep 23, 2016
  
  a9016d61
- Merge branch 'forages' into staging · 7fd34073
  Matija Obreza authored Sep 23, 2016
```
# 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
```
  7fd34073
- PDCI recalc based on id · c058f638
  Matija Obreza authored Sep 23, 2016
  
  c058f638
- PDCI included in ES, aspects pick up recalculations · a545828e
  Matija Obreza authored Sep 22, 2016
  
  a545828e
22 Sep, 2016 10 commits
- Ignore stuff · 282efc81
  Matija Obreza authored Sep 22, 2016
  
  282efc81
- Calculate PDCI when missing · e6f5d2f3
  Matija Obreza authored Sep 22, 2016
  
  e6f5d2f3
- Reordered filters in /explore · 32fa22d7
  Matija Obreza authored Sep 22, 2016
  
  32fa22d7
- Enable #cropName filter in explorer · dc551b86
  Matija Obreza authored Sep 22, 2016
  
  dc551b86
- Merge branch 'forages' into staging · 2f35199d
  Matija Obreza authored Sep 22, 2016
```
# 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
```
  2f35199d
- list of selected accessions UI · f74479e6
  Taisiya Glushko authored Sep 22, 2016 and Matija Obreza committed Sep 22, 2016
  
  f74479e6
- Allow filtering on a#cropName, display cropName statistics on institute, include cropName in ES · 247ca4fa
  Matija Obreza authored Sep 22, 2016
  
  247ca4fa
- Crop#rules editable · 001db69f
  Matija Obreza authored Sep 22, 2016
  
  001db69f
- Tests reorganized and AccessionHistoryTest added · fd5e8e3a
  Matija Obreza authored Aug 15, 2016
  
  fd5e8e3a
- Resource conscious accession#crop update · 05ab953c
  Matija Obreza authored Sep 22, 2016
  
  05ab953c
21 Sep, 2016 5 commits
- New Explorer - Bug #36256 · 16e4b8ed
  Maxim authored Sep 21, 2016 and Matija Obreza committed Sep 21, 2016
  
  16e4b8ed
- Merge branch 'forages' into staging · aa5e4dfb
  Matija Obreza authored Sep 21, 2016
```
* 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
```
  aa5e4dfb
- Reassign accession#crop based on #cropName · 197ac55b
  Matija Obreza authored Sep 21, 2016
  
  197ac55b
- De/Selecting accessions (missing icons) · 19367777
  Maxim authored Sep 20, 2016 and Matija Obreza committed Sep 21, 2016
  
  19367777
- alert-message-space-issue, bottom-pagination-issue · 173f75ba
  Taisiya Glushko authored Sep 21, 2016
  
  173f75ba
20 Sep, 2016 1 commit
- De/Selecting accessions · c8fac8c8
  Maxim authored Sep 20, 2016 and Matija Obreza committed Sep 20, 2016
  
  c8fac8c8
19 Sep, 2016 3 commits
- filtering and extra columns · dd7af809
  Maxim authored Sep 19, 2016 and Matija Obreza committed Sep 19, 2016
  
  dd7af809
- background-color-fixes · 41c3eb13
  Taisiya Glushko authored Sep 19, 2016
  
  41c3eb13
- Merge commit '47cb4f78' into staging · e651672a
  Matija Obreza authored Sep 19, 2016
```
* commit '47cb4f78':
  institute-page-ui

# Conflicts:
#	src/main/sourceapp/1/styles/genesys.scss
```
  e651672a
16 Sep, 2016 2 commits
- institute-page-ui · 47cb4f78
  Taisiya Glushko authored Sep 16, 2016
  
  47cb4f78
- i18n for Ajax prompts · 49a8699f
  Matija Obreza authored Sep 16, 2016
  
  49a8699f
14 Sep, 2016 1 commit
- UI/UX 2016 Revision: accession browser activity indicators · 57572f44
  Maxim authored Sep 14, 2016
  
  57572f44
13 Sep, 2016 1 commit
- forms-layout-ui · 295ad19b
  Taisiya Glushko authored Sep 09, 2016 and Matija Obreza committed Sep 13, 2016
  
  295ad19b
09 Sep, 2016 3 commits
- Download SGSV file before importing · 61d9dfe9
  Matija Obreza authored Sep 09, 2016
  
  61d9dfe9
- Use online version of SGSV database · 42ca97b0
  Matija Obreza authored Sep 09, 2016
  
  42ca97b0
- SGSV import allowing for multiple deposits · c619f269
  Matija Obreza authored Sep 08, 2016
  
  c619f269