Merge branch 'master' into new-gui

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/helpers/todos_helper.rb
	app/views/shared/_footer.html.erb

app/controllers/calendar_controller.rb

@@ -13,6 +13,9 @@ class CalendarController < ApplicationController
 
     respond_to do |format|
       format.html
+      format.m {
+        cookies[:mobile_url]= {:value => request.fullpath, :secure => SITE_CONFIG['secure_cookies']}
+      }
       format.ics   {
         render :action => 'show', :layout => false, :content_type => Mime::ICS
       }

app/controllers/mailgun_controller.rb

@@ -25,7 +25,7 @@ class MailgunController < ApplicationController
 
   def verify
     unless params['signature'] == OpenSSL::HMAC.hexdigest(
-            OpenSSL::Digest::Digest.new('sha256'),
+            OpenSSL::Digest.new('sha256'),
             SITE_CONFIG['mailgun_api_key'],
             '%s%s' % [params['timestamp'], params['token']]
          )

app/controllers/recurring_todos_controller.rb

@@ -70,6 +70,7 @@ class RecurringTodosController < ApplicationController
       @down_count = current_user.recurring_todos.active.count
       @new_recurring_todo = RecurringTodo.new
     else
+      @recurring_todo = builder.recurring_todo
       @status_message = t('todos.error_saving_recurring')
     end
 

app/controllers/stats_controller.rb

@@ -34,8 +34,8 @@ class StatsController < ApplicationController
     @interpolated_actions_created_this_month = interpolate_avg_for_current_month(@actions_created_last12months_array)
     @interpolated_actions_done_this_month = interpolate_avg_for_current_month(@actions_done_last12months_array)
 
-    @created_count_array = Array.new(13, actions_last12months.created_after(@cut_off_year).count/12.0)
-    @done_count_array    = Array.new(13, actions_last12months.completed_after(@cut_off_year).count/12.0)
+    @created_count_array = Array.new(13, actions_last12months.created_after(@cut_off_year).count(:all)/12.0)
+    @done_count_array    = Array.new(13, actions_last12months.completed_after(@cut_off_year).count(:all)/12.0)
     render :layout => false
   end
 
@@ -110,7 +110,7 @@ class StatsController < ApplicationController
     @max_actions = @actions_completion_time_array.max
 
     # get percentage done cumulative
-    @cum_percent_done = convert_to_cumulative_array(@actions_completion_time_array, @actions_completion_time.count)
+    @cum_percent_done = convert_to_cumulative_array(@actions_completion_time_array, @actions_completion_time.count(:all))
 
     render :layout => false
   end

app/controllers/todos_controller.rb

@@ -49,7 +49,10 @@ class TodosController < ApplicationController
         headers['Content-Type']=Mime::TEXT.to_s
         render :content_type => Mime::TEXT
       end
-      format.xml   { render :xml => @todos.to_xml( *todo_xml_params ) }
+      format.xml do
+        @xml_todos = params[:limit_to_active_todos] ? @not_done_todos : @todos
+        render :xml => @xml_todos.to_xml( *todo_xml_params ) 
+      end
       format.any(:rss, :atom) { @feed_title, @feed_description = 'Tracks Actions', "Actions for #{current_user.display_name}" }
       format.ics
     end