kallithea Changeset - c165349fdd0e

Changeset - c165349fdd0e

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Marcin Kuzminski - 15 years ago 2011-01-11 23:06:41
marcin@python-works.com

merged bugfixes for rhodecode 1.1.2 release

6 files changed with 35 insertions and 17 deletions:

docs/changelog.rst

docs/installation.rst

docs/setup.rst

rhodecode/controllers/admin/repos.py

rhodecode/controllers/summary.py

setup.py

0 comments (0 inline, 0 general)

docs/changelog.rst

➞

Show inline comments

@@ @@ -19,12 +19,27 @@ fixes @@
 - fixed #96 redirect loop on files view on repositories without changesets
 - fixed #97 unicode string passed into server header in special cases (mod_wsgi)
   and server crashed with errors
 - fixed large tooltips problems on main page
 - fixed #92 whoosh indexer is more error proof
 .1.2 (**2011-01-12**)
 ======================
 news
 ----
 fixes
 -----
 - fixes #98 protection against float division of percentage stats
 - fixed graph bug
 - forced webhelpers version since it was making troubles during installation
 .1.0 (**2010-12-18**)
 ======================
 news
 ----

docs/installation.rst

➞

Show inline comments

@@ @@ -26,13 +26,13 @@ Easiest way to install ``rhodecode`` is @@
 Or::
  pip install rhodecode
 If you prefer to install manually simply grab latest release from
-http://pypi.python.org/pypi/rhodecode, decompres archive and run::
+http://pypi.python.org/pypi/RhodeCode, decompres archive and run::
    python setup.py install
 Step by step installation example
 ---------------------------------

docs/setup.rst

➞

Show inline comments

@@ @@ -151,14 +151,18 @@ variables inside the ini file. @@
 Remember that the ini files uses format with '.' not with '_' like celery
 so for example setting `BROKER_HOST` in celery means setting `broker.host` in
 the config file.
 In order to make start using celery run::
  paster celeryd <configfile.ini>
 .. note::
    Make sure You run this command from same virtualenv, and with the same user
    that rhodecode runs.
 HTTPS support
 -------------
 There are two ways to enable https, first is to set HTTP_X_URL_SCHEME in
 Your http server headers, than rhodecode will recognise this headers and make
@@ @@ -179,13 +183,13 @@ Sample config for nginx using proxy:: @@
     error_log       /var/log/nginx/rhodecode.error.log;
     location / {
             root /var/www/rhodecode/rhodecode/public/;
             if (!-f $request_filename){
                 proxy_pass      http://127.0.0.1:5000;
+            }
-            #this is important for https !!!
+            #this is important if You want to use https !!!
             proxy_set_header X-Url-Scheme $scheme;
             include         /etc/nginx/proxy.conf;
+    }
+ }
 Here's the proxy.conf. It's tuned so it'll not timeout on long
@@ @@ -258,17 +262,16 @@ Apache's example FCGI config @@
 TODO !
 Other configuration files
 -------------------------
 Some extra configuration files and examples can be found here:
 http://hg.python-works.com/rhodecode/files/tip/init.d
 Some example init.d script can be found here, for debian and gentoo:
 and also an celeryconfig file can be use from here:
 http://hg.python-works.com/rhodecode/files/tip/celeryconfig.py
 https://rhodeocode.org/rhodecode/files/tip/init.d
 Troubleshooting
 ---------------
 - missing static files ?

rhodecode/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Admin controller for RhodeCode
     :created_on: Apr 7, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
+    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
@@ @@ -282,13 +282,13 @@ class ReposController(BaseController): @@
         else:
             last_rev = 0
         c.stats_revision = last_rev
         c.repo_last_rev = r.revisions[-1] if r.revisions else 0
         if last_rev == 0:
+        if last_rev == 0 or c.repo_last_rev == 0:
             c.stats_percentage = 0
         else:
             c.stats_percentage = '%.2f' % ((float((last_rev)) /
                                             c.repo_last_rev) * 100)
         defaults = c.repo_info.get_dict()

rhodecode/controllers/summary.py

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Summary controller for Rhodecode
     :created_on: Apr 18, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
+    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
@@ @@ -25,13 +25,13 @@ @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import calendar
 import logging
 from time import mktime
 from datetime import datetime, timedelta
+from datetime import datetime, timedelta, date
 from vcs.exceptions import ChangesetError
 from pylons import tmpl_context as c, request, url
 from pylons.i18n.translation import _
@@ @@ -99,21 +99,20 @@ class SummaryController(BaseController): @@
         for name, hash in c.repo_info.branches.items()[:10]:
             try:
                 c.repo_branches[name] = c.repo_info.get_changeset(hash)
             except ChangesetError:
                 c.repo_branches[name] = EmptyChangeset(hash)
         td = datetime.today() + timedelta(days=1)
         y, m, d = td.year, td.month, td.day
         td = date.today() + timedelta(days=1)
         td_1m = td - timedelta(days=calendar.mdays[td.month])
         td_1y = td - timedelta(days=365)
         ts_min_y = mktime((y - 1, (td - timedelta(days=calendar.mdays[m])).month,
                             d, 0, 0, 0, 0, 0, 0,))
         ts_min_m = mktime((y, (td - timedelta(days=calendar.mdays[m])).month,
                             d, 0, 0, 0, 0, 0, 0,))
         ts_min_m = mktime(td_1m.timetuple())
         ts_min_y = mktime(td_1y.timetuple())
         ts_max_y = mktime(td.timetuple())
         ts_max_y = mktime((y, m, d, 0, 0, 0, 0, 0, 0,))
         if c.repo_info.dbrepo.enable_statistics:
             c.no_data_msg = _('No data loaded yet')
             run_task(get_commits_stats, c.repo_info.name, ts_min_y, ts_max_y)
         else:
             c.no_data_msg = _('Statistics update are disabled for this repository')
         c.ts_min = ts_min_m

setup.py

➞

Show inline comments

@@ @@ -2,12 +2,13 @@ import sys @@
 py_version = sys.version_info
 from rhodecode import get_version
 requirements = [
         "Pylons==1.0.0",
         "WebHelpers>=1.2",
         "SQLAlchemy==0.6.5",
         "Mako==0.3.6",
         "vcs==0.1.10",
         "pygments==1.3.1",
         "mercurial==1.7.2",
         "whoosh==1.3.4",

0 comments (0 inline, 0 general)