]> source.dussan.org Git - redmine.git/log
redmine.git
8 years agoMerged r15608 (#23206).
Jean-Philippe Lang [Sun, 10 Jul 2016 07:45:54 +0000 (07:45 +0000)]
Merged r15608 (#23206).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15613 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15539 and r15550 (#23067).
Jean-Philippe Lang [Sat, 18 Jun 2016 10:16:51 +0000 (10:16 +0000)]
Merged r15539 and r15550 (#23067).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15558 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15532 and r15533 (#23054).
Jean-Philippe Lang [Sat, 18 Jun 2016 06:02:32 +0000 (06:02 +0000)]
Merged r15532 and r15533 (#23054).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15538 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15510 (#22123).
Jean-Philippe Lang [Sun, 12 Jun 2016 06:03:40 +0000 (06:03 +0000)]
Merged r15510 (#22123).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15515 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15484 from trunk to 3.2-stable (#23000, #23003)
Toshi MARUYAMA [Tue, 7 Jun 2016 13:05:14 +0000 (13:05 +0000)]
Merged r15484 from trunk to 3.2-stable (#23000, #23003)

Bulgarian translation for 3.1-stable updated by Ivan Cenov.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15488 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15448 from trunk to 3.2-stable (#22974, #22988)
Toshi MARUYAMA [Mon, 6 Jun 2016 04:28:59 +0000 (04:28 +0000)]
Merged r15448 from trunk to 3.2-stable (#22974, #22988)

Czech translation updated Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15470 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15459.
Jean-Philippe Lang [Sun, 5 Jun 2016 07:21:40 +0000 (07:21 +0000)]
Merged r15459.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15461 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoUpdates for 3.2.3 release.
Jean-Philippe Lang [Sun, 5 Jun 2016 07:18:08 +0000 (07:18 +0000)]
Updates for 3.2.3 release.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15457 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15452 (#22932).
Jean-Philippe Lang [Sun, 5 Jun 2016 07:07:47 +0000 (07:07 +0000)]
Merged r15452 (#22932).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15454 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15442 (#22898).
Jean-Philippe Lang [Sat, 4 Jun 2016 09:56:53 +0000 (09:56 +0000)]
Merged r15442 (#22898).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15445 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15431 to r15435 (#22924, #22925, #22926).
Jean-Philippe Lang [Sat, 4 Jun 2016 07:25:12 +0000 (07:25 +0000)]
Merged r15431 to r15435 (#22924, #22925, #22926).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15441 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15429 (#22911).
Jean-Philippe Lang [Sat, 4 Jun 2016 07:19:27 +0000 (07:19 +0000)]
Merged r15429 (#22911).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15439 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15428 (#22912).
Jean-Philippe Lang [Sat, 4 Jun 2016 07:18:07 +0000 (07:18 +0000)]
Merged r15428 (#22912).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15437 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15416 (#22808).
Jean-Philippe Lang [Sat, 21 May 2016 06:50:25 +0000 (06:50 +0000)]
Merged r15416 (#22808).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15419 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15385 from trunk to 3.2-stable (#22506, #22761)
Toshi MARUYAMA [Sat, 7 May 2016 14:05:01 +0000 (14:05 +0000)]
Merged r15385 from trunk to 3.2-stable (#22506, #22761)

Korean translation for 3.2-stable updated by Yonghwan SO.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15390 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15384 from trunk to 3.2-stable (#22506, #22760)
Toshi MARUYAMA [Sat, 7 May 2016 14:04:51 +0000 (14:04 +0000)]
Merged r15384 from trunk to 3.2-stable (#22506, #22760)

Korean translation for 3.1-stable updated by Yonghwan SO.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15389 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15376 from trunk to 3.2-stable (#22427)
Toshi MARUYAMA [Sat, 7 May 2016 10:57:33 +0000 (10:57 +0000)]
Merged r15376 from trunk to 3.2-stable (#22427)

Updates pt-BR translation.

Patch by Luiz Moura.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15380 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15365.
Jean-Philippe Lang [Thu, 5 May 2016 18:28:26 +0000 (18:28 +0000)]
Merged r15365.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15366 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15362 (#22721).
Jean-Philippe Lang [Thu, 5 May 2016 18:25:57 +0000 (18:25 +0000)]
Merged r15362 (#22721).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15363 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15357 (#22583).
Jean-Philippe Lang [Sun, 24 Apr 2016 15:14:39 +0000 (15:14 +0000)]
Merged r15357 (#22583).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15358 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15318 and r15319 (#22342).
Jean-Philippe Lang [Tue, 12 Apr 2016 16:55:30 +0000 (16:55 +0000)]
Merged r15318 and r15319 (#22342).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15329 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15298 (#22354).
Jean-Philippe Lang [Sat, 9 Apr 2016 05:55:26 +0000 (05:55 +0000)]
Merged r15298 (#22354).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15310 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15292 (#22134).
Jean-Philippe Lang [Sat, 9 Apr 2016 05:54:45 +0000 (05:54 +0000)]
Merged r15292 (#22134).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15309 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15290 (#5156).
Jean-Philippe Lang [Sat, 9 Apr 2016 05:53:40 +0000 (05:53 +0000)]
Merged r15290 (#5156).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15308 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15293 (#22305).
Jean-Philippe Lang [Sat, 9 Apr 2016 05:52:15 +0000 (05:52 +0000)]
Merged r15293 (#22305).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15306 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15303 (#22336).
Jean-Philippe Lang [Sun, 3 Apr 2016 12:34:05 +0000 (12:34 +0000)]
Merged r15303 (#22336).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15304 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15301 (#22296).
Jean-Philippe Lang [Sun, 3 Apr 2016 12:31:53 +0000 (12:31 +0000)]
Merged r15301 (#22296).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15302 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15299 (#22278).
Jean-Philippe Lang [Sun, 3 Apr 2016 12:29:42 +0000 (12:29 +0000)]
Merged r15299 (#22278).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15300 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15296 (#22196).
Jean-Philippe Lang [Sun, 3 Apr 2016 12:08:54 +0000 (12:08 +0000)]
Merged r15296 (#22196).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15297 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15294 (#22105).
Jean-Philippe Lang [Sun, 3 Apr 2016 12:05:29 +0000 (12:05 +0000)]
Merged r15294 (#22105).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15295 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15282 from trunk to 3.2-stable (#22319, #22134)
Toshi MARUYAMA [Sat, 26 Mar 2016 04:53:40 +0000 (04:53 +0000)]
Merged r15282 from trunk to 3.2-stable (#22319, #22134)

German "error_invalid_csv_file_or_settings" typo fixed by Jens Krämer.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15283 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15252 from trunk to 3.2-stable
Toshi MARUYAMA [Thu, 24 Mar 2016 06:38:05 +0000 (06:38 +0000)]
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

8 years agoMerged r15274 from trunk to 3.2-stable
Toshi MARUYAMA [Thu, 24 Mar 2016 05:53:32 +0000 (05:53 +0000)]
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

8 years agoMerged r15238.
Jean-Philippe Lang [Sun, 13 Mar 2016 10:41:37 +0000 (10:41 +0000)]
Merged r15238.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15239 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15236.
Jean-Philippe Lang [Sun, 13 Mar 2016 10:16:54 +0000 (10:16 +0000)]
Merged r15236.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15237 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15223 and r15225 (#22127).
Jean-Philippe Lang [Sun, 13 Mar 2016 08:20:37 +0000 (08:20 +0000)]
Merged r15223 and r15225 (#22127).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15230 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15228 (#21487).
Jean-Philippe Lang [Sun, 13 Mar 2016 08:14:07 +0000 (08:14 +0000)]
Merged r15228 (#21487).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15229 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15224 (#22178).
Jean-Philippe Lang [Sun, 13 Mar 2016 08:03:08 +0000 (08:03 +0000)]
Merged r15224 (#22178).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15227 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15202 (#22108).
Jean-Philippe Lang [Sun, 13 Mar 2016 08:01:55 +0000 (08:01 +0000)]
Merged r15202 (#22108).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15226 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15136 to r15138 (#21593).
Jean-Philippe Lang [Sat, 12 Mar 2016 10:36:10 +0000 (10:36 +0000)]
Merged r15136 to r15138 (#21593).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15222 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15220.
Jean-Philippe Lang [Sat, 12 Mar 2016 10:34:22 +0000 (10:34 +0000)]
Merged r15220.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15221 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15218 (#22128).
Jean-Philippe Lang [Sat, 12 Mar 2016 10:32:06 +0000 (10:32 +0000)]
Merged r15218 (#22128).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15219 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15216 (#22104).
Jean-Philippe Lang [Sat, 12 Mar 2016 10:25:44 +0000 (10:25 +0000)]
Merged r15216 (#22104).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15217 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15214 (#22101).
Jean-Philippe Lang [Sat, 12 Mar 2016 10:23:46 +0000 (10:23 +0000)]
Merged r15214 (#22101).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15215 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15211 (#22074).
Jean-Philippe Lang [Sat, 12 Mar 2016 10:21:09 +0000 (10:21 +0000)]
Merged r15211 (#22074).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15213 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15211 (#22074).
Jean-Philippe Lang [Sat, 12 Mar 2016 10:20:44 +0000 (10:20 +0000)]
Merged r15211 (#22074).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15212 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15196 (#22072).
Jean-Philippe Lang [Sat, 12 Mar 2016 10:03:41 +0000 (10:03 +0000)]
Merged r15196 (#22072).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15207 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15082 (#20988).
Jean-Philippe Lang [Sat, 12 Mar 2016 10:02:37 +0000 (10:02 +0000)]
Merged r15082 (#20988).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15206 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15204 (#21847).
Jean-Philippe Lang [Sat, 12 Mar 2016 10:01:11 +0000 (10:01 +0000)]
Merged r15204 (#21847).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15205 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15131 (#21867).
Jean-Philippe Lang [Sat, 12 Mar 2016 09:56:40 +0000 (09:56 +0000)]
Merged r15131 (#21867).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15203 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15200 (#21775).
Jean-Philippe Lang [Sat, 12 Mar 2016 08:32:12 +0000 (08:32 +0000)]
Merged r15200 (#21775).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15201 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15134 (#21263).
Jean-Philippe Lang [Sat, 12 Mar 2016 08:25:44 +0000 (08:25 +0000)]
Merged r15134 (#21263).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15199 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15130 (#21900).
Jean-Philippe Lang [Sat, 12 Mar 2016 08:23:58 +0000 (08:23 +0000)]
Merged r15130 (#21900).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15197 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15151 from trunk to 3.2-stable
Toshi MARUYAMA [Fri, 4 Mar 2016 15:57:41 +0000 (15:57 +0000)]
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

8 years agoMerged r15179 from trunk to 3.2-stable (#22009)
Toshi MARUYAMA [Thu, 3 Mar 2016 13:49:10 +0000 (13:49 +0000)]
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

8 years agoMerged r15178 from trunk to 3.2-stable (#22009, #22139)
Toshi MARUYAMA [Thu, 3 Mar 2016 13:49:00 +0000 (13:49 +0000)]
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

8 years agoMerged r15172 from trunk to 3.2-stable (#21963, #22132)
Toshi MARUYAMA [Thu, 3 Mar 2016 08:08:18 +0000 (08:08 +0000)]
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

8 years agoMerged r15168 from trunk to 3.2-stable (#21963, #22132)
Toshi MARUYAMA [Thu, 3 Mar 2016 07:40:10 +0000 (07:40 +0000)]
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

8 years agoMerged r15167 from trunk to 3.2-stable (#21963, #22131)
Toshi MARUYAMA [Thu, 3 Mar 2016 07:39:58 +0000 (07:39 +0000)]
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

8 years agoMerged r15161 from trunk to 3.2-stable
Toshi MARUYAMA [Wed, 2 Mar 2016 04:10:08 +0000 (04:10 +0000)]
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

8 years agoMerged r15122 from trunk to 3.2-stable (#21747, #21899)
Toshi MARUYAMA [Sat, 30 Jan 2016 13:32:54 +0000 (13:32 +0000)]
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

8 years agoMerged r15121 from trunk to 3.2-stable (#21747, #21898)
Toshi MARUYAMA [Sat, 30 Jan 2016 13:32:35 +0000 (13:32 +0000)]
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

8 years agoMerged r15114 from trunk to 3.2-stable (#21883)
Toshi MARUYAMA [Sat, 30 Jan 2016 06:53:47 +0000 (06:53 +0000)]
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

8 years agoMerged r15113 from trunk to 3.2-stable (#21882)
Toshi MARUYAMA [Sat, 30 Jan 2016 06:53:37 +0000 (06:53 +0000)]
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

8 years agoMerged r15112 from trunk to 3.2-stable (#21881)
Toshi MARUYAMA [Sat, 30 Jan 2016 06:53:25 +0000 (06:53 +0000)]
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

8 years agoMerged r15105 from trunk to 3.2-stable.
Toshi MARUYAMA [Tue, 26 Jan 2016 11:45:41 +0000 (11:45 +0000)]
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

8 years agoMerged r15103 from trunk to 3.2-stable.
Toshi MARUYAMA [Tue, 26 Jan 2016 11:45:29 +0000 (11:45 +0000)]
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

8 years agoMerged r15099 from trunk to 3.2-stable (#21843)
Toshi MARUYAMA [Tue, 26 Jan 2016 04:28:16 +0000 (04:28 +0000)]
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

8 years agoMerged r15096 from trunk to 3.2-stable (#21843)
Toshi MARUYAMA [Tue, 26 Jan 2016 04:18:45 +0000 (04:18 +0000)]
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

8 years agoMerged r15013 (#21656).
Jean-Philippe Lang [Thu, 21 Jan 2016 04:47:55 +0000 (04:47 +0000)]
Merged r15013 (#21656).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15079 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15077 (#21740).
Jean-Philippe Lang [Thu, 21 Jan 2016 04:44:38 +0000 (04:44 +0000)]
Merged r15077 (#21740).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15078 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15026 (#21487).
Jean-Philippe Lang [Thu, 21 Jan 2016 04:42:50 +0000 (04:42 +0000)]
Merged r15026 (#21487).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15076 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15024 and r15025 (#21453).
Jean-Philippe Lang [Thu, 21 Jan 2016 04:41:49 +0000 (04:41 +0000)]
Merged r15024 and r15025 (#21453).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15075 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15051 from trunk to 3.2-stable (#21620)
Toshi MARUYAMA [Sun, 10 Jan 2016 03:22:59 +0000 (03:22 +0000)]
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

8 years agoMerged r15050 from trunk to 3.2-stable (#21620, #21689)
Toshi MARUYAMA [Sun, 10 Jan 2016 03:22:49 +0000 (03:22 +0000)]
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

8 years agoMerged r15046 from trunk to 3.2-stable (#21635)
Toshi MARUYAMA [Sat, 9 Jan 2016 19:42:46 +0000 (19:42 +0000)]
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

8 years agoMerged r15045 from trunk to 3.2-stable (#21635, #21687)
Toshi MARUYAMA [Sat, 9 Jan 2016 19:42:35 +0000 (19:42 +0000)]
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

8 years agoMerged r15040 from trunk to 3.2-stable (#21527)
Toshi MARUYAMA [Sat, 9 Jan 2016 16:45:49 +0000 (16:45 +0000)]
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

8 years agoMerged r15039 from trunk to 3.2-stable (#21527, #21686)
Toshi MARUYAMA [Sat, 9 Jan 2016 16:45:38 +0000 (16:45 +0000)]
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

8 years agoMerged r15032 from trunk to 3.2-stable (#21521)
Toshi MARUYAMA [Sat, 9 Jan 2016 14:47:31 +0000 (14:47 +0000)]
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

8 years agoMerged r15031 from trunk to 3.2-stable (#21521)
Toshi MARUYAMA [Sat, 9 Jan 2016 14:47:19 +0000 (14:47 +0000)]
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

8 years agoMerged r15030 from trunk to 3.2-stable (#21533)
Toshi MARUYAMA [Sat, 9 Jan 2016 13:15:55 +0000 (13:15 +0000)]
Merged r15030 from trunk to 3.2-stable (#21533)

Bulgarian translation updated by Ivan Cenov.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15035 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15029 from trunk to 3.2-stable (#21511)
Toshi MARUYAMA [Sat, 9 Jan 2016 13:15:40 +0000 (13:15 +0000)]
Merged r15029 from trunk to 3.2-stable (#21511)

Japanese translation updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15034 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15028 from trunk to 3.2-stable (#21506)
Toshi MARUYAMA [Sat, 9 Jan 2016 13:15:24 +0000 (13:15 +0000)]
Merged r15028 from trunk to 3.2-stable (#21506)

Traditional Chinese translation updated by ChunChang Lo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15033 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r14985 (#21535).
Jean-Philippe Lang [Sat, 9 Jan 2016 09:14:51 +0000 (09:14 +0000)]
Merged r14985 (#21535).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15023 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r14987 (#21534).
Jean-Philippe Lang [Sat, 9 Jan 2016 09:13:28 +0000 (09:13 +0000)]
Merged r14987 (#21534).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15022 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r14966 (#21436).
Jean-Philippe Lang [Sat, 9 Jan 2016 09:12:45 +0000 (09:12 +0000)]
Merged r14966 (#21436).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15021 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r14986 (#21531).
Jean-Philippe Lang [Sat, 9 Jan 2016 09:11:54 +0000 (09:11 +0000)]
Merged r14986 (#21531).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15020 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r14984 (#21551).
Jean-Philippe Lang [Sat, 9 Jan 2016 08:43:24 +0000 (08:43 +0000)]
Merged r14984 (#21551).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15016 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r14988 and r14988 (#21504).
Jean-Philippe Lang [Sat, 9 Jan 2016 08:41:01 +0000 (08:41 +0000)]
Merged r14988 and r14988 (#21504).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15014 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15007 from trunk to 3.2-stable (#21522)
Toshi MARUYAMA [Thu, 7 Jan 2016 04:16:57 +0000 (04:16 +0000)]
Merged r15007 from trunk to 3.2-stable (#21522)

Simplified Chinese translation updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15010 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r14974 and r14975 from trunk to 3.2-stable (#21447)
Toshi MARUYAMA [Thu, 7 Jan 2016 04:16:44 +0000 (04:16 +0000)]
Merged r14974 and r14975 from trunk to 3.2-stable (#21447)

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15009 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15006 from trunk to 3.2-stable (#21588)
Toshi MARUYAMA [Thu, 7 Jan 2016 04:15:59 +0000 (04:15 +0000)]
Merged r15006 from trunk to 3.2-stable (#21588)

Simplified Chinese "field_cvs_module" translation fixed by qian hu.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15008 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r15004 from trunk to 3.2-stable (#21454)
Toshi MARUYAMA [Wed, 6 Jan 2016 13:19:27 +0000 (13:19 +0000)]
Merged r15004 from trunk to 3.2-stable (#21454)

Simplified Chinese translation for 3.2-stable updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15005 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r14995 from trunk to 3.2-stable (#21456)
Toshi MARUYAMA [Wed, 6 Jan 2016 11:22:41 +0000 (11:22 +0000)]
Merged r14995 from trunk to 3.2-stable (#21456)

Simplified Chinese wiki translation for 3.1-stable updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14998 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r14994 from trunk to 3.2-stable (#21456, #21650)
Toshi MARUYAMA [Wed, 6 Jan 2016 11:22:26 +0000 (11:22 +0000)]
Merged r14994 from trunk to 3.2-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.2-stable@14997 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r14993 from trunk to 3.2-stable (#21456, #21650)
Toshi MARUYAMA [Wed, 6 Jan 2016 11:22:15 +0000 (11:22 +0000)]
Merged r14993 from trunk to 3.2-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.2-stable@14996 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r14977 from trunk to 3.2-stable (#21569)
Toshi MARUYAMA [Mon, 21 Dec 2015 04:17:05 +0000 (04:17 +0000)]
Merged r14977 from trunk to 3.2-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.2-stable@14990 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r14967 to r14969 (#21488).
Jean-Philippe Lang [Sat, 19 Dec 2015 08:12:58 +0000 (08:12 +0000)]
Merged r14967 to r14969 (#21488).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14982 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 years agoMerged r14970 to r14972 (#21477).
Jean-Philippe Lang [Sat, 19 Dec 2015 08:01:58 +0000 (08:01 +0000)]
Merged r14970 to r14972 (#21477).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14980 e93f8b46-1217-0410-a6f0-8f06a7374b81