Merge branch 'upstream' into kohana

Conflicts:
	app/views/issues/_relations.rhtml

.gitignore

@@ -1,3 +1,5 @@
+/.project
+/.loadpath
 /config/additional_environment.rb
 /config/configuration.yml
 /config/database.yml
@@ -8,6 +10,8 @@
 /db/*.sqlite3
 /db/schema.rb
 /files/*
+/lib/redmine/scm/adapters/mercurial/redminehelper.pyc
+/lib/redmine/scm/adapters/mercurial/redminehelper.pyo
 /log/*.log*
 /log/mongrel_debug
 /public/dispatch.*

.hgignore

@@ -1,5 +1,7 @@
 syntax: glob
 
+.project
+.loadpath
 config/additional_environment.rb
 config/configuration.yml
 config/database.yml
@@ -10,6 +12,8 @@ db/*.db
 db/*.sqlite3
 db/schema.rb
 files/*
+lib/redmine/scm/adapters/mercurial/redminehelper.pyc
+lib/redmine/scm/adapters/mercurial/redminehelper.pyo
 log/*.log*
 log/mongrel_debug
 public/dispatch.*
@@ -21,3 +25,5 @@ tmp/sockets/*
 tmp/test/*
 vendor/rails
 *.rbc
+.svn/
+.git/

app/controllers/activities_controller.rb

@@ -1,11 +1,28 @@
+# Redmine - project management software
+# 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
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 class ActivitiesController < ApplicationController
   menu_item :activity
   before_filter :find_optional_project
-  accept_key_auth :index
+  accept_rss_auth :index
 
   def index
     @days = Setting.activity_days_default.to_i
-    
+
     if params[:from]
       begin; @date_to = params[:from].to_date + 1; rescue; end
     end
@@ -14,18 +31,18 @@ def index
     @date_from = @date_to - @days
     @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
     @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
-    
-    @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project, 
+
+    @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,
                                                              :with_subprojects => @with_subprojects,
                                                              :author => @author)
     @activity.scope_select {|t| !params["show_#{t}"].nil?}
     @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
 
     events = @activity.events(@date_from, @date_to)
-    
+
     if events.empty? || stale?(:etag => [@activity.scope, @date_to, @date_from, @with_subprojects, @author, events.first, User.current, current_language])
       respond_to do |format|
-        format.html { 
+        format.html {
           @events_by_day = events.group_by(&:event_date)
           render :layout => false if request.xhr?
         }
@@ -40,7 +57,7 @@ def index
         }
       end
     end
-    
+
   rescue ActiveRecord::RecordNotFound
     render_404
   end
@@ -55,5 +72,4 @@ def find_optional_project
   rescue ActiveRecord::RecordNotFound
     render_404
   end
-
 end

app/controllers/admin_controller.rb

@@ -17,9 +17,7 @@
 
 class AdminController < ApplicationController
   layout 'admin'
-
   before_filter :require_admin
-
   helper :sort
   include SortHelper	
 
@@ -30,22 +28,20 @@ def index
   def projects
     @status = params[:status] ? params[:status].to_i : 1
     c = ARCondition.new(@status == 0 ? "status <> 0" : ["status = ?", @status])
-
     unless params[:name].blank?
       name = "%#{params[:name].strip.downcase}%"
       c << ["LOWER(identifier) LIKE ? OR LOWER(name) LIKE ?", name, name]
     end
-
     @projects = Project.find :all, :order => 'lft',
                                    :conditions => c.conditions
 
     render :action => "projects", :layout => false if request.xhr?
   end
-  
+
   def plugins
     @plugins = Redmine::Plugin.all
   end
-  
+
   # Loads the default configuration
   # (roles, trackers, statuses, workflow, enumerations)
   def default_configuration
@@ -59,7 +55,7 @@ def default_configuration
     end
     redirect_to :action => 'index'
   end
-  
+
   def test_email
     raise_delivery_errors = ActionMailer::Base.raise_delivery_errors
     # Force ActionMailer to raise delivery errors so we can catch it
@@ -73,14 +69,16 @@ def test_email
     ActionMailer::Base.raise_delivery_errors = raise_delivery_errors
     redirect_to :controller => 'settings', :action => 'edit', :tab => 'notifications'
   end
-  
+
   def info
     @db_adapter_name = ActiveRecord::Base.connection.adapter_name
     @checklist = [
-      [:text_default_administrator_account_changed, User.find(:first, :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?],
+      [:text_default_administrator_account_changed,
+          User.find(:first,
+                    :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?],
       [:text_file_repository_writable, File.writable?(Attachment.storage_path)],
-      [:text_plugin_assets_writable, File.writable?(Engines.public_directory)],
-      [:text_rmagick_available, Object.const_defined?(:Magick)]
+      [:text_plugin_assets_writable,   File.writable?(Engines.public_directory)],
+      [:text_rmagick_available,        Object.const_defined?(:Magick)]
     ]
-  end  
+  end
 end