Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-24 13:21:04 +01:00
Code Issues Packages Projects Releases Activity
10,782 Commits 35 Branches 228 Tags
bd373904245a8bc89fb95fa5ce16c65a58b2cb52
Commit Graph

10782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Toshi MARUYAMA
323527beb7 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
 2014-03-25 08:39:07 +00:00
Toshi MARUYAMA
0d3cb4e8e1 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
 2014-03-25 08:17:07 +00:00
Toshi MARUYAMA
75855f21bb 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
 2014-03-18 03:42:06 +00:00
Jean-Philippe Lang
c61a6a707f Merged r12971 (#16255). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12979 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-17 08:30:30 +00:00
Jean-Philippe Lang
4aab2ed303 Merged r12967 (#16321). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12978 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-17 08:29:20 +00:00
Toshi MARUYAMA
e0a8e692da 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
 2014-03-15 06:27:34 +00:00
Toshi MARUYAMA
5e06374eb7 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
 2014-03-13 11:38:41 +00:00
Toshi MARUYAMA
9686c078f9 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
 2014-03-13 08:53:17 +00:00
Toshi MARUYAMA
b3ac538a18 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
 2014-03-12 00:37:58 +00:00
Toshi MARUYAMA
a43716d6bb 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
 2014-03-11 09:57:15 +00:00
Jean-Philippe Lang
91a161fadb Merged r12951. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12952 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-02 11:24:13 +00:00
Jean-Philippe Lang
c75e07f8d3 Updates for 2.5.0 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12950 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-02 09:39:31 +00:00
Jean-Philippe Lang
dbe03f5443 Merged r12944 (#16143). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12947 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-02 09:34:00 +00:00
Jean-Philippe Lang
5b1799f245 Merged r12896 (#16081). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12945 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-02 09:29:22 +00:00
Jean-Philippe Lang
8b1a61d856 Merged r12941 (#16161). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12942 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-28 12:53:05 +00:00
Jean-Philippe Lang
9cb17f598d Merged r12938 (#16169). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12939 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-28 11:39:01 +00:00
Toshi MARUYAMA
0d5dd6fc19 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
 2014-02-26 16:53:51 +00:00
Toshi MARUYAMA
fcc1f198e7 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
 2014-02-26 13:02:03 +00:00
Toshi MARUYAMA
41667cd5de 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
 2014-02-26 13:01:43 +00:00
Toshi MARUYAMA
51175ede2c 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
 2014-02-25 06:53:35 +00:00
Toshi MARUYAMA
9abdbd423d 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
 2014-02-25 06:49:53 +00:00
Jean-Philippe Lang
63212e5c16 Merged r12915 to 12918 (#16107). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12923 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-23 08:20:42 +00:00