Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-15 09:46:02 +01:00
Code Issues Packages Projects Releases Activity
12,670 Commits 35 Branches 222 Tags
f02e841bf03b51f77eec175e417ce0c2f8a5d03e
Commit Graph

2467 Commits

Author SHA1 Message Date
Jean-Philippe Lang
776e2c5b90 Merged test from r17263 into 3.3-stable (#28208). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17276 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-04-07 08:16:48 +00:00
Jean-Philippe Lang
404de3b229 Merged r17269 into 3.3-stable (#28302). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17271 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-04-07 07:56:08 +00:00
Jean-Philippe Lang
d4d750ccae Merged r17266 into 3.3-stable (#25299). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17268 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-04-07 07:46:12 +00:00
Go MAEDA
b0b271283d Merged r17198 to 3.3-stable (#28119). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17248 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-03-31 05:31:54 +00:00
Go MAEDA
7e39185ec2 3.3-stable: Too large avatar breaks gantt when assignee is a group (#28204). 
Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17203 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-02-18 05:29:35 +00:00
Jean-Philippe Lang
8f93f08e1c Merged r17150 to 3.3-stable (#26699). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17152 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-07 22:06:11 +00:00
Jean-Philippe Lang
8072c0dd1e Merged r17147 to 3.3-stable (#27885). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17149 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-07 21:48:02 +00:00
Jean-Philippe Lang
0acf526cf3 Merged r17144 to 3.3-stable (#27881). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17146 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-07 21:43:44 +00:00
Toshi MARUYAMA
515315028d Merged r15600 from trunk to 3.3-stable. 
TimeEntryTest#test_spent_on_with_time fails at Japanese daytime.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17111 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-11 15:09:24 +00:00
Toshi MARUYAMA
5a2c8f57a7 Merged r17062 from trunk to 3.3-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.3-stable@17072 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-07 12:19:39 +00:00
Toshi MARUYAMA
feb8c98e1b Merged r17060 from trunk to 3.3-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.3-stable@17070 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-07 12:19:13 +00:00
Go MAEDA
63fe8ed3aa Merged r17056 to 3.3-stable (#27663). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17058 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-06 13:24:49 +00:00
Toshi MARUYAMA
2ede29186c Merged r16938 from trunk to 3.3-stable (#22320) 
try IssueTest#test_overdue failing on CI server at Japanese daytime.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16952 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-08-09 06:38:04 +00:00
Jean-Philippe Lang
988402f8c8 Merged r16926. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16928 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-30 17:10:53 +00:00
Jean-Philippe Lang
49108983cb Merged r16622 to r16625 (#26055). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16630 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-07 19:35:27 +00:00
Jean-Philippe Lang
635daf888a Merged r16619 (#26072). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16628 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-07 19:33:15 +00:00
Jean-Philippe Lang
f561ffd5e9 Merged r16574 (#25760). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16620 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-06 21:17:08 +00:00
Jean-Philippe Lang
e24ba3b907 Merged r16568 (#25634). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16570 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-05-27 08:36:05 +00:00
Jean-Philippe Lang
0c19c9394f Merged r16557 (#25713). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16566 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-05-27 07:40:13 +00:00
Jean-Philippe Lang
ec59ffc8f3 Merged r16500 to r16503 (#25503). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16523 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-08 07:45:20 +00:00
Jean-Philippe Lang
2af7d986d9 Merged r16504 (#25478). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16521 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-08 07:37:37 +00:00
Jean-Philippe Lang
ac7ebdc34a Merged r16283 (#23793). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16300 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:44:42 +00:00
Jean-Philippe Lang
5dd1fe1345 Merged r16059, r16060, r16064, r16072. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16106 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-20 16:02:38 +00:00
Jean-Philippe Lang
f3c5056e39 Merged r16071 (#24595). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16099 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-20 09:05:23 +00:00
Jean-Philippe Lang
6501e1451a Merged r15890 (#24014). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15893 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-09 08:39:37 +00:00
Jean-Philippe Lang
52b19aca3c Merged r15879 (#23969). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15889 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-08 07:05:15 +00:00
Jean-Philippe Lang
dce9b21f3f Merged r15857 (#23878). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15876 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-02 10:21:45 +00:00
Jean-Philippe Lang
3fa2f52532 Merged r15848 (#23764). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15870 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-02 10:18:53 +00:00
Jean-Philippe Lang
c6e20372fd Merged r15846 (#23841). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15867 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-02 10:12:19 +00:00
Toshi MARUYAMA
50a8e40cbe Merged r15512 from trunk to 3.3-stable (#22951, #23558) 
Include required module.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15828 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-09-08 15:01:48 +00:00
Toshi MARUYAMA
49fcc1b3e9 Merged r15511 from trunk to 3.3-stable (#22951, #23558) 
Set default language in import tests.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15824 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-09-08 14:25:24 +00:00
Jean-Philippe Lang
1e4678b9ae Merged r15816 (#23758). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15817 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-09-04 17:11:10 +00:00
Jean-Philippe Lang
62f9b56c1e Merged r15751 (#23596). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15770 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-08-31 16:55:53 +00:00
Jean-Philippe Lang
d20f2a7def Merged r15750 (#23655). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15765 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-08-31 16:51:20 +00:00
Jean-Philippe Lang
e8afae7cbc Merged r15586 (#23172). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15743 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-08-20 11:45:49 +00:00
Jean-Philippe Lang
f231779252 Merged r15609 (#23278). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15637 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-11 18:09:54 +00:00
Jean-Philippe Lang
e75926314f Merged r15587 and r15588 (#23180). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15619 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-10 07:54:29 +00:00
Jean-Philippe Lang
0804245614 Merged r15610 and r15611 (#23242). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15617 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-10 07:51:52 +00:00
Jean-Philippe Lang
0b67170baf Merged r15607 (#23246). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15614 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-10 07:46:52 +00:00
Jean-Philippe Lang
11b7b573df Merged r15547 and r15561 (#23020). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15566 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-18 10:57:22 +00:00
Jean-Philippe Lang
1f79610fdc Merged r15536 and r15541 (#23083). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15560 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-18 10:18:40 +00:00
Jean-Philippe Lang
5169055276 Merged r15539 and r15550 (#23067). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15557 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-18 10:16:43 +00:00
Jean-Philippe Lang
26ec2cdc07 Merged r15540 (#285). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15542 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-18 06:46:55 +00:00
Jean-Philippe Lang
748fd10893 Merged r15501 to r15508 (#15880). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15513 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-12 05:50:26 +00:00
Jean-Philippe Lang
8516e1c88d Merged r15490 to r15493, r15496, r15497 (#22951). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15500 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-11 05:25:46 +00:00
Jean-Philippe Lang
6e68d008c4 Merged 15430, 15464 to 15469, 15475, 15476 (#285, #7839). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15478 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-06 09:41:50 +00:00
Jean-Philippe Lang
cdfebdcec8 Merged r15442 (#22898). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15444 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-04 09:56:44 +00:00
Jean-Philippe Lang
8c09e330d4 Merged r15431 to r15435 (#22924, #22925, #22926). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15440 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-04 07:24:45 +00:00
Jean-Philippe Lang
961c0e0de9 Merged r15429 (#22911). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15438 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-04 07:19:20 +00:00
Jean-Philippe Lang
8cbfeddeb0 Child nodes should only be rendered if the user is actually authorized to see them (#15880). 
Patch by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/trunk@15393 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-05-08 06:48:36 +00:00