# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 1330269909 -7200
# Node ID 82a88013a3fdbf09b6911d774ebe6f55a50dffa9
# Parent  ab0e122b38a72f4e331c96c095a5a39056683357# Parent  61f9aeb2129e10a12d88895527ffe1f1692e997d
merge 1.3 into stable

diff -r 61f9aeb2129e -r 82a88013a3fd .hgignore
--- a/.hgignore	Sun Feb 26 01:25:38 2012 +0200
+++ b/.hgignore	Sun Feb 26 17:25:09 2012 +0200
@@ -2,7 +2,8 @@
 *.pyc
 *.swp
 *.sqlite
-Paste*.egg
+*.egg-info
+*.egg
 
 syntax: regexp
 ^build
diff -r 61f9aeb2129e -r 82a88013a3fd .hgtags
--- a/.hgtags	Sun Feb 26 01:25:38 2012 +0200
+++ b/.hgtags	Sun Feb 26 17:25:09 2012 +0200
@@ -23,7 +23,26 @@
 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
diff -r 61f9aeb2129e -r 82a88013a3fd CONTRIBUTORS
diff -r 61f9aeb2129e -r 82a88013a3fd MANIFEST.in
diff -r 61f9aeb2129e -r 82a88013a3fd README.rst
diff -r 61f9aeb2129e -r 82a88013a3fd development.ini
diff -r 61f9aeb2129e -r 82a88013a3fd docs/api/api.rst
diff -r 61f9aeb2129e -r 82a88013a3fd docs/changelog.rst
--- a/docs/changelog.rst	Sun Feb 26 01:25:38 2012 +0200
+++ b/docs/changelog.rst	Sun Feb 26 17:25:09 2012 +0200
@@ -4,7 +4,7 @@
 =========
 
 
-1.3.0 (**XXXX-XX-XX**)
+1.3.0 (**2012-02-XX**)
 ----------------------
 
 :status: in-progress
diff -r 61f9aeb2129e -r 82a88013a3fd docs/contributing.rst
--- a/docs/contributing.rst	Sun Feb 26 01:25:38 2012 +0200
+++ b/docs/contributing.rst	Sun Feb 26 17:25:09 2012 +0200
@@ -17,6 +17,14 @@
 To run RhodeCode in a development version you always need to install the tip
 version of RhodeCode and the VCS library.
 
+after downloading RhodeCode make sure you run::
+
+    python setup.py develop
+
+command to install all required packages, and prepare development enviroment
+
+
+
 | Thank you for any contributions!
 |  Marcin
 
diff -r 61f9aeb2129e -r 82a88013a3fd docs/index.rst
diff -r 61f9aeb2129e -r 82a88013a3fd docs/installation.rst
diff -r 61f9aeb2129e -r 82a88013a3fd docs/setup.rst
diff -r 61f9aeb2129e -r 82a88013a3fd docs/theme/nature/layout.html
--- a/docs/theme/nature/layout.html	Sun Feb 26 01:25:38 2012 +0200
+++ b/docs/theme/nature/layout.html	Sun Feb 26 17:25:09 2012 +0200
@@ -10,5 +10,9 @@
 	border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
 	<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
 	</form>
+	<div style="padding:5px">
+    <a href="http://flattr.com/thing/167489/RhodeCode" target="_blank">
+    <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a>
+    </div>	
 </div>
 {% endblock %}}
diff -r 61f9aeb2129e -r 82a88013a3fd docs/upgrade.rst
diff -r 61f9aeb2129e -r 82a88013a3fd docs/usage/git_support.rst
diff -r 61f9aeb2129e -r 82a88013a3fd docs/usage/statistics.rst
diff -r 61f9aeb2129e -r 82a88013a3fd ez_setup.py
diff -r 61f9aeb2129e -r 82a88013a3fd production.ini
diff -r 61f9aeb2129e -r 82a88013a3fd requires.txt
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/__init__.py
--- a/rhodecode/__init__.py	Sun Feb 26 01:25:38 2012 +0200
+++ b/rhodecode/__init__.py	Sun Feb 26 17:25:09 2012 +0200
@@ -26,7 +26,7 @@
 import sys
 import platform
 
