Commits · de04ddc11efe1d1a62fa32dd3fc3c5e75afa931b · Genesys PGR / Genesys Backend

19 Oct, 2016 2 commits
- Accession image width not limited · de04ddc1
  Matija Obreza authored Oct 19, 2016
  
  de04ddc1
- map 100% height · 3d628c86
  Taisiya Glushko authored Oct 19, 2016
  
  3d628c86
17 Oct, 2016 5 commits
- Increased Accession#cropName field size and added REST API taxonomy record 'sanitizer' · 74c575e7
  Matija Obreza authored Oct 17, 2016
  
  74c575e7
- Duplicated term displayed in Institute details · 7565e69f
  Matija Obreza authored Oct 17, 2016
  
  7565e69f
- Updating taxonomy must not reuse existing data · 6f7fb7e7
  Matija Obreza authored Oct 17, 2016
  
  6f7fb7e7
- Reversed spring-security Java config · 05196200
  Matija Obreza authored Oct 17, 2016
  
  05196200
- Fixed Hazelcast 3.6 and SpringAwareWebFilter · 76861a2c
  Matija Obreza authored Oct 17, 2016
  
  76861a2c
14 Oct, 2016 1 commit
- Reversed changes to session and web.xml · 6ad235a8
  Matija Obreza authored Oct 14, 2016
  
  6ad235a8
13 Oct, 2016 1 commit
- Bug fix: checkboxes from explore-table do not work · 34fae3bc
  Maxim authored Oct 13, 2016
  
  34fae3bc
12 Oct, 2016 1 commit
- accession-gallery-ui · aaa32b13
  Taisiya Glushko authored Oct 12, 2016
  
  aaa32b13
11 Oct, 2016 2 commits
- #content-area fixes · 2170b834
  Taisiya Glushko authored Oct 11, 2016
  
  2170b834
- news-list-ui · 0599a5ac
  Taisiya Glushko authored Oct 11, 2016
  
  0599a5ac
10 Oct, 2016 1 commit
- Migrated spring-security.xml and spring-security-oauth.xml to Java Config · c6cb490e
  Aleksandr Sharaban authored Oct 10, 2016 and Matija Obreza committed Oct 10, 2016
  
  c6cb490e
07 Oct, 2016 4 commits
- Migrated spring-security.xml and spring-security-oauth.xml to Java Config · 118d7260
  Aleksandr Sharaban authored Oct 07, 2016 and Matija Obreza committed Oct 07, 2016
  
  118d7260
- two-column-text-chrome-alignment-issue · 41fdf29c
  Taisiya Glushko authored Oct 07, 2016
  
  41fdf29c
- Jshint task errors fix. · 62b3a45d
  Aleksandr Sharaban authored Oct 07, 2016
  
  62b3a45d
- Merge commit '78ff876d' into staging · 6d4229c3
  Matija Obreza authored Oct 07, 2016
```
* commit '78ff876d':
  Explorer: Three "view modes"
```
  6d4229c3
06 Oct, 2016 2 commits
- Explorer: Three "view modes" · 78ff876d
  Maxim authored Oct 06, 2016
  
  78ff876d
- institute-page-text-blob · 9f769fa1
  Taisiya Glushko authored Oct 06, 2016
  
  9f769fa1
05 Oct, 2016 2 commits
- welcome-page-newsletter-ui · 3e0e2c5f
  Taisiya Glushko authored Oct 05, 2016
  
  3e0e2c5f
- download-notification-page-ui · 2d2dbf49
  Taisiya Glushko authored Oct 05, 2016
  
  2d2dbf49
04 Oct, 2016 3 commits
- Marked free-text block on entry page for styling · 0fe7f8ba
  Matija Obreza authored Oct 04, 2016
  
  0fe7f8ba
- 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 4 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