kallithea Changeset - c5af1d3c861f

Changeset - c5af1d3c861f

Parent rev.

Child rev.

[Not reviewed]

rhodecode-0.0.1.1.6 default

0 10 0

Marcin Kuzminski - 15 years ago 2011-03-21 22:34:13
marcin@python-works.com

changes for rhodecode release 1.1.6

10 files changed with 36 insertions and 18 deletions:

README.rst

docs/changelog.rst

rhodecode/__init__.py

rhodecode/lib/auth.py

rhodecode/templates/base/base.html

rhodecode/templates/errors/error_document.html

rhodecode/templates/login.html

rhodecode/templates/password_reset.html

rhodecode/templates/register.html

setup.py

0 comments (0 inline, 0 general)

README.rst

➞

Show inline comments

@@ @@ -31,13 +31,13 @@ using the following credentials: @@
 Source code
 -----------
 The latest source for RhodeCode can be obtained from official RhodeCode instance
 https://hg.rhodecode.org
-Rarely updated source code and issue tracker is available at bitbcuket
+Rarely updated source code and issue tracker is available at bitbucket
 http://bitbucket.org/marcinkuzminski/rhodecode
 Installation
 ------------
 Please visit http://packages.python.org/RhodeCode/installation.html
@@ @@ -45,14 +45,14 @@ Please visit http://packages.python.org/ @@
 RhodeCode Features
 ------------------
 - Has it's own middleware to handle mercurial_ protocol requests.
   Each request can be logged and authenticated.
 - Runs on threads unlike hgweb. You can make multiple pulls/pushes simultaneous. Supports http/https
   and LDAP
 - Runs on threads unlike hgweb. You can make multiple pulls/pushes simultaneous.
   Supports http/https and LDAP
 - Full permissions (private/read/write/admin) and authentication per project.
   One account for web interface and mercurial_ push/pull/clone operations.
 - Mako templates let's you customize the look and feel of the application.
 - Beautiful diffs, annotations and source code browsing all colored by pygments.
 - Mercurial_ branch graph and yui-flot powered graphs with zooming and statistics
 - Admin interface with user/permission management. Admin activity journal, logs
@@ @@ -113,18 +113,18 @@ Online documentation @@
 Online documentation for the current version of RhodeCode is available at
 http://packages.python.org/RhodeCode/.
 You may also build the documentation for yourself - go into ``docs/`` and run::
    make html
 (You need to have sphinx installed to build the documentation. If you don't
 have sphinx installed you can install it via the command: ``easy_install sphinx``)
 (You need to have sphinx_ installed to build the documentation. If you don't
 have sphinx_ installed you can install it via the command: ``easy_install sphinx``)
 .. _virtualenv: http://pypi.python.org/pypi/virtualenv
 .. _python: http://www.python.org/
-.. _django: http://www.djangoproject.com/
+.. _sphinx: http://sphinx.pocoo.org/
 .. _mercurial: http://mercurial.selenic.com/
 .. _bitbucket: http://bitbucket.org/
 .. _subversion: http://subversion.tigris.org/
 .. _git: http://git-scm.com/
 .. _celery: http://celeryproject.org/
 .. _Sphinx: http://sphinx.pocoo.org/

docs/changelog.rst

➞

Show inline comments

 .. _changelog:
 Changelog
 =========
 .1.6 (**2011-03-21**)
 ======================
 news
 ----
 fixes
 -----
 - fixed #136 installation support for FreeBSD
 - RhodeCode will check for python version during installation
 .1.5 (**2011-03-17**)
 ======================
 news
 ----

rhodecode/__init__.py

➞

Show inline comments

@@ @@ -24,17 +24,20 @@ @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import platform
-VERSION = (1, 1, 5)
+VERSION = (1, 1, 6)
 __version__ = '.'.join((str(each) for each in VERSION[:4]))
 __dbversion__ = 2 #defines current db version for migrations
 __platform__ = platform.system()
 PLATFORM_WIN = ('Windows',)
 PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD',)
 try:
     from rhodecode.lib.utils import get_current_revision
     _rev = get_current_revision()
 except ImportError:
     #this is needed when doing some setup.py operations
     _rev = False

