Felix Schäfer
|
70e10ab4bd
|
Merge the master-journalized branch from https://github.com/finnlabs/redmine/
|
2011-04-14 16:28:10 +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
|
1f9eda4e0d
|
update tests to work with the new data model, where neccessary
|
2010-08-05 19:05:04 +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
|
2d282f8deb
|
move (almost) everything over to acts_as_journalized
|
2010-07-15 18:24:12 +02:00 |
|
Tim Felgentreff
|
aecb868b85
|
remove more journal specific functionality
|
2010-07-14 19:00:03 +02:00 |
Eric Davis
|
ad73f12a6b
|
Include visible subprojects when checking for available Activity event types. #5589
Contributed by Felix Schäfer
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3829 e93f8b46-1217-0410-a6f0-8f06a7374b81
|
2010-07-06 02:22:03 +00:00 |
Jean-Philippe Lang
|
a658679d29
|
Add etag check on the activity view to avoid rendering when not modified.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2982 e93f8b46-1217-0410-a6f0-8f06a7374b81
|
2009-10-25 17:27:24 +00:00 |
|
Jean-Philippe Lang
|
6e777b7453
|
Makes activity view accept a user_id param to show user's activity (#1002).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2067 e93f8b46-1217-0410-a6f0-8f06a7374b81
|
2008-11-30 12:12:06 +00:00 |
|
Jean-Philippe Lang
|
fce4615f10
|
Display latest user's activity on account/show view.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2066 e93f8b46-1217-0410-a6f0-8f06a7374b81
|
2008-11-30 11:18:22 +00:00 |
|
Jean-Philippe Lang
|
a774c5c48b
|
Activity refactoring.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1701 e93f8b46-1217-0410-a6f0-8f06a7374b81
|
2008-07-27 17:54:09 +00:00 |