Skip to content

Commit

Permalink
Set version to 0.64.0 (#2901)
Browse files Browse the repository at this point in the history
* Set version to 0.64.0

* Fix a problem where heart restarted Zotonic after a zotonic stop command. Fixes #2715

* Update release notes.
  • Loading branch information
mworrell committed Mar 4, 2022
1 parent fd6c25f commit 3ccce2b
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 5 deletions.
4 changes: 2 additions & 2 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@
# built documents.
#
# The short X.Y version.
version = '0.63'
version = '0.64'
# The full version, including alpha/beta/rc tags.
release = '0.63.0'
release = '0.64.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
34 changes: 34 additions & 0 deletions doc/developer-guide/releasenotes/rel_0.64.0.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
.. _rel-0.64.0:

Release 0.64.0
==============

Welcome to Zotonic 0.64.0, released on March 4, 2022.

This is a maintenance release.

Main changes are:

* Add Instagram Javascript to the sanitizer whitelist.
* Show username and last logon date in the admin on the user's page and in the user lists.
* Better support for additional URLs in the SEO sitemap table.


Commits since 0.63.0
--------------------

Marc Worrell (7):

* Fix an issue where the allowed predicates of a subject did not change when its category was updated. Fixes #2791
* seo_sitemap: fix a problem where resources were not final-checked for inclusion in the sitemap.
* Allow www.instagram.com/embed.js in the sanitizer.
* In the admin show information about username and last logon.
* mod_filestore: add simple test function to test the filestore connection.
* seo_sitemap: add m_seo_sitemap:delete_before/3. (0.x)
* seo_sitemap: add index on modified. Add sql timeouts.
* Fix a problem where heart restarted Zotonic after a zotonic stop command. Fixes #2715

Rob van den Bogaard (2):

* Merge pull request #2874 from zotonic/0x-m_seo_sitemap-delete_before
* seo_sitemap: add notification at sitemap rebuild for custom indexing (#2894)
2 changes: 1 addition & 1 deletion include/zotonic_release.hrl
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
%% limitations under the License.

%% Release number
-define(ZOTONIC_VERSION, "0.63.0").
-define(ZOTONIC_VERSION, "0.64.0").
2 changes: 1 addition & 1 deletion src/zotonic.app.src
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%% -*- mode: erlang -*-
{application, zotonic,
[{description, "zotonic"},
{vsn, "0.63.0"},
{vsn, "0.64.0"},
{modules,
[
zotonic,
Expand Down
3 changes: 2 additions & 1 deletion src/zotonic.erl
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ stop() ->
application:stop(lager),
application:stop(webzmachine),
application:stop(crypto),
erlang:halt().
heart:set_cmd("echo ok"),
erlang:halt(0).

await_sites_stopping(0) -> ok;
await_sites_stopping(N) ->
Expand Down

0 comments on commit 3ccce2b

Please sign in to comment.