[Snyk] Security upgrade grunt-contrib-jasmine from 0.8.0 to 1.0.0

Gemfile.d/app.rb

@@ -19,7 +19,7 @@
 gem 'active_model-better_errors', '1.6.7', require: 'active_model/better_errors'
 gem 'dynamic_form', '1.1.4', require: false
 gem 'rails-patch-json-encode', '0.0.1'
-gem 'switchman', '1.2.39'
+gem 'switchman', '1.2.40'
 gem 'folio-pagination', '0.0.9', require: 'folio/rails'
   # for folio, see the folio README
   gem 'will_paginate', '3.0.7', require: false
@@ -62,7 +62,7 @@
   gem 'subexec', '0.0.4', require: false
 gem 'multi_json', '1.10.1'
 gem 'netaddr', '1.5.0', require: false
-gem 'nokogiri', '1.6.6.2', require: false
+gem 'nokogiri', '1.6.6.2.20150813143452', require: false, github: 'codekitchen/nokogiri', ref: 'd47e53f885'
 # oauth gem, with rails3 fixes rolled in
 gem 'oauth-instructure', '0.4.10', require: false
 gem 'oauth2', '1.0.0', require: false
@@ -73,14 +73,14 @@
   gem 'stackprof', '0.2.7', require: false
 gem 'rake', '10.4.2'
 gem 'rdoc', '3.12'
-gem 'ratom', '0.9.0', require: false
+gem 'ratom-nokogiri', '0.10.3', require: false
 gem 'rdiscount', '1.6.8', require: false
 gem 'ritex', '1.0.1', require: false
 
 gem 'rotp', '1.6.1', require: false
 gem 'net-ldap', '0.10.1', require: false
 gem 'ruby-duration', '3.2.0', require: false
-gem 'ruby-saml-mod', '0.2.6'
+gem 'ruby-saml-mod', '0.2.7'
 gem 'rubycas-client', '2.3.9', require: false
 gem 'rubyzip', '1.1.1', require: 'zip'
 gem 'zip-zip', '0.2' # needed until plugins use the new namespace

app/coffeescripts/calendar/EditAssignmentDetails.coffee

@@ -1,13 +1,14 @@
 define [
   'jquery'
+  'timezone'
   'compiled/calendar/commonEventFactory'
   'jst/calendar/editAssignment'
   'jst/calendar/editAssignmentOverride'
   'jst/calendar/genericSelectOptions'
   'jquery.instructure_date_and_time'
   'jquery.instructure_forms'
   'jquery.instructure_misc_helpers'
-], ($, commonEventFactory, editAssignmentTemplate, editAssignmentOverrideTemplate, genericSelectOptionsTemplate) ->
+], ($, tz, commonEventFactory, editAssignmentTemplate, editAssignmentOverrideTemplate, genericSelectOptionsTemplate) ->
 
   class EditAssignmentDetails
     constructor: (selector, @event, @contextChangeCB, @closeCB) ->
