Matteo Bertini avatar Matteo Bertini committed e57b7e1 Merge

merge

Comments (0)

Files changed (107)

 *.pyc
 *.swp
 *.sqlite
-Paste*.egg
+*.egg-info
+*.egg
 
 syntax: regexp
 ^rcextensions
 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
+dbc82e3362a25d2aece42060089824c4342efd17 v1.3.0
+79a95f338fd0115b2cdb77118f39e17d22ff505c v1.3.1
+9ab21c5ddb84935bea5c743b4e147ed5a398b30c v1.3.2
+934906f028b582a254e0028ba25e5d20dd32b9cd v1.3.3

File contents unchanged.

File contents unchanged.

File contents unchanged.

File contents unchanged.

File contents unchanged.

docs/changelog.rst

 =========
 
 
+<<<<<<< local
 1.3.4 (**2012-XX-XX**)
 ----------------------
 
 
 fixes
 +++++
+||||||| base
+1.3.4 (**2012-XX-XX**)
+----------------------
+
+:status: in-progress
+:branch: beta
+
+news
+++++
+
+
+fixes
++++++
+=======
+>>>>>>> other
 
 - fixed #390 cache invalidation problems on repos inside group
 - fixed #385 clone by ID url was loosing proxy prefix in URL

File contents unchanged.

File contents unchanged.

File contents unchanged.

File contents unchanged.

Add a comment to this file

docs/theme/nature/layout.html

File contents unchanged.

File contents unchanged.

Add a comment to this file

docs/usage/git_support.rst

File contents unchanged.

Add a comment to this file

docs/usage/statistics.rst

File contents unchanged.

File contents unchanged.

 ## all running rhodecode instances. Leave empty if you don't use it
 instance_id = 
 
+<<<<<<< local
 ## alternative return HTTP header for failed authentication. Default HTTP
 ## response is 401 HTTPUnauthorized. Currently HG clients have troubles with 
 ## handling that. Set this variable to 403 to return HTTPForbidden
 auth_ret_code =
 
+||||||| base
+=======
+errormator = true
+errormator.server_url = https://api.errormator.com
+errormator.api_key = AewWgTYtmlcijfJlARVJYJUwFcekxyCi
+errormator.buffer_flush_time = 60
+errormator.server = RhodeCode/Demo
+errormator.report_404 = true
+
+
+>>>>>>> other
 ####################################
 ###        CELERY CONFIG        ####
 ####################################

File contents unchanged.

rhodecode/__init__.py

 import sys
 import platform
 
+<<<<<<< local
 VERSION = (1, 3, 4, 'b')
 
 try:
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])) +
                '.'.join(VERSION[3:]))
+||||||| base
+VERSION = (1, 3, 4, 'beta')
+__version__ = '.'.join((str(each) for each in VERSION[:4]))
+=======
+VERSION = (1, 3, 3)
+__version__ = '.'.join((str(each) for each in VERSION[:4]))
+>>>>>>> other
 __dbversion__ = 5  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'GPLv3'
     requirements.append("mercurial>=2.1,<2.2")
 
 
+<<<<<<< local
+||||||| base
+try:
+    from rhodecode.lib import get_current_revision
+    _rev = get_current_revision()
+except ImportError:
+    # this is needed when doing some setup.py operations
+    _rev = False
+
+if len(VERSION) > 3 and _rev:
+    __version__ += ' [rev:%s]' % _rev[0]
+
+
+=======
+try:
+    from rhodecode.lib import get_current_revision
+    _rev = get_current_revision(quiet=True)
+except ImportError:
+    # this is needed when doing some setup.py operations
+    _rev = False
+
+if len(VERSION) > 3 and _rev:
+    __version__ += ' [rev:%s]' % _rev[0]
+
+
+>>>>>>> other
 def get_version():
     """Returns shorter version (digit parts only) as string."""
 
Add a comment to this file

rhodecode/config/deployment.ini_tmpl

File contents unchanged.

Add a comment to this file

rhodecode/config/environment.py

File contents unchanged.

rhodecode/config/middleware.py

 
     if asbool(full_stack):
 
-        # Handle Python exceptions
+        # Handle Python exceptions via errormator
+        if asbool(config.get('errormator')):
+            try:
+                from errormator_client import make_errormator_middleware
+                app = make_errormator_middleware(app, config)
+            except ImportError:
+                pass
+
         app = ErrorHandler(app, global_conf, **config['pylons.errorware'])
 
         # we want our low level middleware to get to the request ASAP. We don't
