Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-02-01 04:09:56 +01:00
Code Issues Packages Projects Releases Activity
11,081 Commits 35 Branches 225 Tags
b74e5e24f93641fedcb8a2b2c5d7307b6dcbf04c
Commit Graph

11081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Toshi MARUYAMA
b74e5e24f9 Merged r13826 from trunk to 2.6-stable. 
add jruby-21mode to .travis.yml.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13827 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-03 16:04:46 +00:00
Toshi MARUYAMA
43a67cce53 Merged r13819 from trunk to 2.6-stable (#18587) 
Swedish translation updated by Khedron Wilk.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13820 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-03 11:22:04 +00:00
Toshi MARUYAMA
158a01f2b7 2.6-stable: fix r13807 on Ruby 1.8.7 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13817 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 16:06:44 +00:00
Toshi MARUYAMA
4107e5619e 2.6-stable: Gemfile: use i18n 0.6 on Ruby 1.8.7 and Ruby 1.9.2 
i18n 0.7 requires Ruby version >= 1.9.3

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13816 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 14:57:46 +00:00
Toshi MARUYAMA
ede61fa9c7 2.6-stable: Gemfile: pin i18n and rmagick versions due to bundler error on Ruby 1.8.7 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13815 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 14:35:30 +00:00
Jean-Philippe Lang
049db4923c Fixed order syntax for Rails 3 (#18667). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13810 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 11:46:34 +00:00
Jean-Philippe Lang
4da6874d05 Reverts r13805 (#18679). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13809 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 11:43:59 +00:00
Jean-Philippe Lang
8238e66fb1 Merged r13807. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13808 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 11:41:05 +00:00
Jean-Philippe Lang
279fae1c62 Merged r13786 and r13789 (#18679). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13805 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 10:48:17 +00:00
Jean-Philippe Lang
c430cc07f8 Merged r13768 (#18685). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13804 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 10:47:06 +00:00
Jean-Philippe Lang
7ca5df0836 Merged r13787 (#18667). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13803 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 10:46:29 +00:00
Jean-Philippe Lang
3c7aa17b5c Merged r13785 (#18665). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13802 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 10:45:18 +00:00
Jean-Philippe Lang
1e7de03fb5 Merged r13677 (#18501). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13801 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 10:43:15 +00:00
Jean-Philippe Lang
baa9469c9b Merged r13670 (#18499). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13800 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 10:42:41 +00:00
Jean-Philippe Lang
786559177f Merged r13659 (#18464). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13799 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 10:41:55 +00:00
Jean-Philippe Lang
60d9dba5af Merged r13784 (#14699). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13798 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 10:41:15 +00:00
Toshi MARUYAMA
8beb90c5c8 Merged r13684 from trunk to 2.6-stable (#18534, #18502) 
Galician (gl) translation updated by Adrián Chaves Fernández.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13685 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-02 05:11:48 +00:00
Jean-Philippe Lang
548e316898 Merged r13638 (#18060). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13642 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-23 08:44:39 +00:00
Toshi MARUYAMA
6ddae89aff 2.6-stable: fix syntax error on Ruby 1.8.7 (#18280) 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13640 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 13:45:35 +00:00
Jean-Philippe Lang
f295623267 Merged r13625 (#18410). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13637 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:54:41 +00:00
Jean-Philippe Lang
c38fb467c0 Merged r13610 (#18357). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13636 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:45:16 +00:00
Jean-Philippe Lang
ebde5a5f90 Merged r13486 to r13489 and r13492 (#8817). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13635 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:44:30 +00:00
Jean-Philippe Lang
73edc3f59d Merged r13593 (#17705). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13634 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:42:59 +00:00
Jean-Philippe Lang
da1247ac65 Merged r13477 (#18051). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13633 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:41:48 +00:00
Jean-Philippe Lang
cf12814911 Merged r13592, r13594, r13599 (#18349). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13632 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:41:00 +00:00
Jean-Philippe Lang
cc2d5f61ab Backported r13560 and r13569 (#18280). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13631 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:39:09 +00:00
Jean-Philippe Lang
2d612f32b7 Merged r13562 (#18269). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13630 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:35:38 +00:00
Jean-Philippe Lang
89e386ea0c Merged r13557 (#17744). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13629 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:34:25 +00:00
Jean-Philippe Lang
fa4b6f294b Merged r13556 (#13673). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13628 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:33:16 +00:00
Jean-Philippe Lang
7436169bd1 Merged r13555 (#13608). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13627 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:31:35 +00:00
Toshi MARUYAMA
672dbf418e 2.6-stable: Gemfile: update Rails to 3.2.21 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13612 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-18 11:13:57 +00:00
Toshi MARUYAMA
1a6b7e2a60 Merged r13531 from trunk to 2.6-stable (#18252) 
Japanese wiki_syntax_detailed.html translation updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13532 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-01 07:39:12 +00:00
Toshi MARUYAMA
f716688eef 2.6-stable: Gemfile: update Rails to 3.2.20 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13530 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-31 04:15:01 +00:00
Toshi MARUYAMA
83d55b40af Merged r13506 from trunk to 2.6-stable (#18176) 
Gemfile: update rbpdf to version 1.18.2.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13507 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-25 07:39:41 +00:00
Toshi MARUYAMA
008516e47d Merged r13493 from trunk to 2.6-stable (#18156) 
Spanish wiki_syntax.html translation updated by Jesus Gutierrez de la Vega.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13494 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-23 01:52:15 +00:00
Toshi MARUYAMA
6b3e62e57a Merged r13479 from trunk to 2.6-stable (#18157) 
German translation updated by Gundolf Dampf.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13481 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 09:40:24 +00:00
Toshi MARUYAMA
c1fb0a73bb Merged r13478 from trunk to 2.6-stable (#18156) 
Spanish translation updated by Jesus Gutierrez de la Vega.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13480 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 09:40:14 +00:00
Jean-Philippe Lang
05c2cea56f Merged r13471. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13472 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-21 18:59:33 +00:00
Jean-Philippe Lang
178c7dab80 Merged r13464 (#18144). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13465 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 21:23:15 +00:00
Jean-Philippe Lang
3a0a55c8ba Merged r13451 (#18119). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13463 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 21:11:08 +00:00
Jean-Philippe Lang
778625de9a Merged r13450 (#18110). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13462 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 21:10:32 +00:00
Toshi MARUYAMA
5bbcc0698a Merged r13458 from trunk to 2.6-stable (#13781) 
pdf: define "general_pdf_fontname" at i18n yaml for multilingual environment.

Contributed by Jun NAITOH.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13460 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 06:36:40 +00:00
Toshi MARUYAMA
ebd3435cc7 Merged r13457 from trunk to 2.6-stable (#14491) 
use deep_dup to prevent losing mail receiving options.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13459 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 06:36:05 +00:00
Toshi MARUYAMA
93d43cfc94 Merged r13439 from trunk to 2.6-stable (#18069) 
Japanese translation updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13440 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-12 13:56:35 +00:00
Jean-Philippe Lang
0b34d5e365 Set version to stable. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13438 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-12 13:04:16 +00:00
Jean-Philippe Lang
32f67a5f73 Added 2.6-stable branch. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13437 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-12 13:02:26 +00:00
Jean-Philippe Lang
6d10e8cd13 Set version to 2.6.0. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13436 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-12 13:02:03 +00:00
Toshi MARUYAMA
6ac8507b3b MailHandler: Don't use String#respond_to?(:force_encoding) (#18047) 
Contributed by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@13432 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-08 14:59:21 +00:00
Toshi MARUYAMA
bfe7997e38 remove unneeded instance variable assignment from ProjectNestedSetTest 
git-svn-id: http://svn.redmine.org/redmine/trunk@13430 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-08 14:20:34 +00:00
Jean-Philippe Lang
85f2074aff Reverts change in r13428, project can't be found by identifier (#17959). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13429 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-05 13:24:24 +00:00