diff --git a/kallithea/lib/vcs/backends/git/repository.py b/kallithea/lib/vcs/backends/git/repository.py --- a/kallithea/lib/vcs/backends/git/repository.py +++ b/kallithea/lib/vcs/backends/git/repository.py @@ -18,12 +18,18 @@ import urllib2 import logging import posixpath import string -try: - # Python <=2.7 - from pipes import quote -except ImportError: - # Python 3.3+ - from shlex import quote +import sys +if sys.platform == "win32": + from subprocess import list2cmdline + def quote(s): + return list2cmdline([s]) +else: + try: + # Python <=2.7 + from pipes import quote + except ImportError: + # Python 3.3+ + from shlex import quote from dulwich.objects import Tag from dulwich.repo import Repo, NotGitRepository diff --git a/kallithea/model/repo.py b/kallithea/model/repo.py --- a/kallithea/model/repo.py +++ b/kallithea/model/repo.py @@ -210,9 +210,9 @@ class RepoModel(BaseModel): def desc(desc): if c.visual.stylify_metatags: - return h.urlify_text(h.desc_stylize(h.escape(h.truncate(desc, 60)))) + return h.urlify_text(h.desc_stylize(h.html_escape(h.truncate(desc, 60)))) else: - return h.urlify_text(h.escape(h.truncate(desc, 60))) + return h.urlify_text(h.html_escape(h.truncate(desc, 60))) def state(repo_state): return _render("repo_state", repo_state) diff --git a/kallithea/public/js/base.js b/kallithea/public/js/base.js --- a/kallithea/public/js/base.js +++ b/kallithea/public/js/base.js @@ -735,6 +735,9 @@ var deleteComment = function(comment_id) var success = function(o){ var $deleted = $('#comment-tr-'+comment_id); var $prev = $deleted.prev('tr'); + while ($prev.hasClass('inline-comments')){ + $prev = $prev.prev('tr'); + } $deleted.remove(); _placeAddButton($prev); } diff --git a/kallithea/templates/files/files_browser.html b/kallithea/templates/files/files_browser.html --- a/kallithea/templates/files/files_browser.html +++ b/kallithea/templates/files/files_browser.html @@ -90,7 +90,7 @@