Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-27 01:39:58 +01:00
Code Issues Packages Projects Releases Activity
10,284 Commits 35 Branches 225 Tags
b48baee5fc8be53a4ebf210d283daddcc5ecb754
Commit Graph

10284 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Philippe Lang
b48baee5fc Backported r13190 (#17206). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13215 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-05 09:06:15 +00:00
Toshi MARUYAMA
87c93a3c85 Merge .travis.yml related revisions from trunk to 2.4-stable 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13212 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-04 02:23:16 +00:00
Toshi MARUYAMA
0982d5fc6c Merged r13208 from trunk to 2.4-stable 
Gemfile: update Rails 3.2.19

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13211 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-04 00:24:53 +00:00
Toshi MARUYAMA
64337c44e8 Merged r13199 from trunk to 2.4-stable (#17151) 
Fix file upload broken on Chrome 36.

Contributed by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13203 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-01 05:28:14 +00:00
Toshi MARUYAMA
639fb60468 Merged r13198 from trunk to 2.4-stable (#17235) 
Prevent "can't modify frozen String" exception when mail sending error.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13202 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-01 05:27:57 +00:00
Toshi MARUYAMA
e23a546f59 Merged r13184 from trunk to 2.4-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.4-stable@13189 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-06-25 17:42:34 +00:00
Toshi MARUYAMA
faadf8f28f Merged r13177 from trunk to 2.4-stable (#5706) 
fix Ruby Logger doc link.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13179 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-06-09 00:11:03 +00:00
Toshi MARUYAMA
ea26a253ea Merged r13130 from trunk to 2.4-stable 
Gemfile: update Rails 3.2.18

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13134 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-07 08:43:55 +00:00
Toshi MARUYAMA
87cb2fdfd1 2.4-stable: revert r13114 (#16685) 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13121 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-01 13:39:22 +00:00
Toshi MARUYAMA
8e50e4940b Merged r13117 from trunk to 2.4-stable (#16685) 
Gemfile: upgrade mocha version.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13119 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-01 12:28:59 +00:00
Toshi MARUYAMA
11f5a159a7 Merged r13110 and r13112 from trunk to 2.4-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.4-stable@13114 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-01 01:55:03 +00:00
Toshi MARUYAMA
70bc3fd601 Merged r13101 from trunk to 2.4-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.4-stable@13103 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-04-17 19:38:02 +00:00
Jean-Philippe Lang
3b91ec2246 Merged r13041 (#16511). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13047 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-04-05 14:34:53 +00:00
Jean-Philippe Lang
0565e3371e Merged r13040 (#16467). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13045 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-04-05 14:33:32 +00:00
Toshi MARUYAMA
5d8b75fbb7 Merged r13037 from trunk to 2.4-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.4-stable@13039 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-04-05 00:27:53 +00:00
Jean-Philippe Lang
0a876dcb28 Updates for 2.4.5 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13031 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-29 16:06:51 +00:00
Jean-Philippe Lang
1b20fa3b49 Merged r13018 (#16466). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13028 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-29 14:54:06 +00:00
Toshi MARUYAMA
1cfa91c6d6 Merged r13004 from trunk to 2.4-stable. 
add ChangeLog note that #15781 was forgotten to merge to v2.4.3.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13006 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-25 08:40:28 +00:00
Toshi MARUYAMA
8edbbbf267 Merged r13001 from trunk to 2.4-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.4-stable@13003 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-25 08:18:44 +00:00
Jean-Philippe Lang
92dce4f80d Updates for 2.4.4 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12949 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-02 09:38:40 +00:00
Jean-Philippe Lang
d05cbf4df8 Merged r12896 (#16081). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12946 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-02 09:30:35 +00:00
Jean-Philippe Lang
e9e0ffb6dd Merged r12941 (#16161). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12943 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-28 12:53:34 +00:00
Jean-Philippe Lang
40abbfa82d Backported r12938 (#16169). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12940 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-28 11:40:02 +00:00
Toshi MARUYAMA
8d7fd10f90 Merged r12935 from trunk to 2.4-stable (#16177) 
use Python getattr instead of hasattr.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12937 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-26 16:55:12 +00:00
Toshi MARUYAMA
dac4f38eb4 Merged r12930 from trunk to 2.4-stable (#16177) 
Mercurial 2.9 compatibility.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12934 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-26 13:06:02 +00:00
Toshi MARUYAMA
5e031bce47 Merged r12929 from trunk to 2.4-stable (#16177) 
scm: mercurial: add one "closed" branch to test repository.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12933 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-26 13:05:45 +00:00
Toshi MARUYAMA
dc431edbc8 Merged r12906 from trunk to 2.4-stable 
update Rails to 3.2.17

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12908 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-19 10:19:06 +00:00
Jean-Philippe Lang
8980f7a01a Merged r12861, updates for 2.4.3 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12862 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-08 08:01:44 +00:00
Jean-Philippe Lang
c47aacd6b0 Merged r12736 (#15977). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12860 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-08 07:58:49 +00:00
Jean-Philippe Lang
287bcacd81 Merged r12848 (#16032). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12853 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-07 08:09:36 +00:00
Jean-Philippe Lang
d6b718b43c Merged r12844 (#16038). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12852 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-07 08:06:38 +00:00
Jean-Philippe Lang
b8ffc995c1 Merged r12745 (#15870). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12847 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 18:00:37 +00:00
Jean-Philippe Lang
f52253c2ef Merged r12652 (#15664). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12846 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 17:59:08 +00:00
Jean-Philippe Lang
a11aec0d4c Merged r12660 (#13544). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12845 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 17:58:24 +00:00
Toshi MARUYAMA
a9f44b323f Merged r12695 from trunk to 2.4-stable (#15960) 
pt-BR translation for 2.4-stable updated by Leandro Gehlen.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12697 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-01-25 05:11:54 +00:00
Toshi MARUYAMA
fbeba062cf Merged r12456 from trunk to 2.4-stable (#15756) 
change requirement in bazaar lib as same with other scm libs.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12458 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-24 07:17:01 +00:00
Toshi MARUYAMA
37a07789d1 backport r12453 AbstractAdapter change to 2.4-stable (#15756) 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12454 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-24 05:00:26 +00:00
Jean-Philippe Lang
742ab6f6b3 Merged r12447 for 2.4.2 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12448 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-23 08:47:47 +00:00
Jean-Philippe Lang
aacaa9da8e Merged r12438 (#15735). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12444 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-22 14:48:46 +00:00
Jean-Philippe Lang
9ebcb1e734 Merged r12435 (#15741). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12436 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-21 11:35:02 +00:00
Jean-Philippe Lang
36c35080b2 Merged r12419. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12434 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-21 11:26:01 +00:00
Jean-Philippe Lang
beed3c5746 Merged r12420 (#15684). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12433 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-21 11:25:25 +00:00
Jean-Philippe Lang
fa2b39bf73 Merged r12415 (#15677). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12432 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-21 11:24:41 +00:00
Jean-Philippe Lang
c295f67329 Merged r12414 (#15623). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12431 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-21 11:23:58 +00:00
Jean-Philippe Lang
624b0071ad Merged r12349 (#15523). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12430 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-21 11:23:12 +00:00
Jean-Philippe Lang
8ea273d427 Merged r12309 (#15398). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12429 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-21 11:21:59 +00:00
Toshi MARUYAMA
d05042fbb5 Merged r12424 from trunk to 2.4-stable. 
fix svn raw diff failure on svn version 1.6.17 (revision 1128011).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12425 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-20 17:46:11 +00:00
Toshi MARUYAMA
00ff3361d6 Merged r12408 from trunk to 2.4-stable (#15696) 
Russian translation updated by Alex Stein.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12411 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-15 05:30:32 +00:00
Toshi MARUYAMA
4f937b42ac Merged r12407 from trunk to 2.4-stable (#15688) 
Spanish translation updated by Borja Campina.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12410 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-15 05:30:15 +00:00
Toshi MARUYAMA
64a72f2ea2 Merged r12273 from trunk to 2.4-stable. 
Fixed uninitialized constant Redmine::Scm::Adapters::CommandFailed error when reloading in development mode.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12389 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-09 05:44:08 +00:00