Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-25 22:00:43 +01:00
Code Issues Packages Projects Releases Activity
11,209 Commits 35 Branches 228 Tags
2.6-stable
Commit Graph

11209 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Philippe Lang
7c266707dc Updates copyright for 2016. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@15241 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-03-13 10:57:14 +00:00
Jean-Philippe Lang
03cc354f25 Updates for 2.6.10 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@15234 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-03-13 10:11:59 +00:00
Jean-Philippe Lang
864220f095 Use rake 10.4 if ruby < 1.9.3. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@15233 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-03-13 08:29:59 +00:00
Jean-Philippe Lang
04a926592f Merged r15223 and r15225 (#22127). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@15232 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-03-13 08:24:55 +00:00
Jean-Philippe Lang
773f44d95e Backported r15196 to 2.6-stable (#22072). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@15209 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-03-12 10:10:04 +00:00
Toshi MARUYAMA
d7310fe499 Merged r15151 from trunk to 2.6-stable 
remove Travis CI files

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@15192 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-03-04 15:59:30 +00:00
Toshi MARUYAMA
d74ee4ee13 2.6-stable: Gemfile: update Rails to 3.2.22.2 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@15164 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-03-02 04:20:41 +00:00
Toshi MARUYAMA
45f7223c6e Merged r15121 from trunk to 2.6-stable (#21747, #21898) 
Catalan wiki translation for 2.6-stable updated by Helder Manuel Torres Vieira.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@15127 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-01-30 13:42:45 +00:00
Toshi MARUYAMA
6e31f3651e Merged r15112 from trunk to 2.6-stable (#21881) 
Russian wiki translation for 2.6-stable updated by Kirill Gritsaenko.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@15120 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-01-30 06:58:43 +00:00
Toshi MARUYAMA
eb1987c125 2.6-stable: not use rails github gem on Ruby 1.9.2 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@15111 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-01-29 05:11:39 +00:00
Toshi MARUYAMA
875f539195 2.6-stable: use rails GitHub gem on Ruby 1.8.7 
Rails 3.2.22.1 breaks Ruby 1.8.7.

* https://github.com/rails/rails/issues/23248
* https://github.com/rails/rails/pull/23250

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@15110 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-01-29 04:16:09 +00:00
Toshi MARUYAMA
53a977c9d3 2.6-stable: update Rails to 3.2.22.1 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@15104 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-01-26 10:57:26 +00:00
Toshi MARUYAMA
9cd9806a66 Merged r15096 and r15099 from trunk to 2.6-stable (#21843) 
Request at least nokogiri 1.6.7.2 because of security advisories.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@15102 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-01-26 04:35:49 +00:00
Jean-Philippe Lang
5f8bea1d96 Merged r15013 (#21656). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@15081 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-01-21 04:49:57 +00:00
Toshi MARUYAMA
e1cabd14f4 Merged r15006 from trunk to 2.6-stable (#21588) 
Simplified Chinese "field_cvs_module" translation fixed by qian hu.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@15012 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-01-07 04:27:34 +00:00
Toshi MARUYAMA
82b0bf3299 Merged r14994 from trunk to 2.6-stable (#21456, #21650) 
Simplified Chinese wiki "project:someproject" translation for 2.6-stable updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@15003 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-01-06 11:39:47 +00:00
Toshi MARUYAMA
edbc05c21d Merged r14993 from trunk to 2.6-stable (#21456, #21650) 
Simplified Chinese wiki translation for 2.6-stable updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@15002 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-01-06 11:39:33 +00:00
Toshi MARUYAMA
315aa35c0c Merged r14977 from trunk to 2.6-stable (#21569) 
Request at least nokogiri 1.6.7.1 because of security advisories.

Patch by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14992 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-12-21 04:18:49 +00:00
Jean-Philippe Lang
b5e7425af6 Updates for 2.6.9 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14940 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-12-05 08:45:01 +00:00
Toshi MARUYAMA
8b85454542 Merged r14926 from trunk to 2.6-stable (#21412, #21430) 
Simplified Chinese translation for 2.6-stable updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14937 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-12-05 06:16:36 +00:00
Jean-Philippe Lang
a75b0e9cbf Merged r14913 (#21419). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14923 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-12-04 12:54:41 +00:00
Jean-Philippe Lang
c46fc79061 Merged r14892 (#21312). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14919 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-12-04 12:49:42 +00:00
Jean-Philippe Lang
5bade244d8 Merged r14883 (#16948). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14916 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-12-04 12:47:42 +00:00
Toshi MARUYAMA
011d0afc52 Merged r14888 from trunk to 2.6-stable (#21328) 
pdf: fix Vietnamese Italic is not shown.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14890 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-25 07:43:51 +00:00
Jean-Philippe Lang
98712e0039 Updates for 2.6.8 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14868 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-14 08:48:51 +00:00
Jean-Philippe Lang
f2e03946a5 Merged r14863 (#6969). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14866 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-11 07:35:44 +00:00
Jean-Philippe Lang
5ef6f243b1 Merged r14856 (#21155). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14862 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-11 07:23:49 +00:00
Jean-Philippe Lang
8d8f612fa3 Merged r14794 (#21136). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14843 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-08 09:09:03 +00:00
Jean-Philippe Lang
4a254b6f06 Backported r14796 (#21150). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14840 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-08 09:03:55 +00:00
Jean-Philippe Lang
88fcb8c3f9 Merged r14795 (#21150). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14839 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-08 09:00:12 +00:00
Jean-Philippe Lang
1b8b03d747 Merged r14812 (#6969). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14836 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-08 08:50:54 +00:00
Toshi MARUYAMA
fe2823cf43 Merged r14813 from trunk to 2.6-stable (#20591, #20811) 
update rbpdf version to 1.18.7.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14816 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-07 11:11:10 +00:00
Jean-Philippe Lang
f85ddd022e Backported r14670 (#20677). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14801 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-07 08:16:50 +00:00
Toshi MARUYAMA
c78a95576c 2.6-stable: Gemfile: pin rack-cache 1.2 on Ruby 1.8.7 and 1.9.2 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14708 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-10-20 12:32:25 +00:00
Toshi MARUYAMA
7a026a69d5 Merged r14698 from trunk to 2.6-stable (#20785, #21030) 
Polish translation for 2.6-stable updated by Sebastian Paluch.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14706 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-10-20 12:02:49 +00:00
Jean-Philippe Lang
ddb9e1b24a Merged r14658 (#20380). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14661 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-10-09 07:23:19 +00:00
Jean-Philippe Lang
e326f44ea8 Merged r14654 (#20380). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14657 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-10-09 07:14:01 +00:00
Jean-Philippe Lang
3ea387379d Merged r14618 (#20360). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14653 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-10-09 06:43:03 +00:00
Jean-Philippe Lang
5cec71b64c Updates for 2.6.7 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14604 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-20 06:12:58 +00:00
Toshi MARUYAMA
d5a9da6aa2 Merged r14598 from trunk to 2.6-stable (#20761) 
fix typo of Japanese translation for notice_gantt_chart_truncated.

Contributed by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14601 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-16 10:52:27 +00:00
Toshi MARUYAMA
b8167ca2bd Merged r14586 from trunk to 2.6-stable (#20728, #20745) 
Portuguese translation for 2.6-stable updated by Rui Rebelo.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14595 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-14 14:30:22 +00:00
Toshi MARUYAMA
eac6381e1f 2.6-stable: travis: upgrade jruby-9.0.0.0 to jruby-9.0.1.0 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14580 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-14 07:55:30 +00:00
Toshi MARUYAMA
23ab68f628 2.6-stable: travis: allow failures on jruby-9.0.0.0 postgresql 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14570 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-14 05:07:06 +00:00
Jean-Philippe Lang
52f9ab1105 Use redcarpet 3.3 if using ruby 1.9 and higher (#20735). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14567 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-13 14:52:58 +00:00
Jean-Philippe Lang
5fde4e2246 Merged r14560 and r14561 (#19577). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14564 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-13 14:45:20 +00:00
Toshi MARUYAMA
fb49c28d1c Merged r14416 and r14530 from trunk to 2.6-stable 
travis: add PostgreSQL environments

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14532 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-30 05:16:02 +00:00
Toshi MARUYAMA
5168b5e86e 2.6-stable: travis: add jruby 9000 
refer:
https://github.com/travis-ci/travis-ci/issues/4720

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14527 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-30 00:26:25 +00:00
Toshi MARUYAMA
3b8279354e Merged r14513 from trunk to 2.6-stable (#20452, #20557) 
Czech translation for 2.6-stable updated by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14515 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-18 13:47:30 +00:00
Toshi MARUYAMA
aa3563427d Merged r14459 from trunk to 2.6-stable (#20338, #20408) 
Turkish translation for 2.6-stable updated by Giray Pultar.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14467 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-26 14:16:51 +00:00
Toshi MARUYAMA
f934915b32 Merged r14428 from trunk to 2.6-stable (#20199, #20294) 
Russian translation for 2.6-stable updated.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14436 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-12 09:55:58 +00:00