Tim Felgentreff
|
6863c00359
|
forgot a few versioned => journaled conversions
|
2010-09-15 11:05:42 +02:00 |
Tim Felgentreff
|
3279b2adbd
|
fix mailer tests
|
2010-09-15 10:53:00 +02:00 |
Tim Felgentreff
|
485335599a
|
fix attachment_removal
|
2010-09-15 10:38:07 +02:00 |
Tim Felgentreff
|
3b51eb54ea
|
fix 2 more tests
|
2010-09-14 19:18:28 +02:00 |
Tim Felgentreff
|
e8af8d1945
|
Still use the event api for now
|
2010-09-14 18:26:08 +02:00 |
Tim Felgentreff
|
9cd55d8dd4
|
more test fixes
|
2010-09-14 18:07:38 +02:00 |
Tim Felgentreff
|
d1ba27358a
|
fix wiki content specs
|
2010-09-14 16:59:43 +02:00 |
Tim Felgentreff
|
68ca0636c4
|
init journal will return the last_journal, not the new one, now
|
2010-09-14 16:59:27 +02:00 |
Tim Felgentreff
|
4eb07d6ce6
|
fix use of versions vs journals
|
2010-09-14 15:18:28 +02:00 |
Tim Felgentreff
|
a6a25cc5c1
|
render done_ratio as decimal
|
2010-09-14 15:17:51 +02:00 |
Tim Felgentreff
|
44a3546579
|
add show_detail to issue helper for limited backwards compatibility
|
2010-09-14 15:17:34 +02:00 |
Tim Felgentreff
|
d7854003c4
|
fix applicationcontroller test
|
2010-09-14 14:46:31 +02:00 |
Tim Felgentreff
|
72e7baafdf
|
fix various tests in mailer, wiki content and issue helper
|
2010-09-14 14:25:19 +02:00 |
Tim Felgentreff
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
ccbc9f8ff9
|
Merged r3952 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4002 e93f8b46-1217-0410-a6f0-8f06a7374b81
|
2010-08-19 04:34:48 +00:00 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
597266e5a2
|
Merged r3929 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3979 e93f8b46-1217-0410-a6f0-8f06a7374b81
|
2010-08-19 04:32:36 +00:00 |
Eric Davis
|
36ad597b69
|
Merged r3928 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3978 e93f8b46-1217-0410-a6f0-8f06a7374b81
|
2010-08-19 04:32:31 +00:00 |
Eric Davis
|
c67272599c
|
Merged r3927 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3977 e93f8b46-1217-0410-a6f0-8f06a7374b81
|
2010-08-19 04:32:25 +00:00 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
102e845391
|
Merged r3916 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3966 e93f8b46-1217-0410-a6f0-8f06a7374b81
|
2010-08-19 04:31:18 +00:00 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |
Eric Davis
|
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 |