summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 3.4-stable: Gemfile: pin public_suffix if ruby < 2.1Toshi MARUYAMA2017-10-171-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17011 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17003 and r17004.Jean-Philippe Lang2017-10-152-1/+61
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17005 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Editing issues no longer sends notifications to previous assignee (#26627).Jean-Philippe Lang2017-10-153-11/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17002 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16999 and r17000 (#26667).Jean-Philippe Lang2017-10-153-2/+37
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17001 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16997 (#26667).Jean-Philippe Lang2017-10-152-2/+16
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16998 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16995 (#26682).Jean-Philippe Lang2017-10-151-1/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16996 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16993 (#26689).Jean-Philippe Lang2017-10-151-2/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16994 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16990 (#26780).Jean-Philippe Lang2017-10-151-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16991 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16924 and r16925 (#26520).Jean-Philippe Lang2017-10-153-1/+16
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16989 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16983 to r16985 (#27186).Jean-Philippe Lang2017-10-153-3/+7
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16986 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16977 from trunk to 3.4-stable (#27034)Toshi MARUYAMA2017-10-131-1/+1
| | | | | | Chinese "label_font_monospace" translation changed by Sharuru Zhang. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16981 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16976 from trunk to 3.4-stable (#27034)Toshi MARUYAMA2017-10-131-2/+2
| | | | | | Chinese translation for 3.4-stable updated by Sharuru Zhang. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16980 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16975 from trunk to 3.4-stable (#25702)Toshi MARUYAMA2017-10-131-1/+1
| | | | | | Gemfile: update rbpdf version to 1.19.3. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16979 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16971 (#27186).Jean-Philippe Lang2017-10-121-1/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16972 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16965 from trunk to 3.4-stable (#26703)Toshi MARUYAMA2017-09-151-18/+17
| | | | | | German translation for 3.4-stable updated by Peter Pfläging. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16969 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16964 from trunk to 3.4-stable (#26703, #27006)Toshi MARUYAMA2017-09-151-4/+2
| | | | | | German translation for 3.3-stable updated by Peter Pfläging. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16968 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16957 from trunk to 3.4-stable (#26599)Toshi MARUYAMA2017-08-302-3/+25
| | | | | | | | fix file name corruption when export a wiki page with non-ASCII title in MS browsers. Contributed by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16959 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16938 from trunk to 3.4-stable (#22320)Toshi MARUYAMA2017-08-091-4/+6
| | | | | | try IssueTest#test_overdue failing on CI server at Japanese daytime. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16951 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16948 from trunk to 3.4-stable (#26645)Toshi MARUYAMA2017-08-081-1/+1
| | | | | | git: remove "--no-color" option from "git --version" for git 2.14 compatibility. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16949 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16926.Jean-Philippe Lang2017-07-301-3/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16927 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16843 (#26403).Jean-Philippe Lang2017-07-301-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16923 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16921 (#26568).Jean-Philippe Lang2017-07-301-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16922 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16918 and r16919 (#26564).Jean-Philippe Lang2017-07-302-1/+13
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16920 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16894 from trunk to 3.4-stableToshi MARUYAMA2017-07-271-0/+1
| | | | | | add missing fixture for IssueTest#test_update_should_notify_previous_assignee git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16895 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16874.Jean-Philippe Lang2017-07-251-0/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16888 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16841 (#26492).Jean-Philippe Lang2017-07-221-3/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16847 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16835 (#26468).Jean-Philippe Lang2017-07-221-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16846 e93f8b46-1217-0410-a6f0-8f06a7374b81