diff --git a/docs/changelog.rst b/docs/changelog.rst --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -4,8 +4,7 @@ Changelog ========= - -1.3.4 (**2012-XX-XX**) +1.3.5 (**2012-XX-XX**) ---------------------- :status: in-progress @@ -14,6 +13,19 @@ Changelog news ++++ +- use ext_json for json module + +fixes ++++++ + +- fixed dev-version marker for stable when served from source codes + +1.3.4 (**2012-03-28**) +---------------------- + +news +++++ + - Whoosh logging is now controlled by the .ini files logging setup - added clone-url into edit form on /settings page - added help text into repo add/edit forms diff --git a/rhodecode/lib/ext_json.py b/rhodecode/lib/ext_json.py --- a/rhodecode/lib/ext_json.py +++ b/rhodecode/lib/ext_json.py @@ -68,7 +68,7 @@ try: except NotImplementedError: pass raise TypeError("%r is not JSON serializable" % (obj,)) - # we handle decimals our own it makes unified behavior of json vs + # we handle decimals our own it makes unified behavior of json vs # simplejson _sj.dumps = functools.partial(_sj.dumps, default=extended_encode, use_decimal=False) diff --git a/rhodecode/templates/base/root.html b/rhodecode/templates/base/root.html --- a/rhodecode/templates/base/root.html +++ b/rhodecode/templates/base/root.html @@ -133,13 +133,13 @@ ## IE hacks + + ${next.body()}