Commit Graph

12167 Commits

Author SHA1 Message Date
Toshi MARUYAMA
fb3ff98f80 Merged r15252 from trunk to 3.2-stable
NameError: uninitialized constant Redmine::ApiTest::GroupsTest::MultiJson

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15278 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-24 06:38:05 +00:00
Toshi MARUYAMA
dd1adc345e Merged r15274 from trunk to 3.2-stable
Gemfile: switch mime-types version by Ruby >= 2.0 or not

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15276 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-24 05:53:32 +00:00
Jean-Philippe Lang
b2131b3245 Merged r15238.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15239 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-13 10:41:37 +00:00
Jean-Philippe Lang
b94db7abd9 Merged r15236.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15237 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-13 10:16:54 +00:00
Jean-Philippe Lang
54856b4699 Merged r15223 and r15225 (#22127).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15230 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-13 08:20:37 +00:00
Jean-Philippe Lang
48870e71ae Merged r15228 (#21487).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15229 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-13 08:14:07 +00:00
Jean-Philippe Lang
65e2e932d1 Merged r15224 (#22178).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15227 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-13 08:03:08 +00:00
Jean-Philippe Lang
d09b080463 Merged r15202 (#22108).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15226 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-13 08:01:55 +00:00
Jean-Philippe Lang
985634ef9e Merged r15136 to r15138 (#21593).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15222 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-12 10:36:10 +00:00
Jean-Philippe Lang
e78e976009 Merged r15220.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15221 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-12 10:34:22 +00:00
Jean-Philippe Lang
b5a63dc48c Merged r15218 (#22128).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15219 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-12 10:32:06 +00:00
Jean-Philippe Lang
6a824a35de Merged r15216 (#22104).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15217 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-12 10:25:44 +00:00
Jean-Philippe Lang
91d024b25b Merged r15214 (#22101).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15215 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-12 10:23:46 +00:00
Jean-Philippe Lang
81e56d0dc8 Merged r15211 (#22074).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15213 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-12 10:21:09 +00:00
Jean-Philippe Lang
baa58c3325 Merged r15211 (#22074).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15212 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-12 10:20:44 +00:00
Jean-Philippe Lang
56f6602e23 Merged r15196 (#22072).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15207 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-12 10:03:41 +00:00
Jean-Philippe Lang
a9a6c2625a Merged r15082 (#20988).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15206 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-12 10:02:37 +00:00
Jean-Philippe Lang
d12a27c4f4 Merged r15204 (#21847).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15205 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-12 10:01:11 +00:00
Jean-Philippe Lang
361b65854c Merged r15131 (#21867).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15203 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-12 09:56:40 +00:00
Jean-Philippe Lang
18631c1da3 Merged r15200 (#21775).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15201 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-12 08:32:12 +00:00
Jean-Philippe Lang
c1ec49459b Merged r15134 (#21263).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15199 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-12 08:25:44 +00:00
Jean-Philippe Lang
225c972c11 Merged r15130 (#21900).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15197 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-12 08:23:58 +00:00
Toshi MARUYAMA
5784d98129 Merged r15151 from trunk to 3.2-stable
remove Travis CI files

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15190 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-04 15:57:41 +00:00
Toshi MARUYAMA
4f8ecfe848 Merged r15179 from trunk to 3.2-stable (#22009)
Japanese wiki syntax (Markdown) translation for 3.2-stable updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15181 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-03 13:49:10 +00:00
Toshi MARUYAMA
7183e2f49e Merged r15178 from trunk to 3.2-stable (#22009, #22139)
Japanese wiki syntax (Markdown) translation for 3.1-stable updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15180 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-03 13:49:00 +00:00
Toshi MARUYAMA
4740e18b98 Merged r15172 from trunk to 3.2-stable (#21963, #22132)
German translations for 3.2-stable updated by Tobias Fischer.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15173 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-03 08:08:18 +00:00
Toshi MARUYAMA
0e53a708df Merged r15168 from trunk to 3.2-stable (#21963, #22132)
German translations for 3.2-stable updated by Tobias Fischer.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15170 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-03 07:40:10 +00:00
Toshi MARUYAMA
73405fe847 Merged r15167 from trunk to 3.2-stable (#21963, #22131)
German translations for 3.1-stable updated by Tobias Fischer.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15169 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-03 07:39:58 +00:00
Toshi MARUYAMA
7788ed251f Merged r15161 from trunk to 3.2-stable
Gemfile: update Rails to 4.2.5.2

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15162 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-02 04:10:08 +00:00
Toshi MARUYAMA
0b0a7a92d9 Merged r15122 from trunk to 3.2-stable (#21747, #21899)
Catalan wiki translation for 3.1-stable updated by Helder Manuel Torres Vieira.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15124 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-30 13:32:54 +00:00
Toshi MARUYAMA
a642c38449 Merged r15121 from trunk to 3.2-stable (#21747, #21898)
Catalan wiki translation for 2.6-stable updated by Helder Manuel Torres Vieira.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15123 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-30 13:32:35 +00:00
Toshi MARUYAMA
38ff8f5f4f Merged r15114 from trunk to 3.2-stable (#21883)
Russian wiki translation for 3.2-stable updated by Kirill Gritsaenko.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15117 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-30 06:53:47 +00:00
Toshi MARUYAMA
f91c463b93 Merged r15113 from trunk to 3.2-stable (#21882)
Russian wiki translation for 3.1-stable updated by Kirill Gritsaenko.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15116 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-30 06:53:37 +00:00
Toshi MARUYAMA
73cc3708b0 Merged r15112 from trunk to 3.2-stable (#21881)
Russian wiki translation for 2.6-stable updated by Kirill Gritsaenko.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15115 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-30 06:53:25 +00:00
Toshi MARUYAMA
f0c1d52bd1 Merged r15105 from trunk to 3.2-stable.
request at least rails-html-sanitizer 1.0.3 because of security advisories.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15107 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-26 11:45:41 +00:00
Toshi MARUYAMA
604b3472d4 Merged r15103 from trunk to 3.2-stable.
update Rails to 4.2.5.1.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15106 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-26 11:45:29 +00:00
Toshi MARUYAMA
274378ceb2 Merged r15099 from trunk to 3.2-stable (#21843)
fix nokogiri version comment.

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

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15097 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-26 04:18:45 +00:00
Jean-Philippe Lang
253202c4af Merged r15013 (#21656).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15079 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-21 04:47:55 +00:00
Jean-Philippe Lang
3519d2148f Merged r15077 (#21740).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15078 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-21 04:44:38 +00:00
Jean-Philippe Lang
c2cba83338 Merged r15026 (#21487).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15076 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-21 04:42:50 +00:00
Jean-Philippe Lang
1adeee686e Merged r15024 and r15025 (#21453).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15075 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-21 04:41:49 +00:00
Toshi MARUYAMA
46310f32c5 Merged r15051 from trunk to 3.2-stable (#21620)
Turkish translation for 3.2-stable updated by Bahri Yardim.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15053 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-10 03:22:59 +00:00
Toshi MARUYAMA
330b438d9f Merged r15050 from trunk to 3.2-stable (#21620, #21689)
Turkish translation for 3.1-stable updated by Bahri Yardim.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15052 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-10 03:22:49 +00:00
Toshi MARUYAMA
ef86873ea2 Merged r15046 from trunk to 3.2-stable (#21635)
German translations for 3.2-stable updated by Benedikt Huss.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15048 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 19:42:46 +00:00
Toshi MARUYAMA
492e0b7a26 Merged r15045 from trunk to 3.2-stable (#21635, #21687)
German translations for 3.1-stable updated by Benedikt Huss.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15047 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 19:42:35 +00:00
Toshi MARUYAMA
4c4a52d7c3 Merged r15040 from trunk to 3.2-stable (#21527)
Russian translation for 3.2-stable updated by Alexander Ryabinovskiy.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15043 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 16:45:49 +00:00
Toshi MARUYAMA
bb43848378 Merged r15039 from trunk to 3.2-stable (#21527, #21686)
Russian translation for 3.1-stable updated by Alexander Ryabinovskiy.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15042 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 16:45:38 +00:00
Toshi MARUYAMA
19138c3943 Merged r15032 from trunk to 3.2-stable (#21521)
Spanish and Spanish Panama translation updated by Leonel Iturralde.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15038 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 14:47:31 +00:00
Toshi MARUYAMA
1b4361873f Merged r15031 from trunk to 3.2-stable (#21521)
Spanish "permission_import_issues" and "label_import_issues" translation fixed by Leonel Iturralde.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15037 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 14:47:19 +00:00