summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix typo of Japanese translation for notice_gantt_chart_truncated (#20761)Toshi MARUYAMA2015-09-161-1/+1
| | | | | | Contributed by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@14598 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Portuguese translation for trunk updated by Rui Rebelo (#20728)Toshi MARUYAMA2015-09-141-20/+18
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14589 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Portuguese translation for 3.1-stable updated by Rui Rebelo (#20728, #20747)Toshi MARUYAMA2015-09-141-24/+23
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14588 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Portuguese translation for 3.0-stable updated by Rui Rebelo (#20728, #20746)Toshi MARUYAMA2015-09-141-23/+23
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14587 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Portuguese translation for 2.6-stable updated by Rui Rebelo (#20728, #20745)Toshi MARUYAMA2015-09-141-2/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14586 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Spanish and Spanish Panama translation updated by Leonel Iturralde (#20708)Toshi MARUYAMA2015-09-142-40/+40
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14585 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Japanese "spent time" translation changed by Go MAEDA (#20731)Toshi MARUYAMA2015-09-141-4/+4
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14584 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Japanese translation updated by Go MAEDA (#20729)Toshi MARUYAMA2015-09-141-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14582 e93f8b46-1217-0410-a6f0-8f06a7374b81
* trunk: Merged r14580 from 2.6-stable.Toshi MARUYAMA2015-09-141-2/+2
| | | | | | travis: upgrade jruby-9.0.0.0 to jruby-9.0.1.0. git-svn-id: http://svn.redmine.org/redmine/trunk@14581 e93f8b46-1217-0410-a6f0-8f06a7374b81
* trunk: merge r14572 from 3.1-stable (#20452)Toshi MARUYAMA2015-09-141-1/+1
| | | | | | fix Czech textile ol example. git-svn-id: http://svn.redmine.org/redmine/trunk@14573 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Traditional Chinese "issue" translation changed by ChunChang Lo (#20720)Toshi MARUYAMA2015-09-141-97/+97
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14569 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Traditional Chinese translation updated by ChunChang Lo (#20720)Toshi MARUYAMA2015-09-141-21/+19
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14568 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds a test for #20714.Jean-Philippe Lang2015-09-131-1/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14561 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Open redirect vulnerability (#19577).Jean-Philippe Lang2015-09-132-9/+36
| | | | | | Patch by Holger Just. git-svn-id: http://svn.redmine.org/redmine/trunk@14560 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds translation strings (#20688).Jean-Philippe Lang2015-09-1247-0/+47
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14555 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds a Total estimated hours column on issue list (#20688).Jean-Philippe Lang2015-09-124-0/+18
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14554 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Help cursor showing up on span tags with title (#20633).Jean-Philippe Lang2015-09-122-2/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14552 e93f8b46-1217-0410-a6f0-8f06a7374b81
* WARNING: Can't mass-assign protected attributes for User (#20490).Jean-Philippe Lang2015-09-121-2/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14550 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: remove loofah definition (#16962, #19419)Toshi MARUYAMA2015-09-011-1/+0
| | | | | | actionpack 4.2 depends on loofah. git-svn-id: http://svn.redmine.org/redmine/trunk@14542 e93f8b46-1217-0410-a6f0-8f06a7374b81
* trunk: revert r14300 (#16535, #20466, #20641)Toshi MARUYAMA2015-09-014-27/+4
| | | | | | | | Set a max width to html email content. Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@14541 e93f8b46-1217-0410-a6f0-8f06a7374b81
* add roadie-rails gem for e-mail inline styles (#8335, #20641)Toshi MARUYAMA2015-08-312-0/+4
| | | | | | Contributed by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@14540 e93f8b46-1217-0410-a6f0-8f06a7374b81
* travis: add PostgreSQL environmentsToshi MARUYAMA2015-08-302-1/+46
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14530 e93f8b46-1217-0410-a6f0-8f06a7374b81
* travis: allow failures on jruby 9000Toshi MARUYAMA2015-08-301-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14529 e93f8b46-1217-0410-a6f0-8f06a7374b81
* trunk: merge r14527 from 2.6-stableToshi MARUYAMA2015-08-301-1/+9
| | | | | | | | | travis: add jruby 9000 refer: https://github.com/travis-ci/travis-ci/issues/4720 git-svn-id: http://svn.redmine.org/redmine/trunk@14528 e93f8b46-1217-0410-a6f0-8f06a7374b81
* travis: allow test failures on MySQL 5.7Toshi MARUYAMA2015-08-291-0/+3
| | | | | | | | | | | | | | | <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/trunk@14525 e93f8b46-1217-0410-a6f0-8f06a7374b81
* travis: allow ui test failure on all environments (#20251)Toshi MARUYAMA2015-08-291-0/+6
| | | | | | | Refer: https://github.com/travis-ci/travis-ci/issues/3225 git-svn-id: http://svn.redmine.org/redmine/trunk@14522 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: update Rails to 4.2.4Toshi MARUYAMA2015-08-291-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14521 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Reverts r14510 (#20508) and r14511 (#20507), tests broken.Jean-Philippe Lang2015-08-222-5/+4
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14520 e93f8b46-1217-0410-a6f0-8f06a7374b81
* trunk: merge r14516 from 3.1-stable (#20452)Toshi MARUYAMA2015-08-184-161/+157
| | | | | | Czech wiki help translation updated by Karel Pičman. git-svn-id: http://svn.redmine.org/redmine/trunk@14519 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Czech translation updated by Karel Pičman (#20452)Toshi MARUYAMA2015-08-181-36/+35
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14517 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Czech translation for 2.6-stable updated by Karel Pičman (#20452, #20557)Toshi MARUYAMA2015-08-183-14/+14
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14513 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Don't render empty divs when there are no custom fields on the issue form ↵Jean-Philippe Lang2015-08-181-0/+2
| | | | | | (#20501). git-svn-id: http://svn.redmine.org/redmine/trunk@14512 e93f8b46-1217-0410-a6f0-8f06a7374b81
* ThemesHelper reopening ApplicationHelper is problem with autoloading (#20507).Jean-Philippe Lang2015-08-181-1/+2
| | | | | | Patch by Ondřej Ezr. git-svn-id: http://svn.redmine.org/redmine/trunk@14511 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Required file lib/redmine/hook.rb is patching autoloaded ApplicationHelper ↵Jean-Philippe Lang2015-08-181-3/+3
| | | | | | | | (#20508). Patch by Ondřej. git-svn-id: http://svn.redmine.org/redmine/trunk@14510 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Redmine I18n autoload instead of require (#20506).Jean-Philippe Lang2015-08-181-1/+0
| | | | | | Patch by Ondřej Ezr. git-svn-id: http://svn.redmine.org/redmine/trunk@14509 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Project.copy_from deletes enabled_modules on source (#20512).Jean-Philippe Lang2015-08-182-2/+15
| | | | | | Fix by Ondřej Ezr. git-svn-id: http://svn.redmine.org/redmine/trunk@14508 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Japanese translation updated by Go MAEDA (#20538)Toshi MARUYAMA2015-08-181-21/+19
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14507 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Find user by login then by email.Jean-Philippe Lang2015-08-151-4/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14506 e93f8b46-1217-0410-a6f0-8f06a7374b81
* DEPRECATION WARNING: `#timestamps` was called without specifying an option ↵Jean-Philippe Lang2015-08-151-1/+1
| | | | | | for `null` (#905, #20533). git-svn-id: http://svn.redmine.org/redmine/trunk@14505 e93f8b46-1217-0410-a6f0-8f06a7374b81
* CSV importer raises I18n::InvalidLocale exception if current user's language ↵Jean-Philippe Lang2015-08-152-1/+10
| | | | | | is "(auto)" (#905, #20535). git-svn-id: http://svn.redmine.org/redmine/trunk@14504 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Use same logic for finding user as a custom field (#950).Jean-Philippe Lang2015-08-153-15/+39
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14503 e93f8b46-1217-0410-a6f0-8f06a7374b81
* #downcase no longer needed after r14484 (#20369).Jean-Philippe Lang2015-08-151-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14502 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Use same logic for finding user when importing a file (#950).Jean-Philippe Lang2015-08-153-5/+14
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14501 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Moved implementation to Principal.Jean-Philippe Lang2015-08-152-21/+25
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14500 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed that #find_assignee_from_keyword may return a group with blank keyword ↵Jean-Philippe Lang2015-08-151-0/+2
| | | | | | (#20454). git-svn-id: http://svn.redmine.org/redmine/trunk@14499 e93f8b46-1217-0410-a6f0-8f06a7374b81
* #downcase no longer needed after r14484 (#20369).Jean-Philippe Lang2015-08-151-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14498 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Use named scope to find the matching version (#950).Jean-Philippe Lang2015-08-151-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14497 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Set default date format based on user locale (#950).Jean-Philippe Lang2015-08-142-1/+15
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14496 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds support for custom date format when importing a CSV file (#950).Jean-Philippe Lang2015-08-147-4/+59
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14495 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds translation strings (#950).Jean-Philippe Lang2015-08-1447-0/+987
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@14494 e93f8b46-1217-0410-a6f0-8f06a7374b81