Mercurial > kallithea
changeset 1515:da8f1d1b22de
merge stable with beta
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Fri, 07 Oct 2011 02:53:29 +0200 |
| parents | 12946daf44f9 (diff) 87ec80c280bb (current diff) |
| children | 5585609772d0 |
| files | rhodecode/controllers/branches.py rhodecode/controllers/changelog.py rhodecode/controllers/changeset.py rhodecode/controllers/files.py rhodecode/controllers/summary.py rhodecode/controllers/tags.py rhodecode/lib/__init__.py rhodecode/lib/celerylib/tasks.py rhodecode/lib/odict.py rhodecode/lib/oset.py rhodecode/model/db.py rhodecode/model/forms.py |
| diffstat | 10 files changed, 37 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Fri Oct 07 02:51:18 2011 +0200 +++ b/.hgignore Fri Oct 07 02:53:29 2011 +0200 @@ -1,6 +1,8 @@ syntax: glob *.pyc *.swp +*.egg-info +*.egg syntax: regexp ^build @@ -13,4 +15,3 @@ ^rhodecode\.db$ ^test\.db$ ^repositories\.config$ -^RhodeCode\.egg-info$
--- a/.hgtags Fri Oct 07 02:51:18 2011 +0200 +++ b/.hgtags Fri Oct 07 02:53:29 2011 +0200 @@ -23,7 +23,17 @@ 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
--- a/CONTRIBUTORS Fri Oct 07 02:51:18 2011 +0200 +++ b/CONTRIBUTORS Fri Oct 07 02:53:29 2011 +0200 @@ -4,6 +4,7 @@ Jason Harris <jason@jasonfharris.com> Thayne Harbaugh <thayne@fusionio.com> cejones + Thomas Waldmann <tw-public@gmx.de> Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it> Dmitri Kuznetsov Jared Bunting <jared.bunting@peachjean.com> @@ -11,4 +12,4 @@ Augosto Hermann <augusto.herrmann@planejamento.gov.br> Ankit Solanki <ankit.solanki@gmail.com> Liad Shani <liadff@gmail.com> - + \ No newline at end of file
--- a/docs/changelog.rst Fri Oct 07 02:51:18 2011 +0200 +++ b/docs/changelog.rst Fri Oct 07 02:53:29 2011 +0200 @@ -3,11 +3,9 @@ Changelog ========= -1.2.0 (**2011-XX-XX**) +1.2.0 (**2011-10-07**) ====================== -:status: in-progress -:branch: beta news ----
--- a/docs/contributing.rst Fri Oct 07 02:51:18 2011 +0200 +++ b/docs/contributing.rst Fri Oct 07 02:53:29 2011 +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 Fri Oct 07 02:51:18 2011 +0200 +++ b/docs/theme/nature/layout.html Fri Oct 07 02:53:29 2011 +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 Fri Oct 07 02:51:18 2011 +0200 +++ b/rhodecode/__init__.py Fri Oct 07 02:53:29 2011 +0200 @@ -25,7 +25,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import platform -VERSION = (1, 2, 0, 'beta') +VERSION = (1, 2, 0) __version__ = '.'.join((str(each) for each in VERSION[:4])) __dbversion__ = 3 #defines current db version for migrations __platform__ = platform.system()
--- a/rhodecode/templates/search/search_content.html Fri Oct 07 02:51:18 2011 +0200 +++ b/rhodecode/templates/search/search_content.html Fri Oct 07 02:53:29 2011 +0200 @@ -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 Fri Oct 07 02:51:18 2011 +0200 +++ b/setup.cfg Fri Oct 07 02:53:29 2011 +0200 @@ -1,5 +1,5 @@ [egg_info] -tag_build = beta +tag_build = tag_svn_revision = true [easy_install]
--- a/setup.py Fri Oct 07 02:51:18 2011 +0200 +++ b/setup.py Fri Oct 07 02:53:29 2011 +0200 @@ -16,25 +16,24 @@ "SQLAlchemy>=0.7.2,<0.8", "Mako>=0.4.2", "pygments>=1.4", - "mercurial>=1.9,<2.0", + "mercurial>=1.9.3,<2.0", "whoosh<1.8", "celery>=2.2.5,<2.3", "babel", "python-dateutil>=1.5.0,<2.0.0", "dulwich>=0.8.0", - "vcs>=0.2.1.dev", + "vcs>=0.2.1", "webob==1.0.8" ] dependency_links = [ - "https://secure.rhodecode.org/vcs/archive/default.zip#egg=vcs-0.2.1.dev", - "https://bitbucket.org/marcinkuzminski/vcs/get/default.zip#egg=vcs-0.2.1.dev", ] -classifiers = ['Development Status :: 4 - Beta', +classifiers = ['Development Status :: 5 - Production/Stable', 'Environment :: Web Environment', 'Framework :: Pylons', 'Intended Audience :: Developers', + 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 2.5',