Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-29 02:40:00 +01:00
Code Issues Packages Projects Releases Activity
10,804 Commits 35 Branches 225 Tags
5baf46b64019f6905ab728940cf77b15cc8071fe
Commit Graph

10804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Toshi MARUYAMA
5baf46b640 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
 2014-07-01 05:25:24 +00:00
Toshi MARUYAMA
5ecad330d9 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
 2014-07-01 05:25:07 +00:00
Jean-Philippe Lang
438cd4d6fa Merged r13055 (#16519). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13193 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-06-26 19:35:53 +00:00
Jean-Philippe Lang
72d81e9b6f Merged r13168 (#16747). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13192 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-06-26 19:34:59 +00:00
Jean-Philippe Lang
37417628f4 Merged r13167 (#16798). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13191 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-06-26 19:34:12 +00:00
Toshi MARUYAMA
b06efff4f1 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
 2014-06-25 17:40:26 +00:00
Toshi MARUYAMA
99e8c2c67d 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
 2014-06-25 17:40:11 +00:00
Toshi MARUYAMA
0b90147d04 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
 2014-06-12 11:44:42 +00:00
Toshi MARUYAMA
8f84605d8c 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
 2014-06-09 00:09:43 +00:00
Jean-Philippe Lang
66084c8f97 Merged r13122 (#16781). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13166 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:40:29 +00:00
Jean-Philippe Lang
a532ba114e Merged r13107 (#16710). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13165 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:39:54 +00:00
Jean-Philippe Lang
a6d62710cd Merged r13125 (#16700). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13164 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:39:18 +00:00
Jean-Philippe Lang
54a12ccb69 Merged r13141 (#16926). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13163 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:38:36 +00:00
Jean-Philippe Lang
221c8392c6 Merged r13140 and r13142 (#16795). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13162 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:37:38 +00:00
Jean-Philippe Lang
cc37898d15 Merged r13124 (#16755). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13161 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:36:04 +00:00
Jean-Philippe Lang
6b0b38b863 Merged r13109 (#16739). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13160 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:34:47 +00:00
Jean-Philippe Lang
f20b2d6d77 Merged r13108 (#16708). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13159 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:34:07 +00:00
Jean-Philippe Lang
d548d9338e Merged r13105 (#16669). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13158 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:33:13 +00:00
Jean-Philippe Lang
d84c3d35f0 Merged r13106 (#16668). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13157 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:32:28 +00:00
Jean-Philippe Lang
7352f1781b Merged r13104 (#16655). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13156 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:30:41 +00:00
Jean-Philippe Lang
fb0c262f8f Merged r13126 (#16619). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13155 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:29:46 +00:00
Jean-Philippe Lang
23b322772d Merged r13127 (#16564). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13154 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:28:39 +00:00
Toshi MARUYAMA
bd37390424 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
 2014-05-07 08:41:58 +00:00
Toshi MARUYAMA
983ec24a97 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
 2014-05-01 13:37:08 +00:00
Toshi MARUYAMA
cd67b1b02a 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
 2014-05-01 12:27:28 +00:00
Toshi MARUYAMA
4e4a48a05c 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
 2014-05-01 01:52:39 +00:00
Toshi MARUYAMA
83fe35d3d2 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
 2014-05-01 01:45:03 +00:00
Toshi MARUYAMA
f155a1ada6 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
 2014-04-17 19:36:29 +00:00
Toshi MARUYAMA
ebe3a916bc 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
 2014-04-08 11:49:33 +00:00
Toshi MARUYAMA
28c3dd6d90 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
 2014-04-08 02:44:20 +00:00
Toshi MARUYAMA
872d9c2441 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
 2014-04-07 08:00:30 +00:00
Toshi MARUYAMA
b6c79fded3 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
 2014-04-07 08:00:13 +00:00
Jean-Philippe Lang
aeb72db1a9 Merged r13052 (#3177). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13053 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-04-06 11:04:52 +00:00
Toshi MARUYAMA
49b9cd53fd 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
 2014-04-06 07:25:02 +00:00
Jean-Philippe Lang
7e705071a5 Merged r13042 to r13044 (#3177). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13049 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-04-05 14:38:08 +00:00
Jean-Philippe Lang
cf36ba1572 Merged r13041 (#16511). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13048 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-04-05 14:35:22 +00:00
Jean-Philippe Lang
6c0f393ad1 Merged r13040 (#16467). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13046 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-04-05 14:34:07 +00:00
Toshi MARUYAMA
4a5c6c5e34 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
 2014-04-05 00:26:20 +00:00
Jean-Philippe Lang
048036da81 Updates for 2.5.1 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13032 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-29 16:08:43 +00:00
Jean-Philippe Lang
a8d3f491e6 Merged r13029 (#16415). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13030 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-29 16:04:07 +00:00
Jean-Philippe Lang
1807093b75 Merged r13018 (#16466). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13027 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-29 14:53:13 +00:00
Jean-Philippe Lang
665767db44 Merged r12969 and r12973 (#16353). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13026 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-29 14:41:09 +00:00
Jean-Philippe Lang
23ae3d1fa6 Merged r12986 (#16381). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13025 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-29 14:39:24 +00:00
Jean-Philippe Lang
2344dfe7f7 Merged r12968 (#16319). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13024 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-29 14:38:47 +00:00
Jean-Philippe Lang
33a7f6bc11 Merged r12990 and r12991 (#16326). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13023 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-29 14:38:11 +00:00
Jean-Philippe Lang
65c9223fe5 Merged r12990 (#16338). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13022 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-29 14:37:17 +00:00
Jean-Philippe Lang
df7f00afce Merged r12970 (#16259). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13021 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-29 14:36:29 +00:00
Jean-Philippe Lang
c5b52ec29f Merged r12989 and r12997 (#16236). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13020 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-29 14:35:47 +00:00
Jean-Philippe Lang
58786e8d80 Merged r12985 (#14298). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13019 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-29 14:34:28 +00:00
Toshi MARUYAMA
d10f17f216 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
 2014-03-28 11:23:20 +00:00