summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merged r14473 (#20278).Jean-Philippe Lang2015-09-122-1/+8
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14543 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 3.1-stable: revert r14300 (#16535, #20466)Toshi MARUYAMA2015-08-314-27/+4
| | | | | | | | Set a max width to html email content. Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14539 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14413 from trunk to 3.1-stable (#20243, #20456)Toshi MARUYAMA2015-08-312-3/+3
| | | | | | | | Use https links instead of http links in ApplicationHelper#avatar_edit_link and Redmine::Info class methods. Patch by Mischa The Evil. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14538 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14410 from trunk to 3.1-stable (#11253, #20456)Toshi MARUYAMA2015-08-311-0/+2
| | | | | | Asserts that spent time is preloaded. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14537 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14409 from trunk to 3.1-stable (#11253, #20456)Toshi MARUYAMA2015-08-311-1/+2
| | | | | | Fixes methods comments. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14536 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14408 from trunk to 3.1-stable (#11253, #20456)Toshi MARUYAMA2015-08-311-3/+5
| | | | | | Limit queries to given issues only. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14535 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14407 from trunk to 3.1-stable (#11253, #20456)Toshi MARUYAMA2015-08-312-4/+16
| | | | | | Preload total spent time on the issue list with 1 query. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14534 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14406 from trunk to 3.1-stable (#11253, #20456)Toshi MARUYAMA2015-08-3151-0/+67
| | | | | | Adds "Total spent hours" column available on the issue list. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14533 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14416 and r14530 from trunk to 3.1-stableToshi MARUYAMA2015-08-302-1/+52
| | | | | | travis: add PostgreSQL environments git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14531 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14525 from trunk to 3.1-stableToshi MARUYAMA2015-08-291-0/+3
| | | | | | | | | | | | | | | | | travis: allow test failures on MySQL 5.7 <pre> ActiveRecord::StatementInvalid: Mysql2::Error: Table 'performance_schema.session_variables' doesn't exist: SHOW VARIABLES LIKE 'character_set_database' </pre> Refer: * https://github.com/rails/rails/issues/21108 * https://github.com/rails/rails/pull/21318 git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14526 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14521 from trunk to 3.1-stableToshi MARUYAMA2015-08-291-1/+1
| | | | | | Gemfile: update Rails to 4.2.4 git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14524 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14415 and r14522 from trunk to 3.1-stable (#20251)Toshi MARUYAMA2015-08-291-0/+8
| | | | | | | | | travis: allow ui test failure. Refer: https://github.com/travis-ci/travis-ci/issues/3225 git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14523 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14517 from trunk to 3.1-stable (#20452)Toshi MARUYAMA2015-08-181-36/+35
| | | | | | Czech translation updated by Karel Pičman. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14518 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 3.1-stable: Czech wiki help translation updated by Karel Pičman (#20452)Toshi MARUYAMA2015-08-184-161/+157
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14516 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14513 from trunk to 3.1-stable (#20452, #20557)Toshi MARUYAMA2015-08-183-14/+14
| | | | | | Czech translation for 2.6-stable updated by Karel Pičman. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14514 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14461 from trunk to 3.1-stable (#20338, #20410)Toshi MARUYAMA2015-07-261-13/+13
| | | | | | Turkish translation for 3.1-stable updated by Giray Pultar. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14464 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14460 from trunk to 3.1-stable (#20338, #20409)Toshi MARUYAMA2015-07-261-22/+22
| | | | | | Turkish translation for 3.0-stable updated by Giray Pultar. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14463 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14459 from trunk to 3.1-stable (#20338, #20408)Toshi MARUYAMA2015-07-261-18/+18
| | | | | | Turkish translation for 2.6-stable updated by Giray Pultar. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14462 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14455.Jean-Philippe Lang2015-07-261-0/+64
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14456 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14450 (#20206).Jean-Philippe Lang2015-07-252-1/+14
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14453 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14451 (#20372).Jean-Philippe Lang2015-07-251-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14452 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14448 (#5770).Jean-Philippe Lang2015-07-241-1/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14449 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14446 (#16373).Jean-Philippe Lang2015-07-2449-147/+147
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14447 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14443 from trunk to 3.1-stable (#19172)Toshi MARUYAMA2015-07-131-1/+1
| | | | | | doc/INSTALL: update requirements Bundler >= 1.5.0. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14444 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14440 from trunk to 3.1-stable (#20292)Toshi MARUYAMA2015-07-122-0/+2
| | | | | | | | add config/secrets.yml to .gitignore and .hgignore. Contributed by Benjamin Petersen. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14441 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14437 from trunk to 3.1-stable (#20292)Toshi MARUYAMA2015-07-120-0/+0
| | | | | | | | | | add config/secrets.yml to svn:ignore. Contributed by Benjamin Petersen. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14438 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14430 from trunk to 3.1-stable (#20199)Toshi MARUYAMA2015-07-121-27/+26
| | | | | | Russian translation for 3.1-stable updated. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14433 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14429 from trunk to 3.1-stable (#20199, #20295)Toshi MARUYAMA2015-07-121-21/+21
| | | | | | Russian translation for 3.0-stable updated. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14432 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14428 from trunk to 3.1-stable (#20199, #20294)Toshi MARUYAMA2015-07-121-1/+1
| | | | | | Russian translation for 2.6-stable updated. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14431 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14420 from trunk to 3.1-stable (#20198)Toshi MARUYAMA2015-07-071-7/+7
| | | | | | Japanese translation updated by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14422 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14419 from trunk to 3.1-stable (#20193)Toshi MARUYAMA2015-07-071-1/+1
| | | | | | Bulgarian translation updated by Ivan Cenov. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14421 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14417 from trunk to 3.1-stable.Toshi MARUYAMA2015-07-061-1/+3
| | | | | | add missing fixtures to IssueSubtaskingTest. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14418 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14388 (#19842).Jean-Philippe Lang2015-07-055-24/+105
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14403 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14389 (#20203).Jean-Philippe Lang2015-07-054-5/+5
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14400 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14396 (#17757).Jean-Philippe Lang2015-07-051-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14397 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14394 from trunk to 3.1-stable (#19993)Toshi MARUYAMA2015-07-041-2/+2
| | | | | | change csv separators of es-PA.yml by Leonel Iturralde. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14395 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14392 from trunk to 3.1-stable (#19993)Toshi MARUYAMA2015-07-022-26/+24
| | | | | | Spanish (es, es-PA) translation updated by Leonel Iturralde. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14393 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Set BRANCH to stable.Jean-Philippe Lang2015-06-281-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14387 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14380 (#20066).Jean-Philippe Lang2015-06-282-1/+9
|\ | | | | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14385 e93f8b46-1217-0410-a6f0-8f06a7374b81
| * Upgrade jquery_ujs from 3.1.1 to 3.1.3.Jean-Philippe Lang2015-06-282-3/+3
| | | | | | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14381 e93f8b46-1217-0410-a6f0-8f06a7374b81
| * Fixed group sorted scope order (#20066).Jean-Philippe Lang2015-06-282-1/+9
| | | | | | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14380 e93f8b46-1217-0410-a6f0-8f06a7374b81
* | Merged r14381.Jean-Philippe Lang2015-06-282-3/+3
| | | | | | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14382 e93f8b46-1217-0410-a6f0-8f06a7374b81
* | Added 3.1-stable branch.Jean-Philippe Lang2015-06-280-0/+0
|/ | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14379 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Set version to 3.1.0.Jean-Philippe Lang2015-06-281-2/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14378 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Add avatar and edit link to "My account" page (#5418).Jean-Philippe Lang2015-06-272-1/+13
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14377 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Disallow users to delete a version referenced by a custom field (#20159).Jean-Philippe Lang2015-06-274-1/+32
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14376 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Error when using views/issues/index.api.rsb in a plugin (#13924).Jean-Philippe Lang2015-06-271-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14375 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Sort journals by created_on then id (#14881).Jean-Philippe Lang2015-06-271-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14374 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Missing member_roles fixture (#20174).Jean-Philippe Lang2015-06-271-0/+4
| | | | | | Patch by Vincent Robert. git-svn-id: http://svn.redmine.org/redmine/trunk@14373 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Make the updateIssueFrom(url) function return the XMLHttpRequest object ↵Jean-Philippe Lang2015-06-271-1/+1
| | | | | | | | (#20180). Patch by Vincent Robert. git-svn-id: http://svn.redmine.org/redmine/trunk@14372 e93f8b46-1217-0410-a6f0-8f06a7374b81