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
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
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
7af610631f
Merged r3937 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3987 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:33:23 +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
ab5ce45b43
Merged r3935 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3985 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:33:11 +00:00
7ca197b37f
Merged r3933 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3983 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:32:59 +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
3f1c3fa020
Merged r3913 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3963 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:30:59 +00:00
ae3d542664
Merged r3905 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3955 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:29:57 +00:00
c731d11209
Merged r3904 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3954 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:29:51 +00:00
8458dc23d4
Merged r3903 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3953 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:29:46 +00:00
1f9eda4e0d
update tests to work with the new data model, where neccessary
2010-08-05 19:05:04 +02:00
56af944afa
Extend changes.path and changes.from_path to support longer paths. #5771
...
Long paths to SCM files would be truncated or wouldn't insert into some
databases. This extends those fields to support arbitrary length filenames.
Contributed by Holger Just
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3828 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-06 02:07:46 +00:00
7376ef2ad7
Typecast issue ids when searched for.
...
Older Postgres versions don't allow searching over the id field's max size.
Contributed by Holger Just
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3806 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-20 20:01:32 +00:00
c98f46d691
Handle unsuccessful destroys in TimelogController. #5700
...
Contributed by Jan
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3805 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-20 19:30:51 +00:00
116c7a7964
Add a link to the cross project time entries page to /projects. #4935
...
Contributed by Jan.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3802 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-20 16:29:12 +00:00
c5863c0ad0
Support listing directories in svn which include square brackets. #5548
...
Contributed by Gregor Schmidt
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3800 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-20 16:08:26 +00:00
70da33fc29
Add some assertions on the default data loading test to debug a Ruby 1.9 failure.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3799 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-20 16:08:20 +00:00
41ff1b9cb2
Display the correct ISO week number on the project calendar.
...
http://en.wikipedia.org/wiki/ISO_week
Contributed by Holger Just
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3790 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-19 22:52:15 +00:00
093853b56a
Added tests for #5533 's behavior.
...
Contributed by Gregor Schmidt.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3788 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-19 22:17:34 +00:00
f3cc84b343
Show subproject versions on the Roadmap.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3760 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-27 17:16:10 +00:00
0d34c3731b
Add error messages to MembersController#new so a user is informed of missing data.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3749 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-24 20:21:16 +00:00
715c9d16ef
Refactor AuthSourcesController to support non-LDAP sources. #1131
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3744 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-23 03:16:31 +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
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
1be15816dd
Adds test helpers for test repositories.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3720 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-01 08:32:21 +00:00
80f7faf10a
Fixes EOL style related test failures.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3719 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-30 18:08:40 +00:00
51c8f3143c
Fixes URLs in atom feeds broken by r3681 ( #5403 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3703 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-30 10:45:21 +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
9b595c689d
Refactor: Move the rest of the routing tests to RoutingTest.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3687 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-21 16:02:55 +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
5879273739
Makes the wiki sidebar editable ( #5208 ).
...
The content of the wiki page named 'Sidebar' is rendered in the sidebar if it exists. Permission to edit protected pages is required to create this page.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3632 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-11 12:56:18 +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
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
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
Tim Felgentreff
Eric Davis
Jean-Philippe Lang