Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-23 21:00:42 +01:00
Code Issues Packages Projects Releases Activity
11,098 Commits 35 Branches 228 Tags
2.6.1
Commit Graph

11098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Philippe Lang
b831403d73 tagged version 2.6.0 
git-svn-id: http://svn.redmine.org/redmine/tags/2.6.1@13876 e93f8b46-1217-0410-a6f0-8f06a7374b81
2.6.1 		2015-01-11 09:19:12 +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
Toshi MARUYAMA
6ddae89aff 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
 2014-11-22 13:45:35 +00:00
Jean-Philippe Lang
f295623267 Merged r13625 (#18410). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13637 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:54:41 +00:00
Jean-Philippe Lang
c38fb467c0 Merged r13610 (#18357). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13636 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:45:16 +00:00
Jean-Philippe Lang
ebde5a5f90 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
 2014-11-22 10:44:30 +00:00
Jean-Philippe Lang
73edc3f59d Merged r13593 (#17705). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13634 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:42:59 +00:00
Jean-Philippe Lang
da1247ac65 Merged r13477 (#18051). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13633 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:41:48 +00:00
Jean-Philippe Lang
cf12814911 Merged r13592, r13594, r13599 (#18349). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13632 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:41:00 +00:00
Jean-Philippe Lang
cc2d5f61ab Backported r13560 and r13569 (#18280). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13631 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:39:09 +00:00
Jean-Philippe Lang
2d612f32b7 Merged r13562 (#18269). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13630 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:35:38 +00:00
Jean-Philippe Lang
89e386ea0c Merged r13557 (#17744). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13629 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:34:25 +00:00
Jean-Philippe Lang
fa4b6f294b Merged r13556 (#13673). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13628 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:33:16 +00:00
Jean-Philippe Lang
7436169bd1 Merged r13555 (#13608). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13627 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:31:35 +00:00
Toshi MARUYAMA
672dbf418e 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
 2014-11-18 11:13:57 +00:00
Toshi MARUYAMA
1a6b7e2a60 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
 2014-11-01 07:39:12 +00:00
Toshi MARUYAMA
f716688eef 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
 2014-10-31 04:15:01 +00:00