From 4e39b4af3e16680bc6d1b9175d7b9a2282c60c5d Mon Sep 17 00:00:00 2001 From: Tom Kazimiers Date: Sat, 15 Feb 2020 23:12:00 -0500 Subject: [PATCH] Release 2020.02.15 --- API_CHANGELOG.md | 2 +- CHANGELOG.md | 3 ++- django/projects/mysite/utils.py | 4 ++-- .../_static/widgets/neuroglancer-widget.html | 24 +++++++++++++++++++ sphinx-doc/source/conf.py | 4 ++-- 5 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 sphinx-doc/source/_static/widgets/neuroglancer-widget.html diff --git a/API_CHANGELOG.md b/API_CHANGELOG.md index 9946254809..dc6f6a91c1 100644 --- a/API_CHANGELOG.md +++ b/API_CHANGELOG.md @@ -2,7 +2,7 @@ This changelog notes changes to API endpoints that are documented and listed through Swagger. Changes to undocumented, internal CATMAID APIs are not included in this changelog. -## Under development +## 2020.02.15 ### Additions diff --git a/CHANGELOG.md b/CHANGELOG.md index 241c8cb0d1..4d4a3e57de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ -## Under development +## 2020.02.15 +Contributors: Chris Barnes, Andrew Champion, Stephan Gerhard, Pat Gunn, Tom Kazimiers ### Notes diff --git a/django/projects/mysite/utils.py b/django/projects/mysite/utils.py index 01514c76c6..c84fa3b8cb 100644 --- a/django/projects/mysite/utils.py +++ b/django/projects/mysite/utils.py @@ -9,11 +9,11 @@ # This variable contains a reference version of the current code-base. It is # updated by release and dev-cycle scripts. -BASE_VERSION = '2019.06.20-dev' +BASE_VERSION = '2020.02.15' # This commit is the reference commit of the BASE_VERSION above. Technically, it # is the commit right before the BASE_VERSION, because the release script will # change these fields and onlt create the actual release commit after the changes. -BASE_COMMIT = '097948fecf923f975705fd862be3c72ffd20ed07' +BASE_COMMIT = 'e8e89cdc441ae20e0f7217578ca98d03074b6b8e' # These file is created as part of our Docker build and is looked at as # fall-back, should no git environment be available. The VERSION_INFO_PATH file # contains the "git describe" output of the build environment. diff --git a/sphinx-doc/source/_static/widgets/neuroglancer-widget.html b/sphinx-doc/source/_static/widgets/neuroglancer-widget.html new file mode 100644 index 0000000000..db1c6ddaaa --- /dev/null +++ b/sphinx-doc/source/_static/widgets/neuroglancer-widget.html @@ -0,0 +1,24 @@ + + +

Synchronized Navigation with Neuroglancer

+ +

This widget allows to open an instance of Neuroglancer + in a new window and synchronizes its navigation with CATMAID + (x,y,z position, scale level). In order for the synchronized navigation to work properly, + the image dataset shown in Neuroglancer needs to match the specification of the dataset that + is open in the main stack viewer in CATMAID. +

+ +

FAFB Example

+ + +

+ + + diff --git a/sphinx-doc/source/conf.py b/sphinx-doc/source/conf.py index b9c9936f6b..c3f8e2e668 100644 --- a/sphinx-doc/source/conf.py +++ b/sphinx-doc/source/conf.py @@ -55,9 +55,9 @@ # built documents. # # The short X.Y version. -version = '2019.06.20-dev' +version = '2020.02.15' # The full version, including alpha/beta/rc tags. -release = '2019.06.20-dev' +release = '2020.02.15' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. #language = None