diff --git a/API_CHANGELOG.md b/API_CHANGELOG.md index 44faeb7602..171111842d 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 +## 2021.12.21 ### Additions diff --git a/CHANGELOG.md b/CHANGELOG.md index c5dcbd960b..0989692414 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ -## Under development +## 2021.12.21 +Contributors: Chris Barnes, Albert Cardona, Andrew Champion, Stephan Gerhard, Sanja Jasek, Tom Kazimiers ### Notes diff --git a/django/projects/mysite/utils.py b/django/projects/mysite/utils.py index 3fcb4de4e8..e47c9de597 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 = '2020.02.15-dev' +BASE_VERSION = '2021.12.21' # 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 = 'e8e89cdc441ae20e0f7217578ca98d03074b6b8e' +BASE_COMMIT = '5e2c7a82890fe274291b231e5ae0ea3491d7d8c1' # 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/api/index.html b/sphinx-doc/source/_static/api/index.html index c7bd26ccec..795d22c1e9 100644 --- a/sphinx-doc/source/_static/api/index.html +++ b/sphinx-doc/source/_static/api/index.html @@ -3,7 +3,7 @@
-'+(n?e:u(e,!0))+"
\n":""+(n?e:u(e,!0))+"
"},a.prototype.blockquote=function(e){return"\n"+e+"\n"},a.prototype.html=function(e){return e},a.prototype.heading=function(e,t,n,r){return this.options.headerIds?"
"+e+"
\n"},a.prototype.table=function(e,t){return t&&(t=""+t+""),""+e+"
"},a.prototype.br=function(){return this.options.xhtml?""+u(e.message+"",!0)+"";throw e}}g.exec=g,k.options=k.setOptions=function(e){return y(k.defaults,e),k},k.getDefaults=function(){return{baseUrl:null,breaks:!1,gfm:!0,headerIds:!0,headerPrefix:"",highlight:null,langPrefix:"language-",mangle:!0,pedantic:!1,renderer:new a,sanitize:!1,sanitizer:null,silent:!1,smartLists:!1,smartypants:!1,xhtml:!1}},k.defaults=k.getDefaults(),k.Parser=l,k.parser=l.parse,k.Renderer=a,k.TextRenderer=s,k.Lexer=r,k.lexer=r.lex,k.InlineLexer=i,k.inlineLexer=i.output,k.Slugger=c,k.parse=k,e.exports=k}(this||"undefined"!=typeof window&&window)}).call(this,n(5))},function(e,t,n){var r=n(7);e.exports=function(e,t){if(!r(e))return e;var n,o;if(t&&"function"==typeof(n=e.toString)&&!r(o=n.call(e)))return o;if("function"==typeof(n=e.valueOf)&&!r(o=n.call(e)))return o;if(!t&&"function"==typeof(n=e.toString)&&!r(o=n.call(e)))return o;throw TypeError("Can't convert object to primitive value")}},function(e,t,n){var r=n(36),o=n(54),i=r("keys");e.exports=function(e){return i[e]||(i[e]=o(e))}},function(e,t){var n=0,r=Math.random();e.exports=function(e){return"Symbol("+String(void 0===e?"":e)+")_"+(++n+r).toString(36)}},function(e,t,n){var r=n(18),o=n(71),i=n(37),a=n(31),s=n(52),l=n(13),c=n(94),u=Object.getOwnPropertyDescriptor;t.f=r?u:function(e,t){if(e=a(e),t=s(t,!0),c)try{return u(e,t)}catch(e){}if(l(e,t))return i(!o.f.call(e,t),e[t])}},function(e,t,n){var r=n(19),o=n(163),i=n(74),a=n(39),s=n(103),l=n(68),c=n(53)("IE_PROTO"),u=function(){},p=function(){var e,t=l("iframe"),n=i.length;for(t.style.display="none",s.appendChild(t),t.src=String("javascript:"),(e=t.contentWindow.document).open(),e.write(" +function Yo(e){return getComputedStyle(e)}function Go(e,t){for(var n in t){var r=t[n];"number"==typeof r&&(r+="px"),e.style[n]=r}return e}function Qo(e){var t=document.createElement("div");return t.className=e,t}var Xo="undefined"!=typeof Element&&(Element.prototype.matches||Element.prototype.webkitMatchesSelector||Element.prototype.mozMatchesSelector||Element.prototype.msMatchesSelector);function Ko(e,t){if(!Xo)throw new Error("No element matching method supported");return Xo.call(e,t)}function Jo(e){e.remove?e.remove():e.parentNode&&e.parentNode.removeChild(e)}function Zo(e,t){return Array.prototype.filter.call(e.children,(function(e){return Ko(e,t)}))}var ei="ps",ti="ps__rtl",ni={thumb:function(e){return"ps__thumb-"+e},rail:function(e){return"ps__rail-"+e},consuming:"ps__child--consume"},ri={focus:"ps--focus",clicking:"ps--clicking",active:function(e){return"ps--active-"+e},scrolling:function(e){return"ps--scrolling-"+e}},oi={x:null,y:null};function ii(e,t){var n=e.element.classList,r=ri.scrolling(t);n.contains(r)?clearTimeout(oi[t]):n.add(r)}function ai(e,t){oi[t]=setTimeout((function(){return e.isAlive&&e.element.classList.remove(ri.scrolling(t))}),e.settings.scrollingThreshold)}var si=function(e){this.element=e,this.handlers={}},li={isEmpty:{configurable:!0}};si.prototype.bind=function(e,t){void 0===this.handlers[e]&&(this.handlers[e]=[]),this.handlers[e].push(t),this.element.addEventListener(e,t,!1)},si.prototype.unbind=function(e,t){var n=this;this.handlers[e]=this.handlers[e].filter((function(r){return!(!t||r===t)||(n.element.removeEventListener(e,r,!1),!1)}))},si.prototype.unbindAll=function(){for(var e in this.handlers)this.unbind(e)},li.isEmpty.get=function(){var e=this;return Object.keys(this.handlers).every((function(t){return 0===e.handlers[t].length}))},Object.defineProperties(si.prototype,li);var ci=function(){this.eventElements=[]};function ui(e){if("function"==typeof window.CustomEvent)return new CustomEvent(e);var t=document.createEvent("CustomEvent");return t.initCustomEvent(e,!1,!1,void 0),t}function pi(e,t,n,r,o){var i;if(void 0===r&&(r=!0),void 0===o&&(o=!1),"top"===t)i=["contentHeight","containerHeight","scrollTop","y","up","down"];else{if("left"!==t)throw new Error("A proper axis should be provided");i=["contentWidth","containerWidth","scrollLeft","x","left","right"]}!function(e,t,n,r,o){var i=n[0],a=n[1],s=n[2],l=n[3],c=n[4],u=n[5];void 0===r&&(r=!0);void 0===o&&(o=!1);var p=e.element;e.reach[l]=null,p[s]<1&&(e.reach[l]="start");p[s]>e[i]-e[a]-1&&(e.reach[l]="end");t&&(p.dispatchEvent(ui("ps-scroll-"+l)),t<0?p.dispatchEvent(ui("ps-scroll-"+c)):t>0&&p.dispatchEvent(ui("ps-scroll-"+u)),r&&function(e,t){ii(e,t),ai(e,t)}(e,l));e.reach[l]&&(t||o)&&p.dispatchEvent(ui("ps-"+l+"-reach-"+e.reach[l]))}(e,n,i,r,o)}function fi(e){return parseInt(e,10)||0}ci.prototype.eventElement=function(e){var t=this.eventElements.filter((function(t){return t.element===e}))[0];return t||(t=new si(e),this.eventElements.push(t)),t},ci.prototype.bind=function(e,t,n){this.eventElement(e).bind(t,n)},ci.prototype.unbind=function(e,t,n){var r=this.eventElement(e);r.unbind(t,n),r.isEmpty&&this.eventElements.splice(this.eventElements.indexOf(r),1)},ci.prototype.unbindAll=function(){this.eventElements.forEach((function(e){return e.unbindAll()})),this.eventElements=[]},ci.prototype.once=function(e,t,n){var r=this.eventElement(e),o=function(e){r.unbind(t,o),n(e)};r.bind(t,o)};var di={isWebKit:"undefined"!=typeof document&&"WebkitAppearance"in document.documentElement.style,supportsTouch:"undefined"!=typeof window&&("ontouchstart"in window||"maxTouchPoints"in window.navigator&&window.navigator.maxTouchPoints>0||window.DocumentTouch&&document instanceof window.DocumentTouch),supportsIePointer:"undefined"!=typeof navigator&&navigator.msMaxTouchPoints,isChrome:"undefined"!=typeof navigator&&/Chrome/i.test(navigator&&navigator.userAgent)};function hi(e){var t=e.element,n=Math.floor(t.scrollTop),r=t.getBoundingClientRect();e.containerWidth=Math.ceil(r.width),e.containerHeight=Math.ceil(r.height),e.contentWidth=t.scrollWidth,e.contentHeight=t.scrollHeight,t.contains(e.scrollbarXRail)||(Zo(t,ni.rail("x")).forEach((function(e){return Jo(e)})),t.appendChild(e.scrollbarXRail)),t.contains(e.scrollbarYRail)||(Zo(t,ni.rail("y")).forEach((function(e){return Jo(e)})),t.appendChild(e.scrollbarYRail)),!e.settings.suppressScrollX&&e.containerWidth+e.settings.scrollXMarginOffset
",n+=ga(e,t),n+="
",n+="