]>
source.dussan.org Git - redmine.git/log
Toshi MARUYAMA [Mon, 16 Mar 2015 23:14:51 +0000 (23:14 +0000)]
Merged r14118 from trunk to 2.6-stable
Gemfile: remove "ffi"
ffi 1.9.7 building error is fixed.
https://github.com/ffi/ffi/issues/414#issuecomment-
81405252
r14118 comment has typo, problem version is not 1.9.6, it is 1.9.7.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14127
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Mon, 16 Mar 2015 18:26:05 +0000 (18:26 +0000)]
Updates for 2.6.3 release.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14123
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Mon, 16 Mar 2015 04:55:45 +0000 (04:55 +0000)]
2.6-stable: fix unit test on Ruby 1.8.7 (#19305)
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14119
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 15 Mar 2015 20:26:34 +0000 (20:26 +0000)]
Merged r14115 (#19305).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14116
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 15 Mar 2015 18:13:58 +0000 (18:13 +0000)]
Merged r14112 (#19305).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14114
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 15 Mar 2015 14:08:00 +0000 (14:08 +0000)]
Merged r14108 (#19348).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14110
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 15 Mar 2015 10:08:04 +0000 (10:08 +0000)]
Redcarpet not available with jruby (#19313).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14105
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 15 Mar 2015 10:03:45 +0000 (10:03 +0000)]
Merged r14102 (#19381).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14104
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sat, 14 Mar 2015 16:37:15 +0000 (16:37 +0000)]
Merged r14078 and r14097 from trunk to 2.6-stable
Building ffi 1.9.7 fails in Ubuntu.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14099
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 14 Mar 2015 14:59:13 +0000 (14:59 +0000)]
Merged r14080 (#19313).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14089
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 8 Mar 2015 09:42:51 +0000 (09:42 +0000)]
Merged r14050 (#19260).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14059
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 8 Mar 2015 09:41:42 +0000 (09:41 +0000)]
Merged r14049 (#19197).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14057
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Thu, 19 Feb 2015 19:05:22 +0000 (19:05 +0000)]
Updates for 2.6.2 release.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14040
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 18 Feb 2015 11:43:56 +0000 (11:43 +0000)]
Merged r14025 (#19120).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14026
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 18 Feb 2015 11:42:11 +0000 (11:42 +0000)]
Merged r14015 (#19065).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14024
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 18 Feb 2015 11:35:45 +0000 (11:35 +0000)]
Merged r13955 (#18961).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14023
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 18 Feb 2015 11:35:02 +0000 (11:35 +0000)]
Merged r13961 (#18922).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14022
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 18 Feb 2015 11:34:25 +0000 (11:34 +0000)]
Merged r13922 (#18896).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14021
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 18 Feb 2015 11:33:40 +0000 (11:33 +0000)]
Merged r13921 (#18894).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14020
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 18 Feb 2015 11:31:46 +0000 (11:31 +0000)]
Merged r13913, r13918 and r13919 (#18883).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14019
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Wed, 18 Feb 2015 11:29:57 +0000 (11:29 +0000)]
Merged r14014 (#17722).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14018
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Tue, 17 Feb 2015 18:00:24 +0000 (18:00 +0000)]
Merged r14016 (#19117).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14017
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 8 Feb 2015 12:23:30 +0000 (12:23 +0000)]
Merged r13943 from trunk to 2.6-stable (#18632)
require rbpdf 1.18.5.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13987
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 8 Feb 2015 10:39:00 +0000 (10:39 +0000)]
Merged r13977 from trunk to 2.6-stable (#10681, #18586)
pdf: remove styles by fontname instated of Arabic/Persian/Thai locale.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13984
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 8 Feb 2015 10:38:48 +0000 (10:38 +0000)]
Merged r13976 from trunk to 2.6-stable (#10681, #18586)
pdf: remove styles of Arabic/Persian Italic and Thai Bold.
Contributed by Jun NAITOH.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13983
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 8 Feb 2015 10:38:33 +0000 (10:38 +0000)]
Merged r13729 from trunk to 2.6-stable (#16040, #18586, #10681)
pdf: use DejaVuSans font in Arabic and Persian.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13982
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Fri, 16 Jan 2015 04:42:04 +0000 (04:42 +0000)]
Merged r13880 from trunk to 2.6-stable
remove jruby-21mode from .travis.yml
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13884
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 11 Jan 2015 09:16:37 +0000 (09:16 +0000)]
Merged r13874, updates for 2.6.1 release.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13875
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 11 Jan 2015 09:12:51 +0000 (09:12 +0000)]
Copyright update in 2.6-stable.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13873
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 11 Jan 2015 04:22:53 +0000 (04:22 +0000)]
Merged r13870 from trunk to 2.6-stable (#18629)
Gemfile: update rbpdf version to 1.18.4.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13871
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 10 Jan 2015 21:22:10 +0000 (21:22 +0000)]
Merged r13615 (#18777).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13869
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 10 Jan 2015 21:12:42 +0000 (21:12 +0000)]
Merged r13860 (#18782).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13868
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 10 Jan 2015 21:12:07 +0000 (21:12 +0000)]
Merged r13861 and r13862 (#18789).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13867
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 10 Jan 2015 21:10:18 +0000 (21:10 +0000)]
Merged r13852 and r13853 (#18769).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13866
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 10 Jan 2015 21:09:29 +0000 (21:09 +0000)]
Merged r13850 (#18734).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13865
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 4 Jan 2015 07:42:05 +0000 (07:42 +0000)]
2.6-stable: Gemfile: pin pg version 0.17 on all platforms
2.6-stable uses Rails 3.2 and passes test described at trunk r13839.
But this revision prevents unexpected changes due to pg version change.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13840
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 4 Jan 2015 04:48:03 +0000 (04:48 +0000)]
Merged r13836 from trunk to 2.6-stable
remove duplicated :remote key from app/views/messages/show.html.erb
Ruby 2.2 shows warning.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13838
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 4 Jan 2015 04:47:55 +0000 (04:47 +0000)]
Merged r13835 from trunk to 2.6-stable
remove duplicated :id key from app/views/timelog/report.html.erb
Ruby 2.2 shows warning.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13837
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 4 Jan 2015 02:57:19 +0000 (02:57 +0000)]
Merged r13831 from trunk to 2.6-stable.
fix Ruby 2.2 warning at lib/redmine/scm/adapters/cvs_adapter.rb.
On ruby 2.2.0p0 (2014-12-25 revision 49005) [x86_64-linux]:
<pre>
lib/redmine/scm/adapters/cvs_adapter.rb:342:
warning: Comparable#== will no more rescue exceptions of #<=> in the next release.
lib/redmine/scm/adapters/cvs_adapter.rb:342:
warning: Return nil in #<=> if the comparison is inappropriate or avoid such comparison.
</pre>
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13834
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 4 Jan 2015 02:57:11 +0000 (02:57 +0000)]
2.6-stable: Gemfile: simplify rmagick version definition
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13833
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sun, 4 Jan 2015 02:57:03 +0000 (02:57 +0000)]
2.6-stable: Gemfile: pin pg version 0.17 on Ruby 1.8.7 due to install error
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13832
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sat, 3 Jan 2015 16:23:53 +0000 (16:23 +0000)]
Merged r13829 from trunk to 2.6-stable.
Gemfile: pin activerecord-jdbcsqlite3-adapter version 1.3.11.
1.3.13 breaks test/functional/issues_controller_test.rb.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13830
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sat, 3 Jan 2015 16:04:55 +0000 (16:04 +0000)]
2.6-stable: Gemfile: pin i18n version 0.6 on all platforms
i18n 0.7 is installed on jruby.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13828
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sat, 3 Jan 2015 16:04:46 +0000 (16:04 +0000)]
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
Toshi MARUYAMA [Sat, 3 Jan 2015 11:22:04 +0000 (11:22 +0000)]
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
Toshi MARUYAMA [Fri, 26 Dec 2014 16:06:44 +0000 (16:06 +0000)]
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
Toshi MARUYAMA [Fri, 26 Dec 2014 14:57:46 +0000 (14:57 +0000)]
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
Toshi MARUYAMA [Fri, 26 Dec 2014 14:35:30 +0000 (14:35 +0000)]
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
Jean-Philippe Lang [Fri, 26 Dec 2014 11:46:34 +0000 (11:46 +0000)]
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
Jean-Philippe Lang [Fri, 26 Dec 2014 11:43:59 +0000 (11:43 +0000)]
Reverts r13805 (#18679).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13809
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Fri, 26 Dec 2014 11:41:05 +0000 (11:41 +0000)]
Merged r13807.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13808
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Fri, 26 Dec 2014 10:48:17 +0000 (10:48 +0000)]
Merged r13786 and r13789 (#18679).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13805
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Fri, 26 Dec 2014 10:47:06 +0000 (10:47 +0000)]
Merged r13768 (#18685).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13804
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Fri, 26 Dec 2014 10:46:29 +0000 (10:46 +0000)]
Merged r13787 (#18667).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13803
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Fri, 26 Dec 2014 10:45:18 +0000 (10:45 +0000)]
Merged r13785 (#18665).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13802
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Fri, 26 Dec 2014 10:43:15 +0000 (10:43 +0000)]
Merged r13677 (#18501).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13801
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Fri, 26 Dec 2014 10:42:41 +0000 (10:42 +0000)]
Merged r13670 (#18499).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13800
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Fri, 26 Dec 2014 10:41:55 +0000 (10:41 +0000)]
Merged r13659 (#18464).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13799
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Fri, 26 Dec 2014 10:41:15 +0000 (10:41 +0000)]
Merged r13784 (#14699).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13798
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Tue, 2 Dec 2014 05:11:48 +0000 (05:11 +0000)]
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
Jean-Philippe Lang [Sun, 23 Nov 2014 08:44:39 +0000 (08:44 +0000)]
Merged r13638 (#18060).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13642
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Sat, 22 Nov 2014 13:45:35 +0000 (13:45 +0000)]
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
Jean-Philippe Lang [Sat, 22 Nov 2014 10:54:41 +0000 (10:54 +0000)]
Merged r13625 (#18410).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13637
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 22 Nov 2014 10:45:16 +0000 (10:45 +0000)]
Merged r13610 (#18357).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13636
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 22 Nov 2014 10:44:30 +0000 (10:44 +0000)]
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
Jean-Philippe Lang [Sat, 22 Nov 2014 10:42:59 +0000 (10:42 +0000)]
Merged r13593 (#17705).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13634
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 22 Nov 2014 10:41:48 +0000 (10:41 +0000)]
Merged r13477 (#18051).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13633
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 22 Nov 2014 10:41:00 +0000 (10:41 +0000)]
Merged r13592, r13594, r13599 (#18349).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13632
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 22 Nov 2014 10:39:09 +0000 (10:39 +0000)]
Backported r13560 and r13569 (#18280).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13631
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 22 Nov 2014 10:35:38 +0000 (10:35 +0000)]
Merged r13562 (#18269).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13630
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 22 Nov 2014 10:34:25 +0000 (10:34 +0000)]
Merged r13557 (#17744).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13629
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 22 Nov 2014 10:33:16 +0000 (10:33 +0000)]
Merged r13556 (#13673).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13628
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 22 Nov 2014 10:31:35 +0000 (10:31 +0000)]
Merged r13555 (#13608).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13627
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Tue, 18 Nov 2014 11:13:57 +0000 (11:13 +0000)]
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
Toshi MARUYAMA [Sat, 1 Nov 2014 07:39:12 +0000 (07:39 +0000)]
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
Toshi MARUYAMA [Fri, 31 Oct 2014 04:15:01 +0000 (04:15 +0000)]
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
Toshi MARUYAMA [Sat, 25 Oct 2014 07:39:41 +0000 (07:39 +0000)]
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
Toshi MARUYAMA [Thu, 23 Oct 2014 01:52:15 +0000 (01:52 +0000)]
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
Toshi MARUYAMA [Wed, 22 Oct 2014 09:40:24 +0000 (09:40 +0000)]
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
Toshi MARUYAMA [Wed, 22 Oct 2014 09:40:14 +0000 (09:40 +0000)]
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
Jean-Philippe Lang [Tue, 21 Oct 2014 18:59:33 +0000 (18:59 +0000)]
Merged r13471.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13472
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Mon, 20 Oct 2014 21:23:15 +0000 (21:23 +0000)]
Merged r13464 (#18144).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13465
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Mon, 20 Oct 2014 21:11:08 +0000 (21:11 +0000)]
Merged r13451 (#18119).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13463
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Mon, 20 Oct 2014 21:10:32 +0000 (21:10 +0000)]
Merged r13450 (#18110).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13462
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Mon, 20 Oct 2014 06:36:40 +0000 (06:36 +0000)]
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
Toshi MARUYAMA [Mon, 20 Oct 2014 06:36:05 +0000 (06:36 +0000)]
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
Toshi MARUYAMA [Sun, 12 Oct 2014 13:56:35 +0000 (13:56 +0000)]
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
Jean-Philippe Lang [Sun, 12 Oct 2014 13:04:16 +0000 (13:04 +0000)]
Set version to stable.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13438
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 12 Oct 2014 13:02:26 +0000 (13:02 +0000)]
Added 2.6-stable branch.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13437
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 12 Oct 2014 13:02:03 +0000 (13:02 +0000)]
Set version to 2.6.0.
git-svn-id: http://svn.redmine.org/redmine/trunk@13436
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Toshi MARUYAMA [Wed, 8 Oct 2014 14:59:21 +0000 (14:59 +0000)]
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
Toshi MARUYAMA [Wed, 8 Oct 2014 14:20:34 +0000 (14:20 +0000)]
remove unneeded instance variable assignment from ProjectNestedSetTest
git-svn-id: http://svn.redmine.org/redmine/trunk@13430
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 5 Oct 2014 13:24:24 +0000 (13:24 +0000)]
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
Jean-Philippe Lang [Sun, 5 Oct 2014 13:18:55 +0000 (13:18 +0000)]
Fixed that preview doesn't show notes when issue project is changed (#17959).
git-svn-id: http://svn.redmine.org/redmine/trunk@13428
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sun, 5 Oct 2014 12:10:33 +0000 (12:10 +0000)]
Don't link multiple changesets from the same commit multiple times (#17931).
git-svn-id: http://svn.redmine.org/redmine/trunk@13427
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 4 Oct 2014 09:46:50 +0000 (09:46 +0000)]
Adds a test for adding a group membership with the REST API (#17904).
git-svn-id: http://svn.redmine.org/redmine/trunk@13426
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 4 Oct 2014 09:36:35 +0000 (09:36 +0000)]
Adds css classes to get sort order on the issue list (#17993).
git-svn-id: http://svn.redmine.org/redmine/trunk@13425
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 4 Oct 2014 09:14:17 +0000 (09:14 +0000)]
Removes routes for time entries nested under project/issues.
git-svn-id: http://svn.redmine.org/redmine/trunk@13424
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 4 Oct 2014 07:26:48 +0000 (07:26 +0000)]
Adds a link to /time_entries/new from My Page Spent Time block (#17955).
git-svn-id: http://svn.redmine.org/redmine/trunk@13423
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
Jean-Philippe Lang [Sat, 4 Oct 2014 07:23:14 +0000 (07:23 +0000)]
Let the new time_entry form be submitted without project (#17954).
git-svn-id: http://svn.redmine.org/redmine/trunk@13422
e93f8b46 -1217-0410-a6f0-
8f06a7374b81
projects / redmine.git / log