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
b419deb907
Merged r4009 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4021 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 19:49:03 +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
86e986f014
Merged r4005 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4017 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 19:48:38 +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
10a76f5e73
Merged r3939 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3989 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:33:34 +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
4426fd695e
Merged r3914 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3964 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:31:06 +00:00
b02463184a
Merged r3911 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3961 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:30:48 +00:00
a6408945e5
Merged r3910 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3960 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:30:41 +00:00
c20e85e4dd
Merged r3909 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3959 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:30:35 +00:00
08a013da44
Minor bug fixes to journalized versions
2010-08-10 16:18:26 +02:00
1f9eda4e0d
update tests to work with the new data model, where neccessary
2010-08-05 19:05:04 +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
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
677fee310a
Merged r3894 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3896 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-29 15:03:11 +00:00
f45bb1e85e
use the render_journal API to pass Issue note editing permissions
2010-07-29 14:48:47 +02:00
29e7ae9698
Merged r3889 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3890 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 12:49:15 +00: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
8146e096f4
Merged r3879 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3880 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 10:35:35 +00:00
41e38483a6
Merged r3877 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3878 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 10:02:55 +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
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
be52ccf01f
Merged r3859 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3862 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-24 00:23:50 +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
96bbd94251
adjust for acts_as_journalized
2010-07-15 15:23:43 +02: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
64d2221db5
Set @project so macros will work on the welcome and project list. #5781
...
Contributed by Holger Just
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3824 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-30 03:32:18 +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
5db9a982cc
Added two hooks to the issues report. #5233
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3797 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-20 03:37:42 +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
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
d635fff3f5
Add ATOM auto discovery link to the Projects list. #5317
...
Contributed by Greg Mefford
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3776 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-19 17:44:59 +00:00
43fabab950
Fixed HTML validation errors
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3775 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-19 16:50:13 +00:00
28519714e0
Updated the project calendar for greater accessibility.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3769 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-15 23:20:32 +00:00
ab4bdc379e
Refactor: extract gantt zoom links to a helper.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3756 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-26 22:48:17 +00:00
c3c3460e0d
Add the page title when editing /my/page.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3755 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-26 21:52:03 +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
f97ff28628
Invalid HTML
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3748 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-24 20:21:08 +00:00
Tim Felgentreff
Eric Davis
Wieland Lindenthal
Jean-Philippe Lang