11186 Commits

Author SHA1 Message Date
Jean-Philippe Lang
739fc3f1fa tagged version 2.6.8
git-svn-id: http://svn.redmine.org/redmine/tags/2.6.8@14872 e93f8b46-1217-0410-a6f0-8f06a7374b81
2.6.8
2015-11-14 08:53:07 +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
Toshi MARUYAMA
c6ae15d764 Merged r14351 from trunk to 2.6-stable (#19825, #20293)
Russian translation update.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14427 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-07-12 05:07:56 +00:00
Jean-Philippe Lang
9bad5de0ae Updates for 2.6.6 release.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14424 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-07-07 19:44:31 +00:00
Jean-Philippe Lang
dc724dfc51 Merged r14389 (#20203).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14402 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-07-05 10:30:21 +00:00
Jean-Philippe Lang
a8993e0347 Merged r14396 (#17757).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14399 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-07-05 10:23:24 +00:00
Jean-Philippe Lang
f745102e4d Merged r14381.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14384 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-06-28 09:19:25 +00:00
Toshi MARUYAMA
0cac2b85b3 Merged r14360 from trunk to 2.6-stable (#20142)
update Gemfile to require rbpdf ~>1.18.6.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14362 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-06-21 09:51:52 +00:00
Toshi MARUYAMA
6741bc22b0 Merged r14351 from trunk to 2.6-stable (#19825)
Russian translation update.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14358 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-06-20 04:15:33 +00:00
Toshi MARUYAMA
29b1e0d919 Merged r14350 from trunk to 2.6-stable (#20035)
Italian translation update.

Patch by Daniele Renda.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14357 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-06-20 04:15:22 +00:00
Toshi MARUYAMA
faf5baeff5 Merged r14329 from trunk to 2.6-stable (#19252)
Gemfile: use jdbc-sqlite3 version >= 3.8.10.1.

sqlite-jdbc was updated to 3.8.10.1 in upstream.
f7a20b0d57

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14331 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-06-18 07:16:44 +00:00
Toshi MARUYAMA
6f01582c61 Merged r14323 from trunk to 2.6-stable.
Gemfile: explicitly update jquery-rails version to 3.1.3 (CVE-2015-1840)

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14325 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-06-17 13:59:02 +00:00
Toshi MARUYAMA
c6f0a04eef 2.6-stable: add Ruby 2.2 to .travis.yml (#19652)
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14321 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-06-17 11:15:54 +00:00
Toshi MARUYAMA
1bff868f6d 2.6-stable: Gemfile: update Rails to 3.2.22
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14320 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-06-17 11:09:36 +00:00
Jean-Philippe Lang
503c9eb895 Merged r14281 (#19956).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14283 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-30 08:19:20 +00:00
Jean-Philippe Lang
09fdc1fcf1 Merged r14267 (#19840).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14280 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-30 08:11:05 +00:00
Jean-Philippe Lang
84a40b16f1 Merged r14268 (#19815).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14278 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-30 08:09:48 +00:00
Jean-Philippe Lang
79bc6a7d47 Updates for 2.6.5 release.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14257 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-10 08:00:00 +00:00
Jean-Philippe Lang
9bdcf3f603 Merged r14237 (#19735).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14255 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-10 07:30:50 +00:00
Jean-Philippe Lang
30e1513b23 Merged r14239 and r14240 (#19706).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14254 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-10 07:29:40 +00:00
Jean-Philippe Lang
e57b796617 Merged r14245 (#19655).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14253 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-10 07:26:52 +00:00
Jean-Philippe Lang
b51dfd414b Merged r14242 (#18580).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14252 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-10 07:25:38 +00:00
Jean-Philippe Lang
100a5f56e9 Updates for 2.6.4 release.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14225 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-26 06:48:42 +00:00
Jean-Philippe Lang
094e772897 Merged r14160 (#19580).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14212 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 07:46:28 +00:00
Jean-Philippe Lang
232ddd0756 Backported r14179 (#19569).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14211 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 07:44:57 +00:00