Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-24 05:10:44 +01:00
Code Issues Packages Projects Releases Activity
11,113 Commits 35 Branches 228 Tags
2.6.2
Commit Graph

11113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Philippe Lang
f6182db7de tagged version 2.6.2 
git-svn-id: http://svn.redmine.org/redmine/tags/2.6.2@14041 e93f8b46-1217-0410-a6f0-8f06a7374b81
2.6.2 		2015-02-19 19:10:04 +00:00
Jean-Philippe Lang
662bd633ce Updates for 2.6.2 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14040 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-19 19:05:22 +00:00
Jean-Philippe Lang
8d1f6e77d3 Merged r14025 (#19120). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14026 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-18 11:43:56 +00:00
Jean-Philippe Lang
87816ea9e1 Merged r14015 (#19065). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14024 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-18 11:42:11 +00:00
Jean-Philippe Lang
1851c6f250 Merged r13955 (#18961). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14023 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-18 11:35:45 +00:00
Jean-Philippe Lang
25e68f13f8 Merged r13961 (#18922). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14022 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-18 11:35:02 +00:00
Jean-Philippe Lang
35c01b3b12 Merged r13922 (#18896). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14021 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-18 11:34:25 +00:00
Jean-Philippe Lang
a5a7c62b69 Merged r13921 (#18894). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14020 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-18 11:33:40 +00:00
Jean-Philippe Lang
f2450b8dde Merged r13913, r13918 and r13919 (#18883). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14019 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-18 11:31:46 +00:00
Jean-Philippe Lang
f2732bc942 Merged r14014 (#17722). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14018 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-18 11:29:57 +00:00
Jean-Philippe Lang
a1f40686ba Merged r14016 (#19117). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14017 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-17 18:00:24 +00:00
Toshi MARUYAMA
0c1a287696 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
 2015-02-08 12:23:30 +00:00
Toshi MARUYAMA
bdaf2c27a1 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
 2015-02-08 10:39:00 +00:00
Toshi MARUYAMA
18927905ba 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
 2015-02-08 10:38:48 +00:00
Toshi MARUYAMA
8fbd102d76 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
 2015-02-08 10:38:33 +00:00
Toshi MARUYAMA
10b0c58ba9 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
 2015-01-16 04:42:04 +00:00
Jean-Philippe Lang
44058186e9 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
 2015-01-11 09:16:37 +00:00
Jean-Philippe Lang
3ba5e24a91 Copyright update in 2.6-stable. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13873 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-11 09:12:51 +00:00
Toshi MARUYAMA
e32a98cbc9 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
 2015-01-11 04:22:53 +00:00
Jean-Philippe Lang
c408c71997 Merged r13615 (#18777). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13869 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 21:22:10 +00:00
Jean-Philippe Lang
a673d1f553 Merged r13860 (#18782). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13868 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 21:12:42 +00:00
Jean-Philippe Lang
0c78d2cd8c Merged r13861 and r13862 (#18789). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13867 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 21:12:07 +00:00
Jean-Philippe Lang
f2ee9ccb1b Merged r13852 and r13853 (#18769). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13866 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 21:10:18 +00:00
Jean-Philippe Lang
b5731806fd Merged r13850 (#18734). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13865 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 21:09:29 +00:00
Toshi MARUYAMA
6dea2fb61a 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
 2015-01-04 07:42:05 +00:00
Toshi MARUYAMA
a845524180 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
 2015-01-04 04:48:03 +00:00
Toshi MARUYAMA
3955c60357 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
 2015-01-04 04:47:55 +00:00
Toshi MARUYAMA
1bceed6922 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
 2015-01-04 02:57:19 +00:00
Toshi MARUYAMA
6034757312 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
 2015-01-04 02:57:11 +00:00
Toshi MARUYAMA
2365736876 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
 2015-01-04 02:57:03 +00:00
Toshi MARUYAMA
6116344f8e 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
 2015-01-03 16:23:53 +00:00
Toshi MARUYAMA
6e6b45eb25 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
 2015-01-03 16:04:55 +00:00
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