Mercurial > kallithea
changeset 5122:dbbe3b1a442d
Merge stable
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 13 May 2015 01:27:19 +0200 |
parents | e04106e46d6f (current diff) 442d81c381dc (diff) |
children | 1f2269c26f93 |
files | kallithea/lib/utils2.py kallithea/public/css/style.css |
diffstat | 8 files changed, 15 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/config/middleware.py Mon Mar 30 21:27:02 2015 +0200 +++ b/kallithea/config/middleware.py Wed May 13 01:27:19 2015 +0200 @@ -87,15 +87,15 @@ else: app = StatusCodeRedirect(app, [400, 401, 403, 404, 500]) - # Enable https redirects based on HTTP_X_URL_SCHEME set by proxy - if any(asbool(config.get(x)) for x in ['https_fixup', 'force_https', 'use_htsts']): - app = HttpsFixup(app, config) - # we want our low level middleware to get to the request ASAP. We don't # need any pylons stack middleware in them - especially no StatusCodeRedirect buffering app = SimpleHg(app, config) app = SimpleGit(app, config) + # Enable https redirects based on HTTP_X_URL_SCHEME set by proxy + if any(asbool(config.get(x)) for x in ['https_fixup', 'force_https', 'use_htsts']): + app = HttpsFixup(app, config) + app = RequestWrapper(app, config) # logging # Establish the Registry for this application
--- a/kallithea/lib/utils2.py Mon Mar 30 21:27:02 2015 +0200 +++ b/kallithea/lib/utils2.py Wed May 13 01:27:19 2015 +0200 @@ -564,9 +564,9 @@ return datetime.datetime.fromtimestamp(tm) # Must match regexp in kallithea/public/js/base.js MentionsAutoComplete() -# Eat char before @ - it must not look like we are in an email addresses. +# Check char before @ - it must not look like we are in an email addresses. # Matching is gready so we don't have to look beyond the end. -MENTIONS_REGEX = re.compile(r'(?:^|[^a-zA-Z0-9])@([a-zA-Z0-9][-_.a-zA-Z0-9]*[a-zA-Z0-9])') +MENTIONS_REGEX = re.compile(r'(?:^|(?<=[^a-zA-Z0-9]))@([a-zA-Z0-9][-_.a-zA-Z0-9]*[a-zA-Z0-9])') def extract_mentioned_users(s): r"""
--- a/kallithea/public/css/style.css Mon Mar 30 21:27:02 2015 +0200 +++ b/kallithea/public/css/style.css Wed May 13 01:27:19 2015 +0200 @@ -3509,6 +3509,10 @@ color: inherit; } +ul.nav-stacked li.active { + list-style-type: disc +} + /* make .btn inputs and buttons and divs look the same */ button.btn, input.btn {
--- a/kallithea/public/js/graph.js Mon Mar 30 21:27:02 2015 +0200 +++ b/kallithea/public/js/graph.js Wed May 13 01:27:19 2015 +0200 @@ -89,7 +89,7 @@ } var edge_pad = this.dot_radius + 2; - var box_size = Math.min(18, Math.floor((canvasWidth - edge_pad*2)/(lineCount))); + var box_size = Math.min(18, (canvasWidth - edge_pad * 2) / lineCount); var base_x = canvasWidth - edge_pad; for (var i=0; i < data.length; ++i) { @@ -115,7 +115,7 @@ end = line[1]; color = line[2]; - x = base_x - box_size * start; + x = Math.floor(base_x - box_size * start); // figure out if this is a dead-end; // we want to fade away this line @@ -165,7 +165,7 @@ } else { - var x2 = base_x - box_size * end; + var x2 = Math.floor(base_x - box_size * end); var ymid = (rowY+nextY) / 2; this.ctx.bezierCurveTo (x,ymid,x2,ymid,x2,nextY); } @@ -175,7 +175,7 @@ column = node[0]; color = node[1]; - x = base_x - box_size * column; + x = Math.floor(base_x - box_size * column); this.setColor(color, 0.25, 0.75); if (closing)
--- a/kallithea/templates/admin/defaults/defaults.html Mon Mar 30 21:27:02 2015 +0200 +++ b/kallithea/templates/admin/defaults/defaults.html Wed May 13 01:27:19 2015 +0200 @@ -22,8 +22,6 @@ ${self.breadcrumbs()} </div> - <h3>${_('Repository Defaults')}</h3> - ${h.form(url('default', id='defaults'),method='put')} <div class="form"> <!-- fields -->
--- a/kallithea/templates/admin/permissions/permissions_ips.html Mon Mar 30 21:27:02 2015 +0200 +++ b/kallithea/templates/admin/permissions/permissions_ips.html Wed May 13 01:27:19 2015 +0200 @@ -1,5 +1,3 @@ -<h4>${_('Default IP Whitelist for All Users')}</h4> - <div class="ips_wrap"> <table class="noborder"> %if c.user_ip_map:
--- a/kallithea/templates/admin/permissions/permissions_perms.html Mon Mar 30 21:27:02 2015 +0200 +++ b/kallithea/templates/admin/permissions/permissions_perms.html Wed May 13 01:27:19 2015 +0200 @@ -1,5 +1,3 @@ -<h4>${_('Default User Permissions Overview')}</h4> - ## permissions overview <%namespace name="p" file="/base/perms_summary.html"/> ${p.perms_summary(c.perm_user.permissions, show_all=True)}
--- a/kallithea/templates/admin/users/user_edit_api_keys.html Mon Mar 30 21:27:02 2015 +0200 +++ b/kallithea/templates/admin/users/user_edit_api_keys.html Wed May 13 01:27:19 2015 +0200 @@ -58,7 +58,7 @@ <div class="fields"> <div class="field"> <div class="label"> - <label for="new_email">${_('New api key')}:</label> + <label for="description">${_('New api key')}:</label> </div> <div class="input"> ${h.text('description', class_='medium', placeholder=_('Description'))}