aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.hgignore3
-rw-r--r--.hgtags28
-rw-r--r--docs/changelog.rst12
-rw-r--r--rhodecode/__init__.py4
-rw-r--r--rhodecode/templates/search/search_content.html2
-rw-r--r--setup.cfg2
-rw-r--r--setup.py2
7 files changed, 32 insertions, 21 deletions
diff --git a/.hgignore b/.hgignore
index 9a3872d7..13e02788 100644
--- a/.hgignore
+++ b/.hgignore
@@ -2,7 +2,8 @@ syntax: glob
*.pyc
*.swp
*.sqlite
-Paste*.egg
+*.egg-info
+*.egg
syntax: regexp
^build
diff --git a/.hgtags b/.hgtags
index 8960a61d..e6ff57ce 100644
--- a/.hgtags
+++ b/.hgtags
@@ -23,7 +23,29 @@ ca41d544dbdfd2f81bd0304168492a26276aadb6 v0.8.3
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
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 86fe06a5..4c5d52e1 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,18 +5,6 @@ Changelog
=========
-1.3.4 (**2012-XX-XX**)
-----------------------
-
-:status: in-progress
-:branch: beta
-
-news
-++++
-
-
-fixes
-+++++
1.3.3 (**2012-03-02**)
----------------------
diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py
index a2266992..4fec3c01 100644
--- a/rhodecode/__init__.py
+++ b/rhodecode/__init__.py
@@ -26,7 +26,7 @@
import sys
import platform
-VERSION = (1, 3, 4, 'beta')
+VERSION = (1, 3, 3)
__version__ = '.'.join((str(each) for each in VERSION[:4]))
__dbversion__ = 5 # defines current db version for migrations
__platform__ = platform.system()
@@ -67,7 +67,7 @@ else:
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
diff --git a/rhodecode/templates/search/search_content.html b/rhodecode/templates/search/search_content.html
index acfdce6a..de1bb9ea 100644
--- a/rhodecode/templates/search/search_content.html
+++ b/rhodecode/templates/search/search_content.html
@@ -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
diff --git a/setup.cfg b/setup.cfg
index 8b460822..c2623138 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
[egg_info]
-tag_build = beta
+tag_build =
tag_svn_revision = true
[easy_install]
diff --git a/setup.py b/setup.py
index c12858e8..52e6a88d 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ dependency_links = [
]
classifiers = [
- 'Development Status :: 4 - Beta',
+ 'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
'Framework :: Pylons',
'Intended Audience :: Developers',