]> source.dussan.org Git - redmine.git/log
redmine.git
10 years agotagged version 2.5.3 2.5.3
Jean-Philippe Lang [Tue, 21 Oct 2014 19:10:51 +0000 (19:10 +0000)]
tagged version 2.5.3

git-svn-id: http://svn.redmine.org/redmine/tags/2.5.3@13474 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoUpdates for 2.5.3 release. 2.5-stable 78/head
Jean-Philippe Lang [Tue, 21 Oct 2014 18:56:25 +0000 (18:56 +0000)]
Updates for 2.5.3 release.

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

10 years agoMerged r13404 from trunk to 2.5-stable (#17581)
Toshi MARUYAMA [Sun, 14 Sep 2014 14:13:32 +0000 (14:13 +0000)]
Merged r13404 from trunk to 2.5-stable (#17581)

stricter check of uploading attachments.

Contributed by fred bregar.

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

10 years agoMerged r13390 (#17163).
Jean-Philippe Lang [Sun, 14 Sep 2014 09:20:19 +0000 (09:20 +0000)]
Merged r13390 (#17163).

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

10 years agoMerged r13334 (#17486).
Jean-Philippe Lang [Sat, 13 Sep 2014 10:08:42 +0000 (10:08 +0000)]
Merged r13334 (#17486).

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

10 years ago2.5-stable: pdf: fix failure exporting issue pdf with UTF-8 U+FFFD (#17826)
Toshi MARUYAMA [Thu, 11 Sep 2014 14:53:41 +0000 (14:53 +0000)]
2.5-stable: pdf: fix failure exporting issue pdf with UTF-8 U+FFFD (#17826)

This revision has trunk r13368 and r13369 test.

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

10 years agoMerged r13365 (#14796).
Jean-Baptiste Barth [Sun, 7 Sep 2014 03:14:05 +0000 (03:14 +0000)]
Merged r13365 (#14796).

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

10 years agoMerged r13354 from trunk to 2.5-stable
Toshi MARUYAMA [Thu, 28 Aug 2014 06:40:16 +0000 (06:40 +0000)]
Merged r13354 from trunk to 2.5-stable

add Ruby 1.9.2 to .travis.yml

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

10 years agoMerged r13346 from trunk to 2.5-stable (#17581, #13932)
Toshi MARUYAMA [Tue, 26 Aug 2014 04:58:09 +0000 (04:58 +0000)]
Merged r13346 from trunk to 2.5-stable (#17581, #13932)

fix Drag & Drop does not work with Safari 5.1.

Contributed by fred bregar.

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

10 years agoMerge r13116 from trunk to 2.5-stable
Toshi MARUYAMA [Tue, 26 Aug 2014 04:57:59 +0000 (04:57 +0000)]
Merge r13116 from trunk to 2.5-stable

use rvm 2.0 and 2.1 instead of 2.0.0 and 2.1.0 at .travis.yml

See:
https://github.com/travis-ci/travis-ci/issues/2220

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

10 years agoMerged r13340 from trunk to 2.5-stable (#17585)
Toshi MARUYAMA [Sat, 23 Aug 2014 05:03:04 +0000 (05:03 +0000)]
Merged r13340 from trunk to 2.5-stable (#17585)

fix typo in Traditional Chinese detailed syntax help.

Contributed by Felix Schäfer.

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

10 years agoMerged r13299 from trunk to 2.5-stable (#17451)
Toshi MARUYAMA [Sat, 12 Jul 2014 23:26:53 +0000 (23:26 +0000)]
Merged r13299 from trunk to 2.5-stable (#17451)

Bulgarian translation updated by Ivan Cenov.

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

10 years agoMerged r13285 from trunk to 2.5-stable (#17421)
Toshi MARUYAMA [Fri, 11 Jul 2014 08:10:03 +0000 (08:10 +0000)]
Merged r13285 from trunk to 2.5-stable (#17421)

Traditional Chinese translation updated by ChunChang Lo.

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

10 years agoMerged r13284 from trunk to 2.5-stable (#17399)
Toshi MARUYAMA [Fri, 11 Jul 2014 08:09:48 +0000 (08:09 +0000)]
Merged r13284 from trunk to 2.5-stable (#17399)

German translation updated by Daniel Felix.

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

10 years agoMerged r13227 (Updates for 2.5.2 release).
Jean-Philippe Lang [Sun, 6 Jul 2014 10:39:34 +0000 (10:39 +0000)]
Merged r13227 (Updates for 2.5.2 release).

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

10 years agoMerged r13213 (#16530).
Jean-Philippe Lang [Sun, 6 Jul 2014 10:32:21 +0000 (10:32 +0000)]
Merged r13213 (#16530).

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

10 years agoMerged r13218 (#16989).
Jean-Philippe Lang [Sun, 6 Jul 2014 10:31:15 +0000 (10:31 +0000)]
Merged r13218 (#16989).

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

10 years agoMerged r13220 (#17392, #17003).
Jean-Philippe Lang [Sun, 6 Jul 2014 10:29:51 +0000 (10:29 +0000)]
Merged r13220 (#17392, #17003).

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

10 years agoMerged r13216, r13217 (#17003).
Jean-Philippe Lang [Sun, 6 Jul 2014 10:29:22 +0000 (10:29 +0000)]
Merged r13216, r13217 (#17003).

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

10 years agoMerged r13219 (#3483).
Jean-Philippe Lang [Sun, 6 Jul 2014 10:27:47 +0000 (10:27 +0000)]
Merged r13219 (#3483).

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

10 years agoMerged r13190 (#17206).
Jean-Philippe Lang [Sat, 5 Jul 2014 09:04:29 +0000 (09:04 +0000)]
Merged r13190 (#17206).

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

10 years agoMerged r13208 from trunk to 2.5-stable
Toshi MARUYAMA [Fri, 4 Jul 2014 00:22:54 +0000 (00:22 +0000)]
Merged r13208 from trunk to 2.5-stable

Gemfile: update Rails 3.2.19

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

10 years agoMerged r13115 and r13171 from trunk to 2.5-stable (#16194)
Toshi MARUYAMA [Wed, 2 Jul 2014 03:50:02 +0000 (03:50 +0000)]
Merged r13115 and r13171 from trunk to 2.5-stable (#16194)

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

10 years agoMerged r13199 from trunk to 2.5-stable (#17151)
Toshi MARUYAMA [Tue, 1 Jul 2014 05:25:24 +0000 (05:25 +0000)]
Merged r13199 from trunk to 2.5-stable (#17151)

Fix file upload broken on Chrome 36.

Contributed by Felix Schäfer.

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

10 years agoMerged r13198 from trunk to 2.5-stable (#17235)
Toshi MARUYAMA [Tue, 1 Jul 2014 05:25:07 +0000 (05:25 +0000)]
Merged r13198 from trunk to 2.5-stable (#17235)

Prevent "can't modify frozen String" exception when mail sending error.

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

10 years agoMerged r13055 (#16519).
Jean-Philippe Lang [Thu, 26 Jun 2014 19:35:53 +0000 (19:35 +0000)]
Merged r13055 (#16519).

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

10 years agoMerged r13168 (#16747).
Jean-Philippe Lang [Thu, 26 Jun 2014 19:34:59 +0000 (19:34 +0000)]
Merged r13168 (#16747).

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

10 years agoMerged r13167 (#16798).
Jean-Philippe Lang [Thu, 26 Jun 2014 19:34:12 +0000 (19:34 +0000)]
Merged r13167 (#16798).

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

10 years agoMerged r13185 from trunk to 2.5-stable (#17301)
Toshi MARUYAMA [Wed, 25 Jun 2014 17:40:26 +0000 (17:40 +0000)]
Merged r13185 from trunk to 2.5-stable (#17301)

Czech translation updated by Karel Pičman.

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

10 years agoMerged r13184 from trunk to 2.5-stable (#13932)
Toshi MARUYAMA [Wed, 25 Jun 2014 17:40:11 +0000 (17:40 +0000)]
Merged r13184 from trunk to 2.5-stable (#13932)

Fix file upload does not work with Safari.

Contributed by Felix Schäfer.

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

10 years agoMerged r13180 from trunk to 2.5-stable (#17166)
Toshi MARUYAMA [Thu, 12 Jun 2014 11:44:42 +0000 (11:44 +0000)]
Merged r13180 from trunk to 2.5-stable (#17166)

Japanese translation updated by Go MAEDA.

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

10 years agoMerged r13177 from trunk to 2.5-stable (#5706)
Toshi MARUYAMA [Mon, 9 Jun 2014 00:09:43 +0000 (00:09 +0000)]
Merged r13177 from trunk to 2.5-stable (#5706)

fix Ruby Logger doc link.

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

10 years agoMerged r13122 (#16781).
Jean-Philippe Lang [Sat, 24 May 2014 16:40:29 +0000 (16:40 +0000)]
Merged r13122 (#16781).

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

10 years agoMerged r13107 (#16710).
Jean-Philippe Lang [Sat, 24 May 2014 16:39:54 +0000 (16:39 +0000)]
Merged r13107 (#16710).

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

10 years agoMerged r13125 (#16700).
Jean-Philippe Lang [Sat, 24 May 2014 16:39:18 +0000 (16:39 +0000)]
Merged r13125 (#16700).

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

10 years agoMerged r13141 (#16926).
Jean-Philippe Lang [Sat, 24 May 2014 16:38:36 +0000 (16:38 +0000)]
Merged r13141 (#16926).

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

10 years agoMerged r13140 and r13142 (#16795).
Jean-Philippe Lang [Sat, 24 May 2014 16:37:38 +0000 (16:37 +0000)]
Merged r13140 and r13142 (#16795).

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

10 years agoMerged r13124 (#16755).
Jean-Philippe Lang [Sat, 24 May 2014 16:36:04 +0000 (16:36 +0000)]
Merged r13124 (#16755).

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

10 years agoMerged r13109 (#16739).
Jean-Philippe Lang [Sat, 24 May 2014 16:34:47 +0000 (16:34 +0000)]
Merged r13109 (#16739).

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

10 years agoMerged r13108 (#16708).
Jean-Philippe Lang [Sat, 24 May 2014 16:34:07 +0000 (16:34 +0000)]
Merged r13108 (#16708).

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

10 years agoMerged r13105 (#16669).
Jean-Philippe Lang [Sat, 24 May 2014 16:33:13 +0000 (16:33 +0000)]
Merged r13105 (#16669).

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

10 years agoMerged r13106 (#16668).
Jean-Philippe Lang [Sat, 24 May 2014 16:32:28 +0000 (16:32 +0000)]
Merged r13106 (#16668).

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

10 years agoMerged r13104 (#16655).
Jean-Philippe Lang [Sat, 24 May 2014 16:30:41 +0000 (16:30 +0000)]
Merged r13104 (#16655).

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

10 years agoMerged r13126 (#16619).
Jean-Philippe Lang [Sat, 24 May 2014 16:29:46 +0000 (16:29 +0000)]
Merged r13126 (#16619).

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

10 years agoMerged r13127 (#16564).
Jean-Philippe Lang [Sat, 24 May 2014 16:28:39 +0000 (16:28 +0000)]
Merged r13127 (#16564).

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

10 years agoMerged r13130 from trunk to 2.5-stable
Toshi MARUYAMA [Wed, 7 May 2014 08:41:58 +0000 (08:41 +0000)]
Merged r13130 from trunk to 2.5-stable

Gemfile: update Rails 3.2.18

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

10 years ago2.5-stable: revert r13111 and r13113 (#16685)
Toshi MARUYAMA [Thu, 1 May 2014 13:37:08 +0000 (13:37 +0000)]
2.5-stable: revert r13111 and r13113 (#16685)

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

10 years agoMerged r13117 from trunk to 2.5-stable (#16685)
Toshi MARUYAMA [Thu, 1 May 2014 12:27:28 +0000 (12:27 +0000)]
Merged r13117 from trunk to 2.5-stable (#16685)

Gemfile: upgrade mocha version.

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

10 years agoMerged r13112 from trunk to 2.5-stable (#16685)
Toshi MARUYAMA [Thu, 1 May 2014 01:52:39 +0000 (01:52 +0000)]
Merged r13112 from trunk to 2.5-stable (#16685)

Gemfile: use double quote for request_store

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

10 years agoMerged r13110 from trunk to 2.5-stable (#16685)
Toshi MARUYAMA [Thu, 1 May 2014 01:45:03 +0000 (01:45 +0000)]
Merged r13110 from trunk to 2.5-stable (#16685)

introduce request_store to ensure that the current user doesn't leak across request boundaries.

Contributed by Holger Just.

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

10 years agoMerged r13101 from trunk to 2.5-stable (#16711)
Toshi MARUYAMA [Thu, 17 Apr 2014 19:36:29 +0000 (19:36 +0000)]
Merged r13101 from trunk to 2.5-stable (#16711)

fix non-ascii attachment file name get corrupted in IE11.

Contributed by Go MAEDA.

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

10 years agoMerged r13080 from trunk to 2.5-stable (#16553, #16566)
Toshi MARUYAMA [Tue, 8 Apr 2014 11:49:33 +0000 (11:49 +0000)]
Merged r13080 from trunk to 2.5-stable (#16553, #16566)

French "text_git_repository_note" translation updated by Darth Vader.

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

10 years agoMerged r13077 from trunk to 2.5-stable (#16545)
Toshi MARUYAMA [Tue, 8 Apr 2014 02:44:20 +0000 (02:44 +0000)]
Merged r13077 from trunk to 2.5-stable (#16545)

Traditional Chinese translation updated by ChunChang Lo.

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

10 years agoMerged r13065 from trunk to 2.5-stable (#16542)
Toshi MARUYAMA [Mon, 7 Apr 2014 08:00:30 +0000 (08:00 +0000)]
Merged r13065 from trunk to 2.5-stable (#16542)

German Translation updated by Daniel Felix.

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

10 years agoMerged r12993 from trunk to 2.5-stable
Toshi MARUYAMA [Mon, 7 Apr 2014 08:00:13 +0000 (08:00 +0000)]
Merged r12993 from trunk to 2.5-stable

move de.yml "label_link" by alphabetical order.

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

10 years agoMerged r13052 (#3177).
Jean-Philippe Lang [Sun, 6 Apr 2014 11:04:52 +0000 (11:04 +0000)]
Merged r13052 (#3177).

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

10 years agoMerged r13050 from trunk to 2.5-stable (#16532)
Toshi MARUYAMA [Sun, 6 Apr 2014 07:25:02 +0000 (07:25 +0000)]
Merged r13050 from trunk to 2.5-stable (#16532)

Bulgarian translation updated by Ivan Cenov.

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

10 years agoMerged r13042 to r13044 (#3177).
Jean-Philippe Lang [Sat, 5 Apr 2014 14:38:08 +0000 (14:38 +0000)]
Merged r13042 to r13044 (#3177).

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

10 years agoMerged r13041 (#16511).
Jean-Philippe Lang [Sat, 5 Apr 2014 14:35:22 +0000 (14:35 +0000)]
Merged r13041 (#16511).

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

10 years agoMerged r13040 (#16467).
Jean-Philippe Lang [Sat, 5 Apr 2014 14:34:07 +0000 (14:34 +0000)]
Merged r13040 (#16467).

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

10 years agoMerged r13037 from trunk to 2.5-stable
Toshi MARUYAMA [Sat, 5 Apr 2014 00:26:20 +0000 (00:26 +0000)]
Merged r13037 from trunk to 2.5-stable

replace mail options reference URL at configuration.yml.example.

wiki.rubyonrails.org seems dead.

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

10 years agoUpdates for 2.5.1 release.
Jean-Philippe Lang [Sat, 29 Mar 2014 16:08:43 +0000 (16:08 +0000)]
Updates for 2.5.1 release.

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

10 years agoMerged r13029 (#16415).
Jean-Philippe Lang [Sat, 29 Mar 2014 16:04:07 +0000 (16:04 +0000)]
Merged r13029 (#16415).

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

10 years agoMerged r13018 (#16466).
Jean-Philippe Lang [Sat, 29 Mar 2014 14:53:13 +0000 (14:53 +0000)]
Merged r13018 (#16466).

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

10 years agoMerged r12969 and r12973 (#16353).
Jean-Philippe Lang [Sat, 29 Mar 2014 14:41:09 +0000 (14:41 +0000)]
Merged r12969 and r12973 (#16353).

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

10 years agoMerged r12986 (#16381).
Jean-Philippe Lang [Sat, 29 Mar 2014 14:39:24 +0000 (14:39 +0000)]
Merged r12986 (#16381).

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

10 years agoMerged r12968 (#16319).
Jean-Philippe Lang [Sat, 29 Mar 2014 14:38:47 +0000 (14:38 +0000)]
Merged r12968 (#16319).

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

10 years agoMerged r12990 and r12991 (#16326).
Jean-Philippe Lang [Sat, 29 Mar 2014 14:38:11 +0000 (14:38 +0000)]
Merged r12990 and r12991 (#16326).

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

10 years agoMerged r12990 (#16338).
Jean-Philippe Lang [Sat, 29 Mar 2014 14:37:17 +0000 (14:37 +0000)]
Merged r12990 (#16338).

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

10 years agoMerged r12970 (#16259).
Jean-Philippe Lang [Sat, 29 Mar 2014 14:36:29 +0000 (14:36 +0000)]
Merged r12970 (#16259).

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

10 years agoMerged r12989 and r12997 (#16236).
Jean-Philippe Lang [Sat, 29 Mar 2014 14:35:47 +0000 (14:35 +0000)]
Merged r12989 and r12997 (#16236).

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

10 years agoMerged r12985 (#14298).
Jean-Philippe Lang [Sat, 29 Mar 2014 14:34:28 +0000 (14:34 +0000)]
Merged r12985 (#14298).

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

10 years agoMerged r13015 from trunk to 2.5-stable (#16453)
Toshi MARUYAMA [Fri, 28 Mar 2014 11:23:20 +0000 (11:23 +0000)]
Merged r13015 from trunk to 2.5-stable (#16453)

Czech translation for 2.5-stable updated by Karel Pičman.

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

10 years agoMerged r13004 from trunk to 2.5-stable.
Toshi MARUYAMA [Tue, 25 Mar 2014 08:39:07 +0000 (08:39 +0000)]
Merged r13004 from trunk to 2.5-stable.

add ChangeLog note that #15781 was forgotten to merge to v2.4.3.

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

10 years agoMerged r13001 from trunk to 2.5-stable.
Toshi MARUYAMA [Tue, 25 Mar 2014 08:17:07 +0000 (08:17 +0000)]
Merged r13001 from trunk to 2.5-stable.

Gemfile: pin rake version 10.1.

rake 10.2.0 requires Ruby version >= 1.9.

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

10 years agoMerged r12981 from trunk to 2.5-stable (#16368)
Toshi MARUYAMA [Tue, 18 Mar 2014 03:42:06 +0000 (03:42 +0000)]
Merged r12981 from trunk to 2.5-stable (#16368)

Polish translation updated by Jan Inowolski.

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

10 years agoMerged r12971 (#16255).
Jean-Philippe Lang [Mon, 17 Mar 2014 08:30:30 +0000 (08:30 +0000)]
Merged r12971 (#16255).

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

10 years agoMerged r12967 (#16321).
Jean-Philippe Lang [Mon, 17 Mar 2014 08:29:20 +0000 (08:29 +0000)]
Merged r12967 (#16321).

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

10 years agoMerged r12965 from trunk to 2.5-stable (#16356)
Toshi MARUYAMA [Sat, 15 Mar 2014 06:27:34 +0000 (06:27 +0000)]
Merged r12965 from trunk to 2.5-stable (#16356)

Spanish translation updated by Jesus Gutierrez de la Vega.

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

10 years agoMerged r12963 from trunk to 2.5-stable (#16336)
Toshi MARUYAMA [Thu, 13 Mar 2014 11:38:41 +0000 (11:38 +0000)]
Merged r12963 from trunk to 2.5-stable (#16336)

Russian translation updated by Kirill Bezrukov.

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

10 years agoMerged r12961 from trunk to 2.5-stable (#16334)
Toshi MARUYAMA [Thu, 13 Mar 2014 08:53:17 +0000 (08:53 +0000)]
Merged r12961 from trunk to 2.5-stable (#16334)

Korean Translation updated by Jong-Ha Ahn.

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

10 years agoMerged r12959 from trunk to 2.5-stable (#16320)
Toshi MARUYAMA [Wed, 12 Mar 2014 00:37:58 +0000 (00:37 +0000)]
Merged r12959 from trunk to 2.5-stable (#16320)

fix Turkish translation typo by Gürkan Gür.

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

10 years agoMerged r12955 from trunk to 2.5-stable (#16291)
Toshi MARUYAMA [Tue, 11 Mar 2014 09:57:15 +0000 (09:57 +0000)]
Merged r12955 from trunk to 2.5-stable (#16291)

Japanese translation updated by Go MAEDA.

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

10 years agoMerged r12951.
Jean-Philippe Lang [Sun, 2 Mar 2014 11:24:13 +0000 (11:24 +0000)]
Merged r12951.

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

10 years agoUpdates for 2.5.0 release.
Jean-Philippe Lang [Sun, 2 Mar 2014 09:39:31 +0000 (09:39 +0000)]
Updates for 2.5.0 release.

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

10 years agoMerged r12944 (#16143).
Jean-Philippe Lang [Sun, 2 Mar 2014 09:34:00 +0000 (09:34 +0000)]
Merged r12944 (#16143).

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

10 years agoMerged r12896 (#16081).
Jean-Philippe Lang [Sun, 2 Mar 2014 09:29:22 +0000 (09:29 +0000)]
Merged r12896 (#16081).

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

10 years agoMerged r12941 (#16161).
Jean-Philippe Lang [Fri, 28 Feb 2014 12:53:05 +0000 (12:53 +0000)]
Merged r12941 (#16161).

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

10 years agoMerged r12938 (#16169).
Jean-Philippe Lang [Fri, 28 Feb 2014 11:39:01 +0000 (11:39 +0000)]
Merged r12938 (#16169).

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

10 years agoMerged r12935 from trunk to 2.5-stable (#16177)
Toshi MARUYAMA [Wed, 26 Feb 2014 16:53:51 +0000 (16:53 +0000)]
Merged r12935 from trunk to 2.5-stable (#16177)

use Python getattr instead of hasattr.

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

10 years agoMerged r12930 from trunk to 2.5-stable (#16177)
Toshi MARUYAMA [Wed, 26 Feb 2014 13:02:03 +0000 (13:02 +0000)]
Merged r12930 from trunk to 2.5-stable (#16177)

Mercurial 2.9 compatibility.

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

10 years agoMerged r12929 from trunk to 2.5-stable (#16177)
Toshi MARUYAMA [Wed, 26 Feb 2014 13:01:43 +0000 (13:01 +0000)]
Merged r12929 from trunk to 2.5-stable (#16177)

scm: mercurial: add one "closed" branch to test repository.

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

10 years agorevert r12925 of 2.5-stable
Toshi MARUYAMA [Tue, 25 Feb 2014 06:53:35 +0000 (06:53 +0000)]
revert r12925 of 2.5-stable

I mistook to commit in stable branch.

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

10 years agoprevent issue tree hierarchy is broken in race conditions (#6579)
Toshi MARUYAMA [Tue, 25 Feb 2014 06:49:53 +0000 (06:49 +0000)]
prevent issue tree hierarchy is broken in race conditions (#6579)

awesome_nested_set 2.1.6 uses lock.
Issue model uses as same way.

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

10 years agoMerged r12915 to 12918 (#16107).
Jean-Philippe Lang [Sun, 23 Feb 2014 08:20:42 +0000 (08:20 +0000)]
Merged r12915 to 12918 (#16107).

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

10 years agoMerged r12914 (#16134).
Jean-Philippe Lang [Sun, 23 Feb 2014 08:15:37 +0000 (08:15 +0000)]
Merged r12914 (#16134).

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

10 years agoMerged r12912 and r12913 from trunk.
Jean-Philippe Lang [Sun, 23 Feb 2014 08:14:59 +0000 (08:14 +0000)]
Merged r12912 and r12913 from trunk.

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

10 years agoMerged r12910 and r12911 (#16091).
Jean-Philippe Lang [Sun, 23 Feb 2014 08:11:59 +0000 (08:11 +0000)]
Merged r12910 and r12911 (#16091).

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

10 years agoMerged r12899 (#16077).
Jean-Philippe Lang [Sun, 23 Feb 2014 08:10:31 +0000 (08:10 +0000)]
Merged r12899 (#16077).

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

10 years agoMerged r12906 from trunk to 2.5-stable
Toshi MARUYAMA [Wed, 19 Feb 2014 10:17:14 +0000 (10:17 +0000)]
Merged r12906 from trunk to 2.5-stable

update Rails to 3.2.17

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