Mercurial > hg > soundsoftware-site
diff app/controllers/.svn/text-base/timelog_controller.rb.svn-base @ 507:0c939c159af4 redmine-1.2
Update to Redmine 1.2.1 on 1.2-stable branch (Redmine SVN rev 6270)
author | Chris Cannam |
---|---|
date | Thu, 14 Jul 2011 10:32:19 +0100 |
parents | cbce1fd3b1b7 |
children |
line wrap: on
line diff
--- a/app/controllers/.svn/text-base/timelog_controller.rb.svn-base Mon Jun 06 14:24:13 2011 +0100 +++ b/app/controllers/.svn/text-base/timelog_controller.rb.svn-base Thu Jul 14 10:32:19 2011 +0100 @@ -1,5 +1,5 @@ # Redmine - project management software -# Copyright (C) 2006-2010 Jean-Philippe Lang +# Copyright (C) 2006-2011 Jean-Philippe Lang # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -22,7 +22,8 @@ before_filter :find_time_entries, :only => [:bulk_edit, :bulk_update, :destroy] before_filter :authorize, :except => [:index] before_filter :find_optional_project, :only => [:index] - accept_key_auth :index, :show, :create, :update, :destroy + accept_rss_auth :index + accept_api_auth :index, :show, :create, :update, :destroy helper :sort include SortHelper