kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,306 Commits 5 Branches 46 Tags 17 MiB
Commit Graph

3306 Commits

Author SHA1 Message Date
Tim Felgentreff bb37aa24dc Update acts_as_journalized 2010-09-15 16:40:59 +02:00
Tim Felgentreff e2b79f9cdc adjust some api 2010-09-15 16:40:52 +02:00
Tim Felgentreff a550d4e667 remove tests that were removed in trunk 2010-09-15 16:40:37 +02:00
Tim Felgentreff e28b809271 use direct method call 2010-09-15 14:26:42 +02:00
Tim Felgentreff 5af629f31f Update acts_as_journalized 2010-09-15 12:57:27 +02:00
Tim Felgentreff 68ae2d0dfd change issue specific journal query and show_details for journal helper 2010-09-15 12:56:33 +02:00
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 aaecab6d7f use latest acts_as_journalized 2010-09-14 19:18:43 +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 0b852af604 fix syntax error 2010-09-14 16:09:39 +02:00
Tim Felgentreff ff56024b9b it's created_at on journals 2010-09-14 15:21:32 +02:00
Tim Felgentreff 09ccc0f6ba remove test helper method 2010-09-14 15:21:15 +02:00
Tim Felgentreff b16d63454d journals are the events, now 2010-09-14 15:21:02 +02:00
Tim Felgentreff ccc4688799 get the object from the db anew, in case it didn't save 2010-09-14 15:20:41 +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 2dd4e3d12d Update acts_as_journalized 2010-09-14 14:25:30 +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
Tim Felgentreff 4804d22ff3 add fixture, fixes another test 2010-09-14 09:19:39 +02:00
Eric Davis 29f9f3feff Merged r4029 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4032 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-22 21:21:25 +00:00
Eric Davis 2bea4b30a5 Merged r4028 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4031 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-22 21:21:20 +00:00
Eric Davis 00b53286fd Merged changelog from trunk, r4027. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4030 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-22 21:21:15 +00: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 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
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 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
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 b8d5a05b20 Merged r4008 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4020 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-22 19:48:57 +00:00
Eric Davis e29244652c Merged r4007 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4019 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-22 19:48:52 +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 d60cc50d99 Merged r4004 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4016 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-22 19:48:32 +00:00
Eric Davis 9e5d2100b6 Merged r4003 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4015 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-22 19:48:26 +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 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
Eric Davis 3e692a908b Merged r3950 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4000 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:34:37 +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 b9f23bedb7 Merged r3948 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3998 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:34:26 +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