Merge pull request #236 from heukirne/master

update ldapjs

services/web/config/settings.defaults.coffee

@@ -393,6 +393,10 @@ module.exports =
 	# 	anonymous: false
 	#	adminDN: 'cn=read-only-admin,dc=example,dc=com'	
 	#	adminPW: 'password'
+	#	starttls: true
+	#	tlsOptions:
+	#		rejectUnauthorized: false
+	#		ca: '/etc/ldap/ca_certs.pem'
 	
 	#templateLinks: [{
 	#	name : "CV projects",

services/web/package.json

@@ -27,7 +27,7 @@
     "heapdump": "^0.3.7",
     "http-proxy": "^1.8.1",
     "jade": "~1.3.1",
-    "ldapjs": "^0.7.1",
+    "ldapjs": "^1.0.0",
     "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.3.1",
     "lynx": "0.1.1",
     "marked": "^0.3.3",