Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-27 17:59:58 +01:00
Code Issues Packages Projects Releases Activity
13,466 Commits 35 Branches 225 Tags
05dc4040c0504e9316ed7cd26f10cd7d4e39e68f
Commit Graph

13466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Go MAEDA
05dc4040c0 Merged r17195 from trunk to 3.4-stable (#28113). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17196 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-02-11 04:54:25 +00:00
Go MAEDA
410d3b8c28 Merged r17192 from trunk to 3.4-stable (#28102). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17193 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-02-01 06:56:26 +00:00
Toshi MARUYAMA
d298328fb4 Merged r17188 from trunk to 3.4-stable (#28109) 
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
 2018-01-31 18:34:51 +00:00
Go MAEDA
d105365e06 Merged r17181 from trunk to 3.4-stable (#27862). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17182 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-19 05:09:50 +00:00
Go MAEDA
6cc40b9dff Merged r17177 from trunk to 3.4-stable (#27994). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17178 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-17 02:52:28 +00:00
Go MAEDA
43ea015497 Merged r17170 from trunk to 3.4-stable (#27963). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17171 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-10 08:40:14 +00:00
Jean-Philippe Lang
9ad71c6178 Merged r17162 to 3.4-stable. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17163 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-08 17:59:06 +00:00
Jean-Philippe Lang
ab31c2e23f Merged r17160 to 3.4-stable (#20513). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17161 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-08 17:54:28 +00:00
Jean-Philippe Lang
cffc5d7026 Merged r17158 to 3.4-stable (#26705). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17159 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-08 17:52:19 +00:00
Jean-Philippe Lang
7943cb031c Merged r17155 and r17156 to 3.4-stable (#27153). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17157 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-07 22:29:24 +00:00
Jean-Philippe Lang
721f3927bb Merged r17153 to 3.4-stable (#26880). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17154 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-07 22:21:32 +00:00
Jean-Philippe Lang
c3da53217c Merged r17150 to 3.4-stable (#26699). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17151 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-07 22:05:47 +00:00
Jean-Philippe Lang
19fdcd7a1f Merged r17147 to 3.4-stable (#27885). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17148 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-07 21:47:48 +00:00
Jean-Philippe Lang
e8bc1dbaa8 Merged r17144 to 3.4-stable (#27881). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17145 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-07 21:43:04 +00:00
Go MAEDA
2a54a539bb Merged r17141 from trunk to 3.4-stable (#27695). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17142 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-07 01:30:21 +00:00
Go MAEDA
ac1f435af1 Merged r17129 to 3.4-stable (#27533). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17130 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-26 07:09:42 +00:00
Toshi MARUYAMA
c974227d1b Merged r17123 from trunk to 3.4-stable (#27620) 
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
 2017-12-21 16:26:44 +00:00
Toshi MARUYAMA
b498f92f04 Merged r17122 from trunk to 3.4-stable (#27620, #27835) 
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
 2017-12-21 16:26:30 +00:00
Toshi MARUYAMA
dfb3bff1bd Merged r17116 from trunk to 3.4-stable (#27691) 
Gemfile: relax mail gem version.

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17117 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-17 06:23:36 +00:00
Go MAEDA
d0ec0508ad Merged r17113 to 3.4-stable (#22532). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17114 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-13 14:07:15 +00:00
Toshi MARUYAMA
52244fb0f6 3.4-stable: Gemfile: use nokogiri 1.8 for Ruby >= 2.1 (#27505) 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17112 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-11 17:46:55 +00:00
Go MAEDA
1acb72786a Merged r17108 to 3.4-stable (#19578). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17109 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-11 03:15:57 +00:00
Go MAEDA
5248b6e8cc iMerged r17105 to 3.4-stable (#27333). 
Patch by Mizuki ISHIKAWA.


git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17106 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-10 15:44:02 +00:00
Toshi MARUYAMA
8913e1308e Merged r17089 from trunk to 3.4-stable (#27507, #27767) 
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
 2017-12-09 18:52:06 +00:00
Toshi MARUYAMA
a146529b7b Merged r17088 from trunk to 3.4-stable 
Czech help files html clean up

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17096 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-09 18:51:55 +00:00
Toshi MARUYAMA
04ab80e9e9 Merged r17087 from trunk to 3.4-stable (#27507, #27766) 
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
 2017-12-09 18:51:41 +00:00
Toshi MARUYAMA
d361c17785 Merged r17086 from trunk to 3.4-stable (#20452) 
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
 2017-12-09 18:51:28 +00:00
Toshi MARUYAMA
e0c899f684 Merged r17084 from trunk to 3.4-stable (#27506, #27767) 
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
 2017-12-09 18:51:17 +00:00
Toshi MARUYAMA
a2fa5aa9c3 Merged r17083 from trunk to 3.4-stable (#27506, #27766) 
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
 2017-12-09 18:51:07 +00:00
Toshi MARUYAMA
69a423bcda Merged r17082 from trunk to 3.4-stable (#27502) 
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
 2017-12-09 18:50:56 +00:00
Toshi MARUYAMA
2e92b65171 Merged r17081 from trunk to 3.4-stable (#27502, #27765) 
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
 2017-12-09 18:50:46 +00:00
Go MAEDA
aae275b4c6 Merged r17078 to 3.4-stable (#27754). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17079 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-09 02:43:09 +00:00
Toshi MARUYAMA
f093d591f1 Merged r17062 from trunk to 3.4-stable (#27516) 
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
 2017-12-07 12:16:07 +00:00
Toshi MARUYAMA
ea070df5cd Merged r17061 from trunk to 3.4-stable (#27516) 
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
 2017-12-07 12:15:56 +00:00
Toshi MARUYAMA
76dd10bd78 Merged r17060 from trunk to 3.4-stable (#27516) 
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
 2017-12-07 12:15:45 +00:00
Go MAEDA
2e8d269c05 Merged r17056 to 3.4-stable (#27663). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17057 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-06 13:23:52 +00:00
Go MAEDA
e9963f9483 Merged r17045 to 3.4-stable (#27649). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17046 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-11-27 15:21:35 +00:00
Go MAEDA
22c283c37b Merged r17042 to 3.4-stale (#27642). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17043 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-11-27 14:57:34 +00:00
Go MAEDA
cdad1f7089 Merged r17039 to 3.4-stable (#27139). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17040 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-11-27 13:05:20 +00:00
Go MAEDA
255010a71f Merged r17032 to 3.4-stable (#27110). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17033 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-11-26 02:26:33 +00:00
Go MAEDA
033fca8535 Merged r17027 to 3.4-stable (#26410). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17028 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-11-25 15:35:32 +00:00
Go MAEDA
0c661238ab Merged r17023 to 3.4-stable (#27586). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17024 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-11-25 12:54:44 +00:00
Toshi MARUYAMA
35500ef34a Merged r17019 from trunk to 3.4-stable 
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
 2017-11-05 19:39:12 +00:00
Toshi MARUYAMA
33a76924fd 3.4-stable: Gemfile: pin public_suffix if ruby < 2.0 (#27229) 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17014 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-19 15:50:51 +00:00
Toshi MARUYAMA
22b7374bbf 3.4-stable: Gemfile: pin public_suffix if ruby < 2.1 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17011 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-17 15:06:18 +00:00
Jean-Philippe Lang
3ad5324ffd Merged r17003 and r17004. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17005 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-15 19:51:13 +00:00
Jean-Philippe Lang
4254148986 Editing issues no longer sends notifications to previous assignee (#26627). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17002 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-15 16:43:19 +00:00
Jean-Philippe Lang
80cf4fd5db Merged r16999 and r17000 (#26667). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17001 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-15 11:56:05 +00:00
Jean-Philippe Lang
f793340077 Merged r16997 (#26667). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16998 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-15 11:42:32 +00:00
Jean-Philippe Lang
e3fafdb6aa Merged r16995 (#26682). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16996 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-15 11:37:25 +00:00