19c7dc0094
Merge remote branch 'edavis/master' into master-journalized
...
Conflicts:
app/controllers/application_controller.rb
app/controllers/wiki_controller.rb
app/helpers/issues_helper.rb
app/models/time_entry.rb
app/models/wiki_content.rb
app/views/wiki/edit.rhtml
config/locales/ja.yml
test/functional/wiki_controller_test.rb
2010-10-26 18:28:39 +02:00
8cece46dd4
Merge branch 'master' into master-journalized
...
Conflicts:
app/controllers/application_controller.rb
app/controllers/context_menus_controller.rb
app/controllers/gantts_controller.rb
app/controllers/issue_moves_controller.rb
app/controllers/issues_controller.rb
app/controllers/journals_controller.rb
app/controllers/previews_controller.rb
app/controllers/timelog_controller.rb
app/helpers/issues_helper.rb
app/helpers/journals_helper.rb
app/models/issue.rb
app/models/journal.rb
app/models/journal_observer.rb
app/views/admin/projects.rhtml
app/views/context_menus/issues.html.erb
app/views/issues/_action_menu.rhtml
app/views/issues/_history.rhtml
app/views/news/_news.rhtml
app/views/news/index.rhtml
app/views/repositories/diff.rhtml
config/locales/bg.yml
config/locales/bs.yml
config/locales/ca.yml
config/locales/cs.yml
config/locales/da.yml
config/locales/de.yml
config/locales/el.yml
config/locales/en-GB.yml
config/locales/es.yml
config/locales/eu.yml
config/locales/fi.yml
config/locales/fr.yml
config/locales/gl.yml
config/locales/he.yml
config/locales/hr.yml
config/locales/hu.yml
config/locales/id.yml
config/locales/it.yml
config/locales/ko.yml
config/locales/lt.yml
config/locales/lv.yml
config/locales/mn.yml
config/locales/nl.yml
config/locales/no.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/locales/pt.yml
config/locales/ro.yml
config/locales/ru.yml
config/locales/sk.yml
config/locales/sl.yml
config/locales/sr-YU.yml
config/locales/sr.yml
config/locales/sv.yml
config/locales/th.yml
config/locales/tr.yml
config/locales/uk.yml
config/locales/vi.yml
config/locales/zh-TW.yml
config/locales/zh.yml
config/routes.rb
doc/CHANGELOG
lib/redmine.rb
lib/redmine/export/pdf.rb
lib/redmine/helpers/gantt.rb
lib/redmine/version.rb
public/stylesheets/application.css
test/functional/context_menus_controller_test.rb
test/functional/issues_controller_test.rb
test/functional/journals_controller_test.rb
test/functional/previews_controller_test.rb
test/functional/users_controller_test.rb
test/functional/wiki_controller_test.rb
test/integration/routing_test.rb
test/unit/issue_test.rb
test/unit/mailer_test.rb
test/unit/query_test.rb
2010-10-26 18:20:57 +02:00
7824eca775
Refactor: merged error rendering methods.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4286 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-23 11:07:04 +00:00
156eca4d22
Added ability to edit issues from different project through contextual menu ( #5332 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4242 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-08 03:09:51 +00:00
b255b7760a
Added ability to delete issues from different projects through contextual menu ( #5332 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4236 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-07 05:11:28 +00:00
61fdd38435
move issue journal reply to issue controller test, as each journalized controller will now use the render_reply journals helper to reply
2010-09-15 17:50:20 +02:00
e2b79f9cdc
adjust some api
2010-09-15 16:40:52 +02:00
a550d4e667
remove tests that were removed in trunk
2010-09-15 16:40:37 +02:00
3b51eb54ea
fix 2 more tests
2010-09-14 19:18:28 +02:00
9cd55d8dd4
more test fixes
2010-09-14 18:07:38 +02:00
0b852af604
fix syntax error
2010-09-14 16:09:39 +02:00
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
12e10f6956
Fixed "Create and continue" redirection broken by recent changes. #6333
...
IssuesController#create is no more scoped under project, but
IssuesController#new is, so we need to precise project_id
when redirecting to "New issue" form.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4083 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-11 20:21:27 +00:00
80256cf298
Refactor: extract #bulk_update method from IssuesController#bulk_edit.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4037 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-24 15:27:12 +00:00
b67b3820a1
Refactor: move IssuesController#changes to JournalsController#index.
...
Since #changes is only an Atom feed of journals of a query, it makes
more sense to have it on the JournalsController resource.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4034 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-23 15:04:36 +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
dfd1d0c7fe
Refactor: merge IssuesController#update_form into IssuesController#new
...
The #update_form action was only refreshing the issue attributes form,
so it's just a specialized JavaScript version of #new. This also removed
old code that was extracted in other places (@issue.new_statuses_allowed_to).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4011 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-20 15:22:19 +00:00
1fcc1bdc89
Refactor: move IssuesController#context_menu to a new controller.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4006 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 18:16:54 +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
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
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
1f8d396e3f
Refactor: move IssuesController#preview to a new controller.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3946 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-18 15:01:35 +00:00
3eff27344b
Refactor: move IssuesController#auto_complete to a new controller. #4382
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3945 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-17 15:03:58 +00:00
22c978ad94
Refactor: move IssuesController#reply to JournalsController
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3941 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-16 16:25:04 +00:00
ff43bb1a74
Refactor: Extract a new IssueMovesController from IssuesController.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3936 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-11 14:42:10 +00:00
041bca6ac9
Refactor: start to split IssuesController#move into two separate actions.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3918 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-06 15:47:27 +00:00
1f9eda4e0d
update tests to work with the new data model, where neccessary
2010-08-05 19:05:04 +02: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
edeb84a070
Fixes strange random test failures with Mysql.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3724 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-01 10:09:20 +00:00
3db77a86a9
Fixes some parameters in functional tests.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3701 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-30 10:06:51 +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
0fc884cf42
Move more routing tests into the routing integration test.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3686 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-20 15:42:57 +00:00
f23aceba86
Fixes a test failure with SQLite3 due to transaction fixtures ( #5290 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3669 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-12 17:43:01 +00:00
f35921d308
Fixes Issue#save_issue_with_child_records so that time entry do not get saved if issue save fails.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3664 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-11 16:48:46 +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
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
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
ddaa95523a
Use assert_select to check the download link. ( #4204 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3558 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-10 05:38:58 +00:00
44955a519c
Added test for when an attachment fails to save.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3527 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-03 17:04:55 +00:00
81d617cd5b
Fixes failing tests from r3521
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3522 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-02 19:25:58 +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
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
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
89cf2d256d
Moved the IssuesController routing tests to an integration test.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3474 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-22 18:15:07 +00:00
320c191f04
Fixed: PDF export of a issue list grouped by a custom field raises an error ( #4600 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3333 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-01-18 18:00:27 +00:00
Tim Felgentreff
Jean-Philippe Lang
Jean-Baptiste Barth
Eric Davis