diff --git a/kallithea/config/middleware.py b/kallithea/config/middleware.py
--- a/kallithea/config/middleware.py
+++ b/kallithea/config/middleware.py
@@ -87,15 +87,15 @@ def make_app(global_conf, full_stack=Tru
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
diff --git a/kallithea/lib/utils2.py b/kallithea/lib/utils2.py
--- a/kallithea/lib/utils2.py
+++ b/kallithea/lib/utils2.py
@@ -564,9 +564,9 @@ def time_to_datetime(tm):
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"""
diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css
--- a/kallithea/public/css/style.css
+++ b/kallithea/public/css/style.css
@@ -3509,6 +3509,10 @@ ul.nav-stacked a {
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 {
diff --git a/kallithea/public/js/graph.js b/kallithea/public/js/graph.js
--- a/kallithea/public/js/graph.js
+++ b/kallithea/public/js/graph.js
@@ -89,7 +89,7 @@ function BranchRenderer(canvas_id, conte
}
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 @@ function BranchRenderer(canvas_id, conte
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 @@ function BranchRenderer(canvas_id, conte
}
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 @@ function BranchRenderer(canvas_id, conte
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)
diff --git a/kallithea/templates/admin/defaults/defaults.html b/kallithea/templates/admin/defaults/defaults.html
--- a/kallithea/templates/admin/defaults/defaults.html
+++ b/kallithea/templates/admin/defaults/defaults.html
@@ -22,8 +22,6 @@
${self.breadcrumbs()}
-