Merge branch 'master' of https://github.com/sharelatex/web-sharelatex

services/web/app/views/layout.jade

@@ -3,7 +3,7 @@ html(itemscope, itemtype='http://schema.org/Product')
 	block vars
 
 	head
-		script(type="text/javscript").
+		script(type="text/javascript").
 			// Stop superfish from loading
 			window.similarproducts = true
 

services/web/app/views/project/editor.jade

@@ -99,6 +99,9 @@ block content
 				},
 				"ace/ext-searchbox": {
 					deps: ["ace/ace"]
+				},
+				"ace/ext-language_tools": {
+					deps: ["ace/ace"]
 				}
 			},
 			config:{

services/web/config/settings.defaults.coffee

@@ -362,5 +362,13 @@ module.exports =
 	# 	fieldName: 'LDAP User'
 	# 	placeholder: 'LDAP User ID'
 	# 	emailAtt: 'mail'
+	
+	#templateLinks: [{
+	#	name : "CV projects",
+	#	url : "/templates/cv"
+	#},{
+	#	name : "all projects",
+	#	url: "/templates/all"
+	#}]
 
 

services/web/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "archiver": "0.9.0",
     "async": "0.6.2",
-    "bcrypt": "0.7.5",
+    "bcrypt": "0.8.3",
     "bufferedstream": "1.6.0",
     "connect-redis": "1.4.5",
     "dateformat": "1.0.4-1.2.3",

services/web/public/coffee/ide/editor/directives/aceEditor/spell-check/SpellCheckManager.coffee

@@ -22,7 +22,8 @@ define [
 				@closeContextMenu()
 
 			@editor.on "changeSession", (e) =>
-				@runSpellCheckSoon(200)
+				if @$scope.spellCheckEnabled and @$scope.spellCheckLanguage and @$scope.spellCheckLanguage != ""
+					@runSpellCheckSoon(200)
 
 				e.oldSession?.getDocument().off "change", onChange
 				e.session.getDocument().on "change", onChange

services/web/public/coffee/ide/pdfng/directives/pdfSpinner.coffee

@@ -17,9 +17,9 @@ define [
 				element.append(spinner)
 
 			stop: (element) ->
-				element.find('.fa-spin').removeClass('fa-spin')
+				element.find('.fa-spinner').removeClass('fa-spin')
 
 			remove: (element) ->
-				element.find('.fa-spin').remove()
+				element.find('.fa-spinner').remove()
 
 		]

services/web/test/UnitTests/coffee/infrastructure/LockManager/getLockTests.coffee

@@ -36,9 +36,11 @@ describe 'LockManager - getting the lock', ->
 	describe "when the lock is initially set", ->
 		beforeEach (done) ->
 			startTime = Date.now()
+			tries = 0
 			@LockManager.LOCK_TEST_INTERVAL = 5
 			@LockManager.tryLock = (doc_id, callback = (error, isFree) ->) ->
-				if Date.now() - startTime < 20
+				if (Date.now() - startTime < 20) or (tries < 2)
+					tries = tries + 1
 					callback null, false
 				else
 					callback null, true