Mercurial > kallithea
changeset 863:4c123ade8485
merge with default
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sat, 18 Dec 2010 17:01:07 +0100 |
| parents | 3d0661b8aaa4 (diff) 4bdd0bf1b1f4 (current diff) |
| children | 4f89f5f078f8 |
| files | rhodecode/__init__.py rhodecode/lib/helpers.py rhodecode/lib/utils.py |
| diffstat | 6 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Sat Dec 18 16:59:52 2010 +0100 +++ b/.hgtags Sat Dec 18 17:01:07 2010 +0100 @@ -23,3 +23,6 @@ 2fa16ec5822da0c6fade3dd1ed9b6c0655e5dbbf v0.8.4 16ba57d8fe2317c49dbd422afd07ab497687aa02 v0.8.5 53128b6b9a4ddb6ee9554cbb83a082a6d1316b42 v1.0.0rc4 +afd98d1f817e6a6b52172735c22160239e615a6b v1.0.0 +bee56f209c40a6880f2f633b02227b5ee1f8ff5a v1.0.1 +d85b0948e53925ebbbc49e9f7967013a04f866e9 v1.0.2
--- a/docs/changelog.rst Sat Dec 18 16:59:52 2010 +0100 +++ b/docs/changelog.rst Sat Dec 18 17:01:07 2010 +0100 @@ -3,7 +3,7 @@ Changelog ========= -1.1.0 (**2010-XX-XX**) +1.1.0 (**2010-12-18**) ---------------------- :status: in-progress
--- a/rhodecode/__init__.py Sat Dec 18 16:59:52 2010 +0100 +++ b/rhodecode/__init__.py Sat Dec 18 17:01:07 2010 +0100 @@ -27,9 +27,9 @@ # MA 02110-1301, USA. -VERSION = (1, 2, 0, 'beta') +VERSION = (1, 1, 0) __version__ = '.'.join((str(each) for each in VERSION[:4])) -__dbversion__ = 3 #defines current db version for migrations +__dbversion__ = 2 #defines current db version for migrations try: from rhodecode.lib.utils import get_current_revision
--- a/rhodecode/templates/search/search_content.html Sat Dec 18 16:59:52 2010 +0100 +++ b/rhodecode/templates/search/search_content.html Sat Dec 18 17:01:07 2010 +0100 @@ -25,7 +25,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 \ No newline at end of file
--- a/setup.cfg Sat Dec 18 16:59:52 2010 +0100 +++ b/setup.cfg Sat Dec 18 17:01:07 2010 +0100 @@ -1,5 +1,5 @@ [egg_info] -tag_build = beta +tag_build = tag_svn_revision = true [easy_install]
--- a/setup.py Sat Dec 18 16:59:52 2010 +0100 +++ b/setup.py Sat Dec 18 17:01:07 2010 +0100 @@ -16,7 +16,7 @@ "babel", ] -classifiers = ['Development Status :: 4 - Beta', +classifiers = ['Development Status :: 5 - Production/Stable', 'Environment :: Web Environment', 'Framework :: Pylons', 'Intended Audience :: Developers',