Commit Graph

11859 Commits

Author SHA1 Message Date
Toshi MARUYAMA
7030afc091 Merged r15099 from trunk to 3.1-stable (#21843)
fix nokogiri version comment.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15101 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-26 04:29:39 +00:00
Toshi MARUYAMA
064bc5a6a2 Merged r15096 from trunk to 3.1-stable (#21843)
Request at least nokogiri 1.6.7.2 because of security advisories.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15098 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-26 04:20:24 +00:00
Jean-Philippe Lang
046437b40c Merged r15013 (#21656).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15080 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-21 04:48:28 +00:00
Toshi MARUYAMA
5418d48478 Merged r15050 from trunk to 3.1-stable (#21620, #21689)
Turkish translation for 3.1-stable updated by Bahri Yardim.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15054 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-10 03:25:17 +00:00
Toshi MARUYAMA
0cd0a6f798 Merged r15045 from trunk to 3.1-stable (#21635, #21687)
German translations for 3.1-stable updated by Benedikt Huss.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15049 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 19:44:08 +00:00
Toshi MARUYAMA
9c678936bd Merged r15039 from trunk to 3.1-stable (#21527, #21686)
Russian translation for 3.1-stable updated by Alexander Ryabinovskiy.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15044 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 16:49:13 +00:00
Jean-Philippe Lang
39f4352a8d Merged r14984 (#21551).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15017 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 08:43:47 +00:00
Jean-Philippe Lang
72ba180cba Merged r14988 and r14988 (#21504).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15015 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 08:41:39 +00:00
Toshi MARUYAMA
4a98b7d58f Merged r15006 from trunk to 3.1-stable (#21588)
Simplified Chinese "field_cvs_module" translation fixed by qian hu.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15011 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-07 04:25:06 +00:00
Toshi MARUYAMA
d003a67a3a Merged r14995 from trunk to 3.1-stable (#21456)
Simplified Chinese wiki translation for 3.1-stable updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15001 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-06 11:30:39 +00:00
Toshi MARUYAMA
822c30beb5 Merged r14994 from trunk to 3.1-stable (#21456, #21650)
Simplified Chinese wiki "project:someproject" translation for 2.6-stable updated by Hang Xie.

r13795 changed English "project:someproject" to project:some-project.
However, Japanese and Traditional Chinese kept translated "project:some-project".
Therefore, this Simplified Chinese translation is valid.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15000 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-06 11:30:28 +00:00
Toshi MARUYAMA
32b956747e Merged r14993 from trunk to 3.1-stable (#21456, #21650)
Simplified Chinese wiki translation for 2.6-stable updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14999 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-06 11:30:06 +00:00
Toshi MARUYAMA
9ded7d7db0 Merged r14977 from trunk to 3.1-stable (#21569)
Request at least nokogiri 1.6.7.1 because of security advisories.

Patch by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14991 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-21 04:17:49 +00:00
Jean-Philippe Lang
9619aa9814 Merged r14967 to r14969 (#21488).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14983 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-19 08:14:48 +00:00
Jean-Philippe Lang
21e551369c Merged r14970 to r14972 (#21477).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14981 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-19 08:02:31 +00:00
Jean-Philippe Lang
b7a16814cb Merged r14973 (#21219).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14979 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-19 07:59:13 +00:00
Jean-Philippe Lang
9d9489a9df Updates for 3.1.3 release.
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14938 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-05 08:43:33 +00:00
Toshi MARUYAMA
58c21a3337 Merged r14928 from trunk to 3.1-stable (#21412)
Simplified Chinese translation for 3.1-stable updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14934 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-05 06:02:54 +00:00
Toshi MARUYAMA
7a707ad6b3 Merged r14927 from trunk to 3.1-stable (#21412, #21431)
Simplified Chinese translation for 3.0-stable updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14933 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-05 06:02:43 +00:00
Toshi MARUYAMA
e8c88041b4 Merged r14926 from trunk to 3.1-stable (#21412, #21430)
Simplified Chinese translation for 2.6-stable updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14932 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-05 06:02:32 +00:00
Jean-Philippe Lang
293f09a15d Merged r14913 (#21419).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14921 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-04 12:51:57 +00:00
Jean-Philippe Lang
f6cbafceb9 Merged r14892 (#21312).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14917 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-04 12:49:03 +00:00
Jean-Philippe Lang
c2723f4bc0 Merged r14883 (#16948).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14914 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-04 12:46:25 +00:00
Toshi MARUYAMA
05fe793c4f 3.1-stable: backport appveyor.yml
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14906 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-30 13:08:12 +00:00
Toshi MARUYAMA
08083b3230 Merged r14888 from trunk to 3.1-stable (#21328)
pdf: fix Vietnamese Italic is not shown.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14889 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-25 07:41:52 +00:00
Toshi MARUYAMA
3cbb4eca93 Merged r14884 from trunk to 3.1-stable.
update Rails to 4.2.5.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14885 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-25 04:25:18 +00:00
Jean-Philippe Lang
2e43f22543 Merged r14870.
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14871 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-14 08:52:07 +00:00
Jean-Philippe Lang
ab561918df Merged r14863 (#6969).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14864 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-11 07:35:03 +00:00
Jean-Philippe Lang
40ba35f6c2 Merged r14856 (#21155).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14860 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-11 07:22:21 +00:00
Jean-Philippe Lang
1c97ce41ff Merged r14794 (#21136).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14841 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-08 09:05:46 +00:00
Jean-Philippe Lang
bff6ff9273 Merged r14795 and r14796 (#21150).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14837 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-08 08:54:15 +00:00
Jean-Philippe Lang
dee154a6dd Merged r14812 (#6969).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14834 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-08 08:50:21 +00:00
Toshi MARUYAMA
74b01ff8be Merged r14813 from trunk to 3.1-stable (#20591, #20811)
update rbpdf version to 1.18.7.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14814 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-07 11:05:04 +00:00
Jean-Philippe Lang
5d9b4f1b21 Merged r14753 (#21085).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14807 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-07 08:21:57 +00:00
Jean-Philippe Lang
521910d430 Merged r14754 (#21076).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14806 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-07 08:21:13 +00:00
Jean-Philippe Lang
9d18d3ef08 Merged r14728 (#20906).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14805 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-07 08:20:26 +00:00
Jean-Philippe Lang
08390b2f58 Merged r14671 (#20992).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14804 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-07 08:19:40 +00:00
Jean-Philippe Lang
53a6e66da6 Merged r14758 (#21071).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14802 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-07 08:18:10 +00:00
Jean-Philippe Lang
d5dcab376e Merged r14670 (#20677).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14799 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-07 08:10:23 +00:00
Toshi MARUYAMA
b221f08254 Merged r14777 from trunk to 3.1-stable (#21019, #20791)
Traditional Chinese translation for 3.1-stable changed by ChunChang Lo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14780 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-31 12:04:05 +00:00
Toshi MARUYAMA
0c8c3e886c Merged r14761 from trunk to 3.1-stable (#20911, #21105)
Japanese wiki_syntax_detailed_textile.html translation for 3.0-stable updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14762 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-29 16:40:48 +00:00
Toshi MARUYAMA
34c10fe477 Merged r14755 from trunk to 3.1-stable (#20892)
Spanish and Spanish Panama translation updated by Leonel Iturralde.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14757 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-29 12:37:03 +00:00
Toshi MARUYAMA
9e20caca3b Merged r14740 from trunk to 3.1-stable (#20837)
Bulgarian translation for 3.1-stable updated by Ivan Cenov.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14741 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-24 11:18:05 +00:00
Toshi MARUYAMA
3ff5514065 Merged r14700 from trunk to 3.1-stable (#20785)
Polish translation for 3.1-stable updated by Sebastian Paluch.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14703 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-20 12:00:02 +00:00
Toshi MARUYAMA
1062324f28 Merged r14699 from trunk to 3.1-stable (#20785, #21031)
Polish translation for 3.0-stable updated by Sebastian Paluch.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14702 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-20 11:59:51 +00:00
Toshi MARUYAMA
113e620ec8 Merged r14698 from trunk to 3.1-stable (#20785, #21030)
Polish translation for 2.6-stable updated by Sebastian Paluch.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14701 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-20 11:59:41 +00:00
Toshi MARUYAMA
0046966131 Merged r14696 from trunk to 3.1-stable (#20791)
Traditional Chinese translation updated by ChunChang Lo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14697 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-20 10:45:14 +00:00
Jean-Philippe Lang
88fd9608ed Merged r14662 (#20730).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14663 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-09 07:36:25 +00:00
Jean-Philippe Lang
387dc4df0a Merged r14658 (#20380).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14659 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-09 07:21:14 +00:00
Jean-Philippe Lang
671d044f37 Merged r14654 (#20380).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14655 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-09 07:06:18 +00:00