Merge branch 'master' into production

app/schemas/models/trial_request.schema.coffee

@@ -7,7 +7,7 @@ TrialRequestSchema = c.object {
 
 _.extend TrialRequestSchema.properties,
   applicant: c.objectId(links: [{rel: 'extra', href: '/db/user/{($)}'}])
-  created: c.date({readOnly: true})
+  created: c.date()
   prepaidCode: c.objectId()
   reviewDate: c.date({readOnly: true})
   reviewer: c.objectId(links: [{rel: 'extra', href: '/db/user/{($)}'}])

app/views/TeachersView.coffee

@@ -7,6 +7,6 @@ module.exports = class TeachersView extends RootView
 
   constructor: ->
     super()
-
-    # Redirect to HoC version of /courses/teachers until we update the /teachers landing page
-    application.router.navigate "/courses/teachers?hoc=true", trigger: true
+    _.defer ->
+      # Redirect to HoC version of /courses/teachers until we update the /teachers landing page
+      application.router.navigate "/courses/teachers?hoc=true", trigger: true

app/views/account/AccountSettingsView.coffee

@@ -37,11 +37,9 @@ module.exports = class AccountSettingsView extends CocoView
 
   #- Form input callbacks
   onChangePanelInput: (e) ->
+    return if $(e.target).closest('.form').attr('id') in ['reset-progress-form', 'delete-account-form']
     $(e.target).addClass 'changed'
-    if (JSON.stringify(document.getElementById('email1').className)).indexOf("changed") > -1 or (JSON.stringify(document.getElementById('password1').className)).indexOf("changed") > -1
-      $(e.target).removeClass 'changed'
-    else
-      @trigger 'input-changed'
+    @trigger 'input-changed'
 
   onClickToggleAllButton: ->
     subs = @getSubscriptions()

app/views/admin/PendingPatchesView.coffee

@@ -102,7 +102,7 @@ module.exports = class PatchesView extends RootView
       @render()
 
     modelNamesRequest = @supermodel.addRequestResource 'patches', {
-      url: "/db/#{collection}/names"
+      url: "/db/#{collection.replace('_', '.')}/names"
       data: {ids: ids}
       method: 'POST'
       success: success

app/views/courses/TeacherCoursesView.coffee

@@ -10,13 +10,13 @@ CourseInstance = require 'models/CourseInstance'
 RootView = require 'views/core/RootView'
 template = require 'templates/courses/teacher-courses-view'
 utils = require 'core/utils'
-InviteToClassroomModal = require 'views/courses/InviteToClassroomModal' 
+InviteToClassroomModal = require 'views/courses/InviteToClassroomModal'
 ClassroomSettingsModal = require 'views/courses/ClassroomSettingsModal'
 
 module.exports = class TeacherCoursesView extends RootView
   id: 'teacher-courses-view'
   template: template
-  
+
   events:
     'click #create-new-class-btn': 'onClickCreateNewclassButton'
     'click .add-students-btn': 'onClickAddStudentsButton'
@@ -67,7 +67,7 @@ module.exports = class TeacherCoursesView extends RootView
     @listenTo classroom, 'sync', ->
       classroom.saving = false
       @fillMissingCourseInstances()
-      
+
   renderManageTab: ->
     isActive = @$('#manage-tab-pane').hasClass('active')
     @renderSelectors('#manage-tab-pane')
@@ -85,7 +85,7 @@ module.exports = class TeacherCoursesView extends RootView
     classroom = @classrooms.get(classroomID)
     modal = new InviteToClassroomModal({classroom: classroom})
     @openModalView(modal)
-    
+
   onLoaded: ->
     super()
     @linkCourseIntancesToCourses()
@@ -94,7 +94,7 @@ module.exports = class TeacherCoursesView extends RootView
   linkCourseIntancesToCourses: ->
     for courseInstance in @courseInstances.models
       courseInstance.course = @courses.get(courseInstance.get('courseID'))
-    
+
   fillMissingCourseInstances: ->
     # TODO: Give teachers control over which courses are enabled for a given class.
     # Add/remove course instances and columns in the view to match.
@@ -135,7 +135,7 @@ module.exports = class TeacherCoursesView extends RootView
     @usersToRedeem = new CocoCollection(_.values(usersToRedeem), {model: User})
     @numCourseInstancesToAddTo = checkedBoxes.length
     @renderSelectors '#fixed-area'
-    
+
   onClickSaveChangesButton: ->
     @$('.course-instance-membership-checkbox').attr('disabled', true)
     checkedBoxes = @$('.course-instance-membership-checkbox:checked')
@@ -154,12 +154,12 @@ module.exports = class TeacherCoursesView extends RootView
     @state = 'saving-changes'
     @renderSelectors '#fixed-area'
     @redeemUsers()
-    
+
   redeemUsers: ->
     if not @usersToRedeem.size()
       @addMemberships()
       return
-    
+
     user = @usersToRedeem.first()
     prepaid = @prepaids.find (prepaid) -> prepaid.openSpots()
     $.ajax({
@@ -186,7 +186,7 @@ module.exports = class TeacherCoursesView extends RootView
       @renderSelectors '#fixed-area'
       document.location.reload()
       return
-      
+
     membershipAddition = @membershipAdditions.first()
     courseInstance = membershipAddition.get('courseInstance')
     userID = membershipAddition.get('userID')
@@ -210,4 +210,4 @@ module.exports = class TeacherCoursesView extends RootView
     })
 
   onClickManageTabLink: ->
-    @$('.nav-tabs a[href="#manage-tab-pane"]').tab('show')
+    @$('.nav-tabs a[href="#manage-tab-pane"]').tab('show')

server/trial_requests/TrialRequest.coffee

@@ -61,6 +61,7 @@ TrialRequestSchema.post 'save', (doc) ->
 
 TrialRequestSchema.statics.privateProperties = []
 TrialRequestSchema.statics.editableProperties = [
+  'created'
   'prepaidCode'
   'properties'
   'reviewDate'