summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merged r17219 from trunk to 3.4-stable (#28259).Go MAEDA2018-03-022-8/+8
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17220 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17209 from trunk to 3.4-stable (#28079).Go MAEDA2018-02-232-2/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17210 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17207 from trunk to 3.4-stable (#28079).Go MAEDA2018-02-224-6/+4
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17208 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17204 from trunk to 3.4-stable (#28168).Go MAEDA2018-02-181-2/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17205 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 3.4-stable: Too large avatar breaks gantt when assignee is a group (#28204).Go MAEDA2018-02-182-0/+2
| | | | | | | Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17202 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17199 from trunk to 3.4-stable (#28110).Go MAEDA2018-02-183-0/+51
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17200 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17195 from trunk to 3.4-stable (#28113).Go MAEDA2018-02-111-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17196 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17192 from trunk to 3.4-stable (#28102).Go MAEDA2018-02-011-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17193 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17188 from trunk to 3.4-stable (#28109)Toshi MARUYAMA2018-01-311-1/+1
| | | | | | | | fix interpolation in Swedish locale. Contributed by Felix Schäfer. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17190 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17181 from trunk to 3.4-stable (#27862).Go MAEDA2018-01-191-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17182 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17177 from trunk to 3.4-stable (#27994).Go MAEDA2018-01-171-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17178 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17170 from trunk to 3.4-stable (#27963).Go MAEDA2018-01-101-2/+0
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17171 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17162 to 3.4-stable.Jean-Philippe Lang2018-01-082-1/+71
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17163 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17160 to 3.4-stable (#20513).Jean-Philippe Lang2018-01-082-3/+0
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17161 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17158 to 3.4-stable (#26705).Jean-Philippe Lang2018-01-083-3/+126
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17159 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17155 and r17156 to 3.4-stable (#27153).Jean-Philippe Lang2018-01-072-1/+21
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17157 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17153 to 3.4-stable (#26880).Jean-Philippe Lang2018-01-072-0/+42
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17154 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17150 to 3.4-stable (#26699).Jean-Philippe Lang2018-01-073-3/+12
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17151 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17147 to 3.4-stable (#27885).Jean-Philippe Lang2018-01-073-0/+67
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17148 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17144 to 3.4-stable (#27881).Jean-Philippe Lang2018-01-072-2/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17145 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17141 from trunk to 3.4-stable (#27695).Go MAEDA2018-01-071-1/+7
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17142 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17129 to 3.4-stable (#27533).Go MAEDA2017-12-261-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17130 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17123 from trunk to 3.4-stable (#27620)Toshi MARUYAMA2017-12-211-46/+44
| | | | | | Brazilian translation for 3.4-stable update by Patrick Kaminski. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17125 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17122 from trunk to 3.4-stable (#27620, #27835)Toshi MARUYAMA2017-12-211-4/+2
| | | | | | Brazilian translation for 3.3-stable update by Patrick Kaminski. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17124 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17116 from trunk to 3.4-stable (#27691)Toshi MARUYAMA2017-12-171-1/+1
| | | | | | Gemfile: relax mail gem version. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17117 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17113 to 3.4-stable (#22532).Go MAEDA2017-12-132-1/+10
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17114 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 3.4-stable: Gemfile: use nokogiri 1.8 for Ruby >= 2.1 (#27505)Toshi MARUYAMA2017-12-111-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17112 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17108 to 3.4-stable (#19578).Go MAEDA2017-12-111-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17109 e93f8b46-1217-0410-a6f0-8f06a7374b81
* iMerged r17105 to 3.4-stable (#27333).Go MAEDA2017-12-101-1/+1
| | | | | | | Patch by Mizuki ISHIKAWA. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17106 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17089 from trunk to 3.4-stable (#27507, #27767)Toshi MARUYAMA2017-12-092-11/+12
| | | | | | Czech help files translation for 3.4-stable updated by Karel Pičman. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17097 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17088 from trunk to 3.4-stableToshi MARUYAMA2017-12-092-20/+34
| | | | | | Czech help files html clean up git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17096 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17087 from trunk to 3.4-stable (#27507, #27766)Toshi MARUYAMA2017-12-094-21/+21
| | | | | | Czech help files translation for 3.3-stable updated by Karel Pičman. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17095 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17086 from trunk to 3.4-stable (#20452)Toshi MARUYAMA2017-12-091-4/+0
| | | | | | fix public/help/cs/wiki_syntax_detailed_markdown.html broken by r14519. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17094 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17084 from trunk to 3.4-stable (#27506, #27767)Toshi MARUYAMA2017-12-091-22/+22
| | | | | | Czech translation for 3.4-stable updated by Karel Pičman. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17093 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17083 from trunk to 3.4-stable (#27506, #27766)Toshi MARUYAMA2017-12-091-5/+5
| | | | | | Czech translation for 3.3-stable updated by Karel Pičman. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17092 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17082 from trunk to 3.4-stable (#27502)Toshi MARUYAMA2017-12-091-27/+27
| | | | | | Lithuanian translation for 3.4-stable updated by Marius Žilėnas. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17091 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17081 from trunk to 3.4-stable (#27502, #27765)Toshi MARUYAMA2017-12-091-16/+17
| | | | | | Lithuanian translation for 3.3-stable updated by Marius Žilėnas. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17090 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17078 to 3.4-stable (#27754).Go MAEDA2017-12-092-1/+16
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17079 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17062 from trunk to 3.4-stable (#27516)Toshi MARUYAMA2017-12-072-19/+20
| | | | | | | | | | | mercurial: work around faulty parsing of early command options Use -sVALUE and --long=VALUE instead of "-s VALUE" and "--long VALUE" respectively. Contributed by Yuya Nishihara. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17068 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17061 from trunk to 3.4-stable (#27516)Toshi MARUYAMA2017-12-071-5/+5
| | | | | | | | | | | | mercurial: separate command options and positional arguments with "--" We don't have much problems here thanks to hgtarget(path) and CGI.escape(), which prepends a repository path and encodes "=" character respectively, but it's better to not rely on the side effect of these functions. Contributed by Yuya Nishihara. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17067 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17060 from trunk to 3.4-stable (#27516)Toshi MARUYAMA2017-12-072-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | mercurial: reject malicious command argument We've got a security report from the Phabricator team, which basically says --config and --debugger arguments can be injected anywhere to lead to an arbitrary command execution. https://secure.phabricator.com/rPa7921a4448093d00defa8bd18f35b8c8f8bf3314 This is a fundamental issue of the argument parsing rules in Mercurial, which allows extensions to populate their parsing rules and such extensions can be loaded by "--config extensions.<name>=". There's a chicken and egg problem. We're working on hardening the parsing rules, but which won't come in by default as it would be a behavior change. This patch adds a verification to reject malicious command arguments as a last ditch. The subsequent patches will fix the problem in more appropriate way. Contributed by Yuya Nishihara. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17066 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17056 to 3.4-stable (#27663).Go MAEDA2017-12-063-3/+25
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17057 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17045 to 3.4-stable (#27649).Go MAEDA2017-11-271-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17046 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17042 to 3.4-stale (#27642).Go MAEDA2017-11-271-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17043 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17039 to 3.4-stable (#27139).Go MAEDA2017-11-271-3/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17040 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17032 to 3.4-stable (#27110).Go MAEDA2017-11-261-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17033 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17027 to 3.4-stable (#26410).Go MAEDA2017-11-252-1/+5
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17028 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17023 to 3.4-stable (#27586).Go MAEDA2017-11-251-3/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17024 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17019 from trunk to 3.4-stableToshi MARUYAMA2017-11-051-0/+1
| | | | | | Gemfile: pin mail gem version to prevent failure of MailHandlerTest#test_add_issue_with_localized_attributes git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17020 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 3.4-stable: Gemfile: pin public_suffix if ruby < 2.0 (#27229)Toshi MARUYAMA2017-10-191-1/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17014 e93f8b46-1217-0410-a6f0-8f06a7374b81