Add a comment to this file

rhodecode/config/routing.py

File contents unchanged.

Add a comment to this file

rhodecode/controllers/admin/admin.py

File contents unchanged.

Add a comment to this file

rhodecode/controllers/admin/ldap_settings.py

File contents unchanged.

Add a comment to this file

rhodecode/controllers/admin/permissions.py

File contents unchanged.

rhodecode/controllers/admin/repos.py

         #           method='delete')
         # url('repo', repo_name=ID)
 
+        h.flash(_('deleted repository %s  [no effect in demo]')
+                % repo_name, category='success')
+        return redirect(url('repos'))
+
         repo_model = RepoModel()
         repo = repo_model.get_by_repo_name(repo_name)
         if not repo:

rhodecode/controllers/admin/settings.py

 
                     hgsettings2 = self.sa.query(RhodeCodeUi)\
                     .filter(RhodeCodeUi.ui_key == '/').one()
-                    hgsettings2.ui_value = form_result['paths_root_path']
+                    #hgsettings2.ui_value = form_result['paths_root_path']
 
                     #HOOKS
                     hgsettings3 = self.sa.query(RhodeCodeUi)\

rhodecode/controllers/admin/users.py

         #    h.form(url('delete_user', id=ID),
         #           method='delete')
         # url('user', id=ID)
+
+        h.flash(_('successfully deleted user [no effect in demo]'),
+                category='success')
+        return redirect(url('users'))
+
         user_model = UserModel()
         try:
             user_model.delete(id)
Add a comment to this file

rhodecode/controllers/api/__init__.py

File contents unchanged.

Add a comment to this file

rhodecode/controllers/api/api.py

File contents unchanged.

Add a comment to this file

rhodecode/controllers/branches.py

File contents unchanged.

Add a comment to this file

rhodecode/controllers/changelog.py

File contents unchanged.

Add a comment to this file

rhodecode/controllers/changeset.py

File contents unchanged.

Add a comment to this file

rhodecode/controllers/error.py

File contents unchanged.

Add a comment to this file

rhodecode/controllers/feed.py

File contents unchanged.

Add a comment to this file

rhodecode/controllers/files.py

File contents unchanged.

Add a comment to this file

rhodecode/controllers/home.py

File contents unchanged.

Add a comment to this file

rhodecode/controllers/journal.py

File contents unchanged.

Add a comment to this file

rhodecode/controllers/login.py

File contents unchanged.

Add a comment to this file

rhodecode/controllers/search.py

File contents unchanged.

rhodecode/controllers/settings.py

         #           method='delete')
         # url('repo_settings_delete', repo_name=ID)
 
+        h.flash(_('deleted repository %s  [no effect in demo]')
+                % repo_name, category='success')
+        return redirect(url('repos'))
+
         repo_model = RepoModel()
         repo = repo_model.get_by_repo_name(repo_name)
         if not repo:
Add a comment to this file

rhodecode/controllers/shortlog.py

File contents unchanged.

Add a comment to this file

rhodecode/controllers/summary.py

File contents unchanged.

Add a comment to this file

rhodecode/controllers/tags.py

File contents unchanged.

Add a comment to this file

rhodecode/i18n/rhodecode.pot

File contents unchanged.

Add a comment to this file

rhodecode/lib/__init__.py

File contents unchanged.

File contents unchanged.

Add a comment to this file

rhodecode/lib/auth_ldap.py

File contents unchanged.

Add a comment to this file

rhodecode/lib/backup_manager.py

File contents unchanged.

File contents unchanged.

Add a comment to this file

rhodecode/lib/celerylib/__init__.py

File contents unchanged.

Add a comment to this file

rhodecode/lib/celerylib/tasks.py

File contents unchanged.

Add a comment to this file

rhodecode/lib/colored_formatter.py

File contents unchanged.

Add a comment to this file

rhodecode/lib/db_manage.py

File contents unchanged.

Add a comment to this file

rhodecode/lib/dbmigrate/__init__.py

File contents unchanged.

Add a comment to this file

rhodecode/lib/dbmigrate/versions/002_version_1_1_0.py

File contents unchanged.

Add a comment to this file

