Commit Graph

1746 Commits

Author SHA1 Message Date
Jean-Philippe Lang c47aacd6b0 Merged r12736 (#15977).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12860 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-08 07:58:49 +00:00
Jean-Philippe Lang 287bcacd81 Merged r12848 (#16032).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12853 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-07 08:09:36 +00:00
Jean-Philippe Lang d6b718b43c Merged r12844 (#16038).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12852 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-07 08:06:38 +00:00
Jean-Philippe Lang b8ffc995c1 Merged r12745 (#15870).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12847 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-06 18:00:37 +00:00
Jean-Philippe Lang a11aec0d4c Merged r12660 (#13544).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12845 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-06 17:58:24 +00:00
Jean-Philippe Lang 36c35080b2 Merged r12419.
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12434 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-21 11:26:01 +00:00
Jean-Philippe Lang beed3c5746 Merged r12420 (#15684).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12433 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-21 11:25:25 +00:00
Jean-Philippe Lang c295f67329 Merged r12414 (#15623).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12431 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-21 11:23:58 +00:00
Jean-Philippe Lang f4aff7919a Log errors when moving attachments (#15295).
git-svn-id: http://svn.redmine.org/redmine/trunk@12249 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-09 09:46:55 +00:00
Jean-Philippe Lang 10e29f2223 Accept custom field format added at runtime (#15277).
Patch by Boris Bera.

git-svn-id: http://svn.redmine.org/redmine/trunk@12248 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-09 09:07:48 +00:00
Toshi MARUYAMA 3109ed9320 code format cleanup app/models/changeset.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12231 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-24 05:40:32 +00:00
Toshi MARUYAMA 16b94e126b code format cleanup app/models/issue.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12230 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-24 05:40:21 +00:00
Jean-Philippe Lang b48fcdaa97 Avoid a query if enabled_modules association is already loaded (#15058).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12228 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-20 16:04:04 +00:00
Jean-Philippe Lang 99bf8c95ab Fixed that issue nested set update is triggered even if parent is not changed (#15135).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12226 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-20 09:25:14 +00:00
Jean-Philippe Lang 3172359f97 Avoid N queries when displaying the issue list with custom fields.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12223 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-15 16:38:17 +00:00
Jean-Philippe Lang 5f747faa58 Fixed that viewing/editing a wiki page without WikiContent raises an error (#14986).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12220 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-13 11:19:47 +00:00
Jean-Philippe Lang 94e7df78ca Fixed that controller_issues_edit_before/after_save hooks have no controller context (#15044).
Patch by Jordan Hollinger.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12219 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-13 10:31:04 +00:00
Jean-Philippe Lang 7bea176cdb Avoid lots of CustomField.find_by_id calls when displaying an issue history with custom fields (#15072).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12217 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-13 10:04:59 +00:00
Jean-Philippe Lang 176ce78574 Fixed that the mail method should return a Mail::Message (#15113).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12210 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-13 07:58:33 +00:00
Jean-Philippe Lang b6cb7aa8e3 Ability to define commit keywords per tracker (#7590).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12208 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-13 07:37:49 +00:00
Jean-Philippe Lang cfc65d9397 NoMethodError when uploading a file without logger (#14977).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12202 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-05 11:37:57 +00:00
Jean-Philippe Lang 7b1b605ae8 Don't update issues nor log time when importing old changesets (#4823).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12199 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-05 10:33:03 +00:00
Jean-Philippe Lang 0444ecca3c Pass the commit keyword used to update the issue to the plugin hook.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12198 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-05 10:02:31 +00:00
Jean-Philippe Lang a77b462a53 Support for multiple issue update keywords/rules in commit messages (#4911).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12197 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-05 09:41:11 +00:00
Toshi MARUYAMA d8ddb2cee4 remove trailing white-spaces from app/models/custom_field.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12188 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-30 09:53:57 +00:00
Jean-Philippe Lang cfc05d310e Exclude attachments from incoming emails based on file name (#3413).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12167 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-29 11:50:49 +00:00
Jean-Philippe Lang 886284b33f REST API: custom fields definition (#11159).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12165 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-29 10:08:30 +00:00
Jean-Philippe Lang 62b66e9b38 Prevents invalid SQL with invalid group_ids (#14902).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12162 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-25 17:35:59 +00:00
Jean-Philippe Lang 59b935aa46 Filters show issues with unused custom fields (#13537).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12133 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-13 17:41:54 +00:00
Jean-Philippe Lang cb747a34ef Wrong done_ratio calculation for parent with subtask having estimated_hours=0 ().
Patch by Daniel Felix.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12131 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-11 22:00:18 +00:00
Jean-Philippe Lang 02fca76c13 Strip eols from file names (#14819).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12128 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-11 19:19:24 +00:00
Jean-Philippe Lang 06efcaddfa Fixed usage of #attribute_present? in UserPreference (#13008).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12126 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-10 17:39:49 +00:00
Toshi MARUYAMA 15ab64488a remove trailing white-space from app/models/journal.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12121 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-05 11:14:30 +00:00
Toshi MARUYAMA ae2b47afd6 code format cleanup app/models/issue.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12087 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-08-06 06:27:16 +00:00
Jean-Philippe Lang b764e39847 Option to force a user to change his password (#3872).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12081 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-08-05 17:58:33 +00:00
Jean-Philippe Lang b19b902345 Moved CUSTOM_FIELDS_TABS out of the model.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12077 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-08-04 10:26:54 +00:00
Toshi MARUYAMA 7711e37da4 remove ineffective "logger.info" and "logger.error" check from MailHandler model (#14598)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12073 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-08-03 10:46:53 +00:00
Jean-Philippe Lang 3df08b02b4 Broken tests (#14491).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12068 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-29 19:08:01 +00:00
Jean-Philippe Lang 1502da5726 Use the default project when receiving an email with an invalid project keyword (#14491).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12067 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-29 16:37:45 +00:00
Jean-Philippe Lang 4a70a319c5 Filtering issues on "related to" may ignore other filters (#14401).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12058 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 15:29:31 +00:00
Jean-Philippe Lang 474453d2b0 Additional status transitions for assignees do not work if assigned to a group (#14447).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12056 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 14:58:06 +00:00
Jean-Philippe Lang 21fc903c04 Fixed that sorting time entries by custom field raises a SQL error (#14366).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12042 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 09:59:34 +00:00
Jean-Philippe Lang dc5e5eca6b Fixed that displaying time entries with custom field column raises an error (#5037).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12041 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-24 18:18:08 +00:00
Jean-Philippe Lang 9ca8b20d55 Don't hardcode news model in Comment.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12026 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-15 20:53:23 +00:00
Jean-Philippe Lang 205eda8b33 Use AR callbacks instead of observers (removed in Rails4) for notifications.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12021 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-14 14:26:27 +00:00
Jean-Philippe Lang 010bfc56e1 Ability to save Gantt query filters (#7836).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12020 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-14 13:41:30 +00:00
Jean-Philippe Lang 594589e0ec Use Hash#reject that returns a Hash with ruby1.8 when Hash#select that returns an Array.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12016 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-13 10:39:36 +00:00
Jean-Philippe Lang 0087d237f7 Don't notify users about relations that are not visible (#1005).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12015 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-13 10:32:48 +00:00
Jean-Philippe Lang 7509dda1ff Fixed that relations to issues that are not visible are displayed in the issue history (#1005).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12014 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-13 09:56:58 +00:00
Jean-Philippe Lang 628d05629b Role-based issue custom field visibility (#5037).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12012 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-13 09:20:11 +00:00