]>
source.dussan.org Git - redmine.git/log
Toshi MARUYAMA [Thu, 21 Dec 2017 16:31:29 +0000 (16:31 +0000)]
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
Toshi MARUYAMA [Sun, 17 Dec 2017 06:25:03 +0000 (06:25 +0000)]
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
Toshi MARUYAMA [Mon, 11 Dec 2017 15:09:24 +0000 (15:09 +0000)]
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
Go MAEDA [Mon, 11 Dec 2017 03:17:06 +0000 (03:17 +0000)]
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
Go MAEDA [Sun, 10 Dec 2017 15:49:01 +0000 (15:49 +0000)]
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
Toshi MARUYAMA [Sat, 9 Dec 2017 19:18:10 +0000 (19:18 +0000)]
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
Toshi MARUYAMA [Sat, 9 Dec 2017 19:17:57 +0000 (19:17 +0000)]
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
Toshi MARUYAMA [Sat, 9 Dec 2017 19:17:44 +0000 (19:17 +0000)]
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
Toshi MARUYAMA [Sat, 9 Dec 2017 19:17:31 +0000 (19:17 +0000)]
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
Toshi MARUYAMA [Thu, 7 Dec 2017 12:19:39 +0000 (12:19 +0000)]
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
Toshi MARUYAMA [Thu, 7 Dec 2017 12:19:27 +0000 (12:19 +0000)]
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
Toshi MARUYAMA [Thu, 7 Dec 2017 12:19:13 +0000 (12:19 +0000)]
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
Toshi MARUYAMA [Thu, 7 Dec 2017 12:19:02 +0000 (12:19 +0000)]
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
Go MAEDA [Wed, 6 Dec 2017 13:24:49 +0000 (13:24 +0000)]
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
Go MAEDA [Mon, 27 Nov 2017 15:24:16 +0000 (15:24 +0000)]
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
Go MAEDA [Mon, 27 Nov 2017 14:58:37 +0000 (14:58 +0000)]
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
Go MAEDA [Mon, 27 Nov 2017 13:08:25 +0000 (13:08 +0000)]
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
Go MAEDA [Sun, 26 Nov 2017 02:30:36 +0000 (02:30 +0000)]
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
Go MAEDA [Sat, 25 Nov 2017 15:38:09 +0000 (15:38 +0000)]
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
Go MAEDA [Sat, 25 Nov 2017 12:59:46 +0000 (12:59 +0000)]
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
Toshi MARUYAMA [Sun, 5 Nov 2017 19:40:41 +0000 (19:40 +0000)]
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
Toshi MARUYAMA [Thu, 19 Oct 2017 15:52:15 +0000 (15:52 +0000)]
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
Toshi MARUYAMA [Tue, 17 Oct 2017 15:07:59 +0000 (15:07 +0000)]
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
Jean-Philippe Lang [Sun, 15 Oct 2017 19:52:18 +0000 (19:52 +0000)]
Updates for 3.3.5 release.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17006
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 15 Oct 2017 11:24:42 +0000 (11:24 +0000)]
Merged r16990 (#26780).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16992
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 15 Oct 2017 11:15:48 +0000 (11:15 +0000)]
Merged r16983 to r16985 (#27186).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16987
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Fri, 13 Oct 2017 05:07:25 +0000 (05:07 +0000)]
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
Jean-Philippe Lang [Thu, 12 Oct 2017 17:39:59 +0000 (17:39 +0000)]
Merged r16971 (#27186).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16973
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Fri, 15 Sep 2017 05:01:48 +0000 (05:01 +0000)]
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
Toshi MARUYAMA [Wed, 30 Aug 2017 16:39:41 +0000 (16:39 +0000)]
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
Toshi MARUYAMA [Wed, 9 Aug 2017 06:38:04 +0000 (06:38 +0000)]
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
Toshi MARUYAMA [Tue, 8 Aug 2017 06:24:05 +0000 (06:24 +0000)]
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
Jean-Philippe Lang [Sun, 30 Jul 2017 17:10:53 +0000 (17:10 +0000)]
Merged r16926.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16928
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 2 Jul 2017 11:55:40 +0000 (11:55 +0000)]
Updates for 3.3.4 release.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16746
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 2 Jul 2017 11:51:38 +0000 (11:51 +0000)]
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
Toshi MARUYAMA [Mon, 26 Jun 2017 13:08:40 +0000 (13:08 +0000)]
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
Toshi MARUYAMA [Mon, 26 Jun 2017 13:08:29 +0000 (13:08 +0000)]
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
Jean-Philippe Lang [Sun, 25 Jun 2017 08:37:04 +0000 (08:37 +0000)]
Merged r16676 (#26183).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16683
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 7 Jun 2017 19:37:29 +0000 (19:37 +0000)]
Merged r16627 (#25064).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16634
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 7 Jun 2017 19:36:40 +0000 (19:36 +0000)]
Merged r16626 (#25212).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16632
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 7 Jun 2017 19:35:27 +0000 (19:35 +0000)]
Merged r16622 to r16625 (#26055).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16630
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 7 Jun 2017 19:33:15 +0000 (19:33 +0000)]
Merged r16619 (#26072).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16628
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Tue, 6 Jun 2017 21:17:08 +0000 (21:17 +0000)]
Merged r16574 (#25760).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16620
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Tue, 6 Jun 2017 20:56:38 +0000 (20:56 +0000)]
Merged r16572 (#25861).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16617
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Tue, 6 Jun 2017 20:54:14 +0000 (20:54 +0000)]
Merged r16569 (#25791).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16616
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Tue, 6 Jun 2017 05:15:16 +0000 (05:15 +0000)]
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
Jean-Philippe Lang [Sat, 27 May 2017 08:36:05 +0000 (08:36 +0000)]
Merged r16568 (#25634).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16570
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 27 May 2017 07:40:13 +0000 (07:40 +0000)]
Merged r16557 (#25713).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16566
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 27 May 2017 07:35:50 +0000 (07:35 +0000)]
Merged r16556 (#25745).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16564
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 27 May 2017 07:34:35 +0000 (07:34 +0000)]
Merged r16554 and r16555 (#25653).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16562
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 27 May 2017 07:32:59 +0000 (07:32 +0000)]
Merged r16553 (#25829).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16560
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Wed, 10 May 2017 12:26:42 +0000 (12:26 +0000)]
Merged r16546 from trunk to 3.3-stable (#25807)
Gemfile: pin roadie-rails version 1.1.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16547
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 9 Apr 2017 08:28:38 +0000 (08:28 +0000)]
Merged r16532.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16533
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 9 Apr 2017 08:14:53 +0000 (08:14 +0000)]
Merged r16520 (#22335, #24271).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16530
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 8 Apr 2017 07:45:20 +0000 (07:45 +0000)]
Merged r16500 to r16503 (#25503).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16523
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 8 Apr 2017 07:37:37 +0000 (07:37 +0000)]
Merged r16504 (#25478).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16521
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Fri, 7 Apr 2017 08:23:07 +0000 (08:23 +0000)]
Merged r16515 and r16516 from trunk to 3.3-stable
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16518
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Thu, 6 Apr 2017 20:05:43 +0000 (20:05 +0000)]
Merged r16507 from trunk to 3.3-stable (#22335, #24271)
Gemfile: use rbpdf 1.19.0.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16512
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Thu, 6 Apr 2017 17:11:49 +0000 (17:11 +0000)]
Merged r16467 (#25501).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16505
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 5 Apr 2017 16:12:45 +0000 (16:12 +0000)]
Merged r16492 (#25526).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16495
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 5 Apr 2017 16:11:56 +0000 (16:11 +0000)]
Merged r16491 (#25526).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16493
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Wed, 5 Apr 2017 11:04:24 +0000 (11:04 +0000)]
Merged r16485 from trunk to 3.3-stable (#22335, #24271)
Gemfile: explicitly use rbpdf 1.19.1.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16486
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Mon, 3 Apr 2017 16:41:00 +0000 (16:41 +0000)]
Merged r16470 from trunk to 3.3-stable (#25349, #25505)
Russian translation for 3.2-stable updated by Kirill Bezrukov.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16471
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Mon, 3 Apr 2017 14:34:56 +0000 (14:34 +0000)]
Russian translation for 3.3-stable updated by Ilya Potapov (#25397, #25502)
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16468
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Wed, 29 Mar 2017 06:10:35 +0000 (06:10 +0000)]
Merged r16438 from trunk to 3.3-stable (#25204, #25458)
Portuguese translation for 3.2-stable updated by Rui Rebelo.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16442
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Wed, 29 Mar 2017 06:10:24 +0000 (06:10 +0000)]
3.3-stable: revert r16439.
I mistook commit log.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16441
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Wed, 29 Mar 2017 05:50:01 +0000 (05:50 +0000)]
Merged r16438 from trunk to 3.3-stable (#25204, #25459)
Portuguese translation for 3.3-stable updated by Rui Rebelo.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16439
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Wed, 29 Mar 2017 05:20:30 +0000 (05:20 +0000)]
Merged r16434 from trunk to 3.3-stable (#25204, #25459)
Portuguese translation for 3.3-stable updated by Rui Rebelo.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16436
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Wed, 29 Mar 2017 05:20:18 +0000 (05:20 +0000)]
Merged r16433 from trunk to 3.3-stable (#25204, #25458)
Portuguese translation for 3.2-stable updated by Rui Rebelo.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16435
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Tue, 28 Mar 2017 14:53:09 +0000 (14:53 +0000)]
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
Toshi MARUYAMA [Fri, 24 Mar 2017 16:15:46 +0000 (16:15 +0000)]
Merged r16428 from trunk to 3.3-stable (#25371)
git: use '--no-renames' option in 'show' command.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16429
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Mon, 20 Mar 2017 18:03:42 +0000 (18:03 +0000)]
Merged r16422 from trunk to 3.3-stable (#25371)
Git 2.9 compatibility.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16424
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Tue, 28 Feb 2017 20:00:17 +0000 (20:00 +0000)]
Merged r16341 (#25115).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16342
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 5 Feb 2017 05:53:30 +0000 (05:53 +0000)]
Merged r16329 from trunk to 3.3-stable (#24999)
Mercurial 4.1 compatibility.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16330
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Thu, 2 Feb 2017 07:27:16 +0000 (07:27 +0000)]
Merged r16324 from trunk to 3.3-stable.
Gemfile: pin i18n version 0.7.0.
i18n 0.8.0 causes error.
<pre>
Redmine::I18nTest#test_languages_options_should_ignore_locales_without_general_lang_name_key:
I18n::InvalidLocale: "foo" is not a valid locale
lib/redmine/i18n.rb:58:in `ll'
lib/redmine/i18n.rb:122:in `block in languages_options'
lib/redmine/i18n.rb:122:in `map'
lib/redmine/i18n.rb:122:in `languages_options'
test/unit/lib/redmine/i18n_test.rb:203:in `test_languages_options_should_ignore_locales_without_general_lang_name_key'
</pre>
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16325
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Mon, 30 Jan 2017 17:42:54 +0000 (17:42 +0000)]
Merged r16293 (#24875).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16307
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Mon, 30 Jan 2017 17:41:54 +0000 (17:41 +0000)]
Merged r16292 (#20661).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16306
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 29 Jan 2017 10:46:08 +0000 (10:46 +0000)]
Merged r16284 (#23803).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16302
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 29 Jan 2017 10:44:42 +0000 (10:44 +0000)]
Merged r16283 (#23793).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16300
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 29 Jan 2017 10:42:50 +0000 (10:42 +0000)]
Merged r16287 to r16289 (#24416).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16298
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 29 Jan 2017 10:41:25 +0000 (10:41 +0000)]
Merged r16286 (#24307).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16296
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 29 Jan 2017 10:39:34 +0000 (10:39 +0000)]
Merged r16285 (#24199).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16294
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 29 Jan 2017 10:25:29 +0000 (10:25 +0000)]
Merged r16227 (#24869).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16290
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sat, 28 Jan 2017 14:32:08 +0000 (14:32 +0000)]
Merged r16277 from trunk to 3.3-stable (#24949, #24923)
Bulgarian translation for 3.2-stable updated by Ivan Cenov.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16278
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sat, 28 Jan 2017 12:59:35 +0000 (12:59 +0000)]
Merged r16027 from trunk to 3.3-stable (#24948, #24400)
Bulgarian translation for 3.3-stable updated by Ivan Cenov.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16276
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Fri, 20 Jan 2017 14:00:19 +0000 (14:00 +0000)]
Merged r16235 from trunk to 3.3-stable (#24751, #24886)
Japanese translation for 3.2-stable updated by Go MAEDA.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16237
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Fri, 20 Jan 2017 12:14:11 +0000 (12:14 +0000)]
Merged r16034 from trunk to 3.3-stable (#24512, #24885)
Japanese translation for 3.3-stable updated by Go MAEDA
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16234
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Tue, 17 Jan 2017 05:25:30 +0000 (05:25 +0000)]
Merged r16212 from trunk to 3.3-stable (#24824)
Traditional Chinese translation for trunk updated by ChunChang Lo.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16214
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Mon, 9 Jan 2017 16:40:13 +0000 (16:40 +0000)]
Merged r16167 from trunk to 3.3-stable.
Gemfile: pin nokogiri version 1.6.
nokogiri 1.7.0.1 requires Ruby version >= 2.1.0.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16168
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 8 Jan 2017 04:45:50 +0000 (04:45 +0000)]
Merged r16157 from trunk to 3.3-stable (#24537, #24778)
Czech translation for 3.3-stable updated by Karel Pičman.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16158
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 7 Jan 2017 08:40:28 +0000 (08:40 +0000)]
Merged r16092.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16145
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 7 Jan 2017 08:37:58 +0000 (08:37 +0000)]
Merged r16142 (3.3.2 release).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16143
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 7 Jan 2017 07:51:52 +0000 (07:51 +0000)]
Merged r16138 (#14658).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16139
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 4 Jan 2017 20:56:22 +0000 (20:56 +0000)]
Merged r16134 (#24283).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16135
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 4 Jan 2017 20:47:29 +0000 (20:47 +0000)]
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
Jean-Philippe Lang [Wed, 4 Jan 2017 19:52:47 +0000 (19:52 +0000)]
Merged r16114 (#24646).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16130
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 4 Jan 2017 18:09:00 +0000 (18:09 +0000)]
Merged r16116 (#22034).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16128
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 4 Jan 2017 18:00:29 +0000 (18:00 +0000)]
Merged r16125.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16126
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Tue, 20 Dec 2016 16:02:38 +0000 (16:02 +0000)]
Merged r16059, r16060, r16064, r16072.
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16106
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Tue, 20 Dec 2016 15:48:15 +0000 (15:48 +0000)]
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
projects / redmine.git / log