Mercurial > kallithea
changeset 2174:85a64b981c07 beta
ws cleanup, +changelog
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Wed, 28 Mar 2012 23:19:58 +0200 |
| parents | 775a7672d363 |
| children | b61b7e266b39 |
| files | docs/changelog.rst rhodecode/lib/ext_json.py rhodecode/templates/base/root.html |
| diffstat | 3 files changed, 17 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/changelog.rst Wed Mar 28 23:11:49 2012 +0200 +++ b/docs/changelog.rst Wed Mar 28 23:19:58 2012 +0200 @@ -4,8 +4,7 @@ Changelog ========= - -1.3.4 (**2012-XX-XX**) +1.3.5 (**2012-XX-XX**) ---------------------- :status: in-progress @@ -14,6 +13,19 @@ 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
--- a/rhodecode/lib/ext_json.py Wed Mar 28 23:11:49 2012 +0200 +++ b/rhodecode/lib/ext_json.py Wed Mar 28 23:19:58 2012 +0200 @@ -68,7 +68,7 @@ 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)
--- a/rhodecode/templates/base/root.html Wed Mar 28 23:11:49 2012 +0200 +++ b/rhodecode/templates/base/root.html Wed Mar 28 23:19:58 2012 +0200 @@ -133,13 +133,13 @@ ## IE hacks <!--[if IE 7]> <script>YUD.addClass(document.body,'ie7')</script> - <![endif]--> + <![endif]--> <!--[if IE 8]> <script>YUD.addClass(document.body,'ie8')</script> <![endif]--> <!--[if IE 9]> <script>YUD.addClass(document.body,'ie9')</script> - <![endif]--> + <![endif]--> ${next.body()} </body>