summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merged r12420 (#15684).Jean-Philippe Lang2013-12-213-1/+21
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12433 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12415 (#15677).Jean-Philippe Lang2013-12-213-3/+14
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12432 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12414 (#15623).Jean-Philippe Lang2013-12-213-2/+55
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12431 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12349 (#15523).Jean-Philippe Lang2013-12-211-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12430 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12309 (#15398).Jean-Philippe Lang2013-12-211-2/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12429 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12424 from trunk to 2.4-stable.Toshi MARUYAMA2013-12-201-2/+2
| | | | | | fix svn raw diff failure on svn version 1.6.17 (revision 1128011). git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12425 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12408 from trunk to 2.4-stable (#15696)Toshi MARUYAMA2013-12-151-8/+7
| | | | | | Russian translation updated by Alex Stein. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12411 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12407 from trunk to 2.4-stable (#15688)Toshi MARUYAMA2013-12-151-5/+5
| | | | | | Spanish translation updated by Borja Campina. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12410 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12273 from trunk to 2.4-stable.Toshi MARUYAMA2013-12-093-4/+26
| | | | | | Fixed uninitialized constant Redmine::Scm::Adapters::CommandFailed error when reloading in development mode. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12389 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12387 from trunk to 2.4-stable.Toshi MARUYAMA2013-12-091-1/+1
| | | | | | fix disable to run test environment. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12388 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12367 and r12368 from trunk to 2.4-stableToshi MARUYAMA2013-12-072-7/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12369 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12365 from trunk to 2.4-stableToshi MARUYAMA2013-12-071-0/+2
| | | | | | | | | prevent i18n deprecated warning i18n 0.6.4 on Rails 3.2.16 changes behavior. https://github.com/svenfuchs/i18n/commit/3b6e56e06fd70f6e4507996b017238505e66608c git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12366 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12358 from trunk to 2.4-stable (#15601)Toshi MARUYAMA2013-12-051-153/+152
| | | | | | Turkish translation updated by Mert Salih Kaplan. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12359 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12355 from trunk to 2.4-stable.Toshi MARUYAMA2013-12-041-1/+1
| | | | | | update Rails version 3.2.16. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12357 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12340 from trunk to 2.4-stable.Toshi MARUYAMA2013-11-2548-192/+192
| | | | | | use escaping html in wiki_syntax_detailed.html. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12342 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12339 from trunk to 2.4-stable (#15524)Toshi MARUYAMA2013-11-251-2/+2
| | | | | | Japanese translation updated by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12341 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12331 from trunk to 2.4-stable (#9442)Toshi MARUYAMA2013-11-231-1/+1
| | | | | | use escaping html in Russian wiki_syntax.html. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12332 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12326 from trunk to 2.4-stable (#9442)Toshi MARUYAMA2013-11-232-135/+282
| | | | | | Russian wiki syntax help translations by Denis Savitsky. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12327 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12314.Jean-Philippe Lang2013-11-232-1/+11
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12315 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12310 (#15414).Jean-Philippe Lang2013-11-232-8/+13
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12313 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12311 (#15427).Jean-Philippe Lang2013-11-222-5/+52
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12312 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12302 from trunk to 2.4-stable (#15391, #15401)Toshi MARUYAMA2013-11-1946-46/+46
| | | | | | | | Fix wiki syntax "bold italic". Contributed by Karel Pičman. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12307 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12301 from trunk to 2.4-stable (#15391, #15400)Toshi MARUYAMA2013-11-192-131/+131
| | | | | | Czech Wiki syntax traslation updated by Karel Pičman. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12306 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12300 from trunk to 2.4-stable (#15395)Toshi MARUYAMA2013-11-191-1/+1
| | | | | | German translation updated by Daniel Felix. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12305 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12299 from trunk to 2.4-stable (#15391, #15402)Toshi MARUYAMA2013-11-191-13/+12
| | | | | | Czech traslation for 2.4-stable updated by Karel Pičman. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12304 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12296 from trunk to 2.4-stable (#15376)Toshi MARUYAMA2013-11-181-1/+1
| | | | | | Traditional Chinese translation updated by ChunChang Lo. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12297 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12292.Jean-Philippe Lang2013-11-171-0/+116
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12293 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12288 (#15369).Jean-Philippe Lang2013-11-161-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12289 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed UI tests.Jean-Philippe Lang2013-11-162-2/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12286 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12265, r12268, r12272 (#15307).Jean-Philippe Lang2013-11-1683-181/+180
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12282 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12278 (#15311).Jean-Philippe Lang2013-11-1549-1/+50
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12281 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12277 (#15344).Jean-Philippe Lang2013-11-152-1/+11
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12280 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12274 from trunk to 2.4-stable (#13348)Toshi MARUYAMA2013-11-131-1/+1
| | | | | | | | fix repository tree can't handle two loading at once. Contributed by Vadim Pushtaev. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12276 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12267.Jean-Philippe Lang2013-11-112-8/+13
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12271 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12269.Jean-Philippe Lang2013-11-110-0/+0
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12270 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Set version to 2.4.0 stable.Jean-Philippe Lang2013-11-101-3/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12264 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Added 2.4-stable branch.Jean-Philippe Lang2013-11-100-0/+0
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12262 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed that rake db:create fails with JRuby (#15218).Jean-Philippe Lang2013-11-102-12/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@12261 e93f8b46-1217-0410-a6f0-8f06a7374b81
* ci.rake: use 'jdbcsqlite3' for JRubyToshi MARUYAMA2013-11-101-2/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@12258 e93f8b46-1217-0410-a6f0-8f06a7374b81
* ci.rake: code format cleanupToshi MARUYAMA2013-11-101-4/+12
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@12257 e93f8b46-1217-0410-a6f0-8f06a7374b81
* work around "rake db:create:all" error on JRuby SQLite3Toshi MARUYAMA2013-11-101-1/+4
| | | | | | | | | | | | | | | <pre> $ bundle exec rake ci --trace ... rake aborted! stack level too deep /home/xxxx/.rvm/gems/jruby-1.7.4/gems/activerecord-3.2.15/lib/active_record/railties/databases.rake:184:in `local_database?' /home/xxxx/.rvm/gems/jruby-1.7.4/gems/activerecord-3.2.15/lib/active_record/railties/databases.rake:52:in `(root)' org/jruby/RubyHash.java:1375:in `each_value' /home/xxxx/.rvm/gems/jruby-1.7.4/gems/activerecord-3.2.15/lib/active_record/railties/databases.rake:38:in `(root)' </pre> git-svn-id: http://svn.redmine.org/redmine/trunk@12256 e93f8b46-1217-0410-a6f0-8f06a7374b81
* remove trailing white-spaces from test/unit/project_members_inheritance_test.rbToshi MARUYAMA2013-11-091-4/+4
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@12255 e93f8b46-1217-0410-a6f0-8f06a7374b81
* upgrade activerecord-jdbc-adapter to 1.3.2Toshi MARUYAMA2013-11-091-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@12254 e93f8b46-1217-0410-a6f0-8f06a7374b81
* remove trailing white-spaces from test/unit/query_test.rbToshi MARUYAMA2013-11-091-5/+5
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@12253 e93f8b46-1217-0410-a6f0-8f06a7374b81
* remove trailing white-spaces from test/unit/setting_test.rbToshi MARUYAMA2013-11-091-3/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@12252 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Custom fields in issue form - splitting is incorrect (#15227).Jean-Philippe Lang2013-11-091-2/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@12251 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Accept issue id with leading sharp when adding a related issue.Jean-Philippe Lang2013-11-092-1/+10
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@12250 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Log errors when moving attachments (#15295).Jean-Philippe Lang2013-11-091-7/+18
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@12249 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Accept custom field format added at runtime (#15277).Jean-Philippe Lang2013-11-093-1/+22
| | | | | | Patch by Boris Bera. git-svn-id: http://svn.redmine.org/redmine/trunk@12248 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gantt: sort versions like on the roadmap (#7335).Jean-Philippe Lang2013-11-092-24/+5
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@12247 e93f8b46-1217-0410-a6f0-8f06a7374b81