Mercurial > kallithea
changeset 1570:dddd9380d0bf
Merge with ff41d5f00e28d296303e39f29125e83a01157330
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Mon, 17 Oct 2011 01:42:55 +0200 |
parents | ba2205d093dc (diff) ff41d5f00e28 (current diff) |
children | 5498f86ba217 |
files | rhodecode/controllers/files.py setup.py |
diffstat | 10 files changed, 39 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Mon Oct 17 01:40:22 2011 +0200 +++ b/.hgignore Mon Oct 17 01:42:55 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 Mon Oct 17 01:40:22 2011 +0200 +++ b/.hgtags Mon Oct 17 01:42:55 2011 +0200 @@ -23,7 +23,22 @@ 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
--- a/docs/changelog.rst Mon Oct 17 01:40:22 2011 +0200 +++ b/docs/changelog.rst Mon Oct 17 01:42:55 2011 +0200 @@ -4,20 +4,6 @@ ========= -1.3.0 (**XXXX-XX-XX**) -====================== - -:status: in-progress -:branch: beta - -news ----- - - -fixes ------ - - 1.2.2 (**2011-10-17**) ======================
--- a/docs/contributing.rst Mon Oct 17 01:40:22 2011 +0200 +++ b/docs/contributing.rst Mon Oct 17 01:42:55 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 Mon Oct 17 01:40:22 2011 +0200 +++ b/docs/theme/nature/layout.html Mon Oct 17 01:42:55 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 Mon Oct 17 01:40:22 2011 +0200 +++ b/rhodecode/__init__.py Mon Oct 17 01:42:55 2011 +0200 @@ -25,9 +25,9 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import platform -VERSION = (1, 3, 0, 'beta') +VERSION = (1, 2, 2) __version__ = '.'.join((str(each) for each in VERSION[:4])) -__dbversion__ = 4 #defines current db version for migrations +__dbversion__ = 3 #defines current db version for migrations __platform__ = platform.system() __license__ = 'GPLv3'
--- a/rhodecode/config/middleware.py Mon Oct 17 01:40:22 2011 +0200 +++ b/rhodecode/config/middleware.py Mon Oct 17 01:42:55 2011 +0200 @@ -51,7 +51,6 @@ from rhodecode.lib.profiler import ProfilingMiddleware app = ProfilingMiddleware(app) - # we want our low level middleware to get to the request ASAP. We don't # need any pylons stack middleware in them app = SimpleHg(app, config) @@ -80,7 +79,6 @@ app = Cascade([static_app, app]) app = make_gzip_middleware(app, global_conf, compress_level=1) - app.config = config return app
--- a/rhodecode/templates/search/search_content.html Mon Oct 17 01:40:22 2011 +0200 +++ b/rhodecode/templates/search/search_content.html Mon Oct 17 01:42:55 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 Mon Oct 17 01:40:22 2011 +0200 +++ b/setup.cfg Mon Oct 17 01:42:55 2011 +0200 @@ -1,5 +1,5 @@ [egg_info] -tag_build = beta +tag_build = tag_svn_revision = true [easy_install]
--- a/setup.py Mon Oct 17 01:40:22 2011 +0200 +++ b/setup.py Mon Oct 17 01:42:55 2011 +0200 @@ -23,16 +23,14 @@ "babel", "python-dateutil>=1.5.0,<2.0.0", "dulwich>=0.8.0,<0.9.0", - "vcs>=0.2.3.dev", - "webob==1.0.8" + "vcs==0.2.2", + "webob==1.0.8" ] dependency_links = [ - "https://secure.rhodecode.org/vcs/archive/default.zip#egg=vcs-0.2.3.dev", - "https://bitbucket.org/marcinkuzminski/vcs/get/default.zip#egg=vcs-0.2.3.dev", ] -classifiers = ['Development Status :: 4 - Beta', +classifiers = ['Development Status :: 5 - Production/Stable', 'Environment :: Web Environment', 'Framework :: Pylons', 'Intended Audience :: Developers',