rhodecode/lib/dbmigrate/versions/__init__.py

File contents unchanged.

Add a comment to this file

rhodecode/lib/exceptions.py

File contents unchanged.

Add a comment to this file

rhodecode/lib/helpers.py

File contents unchanged.

File contents unchanged.

Add a comment to this file

rhodecode/lib/indexers/__init__.py

File contents unchanged.

Add a comment to this file

rhodecode/lib/indexers/daemon.py

File contents unchanged.

Add a comment to this file

rhodecode/lib/middleware/https_fixup.py

File contents unchanged.

Add a comment to this file

rhodecode/lib/middleware/simplegit.py

File contents unchanged.

Add a comment to this file

rhodecode/lib/middleware/simplehg.py

File contents unchanged.

Add a comment to this file

rhodecode/lib/rcmail/smtp_mailer.py

File contents unchanged.

Add a comment to this file

rhodecode/lib/timerproxy.py

File contents unchanged.

File contents unchanged.

Add a comment to this file

rhodecode/model/__init__.py

File contents unchanged.

File contents unchanged.

Add a comment to this file

rhodecode/model/forms.py

File contents unchanged.

Add a comment to this file

rhodecode/model/permission.py

File contents unchanged.

Add a comment to this file

rhodecode/model/repo.py

File contents unchanged.

Add a comment to this file

rhodecode/model/repo_permission.py

File contents unchanged.

File contents unchanged.

rhodecode/model/user.py

                                   " crucial for entire application"))
             for k, v in form_data.items():
                 if k == 'new_password' and v != '':
-                    user.password = v
-                    user.api_key = generate_api_key(user.username)
+                    #demo application protection
+                    if user.username != 'demo':
+                        user.password = v
+                        user.api_key = generate_api_key(user.username)
                 else:
                     if k not in ['admin', 'active']:
                         setattr(user, k, v)
Add a comment to this file

rhodecode/public/css/style.css

File contents unchanged.

Add a comment to this file

rhodecode/templates/admin/permissions/permissions.html

File contents unchanged.

Add a comment to this file

rhodecode/templates/admin/repos/repos.html

File contents unchanged.

Add a comment to this file

rhodecode/templates/admin/settings/settings.html

File contents unchanged.

Add a comment to this file

rhodecode/templates/admin/users/user_edit.html

File contents unchanged.

Add a comment to this file

rhodecode/templates/admin/users/user_edit_my_account.html

File contents unchanged.

Add a comment to this file

rhodecode/templates/base/base.html

File contents unchanged.

rhodecode/templates/base/root.html

 
         ${self.css()}
 
-        %if c.ga_code:
+        ##%if c.ga_code:
         <!-- Analytics -->
 	     <script type="text/javascript">
 	      var _gaq = _gaq || [];
-	      _gaq.push(['_setAccount', '${c.ga_code}']);
+	      _gaq.push(['_setAccount', 'UA-9301385-2']);
 	      _gaq.push(['_trackPageview']);
 
 	      (function() {
 	        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
 	      })();
 	     </script>
-	    %endif
+	    ##%endif
 
         ## JAVASCRIPT ##
         <%def name="js()">
Add a comment to this file

rhodecode/templates/changelog/changelog.html

File contents unchanged.

Add a comment to this file

rhodecode/templates/changeset/changeset.html

File contents unchanged.

Add a comment to this file

rhodecode/templates/errors/error_document.html

File contents unchanged.

Add a comment to this file

rhodecode/templates/files/files_annotate.html

File contents unchanged.

Add a comment to this file

rhodecode/templates/files/files_browser.html

File contents unchanged.

Add a comment to this file

rhodecode/templates/files/files_source.html

File contents unchanged.

Add a comment to this file

rhodecode/templates/index.html

File contents unchanged.

rhodecode/templates/index_base.html

 <%page args="parent" />
