b16d63454d
journals are the events, now
2010-09-14 15:21:02 +02:00
ccc4688799
get the object from the db anew, in case it didn't save
2010-09-14 15:20:41 +02:00
72e7baafdf
fix various tests in mailer, wiki content and issue helper
2010-09-14 14:25:19 +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
4804d22ff3
add fixture, fixes another test
2010-09-14 09:19:39 +02:00
0d7cead479
Merged r4013 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4025 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 19:49:26 +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
7443f2a310
Merged r4010 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4022 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 19:49:08 +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
047bf692b3
Merged r3951 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4001 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:34:42 +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
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
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
b6bc3a3665
Merged r3926 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3976 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:32:19 +00:00
a96eb375ec
Merged r3925 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3975 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:32:13 +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
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
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
acaa223cf8
Merged r3907 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3957 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:30:23 +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
cbfbd662bb
fix changed method name
2010-08-06 14:57:11 +02:00
9409ae7350
add another journal
2010-08-06 14:56:57 +02:00
acc093b0c1
add a journal entry for messages
2010-08-06 14:22:49 +02:00
1f9eda4e0d
update tests to work with the new data model, where neccessary
2010-08-05 19:05:04 +02:00
52a12aaca8
Merged r3881 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3882 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 10:49:08 +00:00
ec526c1261
Merged r3873 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3874 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 09:52:07 +00:00
cd54efa0c9
Force the test RAILS_ENV to help prevent purging data when mistyping. #4572
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3840 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-09 13:46:20 +00: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
c6201ae15b
Recalculate inherited attributes on parents when a child is moved under a new parent. #5524
...
Contributed by Jean-Baptiste Barth.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3821 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-30 02:45:34 +00:00
6ef240841c
Add some tests for User#try_to_login with LDAP. #5592
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3819 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-30 01:47:47 +00:00
6eea3300f8
Sanitize image links and handle nils in the toc formatter. #5445
...
Based on contribution by Yuki Kita.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3811 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-24 02:35:24 +00:00
de17640489
Change User#login to be case-insensitive. #2473
...
This change also overrides User#find_by_login to give priority to exact
matches in the login.
Contributed by Greg Mefford
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3807 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-20 21:40:50 +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
4083e7e622
Truncate incoming email subject lines to 255 characters. #5698
...
Contributed by Jan
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3801 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-20 16:22:36 +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
b53de502ab
Display the link name when external links are used in the toc macro. #5445
...
Contributed by Yuki Kita and Jean-Baptiste Barth
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3786 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-19 21:39:21 +00:00
Tim Felgentreff
Eric Davis
Jean-Philippe Lang