summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tagged version 2.6.22.6.2Jean-Philippe Lang2015-02-190-0/+0
| | | | git-svn-id: http://svn.redmine.org/redmine/tags/2.6.2@14041 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Updates for 2.6.2 release.Jean-Philippe Lang2015-02-192-1/+16
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14040 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14025 (#19120).Jean-Philippe Lang2015-02-181-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14026 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14015 (#19065).Jean-Philippe Lang2015-02-182-2/+12
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14024 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13955 (#18961).Jean-Philippe Lang2015-02-181-8/+14
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14023 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13961 (#18922).Jean-Philippe Lang2015-02-181-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14022 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13922 (#18896).Jean-Philippe Lang2015-02-182-3/+19
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14021 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13921 (#18894).Jean-Philippe Lang2015-02-182-1/+17
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14020 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13913, r13918 and r13919 (#18883).Jean-Philippe Lang2015-02-181-7/+7
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14019 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14014 (#17722).Jean-Philippe Lang2015-02-181-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14018 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14016 (#19117).Jean-Philippe Lang2015-02-172-4/+4
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14017 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13943 from trunk to 2.6-stable (#18632)Toshi MARUYAMA2015-02-081-1/+1
| | | | | | require rbpdf 1.18.5. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13987 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13977 from trunk to 2.6-stable (#10681, #18586)Toshi MARUYAMA2015-02-081-2/+4
| | | | | | 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
* Merged r13976 from trunk to 2.6-stable (#10681, #18586)Toshi MARUYAMA2015-02-081-2/+7
| | | | | | | | 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
* Merged r13729 from trunk to 2.6-stable (#16040, #18586, #10681)Toshi MARUYAMA2015-02-082-2/+2
| | | | | | 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
* Merged r13880 from trunk to 2.6-stableToshi MARUYAMA2015-01-161-2/+0
| | | | | | remove jruby-21mode from .travis.yml git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13884 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13874, updates for 2.6.1 release.Jean-Philippe Lang2015-01-112-1/+35
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13875 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Copyright update in 2.6-stable.Jean-Philippe Lang2015-01-11504-528/+528
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13873 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13870 from trunk to 2.6-stable (#18629)Toshi MARUYAMA2015-01-111-1/+1
| | | | | | 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
* Merged r13615 (#18777).Jean-Philippe Lang2015-01-101-88/+10
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13869 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13860 (#18782).Jean-Philippe Lang2015-01-101-3/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13868 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13861 and r13862 (#18789).Jean-Philippe Lang2015-01-102-1/+5
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13867 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13852 and r13853 (#18769).Jean-Philippe Lang2015-01-106-6/+6
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13866 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13850 (#18734).Jean-Philippe Lang2015-01-101-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13865 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 2.6-stable: Gemfile: pin pg version 0.17 on all platformsToshi MARUYAMA2015-01-041-2/+1
| | | | | | | 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
* Merged r13836 from trunk to 2.6-stableToshi MARUYAMA2015-01-041-1/+0
| | | | | | | | 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
* Merged r13835 from trunk to 2.6-stableToshi MARUYAMA2015-01-041-2/+2
| | | | | | | | 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
* Merged r13831 from trunk to 2.6-stable.Toshi MARUYAMA2015-01-041-1/+1
| | | | | | | | | | | | | | | 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
* 2.6-stable: Gemfile: simplify rmagick version definitionToshi MARUYAMA2015-01-041-5/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13833 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 2.6-stable: Gemfile: pin pg version 0.17 on Ruby 1.8.7 due to install errorToshi MARUYAMA2015-01-041-1/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13832 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13829 from trunk to 2.6-stable.Toshi MARUYAMA2015-01-031-1/+1
| | | | | | | | 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
* 2.6-stable: Gemfile: pin i18n version 0.6 on all platformsToshi MARUYAMA2015-01-031-1/+1
| | | | | | 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
* Merged r13826 from trunk to 2.6-stable.Toshi MARUYAMA2015-01-031-0/+2
| | | | | | add jruby-21mode to .travis.yml. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13827 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13819 from trunk to 2.6-stable (#18587)Toshi MARUYAMA2015-01-031-32/+27
| | | | | | Swedish translation updated by Khedron Wilk. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13820 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 2.6-stable: fix r13807 on Ruby 1.8.7Toshi MARUYAMA2014-12-262-3/+11
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13817 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 2.6-stable: Gemfile: use i18n 0.6 on Ruby 1.8.7 and Ruby 1.9.2Toshi MARUYAMA2014-12-261-1/+1
| | | | | | 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
* 2.6-stable: Gemfile: pin i18n and rmagick versions due to bundler error on ↵Toshi MARUYAMA2014-12-261-1/+7
| | | | | | Ruby 1.8.7 git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13815 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed order syntax for Rails 3 (#18667).Jean-Philippe Lang2014-12-261-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13810 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Reverts r13805 (#18679).Jean-Philippe Lang2014-12-262-30/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13809 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13807.Jean-Philippe Lang2014-12-262-1/+7
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13808 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13786 and r13789 (#18679).Jean-Philippe Lang2014-12-262-1/+30
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13805 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13768 (#18685).Jean-Philippe Lang2014-12-261-2/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13804 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13787 (#18667).Jean-Philippe Lang2014-12-262-4/+15
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13803 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13785 (#18665).Jean-Philippe Lang2014-12-263-8/+29
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13802 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13677 (#18501).Jean-Philippe Lang2014-12-262-2/+16
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13801 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13670 (#18499).Jean-Philippe Lang2014-12-262-0/+12
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13800 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13659 (#18464).Jean-Philippe Lang2014-12-261-1/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13799 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13784 (#14699).Jean-Philippe Lang2014-12-261-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13798 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13684 from trunk to 2.6-stable (#18534, #18502)Toshi MARUYAMA2014-12-021-2/+2
| | | | | | 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
* Merged r13638 (#18060).Jean-Philippe Lang2014-11-232-1/+6
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13642 e93f8b46-1217-0410-a6f0-8f06a7374b81