Merge branch 'master' into weighted-merge-master

Change-Id: I32521adf9540ba161896fe89e4515772f346ca90

Author: neilgupta

Gemfile.d/_before.rb

@@ -48,5 +48,4 @@ def to_definition(lockfile, unlock)
   "https://github.com/#{repo_name}.git"
 end
 
-gem 'syck', '1.0.4'
 gem 'iconv', '1.0.4'

Gemfile.d/app.rb

@@ -50,7 +50,6 @@
 gem 'highline', '1.7.8', require: false
 gem 'httparty', '0.14.0'
 gem 'i18n', '0.7.0'
-gem 'i18nema', '0.0.8'
 gem 'i18nliner', '0.0.12'
 gem 'icalendar', '1.5.4', require: false
 gem 'ims-lti', '2.1.0.beta.3', require: 'ims'

Gemfile.d/test.rb

@@ -25,6 +25,7 @@
   gem 'rspec_around_all', '0.2.0'
   gem 'rspec-rails', '3.5.2'
   gem 'rspec-collection_matchers', '1.1.3'
+  gem 'shoulda-matchers', '3.1.1'
 
   gem 'rubocop-canvas', require: false, path: 'gems/rubocop-canvas'
     gem 'rubocop', '0.46.0', require: false

app/coffeescripts/bundles/common.coffee

@@ -43,7 +43,10 @@ require [
 
   helpDialog.initTriggers()
 
-  $('#skip_navigation_link').on 'click', ->
+  $('#skip_navigation_link').on 'click', (event) ->
+    # preventDefault so we dont change the hash
+    # this will make nested apps that use the hash happy
+    event.preventDefault()
     $($(this).attr('href')).attr('tabindex', -1).focus()
 
   # show and hide the courses vertical menu when the user clicks the hamburger button

app/coffeescripts/views/outcomes/OutcomeIconView.coffee

@@ -31,7 +31,7 @@ define [
       @$el.attr 'data-id', @model.get 'id'
       @$el.html """
           <a href="#" class="ellipsis" title="#{h @model.get('title')}">
-            <i class="icon-note-light"></i>
+            <i class="icon-outcomes" aria-hidden="true"></i>
             <span>#{h @model.get('title')}</span>
           </a>
         """

app/controllers/accounts_controller.rb

@@ -427,7 +427,12 @@ def update_api
       unless account_settings.empty?
         if @account.grants_right?(@current_user, session, :manage_account_settings)
           if account_settings[:settings]
-            account_settings[:settings].slice!(:restrict_student_past_view, :restrict_student_future_view, :restrict_student_future_listing, :lock_all_announcements)
+            account_settings[:settings].slice!(:restrict_student_past_view, :restrict_student_future_view, :restrict_student_future_listing, :lock_all_announcements, :sis_assignment_name_length_input)
+            sis_name_length_setting = account_settings[:settings][:sis_assignment_name_length_input]
+            if sis_name_length_setting
+              value = sis_name_length_setting[:value]
+              sis_name_length_setting[:value] = (value.to_i.to_s == value.to_s && value.to_i <= 255) ? value : 255
+            end
           end
           @account.errors.add(:name, t(:account_name_required, 'The account name cannot be blank')) if account_params.has_key?(:name) && account_params[:name].blank?
           @account.errors.add(:default_time_zone, t(:unrecognized_time_zone, "'%{timezone}' is not a recognized time zone", :timezone => account_params[:default_time_zone])) if account_params.has_key?(:default_time_zone) && ActiveSupport::TimeZone.new(account_params[:default_time_zone]).nil?
@@ -594,6 +599,7 @@ def update
             :enable_alerts,
             :enable_eportfolios,
             :enable_profiles,
+            :enable_turnitin,
             :show_scheduler,
             :global_includes,
             :gmail_domain

app/controllers/application_controller.rb

@@ -2071,15 +2071,6 @@ def user_has_google_drive
     @user_has_google_drive ||= google_drive_connection.authorized?
   end
 
-  def twitter_connection
-    if @current_user
-      service = @current_user.user_services.where(service: "twitter").first
-      return Twitter::Connection.new(service.token, service.secret)
-    else
-      return Twitter::Connection.new(session[:oauth_twitter_access_token_token], session[:oauth_twitter_access_token_secret])
-    end
-  end
-
   def self.region
     nil
   end

app/controllers/context_modules_controller.rb

@@ -88,6 +88,10 @@ def index
         @modules.each{|m| m.evaluate_for(@current_user) }
         session[:module_progressions_initialized] = true
       end
+
+      if @context.allow_web_export_download?
+        @last_web_export = @context.web_zip_exports.visible_to(@current_user).order('epub_exports.created_at').last
+      end
     end
   end
 

app/controllers/courses_controller.rb

@@ -300,9 +300,9 @@ class CoursesController < ApplicationController
   include CustomSidebarLinksHelper
   include SyllabusHelper
 
-  before_filter :require_user, :only => [:index, :activity_stream, :activity_stream_summary, :effective_due_dates, :offline_web_exports]
+  before_filter :require_user, :only => [:index, :activity_stream, :activity_stream_summary, :effective_due_dates, :offline_web_exports, :start_offline_web_export]
   before_filter :require_user_or_observer, :only=>[:user_index]
-  before_filter :require_context, :only => [:roster, :locks, :create_file, :ping, :effective_due_dates, :offline_web_exports]
+  before_filter :require_context, :only => [:roster, :locks, :create_file, :ping, :effective_due_dates, :offline_web_exports, :start_offline_web_export]
   skip_after_filter :update_enrollment_last_activity_at, only: [:enrollment_invitation, :activity_stream_summary]
 
   include Api::V1::Course
@@ -2463,6 +2463,27 @@ def effective_due_dates
     ])
   end
 
