Mercurial > kallithea
changeset 2031:82a88013a3fd
merge 1.3 into stable
line wrap: on
line diff
--- 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
--- 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
--- 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
--- 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
--- 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 %}}
--- 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()
--- 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_)
--- 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
--- 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]
--- 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',