-VERSION = (1, 3, 0, 'beta')
+VERSION = (1, 3, 0)
 __version__ = '.'.join((str(each) for each in VERSION[:4]))
 __dbversion__ = 5  # defines current db version for migrations
 __platform__ = platform.system()
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/config/deployment.ini_tmpl
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/config/environment.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/config/middleware.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/config/routing.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/admin/admin.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/admin/ldap_settings.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/admin/permissions.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/admin/repos.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/admin/settings.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/admin/users.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/api/__init__.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/api/api.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/branches.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/changelog.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/changeset.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/error.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/feed.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/files.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/home.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/journal.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/login.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/search.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/settings.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/shortlog.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/summary.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/controllers/tags.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/i18n/rhodecode.pot
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/__init__.py
--- a/rhodecode/lib/__init__.py	Sun Feb 26 01:25:38 2012 +0200
+++ b/rhodecode/lib/__init__.py	Sun Feb 26 17:25:09 2012 +0200
@@ -231,6 +231,9 @@
     :rtype: str
     :returns: str object
     """
+    
+    if not isinstance(unicode_, basestring):
+        return str(unicode_)
 
     if not isinstance(unicode_, basestring):
         return str(unicode_)
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/auth.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/auth_ldap.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/backup_manager.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/base.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/celerylib/__init__.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/celerylib/tasks.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/colored_formatter.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/db_manage.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/dbmigrate/__init__.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/dbmigrate/versions/002_version_1_1_0.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/dbmigrate/versions/__init__.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/exceptions.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/helpers.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/hooks.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/indexers/__init__.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/indexers/daemon.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/middleware/https_fixup.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/middleware/simplegit.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/middleware/simplehg.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/rcmail/smtp_mailer.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/timerproxy.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/lib/utils.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/model/__init__.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/model/db.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/model/forms.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/model/permission.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/model/repo.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/model/repo_permission.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/model/scm.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/model/user.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/public/css/style.css
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/templates/admin/permissions/permissions.html
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/templates/admin/repos/repos.html
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/templates/admin/settings/settings.html
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/templates/admin/users/user_edit.html
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/templates/admin/users/user_edit_my_account.html
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/templates/base/base.html
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/templates/changelog/changelog.html
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/templates/changeset/changeset.html
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/templates/errors/error_document.html
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/templates/files/files_annotate.html
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/templates/files/files_browser.html
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/templates/files/files_source.html
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/templates/index.html
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/templates/journal/journal.html
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/templates/login.html
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/templates/password_reset.html
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/templates/register.html
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/templates/search/search_content.html
--- a/rhodecode/templates/search/search_content.html	Sun Feb 26 01:25:38 2012 +0200
+++ b/rhodecode/templates/search/search_content.html	Sun Feb 26 17:25:09 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
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/templates/summary/summary.html
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/tests/__init__.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/tests/functional/test_changelog.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/tests/functional/test_summary.py
diff -r 61f9aeb2129e -r 82a88013a3fd rhodecode/websetup.py
diff -r 61f9aeb2129e -r 82a88013a3fd setup.cfg
--- a/setup.cfg	Sun Feb 26 01:25:38 2012 +0200
+++ b/setup.cfg	Sun Feb 26 17:25:09 2012 +0200
@@ -1,5 +1,5 @@
 [egg_info]
-tag_build = beta
+tag_build = 
 tag_svn_revision = true
 
 [easy_install]
diff -r 61f9aeb2129e -r 82a88013a3fd setup.py
--- a/setup.py	Sun Feb 26 01:25:38 2012 +0200
+++ b/setup.py	Sun Feb 26 17:25:09 2012 +0200
@@ -11,7 +11,7 @@
 ]
 
 classifiers = [
-    'Development Status :: 4 - Beta',
+    'Development Status :: 5 - Production/Stable',
     'Environment :: Web Environment',
     'Framework :: Pylons',
     'Intended Audience :: Developers',
diff -r 61f9aeb2129e -r 82a88013a3fd test.ini