rhodecode/lib/auth.py

➞

Show inline comments

@@ @@ -31,17 +31,17 @@ import traceback @@
 from decorator import decorator
 from pylons import config, session, url, request
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
 from rhodecode import __platform__
+from rhodecode import __platform__, PLATFORM_WIN, PLATFORM_OTHERS
-if __platform__ == 'Windows':
+if __platform__ in PLATFORM_WIN:
     from hashlib import sha256
-if __platform__ in ('Linux', 'Darwin'):
+if __platform__ in PLATFORM_OTHERS:
     import bcrypt
 from rhodecode.lib import str2bool
 from rhodecode.lib.exceptions import LdapPasswordError, LdapUsernameError
 from rhodecode.lib.utils import get_repo_slug
 from rhodecode.lib.auth_ldap import AuthLdap
@@ @@ -86,15 +86,15 @@ class RhodeCodeCrypto(object): @@
         """
         Cryptographic function used for password hashing based on pybcrypt
         or pycrypto in windows
         :param password: password to hash
         """
-        if __platform__ == 'Windows':
+        if __platform__ in PLATFORM_WIN:
             return sha256(str_).hexdigest()
-        elif __platform__ in ('Linux', 'Darwin'):
+        elif __platform__ in PLATFORM_OTHERS:
             return bcrypt.hashpw(str_, bcrypt.gensalt(10))
         else:
             raise Exception('Unknown or unsupported platform %s' % __platform__)
     @classmethod
     def hash_check(cls, password, hashed):

rhodecode/templates/base/base.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <title>${next.title()}</title>
     <link rel="icon" href="${h.url('/images/icons/database_gear.png')}" type="image/png" />
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
     <meta name="robots" content="index, nofollow"/>
     <!-- stylesheets -->

rhodecode/templates/errors/error_document.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>Error - ${c.error_message}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 	    %if c.redirect_time:
 	        <meta http-equiv="refresh" content="${c.redirect_time}; url=${c.url_redirect}"/>
 	    %endif

rhodecode/templates/login.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>${_('Sign In')} - ${c.rhodecode_name}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
         <link rel="icon" href="${h.url("/images/icons/database_gear.png")}" type="image/png" />
         <meta name="robots" content="index, nofollow"/>

rhodecode/templates/password_reset.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>${_('Reset You password')} - ${c.rhodecode_name}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
         <link rel="icon" href="${h.url("/images/hgicon.png")}" type="image/png" />
         <meta name="robots" content="index, nofollow"/>

rhodecode/templates/register.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>${_('Sign Up')} - ${c.rhodecode_name}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
         <link rel="icon" href="${h.url("/images/hgicon.png")}" type="image/png" />
         <meta name="robots" content="index, nofollow"/>

setup.py

➞

Show inline comments

 import sys
 from rhodecode import get_version
 from rhodecode import __platform__
 py_version = sys.version_info
 if py_version < (2, 5):
     raise Exception('RhodeCode requires python 2.5 or later')
 requirements = [
         "Pylons==1.0.0",
         "WebHelpers==1.2",
         "SQLAlchemy==0.6.6",
         "Mako==0.4.0",
         "vcs==0.1.11",
@@ @@ -72,13 +75,13 @@ packages = find_packages(exclude=['ez_se @@
 setup(
     name='RhodeCode',
     version=get_version(),
     description=description,
     long_description=long_description,
     keywords=keywords,
-    license='BSD',
+    license='GPLv3',
     author='Marcin Kuzminski',
     author_email='marcin@python-works.com',
     url='http://rhodecode.org',
     install_requires=requirements,
     classifiers=classifiers,
     setup_requires=["PasteScript>=1.6.3"],

0 comments (0 inline, 0 general)