release 1.0-rc1
Merge commit '387e521e567a765321a3ec74712581e931fd3bbf' into qa

# By Gerhard Weis (3) and others
# Via Khanh Nguyen
* commit '387e521e567a765321a3ec74712581e931fd3bbf':
  Fix bug where the description appears twice when ALA import is complete
  Fix algo configuration items
  exclude many more control panels from theme
  bump version
  be explicit with packaging
Merge branch 'develop' into qa

# By Khanh Nguyen (10) and others
# Via Daniel Yazbek
* develop:
  Create dynamic Biodiverse 'source projection' Page
  Create dynamic Biodiverse 'source projection' Page
  Login button should be clickable - not just the link text
  Initial add biodiverse experiment type
  copy resolution field into theme pages for sdm and projection experiment
  BCCVLII-75: As a researcher I would like to agree to the terms of use so that I'm aware of the terms and conditions
  BCCVLII-76 + BCCVLII-77: Add url to legals page and styling
  BCCVLII-76: As a researcher I would like to agree to the data provider agreement
  BCCVLII-77: As a researcher I would like to agree to the data sharing agreement
  adapt everything to new algorithm parameter handling
  Clean up the absences tab in New SDM experiment
  Change colour of text of menu button in nav bar
  bump version
  BCCVLII-73: As a user I would like to share my datasets
  Add missing html end tag in search.html
  Remove unused var in search.js
  BCCVLII-72: As a user I would like to share my experiments
Merge branch 'develop' into qa

# By Daniel Yazbek (13) and others
* develop: (32 commits)
  rename id to uuid
  BCCVLII-99 Double click on the sharing icon opens then closes the sharing dialog immediately
  Fix bug index bug when submitting projection data to plone
  Fix bug when showing species when selecting a Projection in a Biodiverse experiment
  BCCVLII-85 Use new "BETA" version of the BCCVL Logo
  Alert that threshold vales do not work for biodiverse experiments
  BCCVLII-112 - Radio buttons do not show for yes/no options that are required in Experiment Configs
  Use the label to select the checkbox
  Create dynamic Biodiverse 'source projection' Page
  Create dynamic Biodiverse 'source projection' Page
  BCCVLII-97: Fix capitalization on "Agree To The Terms And Conditions" on all pages
  Remove visualisation button for html and binary files in experiment results page
  don’t fail in case there is no species name
  Fix occurrence visualisation in new sdm experiment page
  BCCVLII-107: put experiment_details back on page
  BCCVLII-92: hide user id on sharing page BCCVLII-95: hide inherit permissions checkbox
  BCCVLII-141: also theme login_form and login_failed pages
  BCCVLII-98: Show sharing action only if user has permission to share dataset
  make all html work on filesystem
  set local flag in js-config generated by diazo rules
  ...

Conflicts:
	setup.py
Merge branch 'develop' into qa

# By Khanh Nguyen (4) and others
# Via Daniel Yazbek
* develop:
  Allow user-specified values for thresholds using Select2
  BCCVLII-141: Error message hidden when login fails
  BCCVLII-158: Experiment progress not correct when revisiting a page of in progress experiment
  BCCVLII-157: Experiment results page needs to be manually refreshed when the experiment is complete
  hide spatialscale drop down until the search filter is activated
  Wire up thresholds for Projection Layers in Biodiverse experiments
  We don't need another .gitignore here
  BCCVLII-84: Change 'get involved' link to the new website
  bump version

Conflicts:
	setup.py
Merge branch 'develop' into qa

# By Daniel Yazbek
# Via Daniel Yazbek
* develop:
  Backout manifest.cfg
  Move Select2
Merge branch 'develop' into qa

* develop:
  make listing pages more failure resilient
Merge branch 'develop' into qa
Merge branch 'develop' into qa

# By Daniel Yazbek (6) and others
# Via Khanh Nguyen
* develop:
  BCCVLII-134: As not an admin, I should not see "admin access" under my name
  BCCVLII-174: Fix validation after sdm config field returns to default
  BCCVLII-174 - validation errors in inactive algorithms stop experiments running
  BCCVLII-132 Tighten validation on the environmental dataset upload page
  Setup google analytics for production
  BCCVLII-176 Visualising projection.out results in some junk being shown in the visualiser
  BCCVLII-175 Disallow scientific notation in integer fields
  BCCVLII-164 some algorithm fields allows decimal notation of whole numbers
  BCCVLII-166: Fix configuration accordions in new SDM experiment
  BCCVLII-105: Add some indication that a file is being uploaded on the upload datasets page
Merge branch 'develop' into qa

* develop:
  bump version
  fix tests
  BCCVLII-196 Biodiverse experiment type - Threshold value in the "configuration" tab produces an error "this value should be a valid integer"
  BCCVLII-188 Ensemble Analysis - New Experiment Type
  BCCVLII-188 Ensemble Analysis - New Experiment Type - create the page
  untabify and re-indent
  update job state handling
  BCCVLII-183 New Projection Experiment - Navigation breadcrumb displays New SDM Projection
  bump develop version
Merge branch 'develop' into qa

* develop:
  prepare release
  Revert "BCCVLII-188 Ensemble Analysis - New Experiment Type - create the page"
  Revert "BCCVLII-188 Ensemble Analysis - New Experiment Type"
  back to develop
release 1.5.2-rc1
back to development