kallithea Changeset - dbbe3b1a442d

Changeset - dbbe3b1a442d

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 8 0

Mads Kiilerich - 11 years ago 2015-05-13 01:27:19
madski@unity3d.com

Merge stable

8 files changed with 15 insertions and 17 deletions:

kallithea/config/middleware.py

kallithea/lib/utils2.py

kallithea/public/css/style.css

kallithea/public/js/graph.js

kallithea/templates/admin/defaults/defaults.html

kallithea/templates/admin/permissions/permissions_ips.html

kallithea/templates/admin/permissions/permissions_perms.html

kallithea/templates/admin/users/user_edit_api_keys.html

0 comments (0 inline, 0 general)

kallithea/config/middleware.py

➞

Show inline comments

@@ @@ -84,21 +84,21 @@ def make_app(global_conf, full_stack=Tru @@
         # Note: will buffer the output in memory!
         if asbool(config['debug']):
             app = StatusCodeRedirect(app)
         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
     app = RegistryManager(app) # thread / request-local module globals / variables
     if asbool(static_files):

kallithea/lib/utils2.py

➞

Show inline comments

@@ @@ -561,15 +561,15 @@ def time_to_datetime(tm): @@
                 tm = float(tm)
             except ValueError:
                 return
         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"""
     Returns unique usernames from given string s that have @mention
     :param s: string to get mentions

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -3506,12 +3506,16 @@ ul.nav-stacked { @@
+}
 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 {
     font-family: inherit;
     font-size: inherit;
     line-height: inherit;

kallithea/public/js/graph.js

➞

Show inline comments

@@ @@ -86,13 +86,13 @@ function BranchRenderer(canvas_id, conte @@
 				if (m > lineCount)
 					lineCount = m;
+			}
+		}
 		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) {
 			var row = document.getElementById(row_id_prefix+idx);
 			if (row == null) {
 				console.log("error: row "+row_id_prefix+idx+" not found");
@@ @@ -112,13 +112,13 @@ function BranchRenderer(canvas_id, conte @@
 			for (var j in in_l) {
 				line = in_l[j];
 				start = line[0];
 				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
 				var dead_end = true;
 				if (next != null) {
 					nextdata = data[i+1];
@@ @@ -162,23 +162,23 @@ function BranchRenderer(canvas_id, conte @@
 				if (start == end)
+				{
 					this.ctx.lineTo(x,nextY+extra,3);
+				}
 				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);
+				}
 				this.ctx.stroke();
+			}
 			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)
+			{
 				this.ctx.fillRect(x - this.close_x, rowY - this.close_y, 2*this.close_x, 2*this.close_y);
+			}

kallithea/templates/admin/defaults/defaults.html

➞

Show inline comments

@@ @@ -19,14 +19,12 @@ @@
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <h3>${_('Repository Defaults')}</h3>
     ${h.form(url('default', id='defaults'),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">

kallithea/templates/admin/permissions/permissions_ips.html

➞

Show inline comments

 <h4>${_('Default IP Whitelist for All Users')}</h4>
 <div class="ips_wrap">
       <table class="noborder">
       %if c.user_ip_map:
         %for ip in c.user_ip_map:
           <tr>
               <td><div class="ip">${ip.ip_addr}</div></td>

kallithea/templates/admin/permissions/permissions_perms.html

➞

Show inline comments

 <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)}

kallithea/templates/admin/users/user_edit_api_keys.html

➞

Show inline comments

@@ @@ -55,13 +55,13 @@ @@
     ${h.form(url('edit_user_api_keys', id=c.user.user_id), method='put')}
     <div class="form">
         <!-- fields -->
         <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'))}
                     ${h.select('lifetime', '', c.lifetime_options)}
                 </div>
              </div>

0 comments (0 inline, 0 general)