d7854003c4
fix applicationcontroller test
2010-09-14 14:46:31 +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
d457f90fcd
Merged r3949 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3999 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:34:31 +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
bc57078b12
Merged r3944 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3994 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:34:02 +00:00
1c93f99a55
Merged r3943 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3993 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:33:57 +00:00
758feaccab
Merged r3942 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3992 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:33:51 +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
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
5345a2dd89
Merged r3934 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3984 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:33:05 +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
358ee2ef2e
Merged r3931 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3981 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:32:47 +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
8dde6e019d
Merged r3906 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3956 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:30:03 +00:00
331d98c2d2
fix first version for wiki
2010-08-10 17:09:28 +02:00
08a013da44
Minor bug fixes to journalized versions
2010-08-10 16:18:26 +02:00
47ecf151dd
completely remove acts_as_versioned as it's functionality is contained in acts_as_journalized
...
This makes the wiki just use the versioning provided by acts_as_journalized
2010-08-04 19:01:18 +02:00
5de0d0997f
remove the reply action from IssueController, and use the JournalHelper API for that
2010-07-29 14:48:24 +02:00
e771fc03bd
Merged r3883, r3884 and r3885 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3886 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 11:49:07 +00:00
69f34a595d
Merged r3865 and r3866 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3867 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 09:34:04 +00: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
48a5460da4
Allow js formatted responses.
...
Otherwise they return the invalid format error (406) instead of 403, 404, or 500
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3827 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-05 18:00:50 +00:00
bd1384db7d
Added hook :controller_timelog_available_criterias
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3826 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-01 18:49:25 +00:00
11ff334cd8
Refactor: extract @available_criterias to utility method.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3825 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-01 18:47:25 +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
95c3c63cfe
Fix for Ruby 1.9 strings.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3798 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-20 16:08:15 +00:00
2562bc5bcd
Hide the role forms when editing or adding Project members. #5452
...
Contributed by Yuki Kita
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3784 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-19 19:51:43 +00:00
921b425b8e
Accept key authentication to ProjectsController#index (for feeds). #5317
...
Contributed by Greg Mefford
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3777 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-19 17:45:04 +00: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
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
908d44519c
Allow AuthSources to control if they allow password changes.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3745 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-23 03:16:37 +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
e417d755e9
Eager load group projects to avoid N SQL queries.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3735 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-09 11:31:39 +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
a4e411c643
Removes broken code in ProjectsController ( #5412 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3706 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-30 11:14:57 +00:00
Tim Felgentreff
Eric Davis
Wieland Lindenthal
Jean-Philippe Lang