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

3290 Commits

Author SHA1 Message Date
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 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
Eric Davis 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
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 18d841553e Merged r3923 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3973 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:31:59 +00:00
Eric Davis 31d233e567 Merged r3922 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3972 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:31:53 +00:00
Eric Davis 4ff6070126 Merged r3921 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3971 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:31:48 +00:00
Eric Davis dfe44017b6 Merged r3920 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3970 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:31:42 +00:00
Eric Davis 7cae43314a Merged r3919 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3969 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:31:36 +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 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
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
Eric Davis 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
Eric Davis 7a9fab7748 Merged r3908 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3958 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:30:29 +00:00
Eric Davis 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
Eric Davis 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
Eric Davis 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
Eric Davis 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
Eric Davis 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
Tim Felgentreff bbd131ad8d Update acts_as_journalized 2010-08-10 17:12:28 +02:00
Tim Felgentreff 331d98c2d2 fix first version for wiki 2010-08-10 17:09:28 +02:00
Wieland Lindenthal 08a013da44 Minor bug fixes to journalized versions 2010-08-10 16:18:26 +02:00
Tim Felgentreff 5844623031 add acts_as_journalized into a submodule 2010-08-10 12:36:45 +02:00
Tim Felgentreff 7d67365e10 smaller fixes for journalized news and attachments 2010-08-06 18:47:56 +02:00
Tim Felgentreff cbfbd662bb fix changed method name 2010-08-06 14:57:11 +02:00
Tim Felgentreff 9409ae7350 add another journal 2010-08-06 14:56:57 +02:00
Tim Felgentreff acc093b0c1 add a journal entry for messages 2010-08-06 14:22:49 +02:00
Tim Felgentreff 1f9eda4e0d update tests to work with the new data model, where neccessary 2010-08-05 19:05:04 +02:00
Tim Felgentreff 81e97d23a8 fix document activity url 2010-08-04 19:02:49 +02:00
Tim Felgentreff 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
Tim Felgentreff cea1a987ab fix display of attachments with acts_as_journalized 2010-08-04 18:56:33 +02:00
Eric Davis 9af4cb5c38 Merged r3899 from trunk 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3902 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-07-30 19:20:56 +00:00
Eric Davis 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
Eric Davis 59f98693ae Merged r3897 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3900 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-07-30 19:20:46 +00:00
Eric Davis 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
Eric Davis 0843b188fb Merged r3893 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3895 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-07-29 15:03:06 +00:00
Tim Felgentreff f45bb1e85e use the render_journal API to pass Issue note editing permissions 2010-07-29 14:48:47 +02:00
Tim Felgentreff 5de0d0997f remove the reply action from IssueController, and use the JournalHelper API for that 2010-07-29 14:48:24 +02:00
Tim Felgentreff 75024acf5a possibly use the activity permissions in the fetcher to find visible event types 2010-07-29 11:31:06 +02:00
Tim Felgentreff d34abea14e use the journal formatters API to register the issue journal formats 2010-07-29 11:30:24 +02:00
Jean-Philippe Lang 8f64938b9e Merged r3891 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3892 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-07-25 12:57:49 +00:00
Jean-Philippe Lang 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