+
+## DEMO TEXT START
+<div style="border: 1px solid #003367;padding:10px;margin-bottom:10px;background-color: #fff " class="top-left-rounded-corner bottom-right-rounded-corner bottom-left-rounded-corner top-right-rounded-corner">   
+
+ <h4>Welcome to RhodeCode - ${c.rhodecode_version} demo version. </h4> 
+    <br/>
+    <p><tt class="docutils literal"><span class="pre">RhodeCode</span></tt> is a fast and powerful management tool for <a class="reference external" href="http://mercurial.selenic.com/">Mercurial</a> and <a class="reference external" href="http://git-scm.com/">GIT</a>
+    with a built in push/pull server and full text search and code-review.
+    It works on http/https and has a built in permission/authentication system with
+    the ability to authenticate via LDAP or ActiveDirectory. RhodeCode also provides
+    simple API so it’s easy integrable with existing external systems.</p>
+    
+    <p>RhodeCode is similar in some respects to github or <a class="reference external" href="http://bitbucket.org/">bitbucket</a>,
+    however RhodeCode can be run as standalone hosted application on your own server.
+    It is open source and donation ware and focuses more on providing a customized,
+    self administered interface for Mercurial and GIT repositories.
+    RhodeCode is powered by a <a class="reference external" href="http://pypi.python.org/pypi/vcs">vcs</a> library that Lukasz Balcerzak and I created to
+    handle multiple different version control systems.</p>
+   
+    <br/>
+    
+        <div style="padding:10px;" id="donation_button">
+            <h5>RhodeCode is an open source software. It's available to everybody for free, forever.
+            If You would like to support future development of RhodeCode please donate</h5><br/>
+            <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+            <input type="hidden" name="cmd" value="_s-xclick">
+            <input type="hidden" name="hosted_button_id" value="8U2LLRPLBKWDU">
+            <input style="border:0px !important" type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_SM.gif" 
+            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>
+    
+    <p>See all RhodeCode features <a href="http://packages.python.org/RhodeCode/index.html#features">here </a></p>
+    
+    <p>
+    If You would like to install <b>RhodeCode</b> You can see installation docs <a href="http://packages.python.org/RhodeCode/installation.html">here</a>
+    </p>
+ <br/>
+ Default login for an administrative account is:<br/>
+ <b>login:demo</b> <br/>
+ <b>password:demo12</b> <br/>
+ <br/>
+ 
+ For better user experience deleting,updating users, and deletion of repos is turned
+ off. You can do pulls/pushes thru the demo app as you wish. You can
+ create repositories, and users. All permissions management is also available. 
+ <br/>If you want to <b>create new user</b> do it ${h.link_to(_("here"),h.url('register'))}
+ <br/>
+ <br/>
+ Please report feedback, proposals and issues to: <br/>
+ <a href="http://www.bitbucket.org/marcinkuzminski/rhodecode/issues">
+     http://www.bitbucket.org/marcinkuzminski/rhodecode/issues
+ </a>
+</div>
+## DEMO TEXT END
+
     <div class="box">
         <!-- box / title -->
         <div class="title">
Add a comment to this file

rhodecode/templates/journal/journal.html

File contents unchanged.

rhodecode/templates/login.html

         </script>
     </div>
     <!-- end login -->
+    
+    
+    <br/>
+    <div style="border: 1px solid #003367;padding:10px;background-color: #fff "  class="top-left-rounded-corner bottom-right-rounded-corner bottom-left-rounded-corner top-right-rounded-corner">   
+         
+        <h4>Welcome to RhodeCode - ${c.rhodecode_version} demo version. </h4> 
+        <br/>
+        Default login for an administrative account is:<br/>
+        <b>login:demo</b> <br/>
+        <b>password:demo12</b> <br/>
+        <br/>
+        
+    </div>
+    
 </div>
Add a comment to this file

rhodecode/templates/password_reset.html

File contents unchanged.

Add a comment to this file

rhodecode/templates/register.html

File contents unchanged.

rhodecode/templates/search/search_content.html

     %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
Add a comment to this file

rhodecode/templates/summary/summary.html

File contents unchanged.

Add a comment to this file

rhodecode/tests/__init__.py

File contents unchanged.

Add a comment to this file

rhodecode/tests/functional/test_changelog.py

File contents unchanged.

Add a comment to this file

rhodecode/tests/functional/test_summary.py

File contents unchanged.

File contents unchanged.

 [egg_info]
-tag_build = beta
+tag_build = 
 tag_svn_revision = true
 
 [easy_install]
 ]
 
 classifiers = [
-    'Development Status :: 4 - Beta',
+    'Development Status :: 5 - Production/Stable',
     'Environment :: Web Environment',
     'Framework :: Pylons',
     'Intended Audience :: Developers',

File contents unchanged.

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.