Skip to content
Snippets Groups Projects
Verified Commit d3b5883c authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'dev' into f-map-list

parents 80c134bf 4b482770
No related branches found
No related tags found
2 merge requests!73REL: Release 0.7.0,!71F map list
Pipeline #22599 passed
...@@ -10,21 +10,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -10,21 +10,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed ### Changed
- Renamed the person reference resolver.
### Deprecated ### Deprecated
### Removed ### Removed
### Fixed ### Fixed
* [webui#170](https://gitlab.com/caosdb/caosdb-webui/-/issues/170)
Autocompletion for "IS REFERENCED BY" leads to query syntax error
### Security ### Security
### Documentation ### Documentation
## [0.6.0] - 2022-05-03
(Daniel Hornung)
### Changed
* Renamed the person reference resolver.
### Fixed
* [webui#170](https://gitlab.com/caosdb/caosdb-webui/-/issues/170)
Autocompletion for "IS REFERENCED BY" leads to query syntax error
## [0.5.0] - 2022-03-25 ## [0.5.0] - 2022-03-25
(Timm Fitschen) (Timm Fitschen)
......
...@@ -18,7 +18,7 @@ guidelines of the CaosDB Project ...@@ -18,7 +18,7 @@ guidelines of the CaosDB Project
2. Check all general prerequisites. 2. Check all general prerequisites.
3. update src/doc/conf.py version 3. Update `src/doc/conf.py` version
4. Merge the release branch into the main branch. 4. Merge the release branch into the main branch.
...@@ -28,4 +28,6 @@ guidelines of the CaosDB Project ...@@ -28,4 +28,6 @@ guidelines of the CaosDB Project
7. Merge the main branch back into the dev branch. 7. Merge the main branch back into the dev branch.
8. Prepare CHANGELOG for next release cycle. 8. Prepare for next release cycle:
* `CHANGELOG.md`: "Unreleased" section
* `src/doc/conf.py`: Bump to next version number and `x.y.z-SNAPSHOT` for the `release` variable.
...@@ -22,13 +22,13 @@ ...@@ -22,13 +22,13 @@
import sphinx_rtd_theme import sphinx_rtd_theme
project = 'caosdb-webui' project = 'caosdb-webui'
copyright = '2020, IndiScale GmbH' copyright = '2022, IndiScale GmbH'
author = 'Daniel Hornung' author = 'Daniel Hornung'
# The short X.Y version # The short X.Y version
version = '0.6.0' version = '0.6.1'
# The full version, including alpha/beta/rc tags # The full version, including alpha/beta/rc tags
release = '0.6.0-SNAPSHOT' release = '0.6.1-SNAPSHOT'
# -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment