summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merged r14235 from trunk to 3.0-stable.Toshi MARUYAMA2015-05-011-3/+3
| | | | | | prevent IssuesControllerTest#test_index_csv_big_5 fails randomly git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14236 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14230 from trunk to 3.0-stableToshi MARUYAMA2015-04-301-0/+2
| | | | | | add missing fixtures to test/unit/changeset_test.rb git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14233 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14223.Jean-Philippe Lang2015-04-262-1/+27
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14224 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14221 (#19570).Jean-Philippe Lang2015-04-251-22/+22
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14222 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14219 (#19537).Jean-Philippe Lang2015-04-251-4/+0
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14220 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14217 (#19185).Jean-Philippe Lang2015-04-252-3/+12
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14218 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14215 (#19482).Jean-Philippe Lang2015-04-252-3/+16
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14216 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14180 (#19606).Jean-Philippe Lang2015-04-252-1/+46
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14214 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14160 (#19580).Jean-Philippe Lang2015-04-252-1/+10
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14213 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14179 (#19569).Jean-Philippe Lang2015-04-254-1/+44
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14210 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14159 (#19558).Jean-Philippe Lang2015-04-254-4/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14209 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14158 (#19553).Jean-Philippe Lang2015-04-252-1/+15
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14208 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14165 and r14166 (#19544).Jean-Philippe Lang2015-04-253-6/+19
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14207 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14162 (#19464).Jean-Philippe Lang2015-04-252-3/+58
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14206 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14155 (#19405).Jean-Philippe Lang2015-04-252-2/+4
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14205 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14163 (#19168).Jean-Philippe Lang2015-04-252-1/+9
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14204 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merges r14151 to r14153 (#19163).Jean-Philippe Lang2015-04-253-5/+19
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14203 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14201 (#13583).Jean-Philippe Lang2015-04-251-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14202 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14164 (#19538).Jean-Philippe Lang2015-04-252-2/+29
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14199 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/3.0-stable@14197 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 3.0-stable: copy Spanish wiki helps to Spanish Panama (#19489)Toshi MARUYAMA2015-04-242-0/+419
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14196 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14193 from trunk to 3.0-stable (#19489)Toshi MARUYAMA2015-04-243-0/+1206
| | | | | | Spanish Panama translation added by Leonel Iturralde. git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14195 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14157 from trunk to 3.0-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/3.0-stable@14183 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14175 from trunk to 3.0-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/3.0-stable@14176 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14172 from trunk to 3.0-stableToshi MARUYAMA2015-04-141-12/+13
| | | | | | | | | | .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/3.0-stable@14173 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14167 from trunk to 3.0-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/3.0-stable@14168 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14141 and r14146 (#19276).Jean-Philippe Lang2015-03-213-3/+14
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14150 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14140 (#19161).Jean-Philippe Lang2015-03-212-2/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14149 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/3.0-stable@14147 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14136 from trunk to 3.0-stable.Toshi MARUYAMA2015-03-201-11/+3
| | | | | | revert r13896 (#14534) git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14145 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14135 from trunk to 3.0-stable.Toshi MARUYAMA2015-03-201-1/+1
| | | | | | Gemfile: upgrade Rails version to 4.2.1 git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14144 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14137 (#19297).Jean-Philippe Lang2015-03-202-4/+35
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14138 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14132 from trunk to 3.0-stableToshi MARUYAMA2015-03-191-13/+13
| | | | | | | | | .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/3.0-stable@14133 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14076 from trunk to 3.0-stableToshi MARUYAMA2015-03-181-6/+6
| | | | | | .travis.yml: move "matrix" after "env" git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14131 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14118 from trunk to 3.0-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/3.0-stable@14126 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14121.Jean-Philippe Lang2015-03-162-1/+23
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14122 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14112 (#19305).Jean-Philippe Lang2015-03-152-1/+46
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14113 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14101 (#19354).Jean-Philippe Lang2015-03-152-4/+25
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14111 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14108 (#19348).Jean-Philippe Lang2015-03-153-17/+8
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14109 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14106 (#19313).Jean-Philippe Lang2015-03-151-0/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14107 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14102 (#19381).Jean-Philippe Lang2015-03-1548-192/+192
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14103 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14084, r14086 and r14087 from trunk to 3.0-stable (#19368)Toshi MARUYAMA2015-03-142-1/+22
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14100 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14097 from trunk to 3.0-stableToshi MARUYAMA2015-03-141-3/+2
| | | | | | | | | Gemfile: move "ffi" definition to :test group Depending: selenium-webdriver -> childprocess -> ffi git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14098 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14078.Jean-Philippe Lang2015-03-141-0/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14096 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14083 (#19368).Jean-Philippe Lang2015-03-142-0/+34
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14095 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14079 (#19316).Jean-Philippe Lang2015-03-142-2/+16
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14094 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14081 (#19323).Jean-Philippe Lang2015-03-142-1/+28
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14093 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14082 (#19322).Jean-Philippe Lang2015-03-141-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14092 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14069 (#19325).Jean-Philippe Lang2015-03-142-1/+11
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14091 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14071 (#19320).Jean-Philippe Lang2015-03-142-1/+53
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14090 e93f8b46-1217-0410-a6f0-8f06a7374b81