4b098d7774
Merge branch 'journals' into 1.0-stable
...
Conflicts:
app/controllers/issues_controller.rb
app/controllers/journals_controller.rb
app/helpers/journals_helper.rb
app/views/issues/_history.rhtml
lib/redmine/activity/fetcher.rb
test/functional/issues_controller_test.rb
test/test_helper.rb
2010-09-14 09:32:35 +02:00
519069b867
Merged r4011 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4023 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 19:49:14 +00:00
27ef72c35e
Merged r4006 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4018 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 19:48:45 +00:00
d1a9f81fc6
Merged r3947 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3997 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:34:20 +00:00
80e833cd88
Merged r3946 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3996 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:34:14 +00:00
a12a073a6e
Merged r3945 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3995 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:34:08 +00:00
2012c60bfd
Merged r3941 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3991 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:33:46 +00:00
8ca6941a33
Merged r3940 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3990 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:33:40 +00:00
6e5f567346
Merged r3938 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3988 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:33:29 +00:00
fab5064643
Merged r3936 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3986 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:33:18 +00:00
72ce3e18f8
Merged r3932 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3982 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:32:53 +00:00
b5b8d34d94
Merged r3930 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3980 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:32:42 +00:00
2f529fd834
Merged r3918 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3968 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:31:30 +00:00
9892ede7b7
Merged r3917 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3967 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:31:24 +00:00
19bbb6e2cb
Merged r3912 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3962 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:30:53 +00:00
5de0d0997f
remove the reply action from IssueController, and use the JournalHelper API for that
2010-07-29 14:48:24 +02:00
96bbd94251
adjust for acts_as_journalized
2010-07-15 15:23:43 +02:00
867266e934
init_journal has now the old signature
2010-07-15 14:43:09 +02:00
aecb868b85
remove more journal specific functionality
2010-07-14 19:00:03 +02:00
345301284a
Added JSON support to the issues API. #1214
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3766 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-05 03:52:59 +00:00
36c82ecc1f
Refactor: move Project Calendar to it's own controller.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3732 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-03 16:02:37 +00:00
306ca5e714
Refactor: Pull up #find_optional_project to ApplicationController.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3716 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-30 17:24:11 +00:00
e5180884c1
Fixes selected menu tab when issue creation fails.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3704 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-30 10:48:19 +00:00
488879d9cf
Refactor: pull #query_statement_invalid up to ApplicationController.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3696 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-29 15:19:19 +00:00
e65c3cfc7d
Refactor: Move gantts to a separate controller.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3695 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-28 15:54:46 +00:00
df7edb843b
Refactor: move method to helper.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3691 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-27 15:28:52 +00:00
dfc448030d
Refactor: extract error to new method with before_filter.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3690 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-26 15:08:06 +00:00
23f097e344
Refactor: Extract duplicated code to a new method.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3689 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-23 15:05:13 +00:00
2c898d8a81
Refactor: Split IssuesController#new to #new and #create to match REST pattern.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3688 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-22 15:43:57 +00:00
0004b52646
Fixes behaviour of move_issues permission for non member role ( #5309 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3683 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-18 12:47:41 +00:00
43e5bb75d2
Fixed: issue optimistic locking broken by r3308 ( #5280 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3663 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-11 16:27:37 +00:00
2bbc948e06
Preview description if it was edited while updating an issue ( #741 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3623 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-28 15:17:46 +00:00
b93cf03483
Fixes backslashes escaping when quoting issue description/note ( #5129 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3616 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-27 13:33:19 +00:00
e584ae220d
Cleans up status assignment in IssuesController#new handled by Issue#safe_attributes= now.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3606 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-20 17:37:04 +00:00
6e6e260cea
Refactor: Extract Query#sortable_columns from the controller.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3604 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-19 15:42:03 +00:00
e6c8760ad7
Refactor: Split the find_object methods to prep for a larger refactoring.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3591 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-16 15:17:47 +00:00
8e3d1b694a
Adds subtasking ( #443 ) including:
...
* priority, start/due dates, progress, estimate, spent time roll-up to parent issues
* descendant issues tree displayed on the issue view with context menu support
* issue tree display on the gantt chart
* issue tree copy on project copy
* unlimited nesting
Defining subtasks requires the new permission 'Manage subtasks'.
Subtasks can not belong to a different project than the parent task.
Implementation is based on scoped nested sets for fast reads and updates.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3573 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-13 14:56:49 +00:00
c7c3c0cc7c
Refactor: Extract method for setting the flash on bulk issue saves.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3560 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-11 16:34:08 +00:00
d65922afde
Remove double negative condition
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3546 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-05 17:25:51 +00:00
3f3e30c2aa
Refactor: Moved the contents of #issue_update into Issue.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3545 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-05 17:11:50 +00:00
c58dc83e74
Refactor: Replace @journal with @issue.current_journal
...
This removes an instance variable in #issue_update which will let it be moved
to the Issue model.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3540 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-04 16:18:51 +00:00
976cba0c5d
Refactor: use the existing Issue#new_statuses_allowed_to method.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3533 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-04 00:58:52 +00:00
fe1e3ccd18
Refactor: Decouple failed attachments and the flash messages
...
Attachment#attach_files will no longer need to return a flash message,
instead it will put unsaved attachments into object#unsaved_attachments
where the calling object can access them.
A utility method #render_attachment_warning_if_needed is included for setting
the standard flash warning.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3528 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-03 17:05:00 +00:00
f6d8752e44
Fixes destroying attachments if the update fails. (r2875 r3523)
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3526 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-03 17:04:50 +00:00
0fd7e2d696
Refactor: Moved ApplicationController#attach_files to the Attachment model
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3523 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-02 19:26:03 +00:00
f5f5a5f64f
Verify issues are updated by HTTP PUT only. Regression from r3486.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3520 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-01 18:29:18 +00:00
8699e5bbcd
Refactor: Decouple building Issue and TimeEntry objects in #issue_update.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3519 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-01 17:40:54 +00:00
ddec53b9a2
Refactor: Extracted saving logic out of #update and into a utility method
...
Now #issue_update can be refactored and push to the Model(s) while keeping
the public interface (#update) clean.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3497 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-26 16:16:18 +00:00
3de1f2e157
Refactor: Extracted the duplication from the last commit into a new method
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3487 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-25 17:01:10 +00:00
c68d853bf4
Refactor: Move the updating of an Issue to the #update method.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3486 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-25 17:01:05 +00:00
Tim Felgentreff
Eric Davis
Jean-Philippe Lang