##// END OF EJS Templates
Migrate to Mergely 3.3.4....
Migrate to Mergely 3.3.4. RhodeCode 2.2.5 distributed Mergely 3.3.4 with some of the changes that Mergely 3.3.3 in RhodeCode 1.7.2 also had. That do however not seem to be changes we want for Kallithea this way and we take the 3.3.4 files as they are. I've also included the Mergely license file, as downloaded from: http://www.mergely.com/license.php That LICENSE file is kept in HTML just as it was downloaded from their website. While it's a bit annoying to keep the license file in HTML, this is the way it came from upstream so we'll leave it that way. Since the Javascript code is used with other GPLv3 Javascript, we are using the GPL option of Mergely's tri-license. Finally, note that previously, this was incorrectly called "mergerly", so the opportunity is taken here to correct the name. That required changes to diff_2way.html. As commands:: $ wget -N --output-document LICENSE-MERGELY.html http://www.mergely.com/license.php $ hg add LICENSE-MERGELY.html $ hg mv rhodecode/public/css/mergerly.css rhodecode/public/css/mergely.css $ hg mv rhodecode/public/js/mergerly.js rhodecode/public/js/mergely.js $ sed -i 's,mergerly\.,mergely,g' rhodecode/templates/files/diff_2way.html $ ( cd /tmp; \ wget -N http://www.mergely.com/releases/mergely-3.3.4.zip; \ unzip mergely-3.3.4.zip ) $ sha256sum /tmp/mergely-3.3.4.zip 87415d30494bbe829c248881aa7cdc0303f7e70b458a5f687615564d4498cc82 mergely-3.3.4.zip $ cp /tmp/mergely-3.3.4/lib/mergely.js rhodecode/public/js/mergely.js $ cp /tmp/mergely-3.3.4/lib/mergely.css rhodecode/public/css/mergely.css $ sed -i -e '/^ \* Version/a\ *\n * NOTE by bkuhn@sfconservancy.org for Kallithea:\n * Mergely license appears at http://www.mergely.com/license.php and in LICENSE-MERGELY.html' rhodecode/public/js/mergely.js rhodecode/public/css/mergely.css

File last commit:

r4116:ffd45b18 rhodecode-2.2.5-gpl
r4125:aa3b5594 rhodecode-2.2.5-gpl
Show More
permissions_globals.html
113 lines | 5.4 KiB | text/html | HtmlLexer
${h.form(url('admin_permissions'), method='post')}
<div class="form">
<!-- fields -->
<div class="fields">
<div class="field">
<div class="label label-checkbox">
<label for="anonymous">${_('Anonymous access')}:</label>
</div>
<div class="checkboxes">
<div class="checkbox">
${h.checkbox('anonymous',True)}
</div>
<span class="help-block">${h.literal(_('Allow access to RhodeCode without need to log in. Anonymous users use %s user permissions' % (h.link_to('*default*',h.url('admin_permissions_perms')))))}</span>
</div>
</div>
<div class="field">
<div class="label">
<label for="default_repo_perm">${_('Repository')}:</label>
</div>
<div class="select">
${h.select('default_repo_perm','',c.repo_perms_choices)}
${h.checkbox('overwrite_default_repo','true')}
<label for="overwrite_default_repo">
<span class="tooltip"
title="${h.tooltip(_('All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost'))}">
${_('Overwrite existing settings')}</span> </label>
</div>
</div>
<div class="field">
<div class="label">
<label for="default_group_perm">${_('Repository group')}:</label>
</div>
<div class="select">
${h.select('default_group_perm','',c.group_perms_choices)}
${h.checkbox('overwrite_default_group','true')}
<label for="overwrite_default_group">
<span class="tooltip"
title="${h.tooltip(_('All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost'))}">
${_('Overwrite existing settings')}</span> </label>
</div>
</div>
<div class="field">
<div class="label">
<label for="default_group_perm">${_('User group')}:</label>
</div>
<div class="select">
${h.select('default_user_group_perm','',c.user_group_perms_choices)}
${h.checkbox('overwrite_default_user_group','true')}
<label for="overwrite_default_user_group">
<span class="tooltip"
title="${h.tooltip(_('All default permissions on each user group will be reset to chosen permission, note that all custom default permission on repository groups will be lost'))}">
${_('Overwrite existing settings')}</span> </label>
</div>
</div>
<div class="field">
<div class="label">
<label for="default_repo_create">${_('Repository creation')}:</label>
</div>
<div class="select">
${h.select('default_repo_create','',c.repo_create_choices)}
</div>
</div>
<div class="field">
<div class="label label-checkbox">
<label for="create_on_write">${_('Repository creation with group write access')}:</label>
</div>
<div class="select">
${h.select('create_on_write','',c.repo_create_on_write_choices)}
<span class="help-block">${_('Write permission to repository groups allows creating repositories inside that group')}</span>
</div>
</div>
<div class="field">
<div class="label">
<label for="default_user_group_create">${_('User group creation')}:</label>
</div>
<div class="select">
${h.select('default_user_group_create','',c.user_group_create_choices)}
</div>
</div>
<div class="field">
<div class="label">
<label for="default_fork">${_('Repository forking')}:</label>
</div>
<div class="select">
${h.select('default_fork','',c.fork_choices)}
</div>
</div>
<div class="field">
<div class="label">
<label for="default_register">${_('Registration')}:</label>
</div>
<div class="select">
${h.select('default_register','',c.register_choices)}
</div>
</div>
<div class="field">
<div class="label">
<label for="default_extern_activate">${_('External auth account activation')}:</label>
</div>
<div class="select">
${h.select('default_extern_activate','',c.extern_activate_choices)}
</div>
</div>
<div class="buttons">
${h.submit('save',_('Save'),class_="btn")}
${h.reset('reset',_('Reset'),class_="btn")}
</div>
</div>
</div>
${h.end_form()}