summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merged r14239 and r14240 (#19706).Jean-Philippe Lang2015-05-102-2/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14254 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14245 (#19655).Jean-Philippe Lang2015-05-102-7/+7
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14253 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14242 (#18580).Jean-Philippe Lang2015-05-104-3/+45
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14252 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Updates for 2.6.4 release.Jean-Philippe Lang2015-04-262-1/+10
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14225 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14160 (#19580).Jean-Philippe Lang2015-04-252-1/+10
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14212 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Backported r14179 (#19569).Jean-Philippe Lang2015-04-254-1/+44
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14211 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14164 (#19538).Jean-Philippe Lang2015-04-252-2/+29
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14200 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14156 and r14161 (#19400).Jean-Philippe Lang2015-04-254-1/+20
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14198 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14157 from trunk to 2.6-stable (#19444).Toshi MARUYAMA2015-04-1944-44/+44
| | | | | | | | Typo in wiki_syntax_detailed.html. Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14184 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 2.6-stable: Gemfile: add gems to test group for Ruby 2.2 (#19652)Toshi MARUYAMA2015-04-171-0/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14181 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14175 from trunk to 2.6-stable (#19252)Toshi MARUYAMA2015-04-141-1/+2
| | | | | | | | Gemfile: remove activerecord-jdbcsqlite3-adapter version and pin jdbc-sqlite3 version < 3.8. r13829 comment "test/functional/issues_controller_test.rb failure" is due to sqlite3 3.8. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14177 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14172 from trunk to 2.6-stableToshi MARUYAMA2015-04-141-9/+10
| | | | | | | | | | .travis.yml: replace DATABASE_ADAPTER to DB Prevent travis UI confusion. * https://github.com/travis-ci/travis-ci/issues/3386 * https://github.com/travis-ci/travis-ci/issues/3402 git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14174 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14167 from trunk to 2.6-stableToshi MARUYAMA2015-04-141-1/+1
| | | | | | | | | Gemfile: pin rmagick version 2.13 rmagick 2.14 prints '[DEPRECATION] requiring "RMagick" is deprecated. Use "rmagick" instead'. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14169 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14142 and r14143 (#19400).Jean-Philippe Lang2015-03-213-3/+21
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14148 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Backported r14137 (#19297).Jean-Philippe Lang2015-03-202-4/+37
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14139 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14132 from trunk to 2.6-stableToshi MARUYAMA2015-03-191-9/+10
| | | | | | | | | .travis.yml: replace TEST_SUITE to SUITE Prevent travis UI confusion. https://github.com/travis-ci/travis-ci/issues/3386 git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14134 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14076 from trunk to 2.6-stableToshi MARUYAMA2015-03-181-6/+6
| | | | | | .travis.yml: move "matrix" after "env" git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14130 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14012 from trunk to 2.6-stableToshi MARUYAMA2015-03-181-0/+1
| | | | | | add redmine.org issue link of jruby IO.popen() at .travis.yml (#19091) git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14129 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14118 from trunk to 2.6-stableToshi MARUYAMA2015-03-161-2/+0
| | | | | | | | | | | 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
* Updates for 2.6.3 release.Jean-Philippe Lang2015-03-162-1/+10
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14123 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 2.6-stable: fix unit test on Ruby 1.8.7 (#19305)Toshi MARUYAMA2015-03-161-2/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14119 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14115 (#19305).Jean-Philippe Lang2015-03-151-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14116 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14112 (#19305).Jean-Philippe Lang2015-03-152-1/+46
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14114 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14108 (#19348).Jean-Philippe Lang2015-03-153-17/+8
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14110 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Redcarpet not available with jruby (#19313).Jean-Philippe Lang2015-03-151-0/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14105 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14102 (#19381).Jean-Philippe Lang2015-03-1548-192/+192
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14104 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14078 and r14097 from trunk to 2.6-stableToshi MARUYAMA2015-03-141-0/+2
| | | | | | 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
* Merged r14080 (#19313).Jean-Philippe Lang2015-03-142-1/+17
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14089 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14050 (#19260).Jean-Philippe Lang2015-03-082-1/+29
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14059 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14049 (#19197).Jean-Philippe Lang2015-03-082-2/+10
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14057 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