Merged master

app/lib/Router.coffee

@@ -44,7 +44,7 @@ module.exports = class CocoRouter extends Backbone.Router
       return @openRoute(args.join('/'))
     view = new ViewClass({}, slugOrId)
     view.render()
-    if view then @openView(view) else @showNotFound()
+    @openView if view then view else @notFoundView()
 
   cache: {}
   openRoute: (route) ->
@@ -99,7 +99,7 @@ module.exports = class CocoRouter extends Backbone.Router
       return document.location.reload()
     path = "views/#{path}"
     ViewClass = @tryToLoadModule path
-    return @showNotFound() if not ViewClass
+    return @openView @notFoundView() if not ViewClass
     view = new ViewClass({}, args...)  # options, then any path fragment args
     view.render()
     @openView(view)
@@ -117,7 +117,7 @@ module.exports = class CocoRouter extends Backbone.Router
       break if ViewClass
       split -= 1
 
-    return @showNotFound() if not ViewClass
+    return @notFoundView() if not ViewClass
     args = pieces[split+1..]
     view = new ViewClass({}, args...)  # options, then any path fragment args
     view.render()
@@ -129,7 +129,7 @@ module.exports = class CocoRouter extends Backbone.Router
       if error.toString().search('Cannot find module "' + path + '" from') is -1
         throw error
 
-  showNotFound: ->
+  notFoundView: ->
     NotFoundView = require('views/not_found')
     view = new NotFoundView()
     view.render()

app/schemas/models/user.coffee

@@ -107,7 +107,7 @@ UserSchema = c.object {},
         name: {type: 'string', maxLength: 30, title: 'Link Name', description: 'What are you linking to? Ex: "Personal Website", "GitHub"', format: 'link-name'}
         link: c.url {title: 'Link', description: 'The URL.', default: 'http://example.com'}
     photoURL: {type: 'string', format: 'image-file', title: 'Profile Picture', description: 'Upload a 256x256px or larger image if you want to show a different profile picture to employers than your normal avatar.'}
-    curated: c.object {title: 'Curated', required: ['shortDescription','mainTag','location','education','workHistory','phoneScreenFilter','schoolFilter','locationFilter','roleFilter','seniorityFilter']},
+    curated: c.object {title: 'Curated', required: ['shortDescription', 'mainTag', 'location', 'education', 'workHistory', 'phoneScreenFilter', 'schoolFilter', 'locationFilter', 'roleFilter', 'seniorityFilter']},
       shortDescription:
         title: 'Short description'
         description: 'A sentence or two describing the candidate'
@@ -118,17 +118,13 @@ UserSchema = c.object {},
         type: 'string'
       location:
         title: 'Location'
-        description: "The CURRENT location of the candidate"
+        description: 'The CURRENT location of the candidate'
         type: 'string'
       education:
         title: 'Education'
         description: 'The main educational institution of the candidate'
         type: 'string'
-      workHistory: c.array
-        title: 'Work history'
-        description: 'One or two places the candidate has worked'
-        type: 'array'
-      ,
+      workHistory: c.array {title: 'Work history', description: 'One or two places the candidate has worked', type: 'array'},
         title: 'Workplace'
         type: 'string'
       phoneScreenFilter:

server/plugins/achievements.coffee

@@ -10,7 +10,7 @@ log = require 'winston'
 # on the condition that it's necessary and still not too frequent in occurrence
 AchievablePlugin = (schema, options) ->
   User = require '../users/User'  # Avoid mutual inclusion cycles
-  Achievement = require('../achievements/Achievement')
+  Achievement = require '../achievements/Achievement'
 
   before = {}