Mercurial > kallithea
changeset 2092:ecd59c28f432
merged beta into stable
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Fri, 02 Mar 2012 21:57:01 +0200 |
parents | 6c6718c06ea2 (diff) 6a97bbdded09 (current diff) |
children | 934906f028b5 |
files | CONTRIBUTORS docs/changelog.rst docs/setup.rst requires.txt rhodecode/__init__.py rhodecode/controllers/admin/settings.py rhodecode/controllers/changeset.py rhodecode/controllers/files.py rhodecode/lib/middleware/simplegit.py rhodecode/model/db.py rhodecode/model/user.py rhodecode/templates/files/files_annotate.html rhodecode/templates/files/files_browser.html rhodecode/templates/files/files_source.html |
diffstat | 7 files changed, 32 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Fri Mar 02 21:56:00 2012 +0200 +++ b/.hgignore Fri Mar 02 21:57:01 2012 +0200 @@ -2,7 +2,8 @@ *.pyc *.swp *.sqlite -Paste*.egg +*.egg-info +*.egg syntax: regexp ^build
--- a/.hgtags Fri Mar 02 21:56:00 2012 +0200 +++ b/.hgtags Fri Mar 02 21:57:01 2012 +0200 @@ -23,7 +23,29 @@ 2fa16ec5822da0c6fade3dd1ed9b6c0655e5dbbf v0.8.4 16ba57d8fe2317c49dbd422afd07ab497687aa02 v0.8.5 53128b6b9a4ddb6ee9554cbb83a082a6d1316b42 v1.0.0rc4 -bdc438fb4fe46fc0408de71bb659c691799a2de6 v1.1.4 -2ab211e0aecdb15fd767e5584244152db5b6f4c1 v1.1.7 -2ab211e0aecdb15fd767e5584244152db5b6f4c1 v1.1.7 +afd98d1f817e6a6b52172735c22160239e615a6b v1.0.0 +bee56f209c40a6880f2f633b02227b5ee1f8ff5a v1.0.1 +d85b0948e53925ebbbc49e9f7967013a04f866e9 v1.0.2 +d9c8dddb96af521e346f05b88d515c536eef3d17 v1.1.0 +344f748517814ed0408a49e392dc625f4cc37fdc v1.1.1 +6c01c12eafb8cc72d4c4cbd121400fad755b2862 v1.1.2 +4fa80e0484ef5c33feaa9c39fc66916f410ba353 v1.1.3 +cb77867d69d3c5931712aac486c980a42ee90745 v1.1.5 +cb77867d69d3c5931712aac486c980a42ee90745 v1.1.5 +008bdfdd95c8bd31ae6d89f76c75c1f49cbcd0bc v1.1.5 +c5af1d3c861fb36b156224e75c2f55a97f54657d v1.1.6 7327a0d1584cf28d33e738048af1f6809d499451 v1.1.7 +bd102f45950f779995a1beae42b6eb099cdd27b3 v1.1.7 +c8974135732aa0ceb841cee6df66e29f089b4963 v1.1.8 +c252049af24cd98eef5f4143fa3abbff3c912e29 1.2.0 +c252049af24cd98eef5f4143fa3abbff3c912e29 1.2.0 +0000000000000000000000000000000000000000 1.2.0 +c252049af24cd98eef5f4143fa3abbff3c912e29 v1.2.0 +0b8fba8ab90b01f811a50e6e7384989cced21d38 v1.2.1 +22273bec00ba2fd860c60a9277d3d7229e288e18 v1.2.2 +1ff606a7858dbd8a5f70b3da5cc89524bd0d84f9 v1.2.3 +a7a282a902b207ce34e830d643c79b7ab52e3b35 v1.2.4 +b6b611e7722e754abebaae6e265cbb4c823d344d v1.2.5 +dbc82e3362a25d2aece42060089824c4342efd17 v1.3.0 +79a95f338fd0115b2cdb77118f39e17d22ff505c v1.3.1 +9ab21c5ddb84935bea5c743b4e147ed5a398b30c v1.3.2
--- a/docs/changelog.rst Fri Mar 02 21:56:00 2012 +0200 +++ b/docs/changelog.rst Fri Mar 02 21:57:01 2012 +0200 @@ -4,33 +4,6 @@ ========= -1.3.3 (**2012-XX-XX**) ----------------------- - -:status: in-progress -:branch: beta - -news -++++ - - -fixes -+++++ - -- fixed some python2.5 compatibility issues -- fixed issues with removed repos was accidentally added as groups, after - full rescan of paths -- fixes #376 Cannot edit user (using container auth) -- fixes #378 Invalid image urls on changeset screen with proxy-prefix - configuration -- fixed initial sorting of repos inside repo group -- fixes issue when user tried to resubmit same permission into user/user_groups -- bumped beaker version that fixes #375 leap error bug -- fixed raw_changeset for git. It was generated with hg patch headers -- fixed vcs issue with last_changeset for filenodes -- fixed missing commit after hook delete -- fixed #372 issues with git operation detection that caused a security issue - for git repos 1.3.2 (**2012-02-28**) ----------------------
--- a/rhodecode/__init__.py Fri Mar 02 21:56:00 2012 +0200 +++ b/rhodecode/__init__.py Fri Mar 02 21:57:01 2012 +0200 @@ -26,7 +26,7 @@ import sys import platform -VERSION = (1, 3, 3, 'beta') +VERSION = (1, 3, 2) __version__ = '.'.join((str(each) for each in VERSION[:4])) __dbversion__ = 5 # defines current db version for migrations __platform__ = platform.system() @@ -67,7 +67,7 @@ try: from rhodecode.lib import get_current_revision - _rev = get_current_revision() + _rev = get_current_revision(quiet=True) except ImportError: # this is needed when doing some setup.py operations _rev = False
--- a/rhodecode/templates/search/search_content.html Fri Mar 02 21:56:00 2012 +0200 +++ b/rhodecode/templates/search/search_content.html Fri Mar 02 21:57:01 2012 +0200 @@ -26,7 +26,7 @@ %endif %endfor %if c.cur_query and c.formated_results: -<div class="pagination-wh pagination-left"> +<div class="pagination-wh pagination-left" style="padding-left:16px"> ${c.formated_results.pager('$link_previous ~2~ $link_next')} </div> %endif
--- a/setup.cfg Fri Mar 02 21:56:00 2012 +0200 +++ b/setup.cfg Fri Mar 02 21:57:01 2012 +0200 @@ -1,5 +1,5 @@ [egg_info] -tag_build = beta +tag_build = tag_svn_revision = true [easy_install]
--- a/setup.py Fri Mar 02 21:56:00 2012 +0200 +++ b/setup.py Fri Mar 02 21:57:01 2012 +0200 @@ -11,7 +11,7 @@ ] classifiers = [ - 'Development Status :: 4 - Beta', + 'Development Status :: 5 - Production/Stable', 'Environment :: Web Environment', 'Framework :: Pylons', 'Intended Audience :: Developers',