+  # @API Permissions
+  # Returns permission information for provided course & current_user
+  #
+  # @argument permissions[] [String]
+  #   List of permissions to check against authenticated user
+  #
+  # @example_request
+  #     curl https://<canvas>/api/v1/courses/<course_id>/permissions \
+  #       -H 'Authorization: Bearer <token>' \
+  #       -d 'permissions[]=manage_grades'
+  #       -d 'permissions[]=send_messages'
+  #
+  # @example_response
+  #   {'manage_grades': 'false', 'send_messages': 'true'}
+  def permissions
+    get_context
+    return unless authorized_action(@context, @current_user, :read)
+    permissions = Array(params[:permissions]).map(&:to_sym)
+    render json: @context.rights_status(@current_user, session, *permissions)
+  end
+
   def student_view
     get_context
     if authorized_action(@context, @current_user, :use_student_view)
@@ -2735,8 +2756,6 @@ def can_change_group_weighting_scheme?
   def offline_web_exports
     return render status: 404, template: 'shared/errors/404_message' unless @context.allow_web_export_download?
     if authorized_action(WebZipExport.new(course: @context), @current_user, :create)
-      @service = EpubExports::CreateService.new(@context, @current_user, :web_zip_export)
-      @service.save
       title = t('Course Content Downloads')
       @page_title = title
       add_crumb(title)
@@ -2745,6 +2764,16 @@ def offline_web_exports
       render :text => '<div id="course-webzip-export-app"></div>'.html_safe, :layout => true
     end
   end
+
+  def start_offline_web_export
+    return render status: 404, template: 'shared/errors/404_message' unless @context.allow_web_export_download?
+    if authorized_action(WebZipExport.new(course: @context), @current_user, :create)
+      @service = EpubExports::CreateService.new(@context, @current_user, :web_zip_export)
+      @service.save
+      redirect_to context_url(@context, :context_offline_web_exports_url)
+    end
+  end
+
   private
 
   def effective_due_dates_params

app/controllers/gradebooks_controller.rb

@@ -124,8 +124,7 @@ def save_assignment_order
 
   def light_weight_ags_json(assignment_groups, opts={})
     assignment_groups.map do |ag|
-      visible_assignments = ag.visible_assignments(opts[:student] || @current_user)
-                              .reject(&:muted?)
+      visible_assignments = ag.visible_assignments(opts[:student] || @current_user).to_a
 
       if multiple_grading_periods? && @current_grading_period_id && !view_all_grading_periods?
         current_period = GradingPeriod.for(@context).find_by(id: @current_grading_period_id)
@@ -138,7 +137,8 @@ def light_weight_ags_json(assignment_groups, opts={})
           submission_types: a.submission_types_array,
           points_possible: a.points_possible,
           due_at: a.due_at,
-          omit_from_final_grade: a.omit_from_final_grade?
+          omit_from_final_grade: a.omit_from_final_grade?,
+          muted: a.muted?
         }
       end