]> source.dussan.org Git - redmine.git/log
redmine.git
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

10 years agoMerged r12897.
Jean-Philippe Lang [Sat, 15 Feb 2014 10:04:48 +0000 (10:04 +0000)]
Merged r12897.

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

10 years agoMerged r12894 (#16091).
Jean-Philippe Lang [Sat, 15 Feb 2014 09:01:16 +0000 (09:01 +0000)]
Merged r12894 (#16091).

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

10 years agoMerged r12892.
Jean-Philippe Lang [Sat, 15 Feb 2014 08:34:57 +0000 (08:34 +0000)]
Merged r12892.

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

10 years agoMerged r12888 to r12890.
Jean-Philippe Lang [Sat, 15 Feb 2014 08:31:07 +0000 (08:31 +0000)]
Merged r12888 to r12890.

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

10 years agoSet version to 2.5.0.stable.
Jean-Philippe Lang [Sat, 15 Feb 2014 07:40:56 +0000 (07:40 +0000)]
Set version to 2.5.0.stable.

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

10 years ago2.5-stable branch added
Jean-Philippe Lang [Sat, 15 Feb 2014 07:37:46 +0000 (07:37 +0000)]
2.5-stable branch added

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

10 years agoGerman translation updated by Daniel Felix (#16097)
Toshi MARUYAMA [Sat, 15 Feb 2014 00:42:37 +0000 (00:42 +0000)]
German translation updated by Daniel Felix (#16097)

git-svn-id: http://svn.redmine.org/redmine/trunk@12884 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agouse escaped "Can't" constant at MailerTest
Toshi MARUYAMA [Fri, 14 Feb 2014 05:05:39 +0000 (05:05 +0000)]
use escaped "Can't" constant at MailerTest

git-svn-id: http://svn.redmine.org/redmine/trunk@12883 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoRails4: fix time related git adapter test failures
Toshi MARUYAMA [Fri, 14 Feb 2014 05:05:24 +0000 (05:05 +0000)]
Rails4: fix time related git adapter test failures

git-svn-id: http://svn.redmine.org/redmine/trunk@12882 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoRails4: replace deprecated Relation#sum with finder options at lib/redmine/helpers...
Toshi MARUYAMA [Fri, 14 Feb 2014 02:33:00 +0000 (02:33 +0000)]
Rails4: replace deprecated Relation#sum with finder options at lib/redmine/helpers/time_report.rb

git-svn-id: http://svn.redmine.org/redmine/trunk@12881 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoadd missing fixtures to TimeEntryReportsControllerTest
Toshi MARUYAMA [Fri, 14 Feb 2014 02:02:06 +0000 (02:02 +0000)]
add missing fixtures to TimeEntryReportsControllerTest

git-svn-id: http://svn.redmine.org/redmine/trunk@12880 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoRails4: fix PreviewsControllerTest assert_template failures
Toshi MARUYAMA [Thu, 13 Feb 2014 08:17:04 +0000 (08:17 +0000)]
Rails4: fix PreviewsControllerTest assert_template failures

<pre>
  1) Failure:
PreviewsControllerTest#test_preview_issue_notes [test/functional/previews_controller_test.rb:44]:
expecting <"preview"> but rendering with <["previews/issue"]>
</pre>

git-svn-id: http://svn.redmine.org/redmine/trunk@12879 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agofix source indent of Repository::Cvs model
Toshi MARUYAMA [Thu, 13 Feb 2014 07:13:59 +0000 (07:13 +0000)]
fix source indent of Repository::Cvs model

git-svn-id: http://svn.redmine.org/redmine/trunk@12878 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoRails4: replace hard-coded html with class at ApplicationHelperTest#test_wiki_links
Toshi MARUYAMA [Thu, 13 Feb 2014 06:29:34 +0000 (06:29 +0000)]
Rails4: replace hard-coded html with class at ApplicationHelperTest#test_wiki_links

See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12877 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoRails4: replace hard-coded html with class at Redmine::WikiFormatting::MacrosTest
Toshi MARUYAMA [Thu, 13 Feb 2014 05:40:09 +0000 (05:40 +0000)]
Rails4: replace hard-coded html with class at Redmine::WikiFormatting::MacrosTest

See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12876 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoallow jruby test failure on travis
Toshi MARUYAMA [Tue, 11 Feb 2014 23:54:51 +0000 (23:54 +0000)]
allow jruby test failure on travis

SCM tests fail randomly due to IO.popen().

See:
https://github.com/jruby/jruby/issues/779

git-svn-id: http://svn.redmine.org/redmine/trunk@12875 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agouse jruby instead of jruby-18mode etc. at .travis.yml
Toshi MARUYAMA [Tue, 11 Feb 2014 23:54:36 +0000 (23:54 +0000)]
use jruby instead of jruby-18mode etc. at .travis.yml

git-svn-id: http://svn.redmine.org/redmine/trunk@12874 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoadd "jruby-20mode" and "jruby-21mode" to .travis.yml
Toshi MARUYAMA [Tue, 11 Feb 2014 08:40:25 +0000 (08:40 +0000)]
add "jruby-20mode" and "jruby-21mode" to .travis.yml

git-svn-id: http://svn.redmine.org/redmine/trunk@12873 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoRails4: replace hard-coded html with class at IssuesHelperTest
Toshi MARUYAMA [Tue, 11 Feb 2014 07:27:30 +0000 (07:27 +0000)]
Rails4: replace hard-coded html with class at IssuesHelperTest

See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12872 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoTraditional Chinese translation updated by ChunChang Lo (#16060)
Toshi MARUYAMA [Mon, 10 Feb 2014 06:21:28 +0000 (06:21 +0000)]
Traditional Chinese translation updated by ChunChang Lo (#16060)

git-svn-id: http://svn.redmine.org/redmine/trunk@12871 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoTest failure with Postgresql+ruby1.8 (#2549).
Jean-Philippe Lang [Sun, 9 Feb 2014 16:34:41 +0000 (16:34 +0000)]
Test failure with Postgresql+ruby1.8 (#2549).

git-svn-id: http://svn.redmine.org/redmine/trunk@12870 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoMakes #watcher_link return an empty string when given nil.
Jean-Philippe Lang [Sun, 9 Feb 2014 12:04:44 +0000 (12:04 +0000)]
Makes #watcher_link return an empty string when given nil.

git-svn-id: http://svn.redmine.org/redmine/trunk@12869 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoDisplay watch link only when inside project with logged-in user (#2549).
Jean-Philippe Lang [Sun, 9 Feb 2014 12:01:22 +0000 (12:01 +0000)]
Display watch link only when inside project with logged-in user (#2549).

git-svn-id: http://svn.redmine.org/redmine/trunk@12868 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoUse spaces instead of tabs.
Jean-Philippe Lang [Sun, 9 Feb 2014 11:58:19 +0000 (11:58 +0000)]
Use spaces instead of tabs.

git-svn-id: http://svn.redmine.org/redmine/trunk@12867 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoEnable the watching of news (#2549).
Jean-Philippe Lang [Sun, 9 Feb 2014 11:54:21 +0000 (11:54 +0000)]
Enable the watching of news (#2549).

git-svn-id: http://svn.redmine.org/redmine/trunk@12866 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoCheck that target tables exist before proceeding.
Jean-Philippe Lang [Sun, 9 Feb 2014 10:49:57 +0000 (10:49 +0000)]
Check that target tables exist before proceeding.

git-svn-id: http://svn.redmine.org/redmine/trunk@12865 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoPrevent inline images to overflow (#3163).
Jean-Philippe Lang [Sat, 8 Feb 2014 11:16:13 +0000 (11:16 +0000)]
Prevent inline images to overflow (#3163).

git-svn-id: http://svn.redmine.org/redmine/trunk@12864 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoUpdates for 2.4.3 release.
Jean-Philippe Lang [Sat, 8 Feb 2014 08:00:23 +0000 (08:00 +0000)]
Updates for 2.4.3 release.

git-svn-id: http://svn.redmine.org/redmine/trunk@12861 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoBulgarian translation updated by Ivan Cenov (#16049)
Toshi MARUYAMA [Sat, 8 Feb 2014 01:12:17 +0000 (01:12 +0000)]
Bulgarian translation updated by Ivan Cenov (#16049)

git-svn-id: http://svn.redmine.org/redmine/trunk@12859 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoadd "git --version" to .travis.yml
Toshi MARUYAMA [Fri, 7 Feb 2014 23:11:53 +0000 (23:11 +0000)]
add "git --version" to .travis.yml

git-svn-id: http://svn.redmine.org/redmine/trunk@12858 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agofix source indent of ApplicationHelperTest
Toshi MARUYAMA [Fri, 7 Feb 2014 12:12:09 +0000 (12:12 +0000)]
fix source indent of ApplicationHelperTest

git-svn-id: http://svn.redmine.org/redmine/trunk@12857 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoReverts r12855.
Jean-Philippe Lang [Fri, 7 Feb 2014 11:45:25 +0000 (11:45 +0000)]
Reverts r12855.

git-svn-id: http://svn.redmine.org/redmine/trunk@12856 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoAdds JS response support to #render_error (#15760).
Jean-Philippe Lang [Fri, 7 Feb 2014 09:26:27 +0000 (09:26 +0000)]
Adds JS response support to #render_error (#15760).

git-svn-id: http://svn.redmine.org/redmine/trunk@12855 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoProject.activities should always return a ActiveRecord::Relation (#15983).
Jean-Philippe Lang [Fri, 7 Feb 2014 08:36:49 +0000 (08:36 +0000)]
Project.activities should always return a ActiveRecord::Relation (#15983).

git-svn-id: http://svn.redmine.org/redmine/trunk@12854 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoCode cleanup.
Jean-Philippe Lang [Fri, 7 Feb 2014 08:00:39 +0000 (08:00 +0000)]
Code cleanup.

git-svn-id: http://svn.redmine.org/redmine/trunk@12851 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoUpdated locales.
Jean-Philippe Lang [Fri, 7 Feb 2014 07:58:35 +0000 (07:58 +0000)]
Updated locales.

git-svn-id: http://svn.redmine.org/redmine/trunk@12850 e93f8b46-1217-0410-a6f0-8f06a7374b81