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

4536 Commits

Author SHA1 Message Date
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
995a0111e9 Merged r16957 from trunk to 3.3-stable (#26599) 
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.3-stable@16960 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-08-30 16:39:41 +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
a594c377a6 Merged r16572 (#25861). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16617 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-06 20:56:38 +00:00
Jean-Philippe Lang
b02b7369a0 Merged r16569 (#25791). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16616 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-06 20:54:14 +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
47f8339e47 Merged r16492 (#25526). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16495 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-05 16:12:45 +00:00
Toshi MARUYAMA
648097cefe 3.3-stable: remove test/ui/custom_fields_test_ui.rb (#25455) 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16431 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-28 14:53:09 +00:00
Jean-Philippe Lang
540237033e Merged r16341 (#25115). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16342 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-02-28 20:00:17 +00:00
Jean-Philippe Lang
cca51a8c51 Merged r16293 (#24875). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16307 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-30 17:42:54 +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
e360394be7 Merged r16287 to r16289 (#24416). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16298 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:42:50 +00:00
Jean-Philippe Lang
b92d7879ff Merged r16286 (#24307). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16296 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:41:25 +00:00
Jean-Philippe Lang
c4b1ab644e Merged r16118 to r16122 (#24693, #24718, #24722). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16132 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-04 20:47:29 +00:00
Jean-Philippe Lang
82a67f4ebe Merged r16114 (#24646). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16130 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-04 19:52:47 +00:00
Jean-Philippe Lang
7ec2c27385 Merged r16116 (#22034). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16128 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-04 18:09:00 +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
21a847d01d Fix test in 3.3-stable (#14817). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16104 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-20 15:48:15 +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
ac456fafc8 Merged r16056 (#14817). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16097 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-20 09:02:07 +00:00
Jean-Philippe Lang
e04ff6feda Merged r15959 (#24311). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16047 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-03 08:42:06 +00:00
Jean-Philippe Lang
6ebb700db2 Merged r15955 and r15956 (#24297). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15999 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-11-26 08:58:41 +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
31825ff1ee Merged r15856 (#23376). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15877 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-02 10:22:30 +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
87e36462d6 Merged r15855 (#23766). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15875 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-02 10:21:02 +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
Jean-Philippe Lang
2f37af1225 Merged r15852 and r15863 (#23839). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15864 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-02 10:07:03 +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
Toshi MARUYAMA
ceeca4a88d 3.3-stable: fix test failure (#23700) 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15793 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-09-01 05:44:50 +00:00
Jean-Philippe Lang
a545fa41cb Merged r15775 and r15776 (#23346). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15777 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-08-31 17:10:14 +00:00
Jean-Philippe Lang
9f8053a82e Merged r15749 (#23700). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15771 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-08-31 16:56:31 +00:00