meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-11 03:33:07 +00:00
Code Issues Releases Wiki Activity
13,558 Commits 32 Branches 194 Tags
Commit Graph

4834 Commits

Author SHA1 Message Date
Go MAEDA
ed8bf602b2 Merged r18008 from trunk to 3.4-stable (#31087). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18010 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-03-26 14:41:30 +00:00
Go MAEDA
e7cbfb012b Merged r18005 from trunk to 3.4-stable (#30923). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18007 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-03-25 03:50:16 +00:00
Jean-Philippe Lang
6626f87e55 Merged r17949 to 3.4-stable (#29055). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17951 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-03-15 07:30:02 +00:00
Go MAEDA
087309ae1a Merged r17881 from trunk to 3.4-stable (#30818). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17886 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-02-19 09:37:50 +00:00
Go MAEDA
1f0a1f65ca Merged r17786 and r17787 from trunk to 3.4-stable (#30412). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17789 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-01-12 01:34:18 +00:00
Go MAEDA
55ef1f4585 Merged r17764 from trunk to 3.4-stable (#30171). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17768 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-12-17 23:48:58 +00:00
Go MAEDA
b543e7dc35 Merged r17692 from trunk to 3.4-stable (#28636). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17693 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-12-07 00:54:38 +00:00
Go MAEDA
57bfd3a186 Merged r17686 from trunk to 3.4-stable (#26785). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17687 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-12-04 10:04:36 +00:00
Jean-Philippe Lang
1b8d448b82 Merged r17658 and r17659 to 3.4-stable (#30001). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17664 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-29 19:12:53 +00:00
Jean-Philippe Lang
8e072c4877 Merged r17656 and r17657 to 3.4-stable (#29918). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17663 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-29 19:11:59 +00:00
Jean-Philippe Lang
8be3e7878d Merged r17645 to 3.4-stable (#29674). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17654 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-29 15:44:21 +00:00
Jean-Philippe Lang
3644d67fb8 Merged r17643 to 3.4-stable (#20788). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17650 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-29 15:40:53 +00:00
Go MAEDA
a046f0db7b Merged r17638 from trunk to 3.4-stable (#30009). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17639 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-26 05:44:35 +00:00
Go MAEDA
a7f6830a8e Merged r17636 from trunk to 3.4-stable (#8395). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17637 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-26 04:56:19 +00:00
Go MAEDA
f7c9ba30a8 Merged r17634 from trunk to 3.4-stable (#30027). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17635 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-26 02:13:52 +00:00
Go MAEDA
fad54d02b8 Merged r17630 from trunk to 3.4-stable (#28576). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17631 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-24 11:20:00 +00:00
Go MAEDA
9b7efd00e8 Merged r17625 from trunk to 3.4-stable (#8317). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17627 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-10 23:02:47 +00:00
Go MAEDA
042dd66527 Merged r17603 from trunk to 3.4-stable (#29756). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17604 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-10-28 11:04:15 +00:00
Jean-Philippe Lang
3881a9ade4 Merged r17488 to 3.4-stable (#28925). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17489 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-09-15 09:08:35 +00:00
Jean-Philippe Lang
9116b030a0 Merged r17484 to 3.4-stable (#28925). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17485 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-09-15 06:47:03 +00:00
Go MAEDA
5377b53db3 Merged r17459 from trunk to 3.4-stable (#29308). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17460 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-08-02 08:46:16 +00:00
Go MAEDA
375c7adfe4 Merged r17450 from trunk to 3.4-stable (#29247). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17451 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-07-21 00:17:51 +00:00
Go MAEDA
53f6578b5a Merged r17436 from trunk to 3.4-stable (#29133). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17437 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-07-08 07:26:11 +00:00
Go MAEDA
c999dacf0c Merged r17432 from trunk to 3.4-stable (#29191). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17433 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-07-06 01:38:33 +00:00
Go MAEDA
a3570ff62b Merged r17428 from trunk to 3.4-stable (#29038). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17429 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-07-02 03:03:12 +00:00
Go MAEDA
f2843a26d0 Merged r17390 from trunk to 3.4-stable (#28946). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17391 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-06-17 01:07:38 +00:00
Jean-Philippe Lang
92bc4919eb Merged r17373 to 3.4-stable (#28649). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17374 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-06-10 06:00:18 +00:00
Go MAEDA
c103a59465 Merged r17368 from trunk to 3.4-stable (#27863). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17369 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-06-07 00:37:12 +00:00
Go MAEDA
24c33c14a1 merged r17362 from trunk to 3.4-stable (#28693). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17363 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-06-03 03:45:06 +00:00
Go MAEDA
0ab0f93786 Merged r17359 and r17360 from trunk to 3.4-stable (#28693). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17361 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-06-03 01:30:33 +00:00
Go MAEDA
929d8b27b2 Merged r17342 from trunk to 3.4-stable (#28765). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17343 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-05-19 01:31:35 +00:00
Go MAEDA
941eb22e99 Merged r17322 from trunk to 3.4-stable (#28469). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17323 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-05-02 02:29:40 +00:00
Go MAEDA
20d16fdba0 Merged r17316 from trunk to 3.4-stable (#27122). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17317 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-04-28 23:52:00 +00:00
Jean-Philippe Lang
db5d241870 Merged test from r17263 into 3.4-stable (#28208). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17275 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-04-07 08:15:17 +00:00
Jean-Philippe Lang
578a9e67d3 Merged r17269 into 3.4-stable (#28302). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17270 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-04-07 07:50:30 +00:00
Jean-Philippe Lang
7d0cbd0d9b Merged r17266 into 3.4-stable (#25299). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17267 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-04-07 07:43:22 +00:00
Go MAEDA
220a961dd4 Merged r17257 from trunk to 3.4-stable (#28180). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17258 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-04-07 00:31:57 +00:00
Go MAEDA
12a420b8c9 Merged r17198 to 3.4-stable (#28119). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17247 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-03-31 05:31:27 +00:00
Go MAEDA
0037cef83d 3.4-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.4-stable@17202 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-02-18 05:21:22 +00:00
Go MAEDA
5ed8c8e511 Merged r17199 from trunk to 3.4-stable (#28110). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17200 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-02-18 04:33:30 +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
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
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
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