]> source.dussan.org Git - redmine.git/log
redmine.git
9 years agoMerged r13870 from trunk to 2.6-stable (#18629)
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

9 years agoMerged r13615 (#18777).
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

9 years agoMerged r13860 (#18782).
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

9 years agoMerged r13861 and r13862 (#18789).
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

9 years agoMerged r13852 and r13853 (#18769).
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

9 years agoMerged r13850 (#18734).
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

9 years ago2.6-stable: Gemfile: pin pg version 0.17 on all platforms
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

9 years agoMerged r13836 from trunk to 2.6-stable
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

9 years agoMerged r13835 from trunk to 2.6-stable
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

9 years agoMerged r13831 from trunk to 2.6-stable.
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

9 years ago2.6-stable: Gemfile: simplify rmagick version definition
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

9 years ago2.6-stable: Gemfile: pin pg version 0.17 on Ruby 1.8.7 due to install error
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

9 years agoMerged r13829 from trunk to 2.6-stable.
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

9 years ago2.6-stable: Gemfile: pin i18n version 0.6 on all platforms
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

9 years agoMerged r13826 from trunk to 2.6-stable.
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

9 years agoMerged r13819 from trunk to 2.6-stable (#18587)
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

9 years ago2.6-stable: fix r13807 on Ruby 1.8.7
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

9 years ago2.6-stable: Gemfile: use i18n 0.6 on Ruby 1.8.7 and Ruby 1.9.2
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

9 years ago2.6-stable: Gemfile: pin i18n and rmagick versions due to bundler error on Ruby 1.8.7
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

9 years agoFixed order syntax for Rails 3 (#18667).
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

9 years agoReverts r13805 (#18679).
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

9 years agoMerged r13807.
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

9 years agoMerged r13786 and r13789 (#18679).
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

9 years agoMerged r13768 (#18685).
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

9 years agoMerged r13787 (#18667).
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

9 years agoMerged r13785 (#18665).
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

9 years agoMerged r13677 (#18501).
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

9 years agoMerged r13670 (#18499).
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

9 years agoMerged r13659 (#18464).
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

9 years agoMerged r13784 (#14699).
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

9 years agoMerged r13684 from trunk to 2.6-stable (#18534, #18502)
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

10 years agoMerged r13638 (#18060).
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

10 years ago2.6-stable: fix syntax error on Ruby 1.8.7 (#18280)
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

10 years agoMerged r13625 (#18410).
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

10 years agoMerged r13610 (#18357).
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

10 years agoMerged r13486 to r13489 and r13492 (#8817).
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

10 years agoMerged r13593 (#17705).
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

10 years agoMerged r13477 (#18051).
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

10 years agoMerged r13592, r13594, r13599 (#18349).
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

10 years agoBackported r13560 and r13569 (#18280).
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

10 years agoMerged r13562 (#18269).
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

10 years agoMerged r13557 (#17744).
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

10 years agoMerged r13556 (#13673).
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

10 years agoMerged r13555 (#13608).
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

10 years ago2.6-stable: Gemfile: update Rails to 3.2.21
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

10 years agoMerged r13531 from trunk to 2.6-stable (#18252)
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

10 years ago2.6-stable: Gemfile: update Rails to 3.2.20
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

10 years agoMerged r13506 from trunk to 2.6-stable (#18176)
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

10 years agoMerged r13493 from trunk to 2.6-stable (#18156)
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

10 years agoMerged r13479 from trunk to 2.6-stable (#18157)
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

10 years agoMerged r13478 from trunk to 2.6-stable (#18156)
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

10 years agoMerged r13471.
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

10 years agoMerged r13464 (#18144).
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

10 years agoMerged r13451 (#18119).
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

10 years agoMerged r13450 (#18110).
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

10 years agoMerged r13458 from trunk to 2.6-stable (#13781)
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

10 years agoMerged r13457 from trunk to 2.6-stable (#14491)
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

10 years agoMerged r13439 from trunk to 2.6-stable (#18069)
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

10 years agoSet version to stable.
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

10 years agoAdded 2.6-stable branch.
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

10 years agoSet version to 2.6.0.
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

10 years agoMailHandler: Don't use String#respond_to?(:force_encoding) (#18047)
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

10 years agoremove unneeded instance variable assignment from ProjectNestedSetTest
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

10 years agoReverts change in r13428, project can't be found by identifier (#17959).
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

10 years agoFixed that preview doesn't show notes when issue project is changed (#17959).
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

10 years agoDon't link multiple changesets from the same commit multiple times (#17931).
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

10 years agoAdds a test for adding a group membership with the REST API (#17904).
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

10 years agoAdds css classes to get sort order on the issue list (#17993).
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

10 years agoRemoves routes for time entries nested under project/issues.
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

10 years agoAdds a link to /time_entries/new from My Page Spent Time block (#17955).
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

10 years agoLet the new time_entry form be submitted without project (#17954).
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

10 years agoTraditional Chinese translation updated by ChunChang Lo (#18002)
Toshi MARUYAMA [Wed, 1 Oct 2014 07:22:38 +0000 (07:22 +0000)]
Traditional Chinese translation updated by ChunChang Lo (#18002)

git-svn-id: http://svn.redmine.org/redmine/trunk@13421 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoFixed test failure with ruby1.8.7 and postgresql (#17976).
Jean-Philippe Lang [Tue, 30 Sep 2014 20:41:15 +0000 (20:41 +0000)]
Fixed test failure with ruby1.8.7 and postgresql (#17976).

git-svn-id: http://svn.redmine.org/redmine/trunk@13420 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoBulgarian translation updated by Ivan Cenov (#17992)
Toshi MARUYAMA [Mon, 29 Sep 2014 11:15:29 +0000 (11:15 +0000)]
Bulgarian translation updated by Ivan Cenov (#17992)

git-svn-id: http://svn.redmine.org/redmine/trunk@13419 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoAdds locales strings (#17976).
Jean-Philippe Lang [Sun, 28 Sep 2014 14:51:42 +0000 (14:51 +0000)]
Adds locales strings (#17976).

git-svn-id: http://svn.redmine.org/redmine/trunk@13418 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoAdds buit-in groups to give specific permissions to anonymous and non members users...
Jean-Philippe Lang [Sun, 28 Sep 2014 14:51:08 +0000 (14:51 +0000)]
Adds buit-in groups to give specific permissions to anonymous and non members users per project (#17976).

git-svn-id: http://svn.redmine.org/redmine/trunk@13417 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoimport jQuery Datepicker i18n files version 1.11.1
Toshi MARUYAMA [Sat, 27 Sep 2014 05:22:10 +0000 (05:22 +0000)]
import jQuery Datepicker i18n files version 1.11.1

https://github.com/jquery/jquery-ui/commit/874945e66d6684e7ef7013e1bc2723b485ed6178

git-svn-id: http://svn.redmine.org/redmine/trunk@13416 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agorename jQuery Datepicker i18n file name
Toshi MARUYAMA [Sat, 27 Sep 2014 05:14:53 +0000 (05:14 +0000)]
rename jQuery Datepicker i18n file name

jquery-ui renamed these files.
https://github.com/jquery/jquery-ui/commit/21154cfa2e02ef1814a6aff68b14553bdad165cb

git-svn-id: http://svn.redmine.org/redmine/trunk@13415 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoIgnore email keywords after truncation line (#8758).
Jean-Philippe Lang [Sat, 20 Sep 2014 07:51:37 +0000 (07:51 +0000)]
Ignore email keywords after truncation line (#8758).

git-svn-id: http://svn.redmine.org/redmine/trunk@13413 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoExpire other sessions on password change (#17796).
Jean-Baptiste Barth [Tue, 16 Sep 2014 21:38:54 +0000 (21:38 +0000)]
Expire other sessions on password change (#17796).

Contributed by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/trunk@13412 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoAdd a constraint on "shoulda-matchers" version (#17828).
Jean-Baptiste Barth [Tue, 16 Sep 2014 21:17:29 +0000 (21:17 +0000)]
Add a constraint on "shoulda-matchers" version (#17828).

This helps bundler find its dependencies in case shoulda-matchers v1.4.2 is
already installed. In such a case bundler breaks while it shouldn't.

git-svn-id: http://svn.redmine.org/redmine/trunk@13411 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoremove trailing white-space from app/models/issue_custom_field.rb
Toshi MARUYAMA [Tue, 16 Sep 2014 02:54:12 +0000 (02:54 +0000)]
remove trailing white-space from app/models/issue_custom_field.rb

git-svn-id: http://svn.redmine.org/redmine/trunk@13410 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoGemfile: update rbpdf version to 1.18.1 (#17570)
Toshi MARUYAMA [Tue, 16 Sep 2014 02:18:48 +0000 (02:18 +0000)]
Gemfile: update rbpdf version to 1.18.1 (#17570)

git-svn-id: http://svn.redmine.org/redmine/trunk@13409 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoBackport r13313 from rails-4.1 to trunk.
Toshi MARUYAMA [Sun, 14 Sep 2014 14:17:52 +0000 (14:17 +0000)]
Backport r13313 from rails-4.1 to trunk.

Upgrade to JQuery 1.11.1

git-svn-id: http://svn.redmine.org/redmine/trunk@13408 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoBackport r13315 from rails-4.1 to trunk.
Toshi MARUYAMA [Sun, 14 Sep 2014 14:16:56 +0000 (14:16 +0000)]
Backport r13315 from rails-4.1 to trunk.

Use .on() instead of .live().

git-svn-id: http://svn.redmine.org/redmine/trunk@13407 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agostricter check of uploading attachments (#17581)
Toshi MARUYAMA [Sun, 14 Sep 2014 13:44:24 +0000 (13:44 +0000)]
stricter check of uploading attachments (#17581)

Contributed by fred bregar.

git-svn-id: http://svn.redmine.org/redmine/trunk@13404 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoCode cleanup (#17717).
Jean-Philippe Lang [Sun, 14 Sep 2014 11:38:52 +0000 (11:38 +0000)]
Code cleanup (#17717).

git-svn-id: http://svn.redmine.org/redmine/trunk@13403 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoLowering configuration.example.yml confusion (#17492)
Jean-Philippe Lang [Sun, 14 Sep 2014 11:32:10 +0000 (11:32 +0000)]
Lowering configuration.example.yml confusion (#17492)

git-svn-id: http://svn.redmine.org/redmine/trunk@13402 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoLong strings such as URL break out of box (#17322).
Jean-Philippe Lang [Sun, 14 Sep 2014 10:47:24 +0000 (10:47 +0000)]
Long strings such as URL break out of box (#17322).

Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@13401 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoParent issue autocomplete does not follow to the "Allow cross-project subtasks" setti...
Jean-Philippe Lang [Sun, 14 Sep 2014 10:42:31 +0000 (10:42 +0000)]
Parent issue autocomplete does not follow to the "Allow cross-project subtasks" setting (#14281).

git-svn-id: http://svn.redmine.org/redmine/trunk@13400 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoLong hyperlinks inserted in task description breaks right frame boundary (#12580).
Jean-Philippe Lang [Sun, 14 Sep 2014 09:49:02 +0000 (09:49 +0000)]
Long hyperlinks inserted in task description breaks right frame boundary (#12580).

Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@13399 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoFixed: Issues counters in roadmap only link to issues in the same project (#9660).
Jean-Philippe Lang [Sun, 14 Sep 2014 09:41:39 +0000 (09:41 +0000)]
Fixed: Issues counters in roadmap only link to issues in the same project (#9660).

Contributed by Sridhar Dhanapalan.

git-svn-id: http://svn.redmine.org/redmine/trunk@13398 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoInvalidate security tokens on password or email changes (#17717).
Jean-Baptiste Barth [Sun, 14 Sep 2014 08:22:25 +0000 (08:22 +0000)]
Invalidate security tokens on password or email changes (#17717).

Contributed by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/trunk@13396 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoIssue API: include is_private attribute in xml/json output (#10914).
Jean-Philippe Lang [Sat, 13 Sep 2014 11:22:49 +0000 (11:22 +0000)]
Issue API: include is_private attribute in xml/json output (#10914).

Patch by Shivam Daryanani.

git-svn-id: http://svn.redmine.org/redmine/trunk@13395 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoAdds a test for default context of controller hooks (#16930).
Jean-Philippe Lang [Sat, 13 Sep 2014 11:09:01 +0000 (11:09 +0000)]
Adds a test for default context of controller hooks (#16930).

git-svn-id: http://svn.redmine.org/redmine/trunk@13394 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoMoves project sidebar content to a partial (#17380).
Jean-Philippe Lang [Sat, 13 Sep 2014 10:53:13 +0000 (10:53 +0000)]
Moves project sidebar content to a partial (#17380).

Patch by Jérôme BATAILLE.

git-svn-id: http://svn.redmine.org/redmine/trunk@13393 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoMakes sys#fetch_changesets accept POST requests (#17077).
Jean-Philippe Lang [Sat, 13 Sep 2014 10:49:31 +0000 (10:49 +0000)]
Makes sys#fetch_changesets accept POST requests (#17077).

git-svn-id: http://svn.redmine.org/redmine/trunk@13392 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoFixed: The error flash message on session expiration is not in the language of the...
Jean-Philippe Lang [Sat, 13 Sep 2014 10:35:46 +0000 (10:35 +0000)]
Fixed: The error flash message on session expiration is not in the language of the user but of the user of the previous request (#17023).

git-svn-id: http://svn.redmine.org/redmine/trunk@13391 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoFixed: Files assigned to a version can not be deleted if Issue Tracking module is...
Jean-Philippe Lang [Sat, 13 Sep 2014 10:17:15 +0000 (10:17 +0000)]
Fixed: Files assigned to a version can not be deleted if Issue Tracking module is disabled (#17163).

Patch by Michael Esemplare.

git-svn-id: http://svn.redmine.org/redmine/trunk@13390 e93f8b46-1217-0410-a6f0-8f06a7374b81

10 years agoadd missing fixtures to TimeEntryActivityTest
Toshi MARUYAMA [Fri, 12 Sep 2014 13:40:07 +0000 (13:40 +0000)]
add missing fixtures to TimeEntryActivityTest

git-svn-id: http://svn.redmine.org/redmine/trunk@13386 e93f8b46-1217-0410-a6f0-8f06a7374b81