Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-08 22:36:02 +01:00
Code Issues Packages Projects Releases Activity
12,701 Commits 35 Branches 222 Tags
5e4f49c8ad1eb3154dca1995c833e47e901b6e24
Commit Graph

12701 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Go MAEDA
1d1fbff99d Merged r17141 from trunk to 3.3-stable (#27695). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17143 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-07 01:31:40 +00:00
Go MAEDA
8905b56b19 Merged r17129 to 3.3-stable (#27533). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17131 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-26 07:11:19 +00:00
Toshi MARUYAMA
76678b7b11 Merged r17122 from trunk to 3.3-stable (#27620, #27835) 
Brazilian translation for 3.3-stable update by Patrick Kaminski.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17126 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-21 16:31:29 +00:00
Toshi MARUYAMA
75223ceb3d Merged r17116 from trunk to 3.3-stable (#27691) 
Gemfile: relax mail gem version.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17118 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-17 06:25:03 +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
Go MAEDA
ce826caae5 Merged r17108 to 3.3-stable (#19578). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17110 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-11 03:17:06 +00:00
Go MAEDA
30322a0726 Merged r17105 to 3.3-stable (#27333). 
Patch by Mizuki ISHIKAWA.


git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17107 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-10 15:49:01 +00:00
Toshi MARUYAMA
b930fb1262 Merged r17087 from trunk to 3.3-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.3-stable@17101 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-09 19:18:10 +00:00
Toshi MARUYAMA
ff0758c3fb Merged r17086 from trunk to 3.3-stable (#20452) 
fix public/help/cs/wiki_syntax_detailed_markdown.html broken by r14519.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17100 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-09 19:17:57 +00:00
Toshi MARUYAMA
64fe77b235 Merged r17083 from trunk to 3.3-stable (#27506, #27766) 
Czech translation for 3.3-stable updated by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17099 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-09 19:17:44 +00:00
Toshi MARUYAMA
b41f3faa4c Merged r17081 from trunk to 3.3-stable (#27502, #27765) 
Lithuanian translation for 3.3-stable updated by Marius Žilėnas.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17098 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-09 19:17:31 +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
06e52a746c Merged r17061 from trunk to 3.3-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.3-stable@17071 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-07 12:19:27 +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
Toshi MARUYAMA
ccefedfbf2 Merged r16421 from trunk to 3.3-stable. 
set "warning = false" for "rake test:scm:units" and "rake test:scm:functionals"

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17069 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-07 12:19:02 +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
Go MAEDA
fc6816629b Merged r17045 to 3.3-stable (#27649). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17047 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-11-27 15:24:16 +00:00
Go MAEDA
6b783c28c0 Merged r17042 to 3.3-stale (#27642). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17044 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-11-27 14:58:37 +00:00
Go MAEDA
2d62fd8429 Merged r17039 to 3.3-stable (#27139). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17041 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-11-27 13:08:25 +00:00
Go MAEDA
936a1f7f13 Merged r17032 to 3.3-stable (#27110). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17034 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-11-26 02:30:36 +00:00
Go MAEDA
0f0865a31f Merged r17027 to 3.3-stable (#26410). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17029 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-11-25 15:38:09 +00:00
Go MAEDA
7ad082e171 Merged r17023 to 3.3-stable (#27586). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17025 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-11-25 12:59:46 +00:00
Toshi MARUYAMA
9392fb59b6 Merged r17019 from trunk to 3.3-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.3-stable@17021 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-11-05 19:40:41 +00:00
Toshi MARUYAMA
df1d0c2d58 3.3-stable: Gemfile: pin public_suffix if ruby < 2.0 (#27229) 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17015 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-19 15:52:15 +00:00
Toshi MARUYAMA
2382f016c8 3.3-stable: Gemfile: pin public_suffix if ruby < 2.1 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17012 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-17 15:07:59 +00:00
Jean-Philippe Lang
03e68482e2 Updates for 3.3.5 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17006 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-15 19:52:18 +00:00
Jean-Philippe Lang
f0c83c92df Merged r16990 (#26780). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16992 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-15 11:24:42 +00:00
Jean-Philippe Lang
d8108230f9 Merged r16983 to r16985 (#27186). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16987 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-15 11:15:48 +00:00
Toshi MARUYAMA
dbf042be28 Merged r16975 from trunk to 3.3-stable (#25702) 
Gemfile: update rbpdf version to 1.19.3.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16982 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-13 05:07:25 +00:00
Jean-Philippe Lang
f5b2a879ea Merged r16971 (#27186). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16973 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-12 17:39:59 +00:00
Toshi MARUYAMA
f2581bbbc4 Merged r16964 from trunk to 3.3-stable (#26703, #27006) 
German translation for 3.3-stable updated by Peter Pfläging.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16970 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-09-15 05:01:48 +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
Toshi MARUYAMA
d48d0b6cf1 Merged r16948 from trunk to 3.3-stable (#26645) 
git: remove "--no-color" option from "git --version" for git 2.14 compatibility.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16950 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-08-08 06:24:05 +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
5938d080d1 Updates for 3.3.4 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16746 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-02 11:55:40 +00:00
Jean-Philippe Lang
99095a7c41 Fix changelog markup (#25616). 
Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16742 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-02 11:51:38 +00:00
Toshi MARUYAMA
73db9ce495 Merged r16709 from trunk to 3.3-stable (#26261, #26264) 
Simplified Chinese translation for 3.3-stable updated by Steven Wong.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16716 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-26 13:08:40 +00:00
Toshi MARUYAMA
78373f0131 Merged r16708 from trunk to 3.3-stable (#26261, #26263) 
Simplified Chinese translation for 3.2-stable updated by Steven Wong.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16715 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-26 13:08:29 +00:00
Jean-Philippe Lang
9365fd97ef Merged r16676 (#26183). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16683 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-25 08:37:04 +00:00
Jean-Philippe Lang
ba9909aa5d Merged r16627 (#25064). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16634 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-07 19:37:29 +00:00
Jean-Philippe Lang
2db8fbb33c Merged r16626 (#25212). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16632 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-07 19:36:40 +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
Toshi MARUYAMA
c07a140f61 Merged r16611 from trunk to 3.3-stable. 
Gemfile: ping roadie version 3.2 to prevent decadency failure on CI server Ruby 2.1.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16613 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-06 05:15:16 +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