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
c8c4fb130c
Merged r4014 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4026 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 19:49:31 +00:00
b5d64b9a2f
Merged r4012 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4024 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 19:49:19 +00: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
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
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
c7e719fc4b
Merged r3924 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3974 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:32:06 +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
7bdf0ab729
Merged r3915 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3965 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:31:12 +00:00
df120e43cd
Merged r3898 from trunk
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3901 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-30 19:20:52 +00:00
f45bb1e85e
use the render_journal API to pass Issue note editing permissions
2010-07-29 14:48:47 +02:00
f682be8468
Merged r3887 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3888 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 11:56:45 +00:00
b4122707f6
Merged r3871 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3872 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 09:48:51 +00:00
f70a8cde88
Merged r3869 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3870 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 09:40:59 +00:00
8a3cb1895b
use the provided helper in issue history
2010-07-23 14:26:08 +02:00
ff31875149
move to STI for journals so the journals themselves can be events
2010-07-21 17:57:45 +02:00
c6223864d0
Add :view_issues_index_bottom hook. #5169
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3842 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-16 03:16:29 +00:00
7d4d87a9a9
journal numbers are now called versions
2010-07-15 14:43:22 +02:00
aecb868b85
remove more journal specific functionality
2010-07-14 19:00:03 +02:00
b10818f4a1
Add a css class to hide content when printing. #5508
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3787 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-19 21:53:58 +00:00
e320017cf0
Convert the file attachment's description to a label.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3750 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-25 00:11:58 +00:00
a7b80fcc06
Use present? instead of any?. Handles nil case.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3736 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-14 17:15:09 +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
cbd4af236c
Adds issue relations to individual issue XML ( #5305 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3729 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-01 14:07:36 +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
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
e4e4b0f4b8
Fixes error on subtask XML format ( #5336 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3677 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-17 11:49:56 +00:00
0e1595ad56
Adds parent issue id in issue REST API ( #5304 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3671 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-13 17:51:06 +00:00
734f8324ea
Fixed: empty ul tag for issue updates with notes only ( #5281 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3666 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-11 17:10:26 +00:00
f77e5d093a
Merge issue and time entry validation error messages.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3665 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-11 17:00:13 +00:00
3979224693
Removed count from issues.xml. It causes a typecast error in ActiveResource. ( #4745 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3631 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-10 07:30:06 +00:00
8df189ff86
Adds a css class to issue id tds ( #5204 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3625 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-29 19:50:00 +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
4524bc04e9
Issue list improvements for subtasking ( #5196 ):
...
* makes the parent task column available
* display the issue hierarchy when list is sorted by parent
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3618 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-27 16:55:20 +00:00
f4be4d101b
Inlines some code to speed up large ticket history rendering.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3594 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-16 21:37:05 +00:00
e605973ec4
Move issue watchers to the sidebar.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3579 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-13 17:45:41 +00:00
508df4a33a
Slight UI changes to the subtasks tree.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3577 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-13 15:47:06 +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
6511e94233
Moves ProjectsController#add_issue_category to IssueCategoriesController#new.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3549 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-06 18:43:00 +00:00
729bea1cf3
Moves ProjectsController#add_version to VersionsController#new.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3548 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-06 18:25:01 +00:00
bd5fe10c13
Adds an helper for creating the context menu.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3542 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-04 19:02:57 +00:00
f2b227547e
Filters collapsed by default for saved queries ( #4623 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3529 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-03 20:09:39 +00:00
b52e75aad9
Fixes some context menu links broken by r3478.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3521 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-01 20:54:55 +00:00
c9197769fb
Fixes bottom links placement in issue with associated changesets ( #4883 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3516 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-28 16:42:31 +00:00
d581510af6
Refactor: Start to extract IssuesController#edit into #update (REST).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3480 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-24 17:21:41 +00:00
6ed9734cb9
Reduces spacing on the bulk edit form.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3479 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-23 21:44:28 +00:00
e24d6cc223
Bulk edit refactoring.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3478 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-23 21:26:29 +00:00
01dbba72ab
Move hardcoded calendar images to css classes.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3477 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-23 21:10:15 +00:00
Tim Felgentreff
Eric Davis
Jean-Philippe Lang