Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-20 14:33:06 +01:00
Code Issues Packages Projects Releases Activity
12,301 Commits 35 Branches 225 Tags
1198d3003e2faeb89417469e7e86160e28547a89
Commit Graph

1793 Commits

Author SHA1 Message Date
Jean-Philippe Lang
1198d3003e Updates for 3.2.9 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@17165 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-08 18:00:50 +00:00
Toshi MARUYAMA
02a2ca8c04 Merged r17062 from trunk to 3.2-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.2-stable@17076 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-07 12:22:44 +00:00
Toshi MARUYAMA
4fb2d864af Merged r17061 from trunk to 3.2-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.2-stable@17075 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-07 12:22:32 +00:00
Toshi MARUYAMA
3481b49a1a Merged r17060 from trunk to 3.2-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.2-stable@17074 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-07 12:22:22 +00:00
Toshi MARUYAMA
d9d803abb5 Merged r16421 from trunk to 3.2-stable. 
set "warning = false" for "rake test:scm:units" and "rake test:scm:functionals"

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@17073 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-07 12:22:11 +00:00
Jean-Philippe Lang
404a549170 Updates for 3.2.8 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@17007 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-15 19:53:13 +00:00
Jean-Philippe Lang
bc21fbb8b7 Updates for 3.2.7 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16745 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-02 11:55:14 +00:00
Jean-Philippe Lang
93d78771c6 Merged r16622 to r16625 (#26055). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16631 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-07 19:35:35 +00:00
Jean-Philippe Lang
3bb7524c1f Merged r16574 (#25760). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16621 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-06 21:17:16 +00:00
Jean-Philippe Lang
c2e613981a Merged r16568 (#25634). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16571 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-05-27 08:36:13 +00:00
Jean-Philippe Lang
7ca976e0c9 Updates for 3.2.6 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16534 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-09 08:30:16 +00:00
Jean-Philippe Lang
b64f8b4de9 Merged r16500 to r16503 (#25503). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16524 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-08 07:47:09 +00:00
Toshi MARUYAMA
7aa98f8187 Merged r16428 from trunk to 3.2-stable (#25371) 
git: use '--no-renames' option in 'show' command.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16430 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-24 16:18:29 +00:00
Toshi MARUYAMA
e87c3a09bd Merged r16422 from trunk to 3.2-stable (#25371) 
Git 2.9 compatibility.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16425 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-20 18:05:10 +00:00
Toshi MARUYAMA
b8ab16b448 Merged r16329 from trunk to 3.2-stable (#24999) 
Mercurial 4.1 compatibility.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16331 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-02-05 05:55:03 +00:00
Jean-Philippe Lang
c717698803 Merged r16227 (#24869). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16291 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:25:36 +00:00
Jean-Philippe Lang
fcdb810ebf Merged r16092. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16146 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-07 08:40:49 +00:00
Jean-Philippe Lang
0e939c5bb1 Updates for 3.2.5 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16144 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-07 08:39:03 +00:00
Jean-Philippe Lang
98787ce42c Merged r15958 (#24296). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16006 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-11-26 09:05:57 +00:00
Jean-Philippe Lang
c97a9488a2 Merged r15950 (#24348). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16002 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-11-26 09:02:52 +00:00
Jean-Philippe Lang
f5bcd05c44 Updates for 3.2.4. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15900 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-10 07:46:12 +00:00
Jean-Philippe Lang
b5fddf0950 Merged r15846 (#23841). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15868 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-02 10:12:56 +00:00
Jean-Philippe Lang
18537b419b Merged r15645 (#23269). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15745 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-08-20 11:54:41 +00:00
Jean-Philippe Lang
891736ef39 Merged r15609 (#23278). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15638 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-11 18:10:01 +00:00
Jean-Philippe Lang
e35c8f7e2e Merged r15607 (#23246). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15615 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-10 07:47:07 +00:00
Jean-Philippe Lang
4566ac1ee9 Merged r15539 and r15550 (#23067). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15558 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-18 10:16:51 +00:00
Jean-Philippe Lang
30077de752 Updates for 3.2.3 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15457 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-05 07:18:08 +00:00
Jean-Philippe Lang
f2ad8df5dd Merged r15442 (#22898). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15445 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-04 09:56:53 +00:00
Jean-Philippe Lang
ee408687c6 Merged r15431 to r15435 (#22924, #22925, #22926). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15441 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-04 07:25:12 +00:00
Jean-Philippe Lang
3b3478b8a3 Merged r15429 (#22911). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15439 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-04 07:19:27 +00:00
Jean-Philippe Lang
354551728f Merged r15365. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15366 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-05-05 18:28:26 +00:00
Jean-Philippe Lang
71e052375d Merged r15362 (#22721). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15363 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-05-05 18:25:57 +00:00
Jean-Philippe Lang
3d4d6c31f3 Merged r15318 and r15319 (#22342). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15329 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-04-12 16:55:30 +00:00
Jean-Philippe Lang
b2131b3245 Merged r15238. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15239 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-03-13 10:41:37 +00:00
Jean-Philippe Lang
b94db7abd9 Merged r15236. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15237 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-03-13 10:16:54 +00:00
Toshi MARUYAMA
9820c3a8e3 Merged r14963 from trunk to 3.2-stable (#19017) 
pdf: use all lower cases for DejaVuSansMono.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14964 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-12-06 12:38:05 +00:00
Toshi MARUYAMA
3eb2ad6617 Merged r14960 from trunk to 3.2-stable (#19017) 
pdf: remove italic from DejaVuSansMono.

DejaVuSansMono Italic Arabic font has problem.

Contributed by Jun NAITOH.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14962 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-12-06 12:24:28 +00:00
Toshi MARUYAMA
60dea89b2a Merged r14959 from trunk to 3.2-stable (#19017) 
pdf: use "family" parameter instead of l(:general_pdf_fontname) at SetFont method.

Contributed by Jun NAITOH.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14961 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-12-06 12:24:18 +00:00
Jean-Philippe Lang
9ead3ea0a5 Merged r14948 and r14949 (#19097). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14954 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-12-06 10:54:03 +00:00
Jean-Philippe Lang
0a45d594d5 Merged r14897 to r14900 and r14949 (#21258). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14953 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-12-06 10:51:56 +00:00
Jean-Philippe Lang
f2fd790555 Merged r14944 (#21413). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14945 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-12-05 10:12:54 +00:00
Toshi MARUYAMA
439b778980 Merged r14908, r14909 and r14910 from trunk to 3.2-stable (#19017) 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14912 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-12-04 07:29:56 +00:00
Jean-Philippe Lang
6dfc3c34eb BRANCH set to stable. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14896 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-28 07:10:32 +00:00
Jean-Philippe Lang
369ee6e418 Version set to 3.2.0. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14893 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-28 06:03:28 +00:00
Toshi MARUYAMA
4eda45bfa6 add plugins ui tests rake task (#21361) 
Patch by Maria Tikhonova.

git-svn-id: http://svn.redmine.org/redmine/trunk@14891 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-27 12:30:57 +00:00
Toshi MARUYAMA
41c64d1266 pdf: fix Vietnamese Italic is not shown (#21328) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14888 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-25 06:55:00 +00:00
Jean-Philippe Lang
5735db1a91 Updates for 3.1.2 release. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14870 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-14 08:51:36 +00:00
Jean-Philippe Lang
868d949f47 Reverts r14812 (#6969). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14863 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-11 07:34:15 +00:00
Jean-Philippe Lang
c6283d7ce5 Fixed that less-than sign is not escaped by textile formatter (#6969). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14812 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-07 10:20:57 +00:00
Jean-Philippe Lang
0df7fa714b Allow a default version to be set on the command line for incoming emails (#7346). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14789 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-01 08:56:27 +00:00