@@ -85,15 +86,14 @@ define [
       @$form.find(".more_options_link").attr('href', moreOptionsUrl)
 
     setupTimeAndDatePickers: () =>
-      @$form.find(".datetime_field").datetime_field()
-
-      startDate = @event.startDate()
-      endDate = @event.endDate()
-
+      $field = @$form.find(".datetime_field")
+      $field.datetime_field()
+      widget = $field.data('instance')
+      startDate = $.unfudgeDateForProfileTimezone(@event.startDate())
       if @event.allDay
-        @$form.find(".datetime_field").val(startDate.toString('MMM d, yyyy')).change()
+        widget.setDate(startDate)
       else if startDate
-        @$form.find(".datetime_field").val(startDate.toString('MMM d, yyyy h:mmtt')).change()
+        widget.setDatetime(startDate)
 
     formSubmit: (e) =>
       e.preventDefault()

app/coffeescripts/handlebars_helpers.coffee

@@ -104,8 +104,8 @@ define [
     # stored elsewhere).
 
     # expects: anything that $.datetimeString can handle
-    datetimeFormatted : (datetime, localized=true) ->
-      $.datetimeString(datetime, {localized: localized})
+    datetimeFormatted : (datetime) ->
+      $.datetimeString(datetime)
 
     # Strips the time information from the datetime and accounts for the user's
     # timezone preference. expects: anything tz() can handle

app/coffeescripts/react_files/components/FilesApp.coffee

@@ -114,7 +114,7 @@ define [
         header {},
           h1 {className: 'screenreader-only'},
             I18n.t('files_heading', "Files")
-        if ENV.use_new_styles
+        if ENV.use_new_styles and contextType == 'courses'
           div {className: 'ic-app-nav-toggle-and-crumbs ic-app-nav-toggle-and-crumbs--files'},
             button {
               className:'Button Button--link Button--small ic-app-course-nav-toggle',

app/coffeescripts/views/DiscussionTopics/EditView.coffee

@@ -182,6 +182,8 @@ htmlEscape, DiscussionTopic, Announcement, Assignment, $, preventDefault, Missin
 
     getFormData: ->
       data = super
+      for dateField in ['last_reply_at', 'posted_at', 'delayed_post_at']
+        data[dateField] = $.unfudgeDateForProfileTimezone(data[dateField])
       data.title ||= I18n.t 'default_discussion_title', 'No Title'
       data.discussion_type = if data.threaded is '1' then 'threaded' else 'side_comment'
       data.podcast_has_student_posts = false unless data.podcast_enabled is '1'

app/coffeescripts/views/conferences/EditConferenceView.coffee

@@ -1,12 +1,13 @@
 define [
   'jquery'
   'underscore'
+  'timezone'
   'compiled/views/DialogBaseView'
   'compiled/util/deparam'
   'jst/conferences/editConferenceForm'
   'jst/conferences/userSettingOptions'
   'compiled/behaviors/authenticity_token'
-], ($, _, DialogBaseView, deparam, template, userSettingOptionsTemplate, authenticity_token) ->
+], ($, _, tz, DialogBaseView, deparam, template, userSettingOptionsTemplate, authenticity_token) ->
 
   class EditConferenceView extends DialogBaseView
 
@@ -100,7 +101,7 @@ define [
             when 'date_picker'
               optionObj['isDatePicker'] = true
               if(currentVal)
-                optionObj['value'] = tz.format(currentVal, "%b %-d, %Y %l:%M%P")
+                optionObj['value'] = tz.format(currentVal, 'date.formats.full_with_weekday')
               else
                 optionObj['value'] = currentVal
               break

app/coffeescripts/views/courses/roster/RosterUserView.coffee

@@ -50,6 +50,7 @@ define [
       json.url = "#{ENV.COURSE_ROOT_URL}/users/#{@model.get('id')}"
       json.isObserver = @model.hasEnrollmentType('ObserverEnrollment')
       json.isPending = @model.pending(@model.currentRole)
+      json.canRemoveStudents = ENV.permissions.manage_students and _.all @model.get('enrollments'), (e) -> !e.sis_course_id
       json.canEditSections = not _.isEmpty @model.sectionEditableEnrollments()
       json.canLinkStudents = json.isObserver && !ENV.course.concluded
       json.canViewLoginIdColumn = ENV.permissions.manage_admin_users or ENV.permissions.manage_students

app/coffeescripts/widget/DatetimeField.coffee

@@ -2,15 +2,19 @@ define [
   'i18n!datepicker'
   'jquery'
   'timezone'
-  'compiled/util/parseDatetime'
   'jquery.instructure_date_and_time' # $.unfudgeDateForProfileTimezone, $.midnight
-], (I18n, $, tz, parseDatetime) ->
+], (I18n, $, tz) ->
+
+  # translate a strftime style format string (guaranteed to only use %d, %-d,
+  # %b, and %Y, though in dynamic order) into a datepicker style format string
+  datepickerFormat = (format) ->
+    format.replace(/%Y/, 'yy').replace(/%b/, 'M').replace(/%-?d/, 'd')
 
   # adds datepicker and suggest functionality to the specified $field
   class DatetimeField
     datepickerDefaults:
       constrainInput: false
-      dateFormat: 'M d, yy'
+      dateFormat: datepickerFormat(I18n.t('#date.formats.medium'))
       showOn: 'button'
       buttonText: '<i class="icon-calendar-month"></i>'
       buttonImageOnly: false
@@ -19,7 +23,9 @@ define [
       prevText:           I18n.t('prevText', 'Prev')                        # title text for previous month icon
       nextText:           I18n.t('nextText', 'Next')                        # title text for next month icon
       monthNames:         I18n.lookup('date.month_names')[1..]              # names of months
+      monthNamesShort:    I18n.lookup('date.abbr_month_names')[1..]         # abbreviated names of months
       dayNames:           I18n.lookup('date.day_names')                     # title text for column headings
+      dayNamesShort:      I18n.lookup('date.abbr_day_names')                # title text for column headings
       dayNamesMin:        I18n.lookup('date.datepicker.column_headings')    # column headings for days (Sunday = 0)
       firstDay:           I18n.t('first_day_index', '0')                    # first day of the week (Sun = 0)
       showMonthAfterYear: I18n.t('#date.formats.medium_month')[0:1] is "%Y" # "month year" or "year month"
@@ -96,13 +102,13 @@ define [
 
     # public API
     setDate: (date) =>
-      @setFormattedDatetime(date, 'MMM d, yyyy')
+      @setFormattedDatetime(date, 'date.formats.medium')
 
     setTime: (date) =>
-      @setFormattedDatetime(date, 'h:mmtt')
+      @setFormattedDatetime(date, 'time.formats.tiny')
 
     setDatetime: (date) =>
-      @setFormattedDatetime(date, 'MMM d, yyyy h:mmtt')
+      @setFormattedDatetime(date, 'date.formats.full')
 
     # private API
     setFromValue: =>
@@ -139,22 +145,23 @@ define [
 
     parseValue: ->
       value = @normalizeValue(@$field.val())
-      @fudged = parseDatetime(value)
-      @datetime = $.unfudgeDateForProfileTimezone(@fudged)
+      @datetime = tz.parse(value)
+      @fudged = $.fudgeDateForProfileTimezone(@datetime)
       @showTime = @alwaysShowTime or (@allowTime and not $.midnight(@datetime))
       @blank = not value
       @invalid = not @blank and @datetime == null
 
     setFormattedDatetime: (datetime, format) ->
       if datetime
+        @blank = false
         @datetime = datetime
         @fudged = $.fudgeDateForProfileTimezone(@datetime)
-        @$field.val(@fudged.toString(format))
+        @$field.val(tz.format(@datetime, format))
       else
+        @blank = true
         @datetime = null
         @fudged = null
         @$field.val("")
-      @blank = @datetime is null
       @invalid = false
       @showTime = @alwaysShowTime or (@allowTime and not $.midnight(@datetime))
       @update()