diff --git a/CHANGELOG.md b/CHANGELOG.md index 921eb56c5f..17ee15fde1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ ## [vMAJOR.MINOR.PATCH] > yyyy-mm-dd +* Features and Improvements: +* Fixes + + +## [v1.3.0] +> 2022-07-05 + * Features and Improvements: * dataset selection in chemspectra viewer [dataset selection in chemspectra viewer #715](https://github.com/ComPlat/chemotion_ELN/issues/715) * Screens: @@ -19,12 +26,20 @@ * Add title for readouts and display of multiple readouts in designer and list * Add attachments * Add import for well data from .xlsx and import template .xlsx - + * Collection Tag for research-plan screen (https://github.com/ComPlat/chemotion_ELN/pull/774) + * Chemspectra : Cyclic Voltametry (Warning: upd chem-spectra-app service to 0.10.14) + * Fixes * report: fix the label can't be assigned issue https://github.com/ComPlat/chemotion_ELN/issues/661 * Reference Style improvement [Reference Style improvement #695](https://github.com/ComPlat/chemotion_ELN/issues/695) * Adjust docker setup to work on mac + * prevent unecessary building of reaction svg on description text input (https://github.com/ComPlat/chemotion_ELN/issues/759) + * elemental composition value with 2 decimals (https://github.com/ComPlat/chemotion_ELN/issues/739) + * reference Manager issues (https://github.com/ComPlat/chemotion_ELN/issues/708 https://github.com/ComPlat/chemotion_ELN/issues/756 ) + * Missing attachment preview in research plan (https://github.com/ComPlat/chemotion_ELN/issues/751) + + ## [v1.2.1] diff --git a/VERSION b/VERSION index 40aea7bf65..648bda153b 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ -version: 1.2.0-pre -base_revision: 14edc0aa32bf9c40ba7e31d141d9db16b725d181 +version: 1.3.0-pre +base_revision: 656685072697780c69693ba6fdbdc9c497c64471 current_revision: 0 diff --git a/scripts/install_production.sh b/scripts/install_production.sh index 272d4f168f..b92a803e18 100755 --- a/scripts/install_production.sh +++ b/scripts/install_production.sh @@ -11,7 +11,7 @@ set -euo pipefail ############# VARIABLES #################### REPO='https://github.com/ComPlat/chemotion_ELN.git' -BRANCH='v1.1' +BRANCH='v1.3' TMP_REPO_DIR="/tmp/${BRANCH}.git" ## user account name (to be created or to be used) diff --git a/scripts/update_production.sh b/scripts/update_production.sh index a38434b86d..f611f6aa93 100755 --- a/scripts/update_production.sh +++ b/scripts/update_production.sh @@ -9,7 +9,7 @@ set -euo pipefail ## CHEMOTION ELN GIT REPOSITORY REPO='https://github.com/ComPlat/chemotion_ELN.git' -BRANCH='v1.1' +BRANCH='v1.3' TMP_REPO_DIR="/tmp/${BRANCH}.git" ## user account name (to be created or to be used)