Commit Graph

3896 Commits

Author SHA1 Message Date
Jean-Philippe Lang fb3b904b8f Better handling of issue update conflicts (#8691).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8774 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-04 17:36:15 +00:00
Etienne Massip b9c26d6ddc Revision graph code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8773 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-04 14:02:31 +00:00
Jean-Philippe Lang 06f8c4b27a Removed useless code.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8771 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-04 11:41:43 +00:00
Jean-Philippe Lang 333a6cc370 Fixed rounding issue on spent hours column in CSV export (#10150).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8764 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-04 11:03:44 +00:00
Toshi MARUYAMA 2789cf2506 attachment: fix that diff type is not saved in user preference (#10152)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8761 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-04 06:23:38 +00:00
Toshi MARUYAMA 7574ab730d code layout cleanup app/controllers/sys_controller.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8756 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-02 23:26:54 +00:00
Jean-Philippe Lang 46ab7b45d7 Permissions report: display role names on each permission group (#10119).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8755 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-02 22:31:00 +00:00
Jean-Philippe Lang e4ef0b04ef Adds specific css class for information in forms.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8754 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-02 20:07:37 +00:00
Jean-Philippe Lang 73f9b825f0 Replaced ruby-net-ldap with net-ldap 0.2.2 gem.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8751 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-02 19:30:01 +00:00
Jean-Philippe Lang d02f6a8e32 Adds a setting that allows to reference/fix issues of all projects (#3087).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8750 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-02 18:09:37 +00:00
Jean-Philippe Lang 3dc73dcb88 Fixed: associated changesets from other projects are not visible if the current project doesn't have the repository module enabled (#3087).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8749 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-02 17:43:36 +00:00
Jean-Philippe Lang b13f85e456 Adds custom field in TimeEntry API responses (#10131).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8748 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-01 21:15:13 +00:00
Jean-Philippe Lang 2808adf99f Adds members of subprojects in assignee and author filters (#10126).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8747 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-01 20:07:01 +00:00
Jean-Philippe Lang 0154d7477b Simplifies Principal.active scope (status defaults to 1 for groups).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8746 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-01 19:35:49 +00:00
Toshi MARUYAMA 5dd08133ef code layout cleanup app/models/mail_handler.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8745 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-31 12:49:06 +00:00
Toshi MARUYAMA 7b600cdb91 code layout cleanup app/models/mail_handler.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8744 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-31 10:19:04 +00:00
Toshi MARUYAMA bcef0de43b replace tabs to spaces at app/views/wiki/index.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8743 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-31 03:53:37 +00:00
Jean-Philippe Lang 2664693ae8 Removed useless permission check in wiki controller.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8735 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-30 18:50:04 +00:00
Jean-Philippe Lang 3d27bf5318 Adds export of all wiki pages to a PDF file (#3463).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8734 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-30 18:42:14 +00:00
Jean-Philippe Lang a03c585a84 Check parent wiki page by default.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8733 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-30 18:19:29 +00:00
Toshi MARUYAMA 2c6edb9f3c remove trailing tabs from app/views/news/_form.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8730 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-30 01:38:58 +00:00
Jean-Philippe Lang e8cfa65155 Enable attached images to be displayed inline on the news list.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8729 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-29 22:42:12 +00:00
Jean-Philippe Lang 24138187eb Allows attachments on news (#1972).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8728 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-29 22:39:06 +00:00
Jean-Philippe Lang 79b12c73d9 Display of multi custom fields.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8726 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-29 22:01:40 +00:00
Jean-Philippe Lang 0cd62a3c77 Display custom_field_values instead of custom_values.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8725 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-29 21:21:45 +00:00
Jean-Philippe Lang cd4a19241a Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8724 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-29 21:12:10 +00:00
Jean-Philippe Lang f84688687b Allow existing single value custom fields to be changed to multiselect.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8723 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-29 21:10:18 +00:00
Jean-Philippe Lang 8d5f932660 Do not validate blank default custom field value.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8722 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-29 21:09:44 +00:00
Jean-Philippe Lang cd6db6a3cb Adds support for multiselect custom fields (#1189).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8721 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-29 20:51:48 +00:00
Jean-Philippe Lang 83e7ee6729 Extracts custom field values validation from CustomValue so that they can be validated globally from the customized object (#1189).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8717 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-28 11:16:58 +00:00
Toshi MARUYAMA d4d27bd2d8 Ruby1.9: skip enforcing UTF-8 encodings on the params hash on Rails2 if it is frozen (#4050, #4796)
Tests on CI server fail.
http://www.redmine.org/builds/build_trunk-1.9.2-sqlite3_257.html

<pre>
  1) Error:
test_index_with_short_filters(IssuesControllerTest):
RuntimeError: can't modify frozen string
    /var/lib/hudson/jobs/trunk-1.9.2-sqlite3/workspace/app/controllers/application_controller.rb:58:in `force_encoding'
    /var/lib/hudson/jobs/trunk-1.9.2-sqlite3/workspace/app/controllers/application_controller.rb:58:in `utf8nize!'
    /var/lib/hudson/jobs/trunk-1.9.2-sqlite3/workspace/app/controllers/application_controller.rb:60:in `block in utf8nize!'
    /var/lib/hudson/jobs/trunk-1.9.2-sqlite3/workspace/app/controllers/application_controller.rb:60:in `each'
    /var/lib/hudson/jobs/trunk-1.9.2-sqlite3/workspace/app/controllers/application_controller.rb:60:in `utf8nize!'
    /var/lib/hudson/jobs/trunk-1.9.2-sqlite3/workspace/app/controllers/application_controller.rb:52:in `params_filter'
    /var/lib/hudson/ruby1.9.2/lib/ruby/gems/1.9.1/gems/activesupport-2.3.14/lib/active_support/callbacks.rb:178:in `evaluate_method'
    /var/lib/hudson/ruby1.9.2/lib/ruby/gems/1.9.1/gems/activesupport-2.3.14/lib/active_support/callbacks.rb:166:in `call'
    /var/lib/hudson/ruby1.9.2/lib/ruby/gems/1.9.1/gems/actionpack-2.3.14/lib/action_controller/filters.rb:225:in `call'
    /var/lib/hudson/ruby1.9.2/lib/ruby/gems/1.9.1/gems/actionpack-2.3.14/lib/action_controller/filters.rb:629:in `run_before_filters'
    /var/lib/hudson/ruby1.9.2/lib/ruby/gems/1.9.1/gems/actionpack-2.3.14/lib/action_controller/filters.rb:615:in `call_filters'
    /var/lib/hudson/ruby1.9.2/lib/ruby/gems/1.9.1/gems/actionpack-2.3.14/lib/action_controller/filters.rb:610:in `perform_action_with_filters'
    /var/lib/hudson/ruby1.9.2/lib/ruby/gems/1.9.1/gems/actionpack-2.3.14/lib/action_controller/benchmarking.rb:68:in `block in perform_action_with_benchmark'
    /var/lib/hudson/ruby1.9.2/lib/ruby/gems/1.9.1/gems/activesupport-2.3.14/lib/active_support/core_ext/benchmark.rb:17:in `block in ms'
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8716 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-28 10:26:34 +00:00
Toshi MARUYAMA 24d73d4644 Ruby1.9: enforce UTF-8 encodings on the params hash on Rails2 (#4050, #4796)
Without this change, non ASCII subject issue cannot be created on Ruby 1.9.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8714 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-28 04:58:11 +00:00
Jean-Philippe Lang 9fbb235d81 Accept project identifier with underscore.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8709 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-27 19:29:07 +00:00
Jean-Philippe Lang 9d372ce6f5 Allow underscores in project identifiers (#1363).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8708 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-27 17:34:58 +00:00
Jean-Philippe Lang ffbd3c0522 Makes all workflow transitions defined for all roles available to administrators (#2323).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8707 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-26 20:30:47 +00:00
Toshi MARUYAMA 30579e6619 replace tabs to spaces at app/views/projects/settings/_repositories.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8706 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-26 12:07:48 +00:00
Toshi MARUYAMA 73b175df8f code layout cleanup app/views/repositories/revisions.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8704 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-26 06:40:55 +00:00
Toshi MARUYAMA 564653167e code layout cleanup app/views/repositories/_revisions.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8703 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-26 06:40:29 +00:00
Jean-Philippe Lang 6714d69767 Fixed javascript error when changing time period on time report.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8701 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-24 21:01:49 +00:00
Jean-Philippe Lang 1fa341df1c Fixed links to versions anchors on the roadmap.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8700 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-24 18:47:38 +00:00
Jean-Philippe Lang af0fcd22e4 Provide a direct access to completed versions form the roadmap.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8699 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-24 18:45:40 +00:00
Jean-Philippe Lang 858bd8dc40 Moved javascript filters functions to application.js.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8698 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-24 18:02:22 +00:00
Jean-Philippe Lang 7f4e3771d8 Allows bulk change issue private flag (#10042).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8696 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-23 18:35:11 +00:00
Jean-Philippe Lang 22317105f9 Notify previous assignee when assignee changes (#2694).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8695 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-23 17:55:29 +00:00
Jean-Philippe Lang f2e7aa596b Adds support for multiple repositories to redmine links (#779).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8694 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-22 14:23:10 +00:00
Jean-Philippe Lang 13f28858ba Fixed that project is ignored when entering an issue id on /time_entries/new form (#10020).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8693 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-22 10:37:57 +00:00
Jean-Philippe Lang 41e82c4598 Keep back_url param for when continuing creating issues.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8692 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-21 14:34:55 +00:00
Jean-Philippe Lang 41eab6615b Enable global time logging at /time_entries/new (#10020).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8691 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-21 14:26:51 +00:00
Jean-Philippe Lang 94b621a99f Fixed that reminders are sent for closed issues (#10006).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8690 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-21 12:28:39 +00:00
Jean-Philippe Lang f2a7f83c82 Adds a <<me>> option for assignee in the context menu (#1102).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8689 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-21 11:11:13 +00:00