Merge remote-tracking branch 'origin/develop' into improvements/logger

packages/rocketchat-lib/lib/settings.coffee

@@ -9,6 +9,14 @@ RocketChat.settings =
 	get: (_id) ->
 		return Meteor.settings?[_id]
 
+	get: (_id, callback) ->
+		if callback?
+			RocketChat.settings.onload _id, callback
+			if Meteor.settings?[_id]?
+				callback _id, Meteor.settings?[_id]
+		else
+			return Meteor.settings?[_id]
+
 	set: (_id, value, callback) ->
 		Meteor.call 'saveSetting', _id, value, callback
 

packages/rocketchat-migrations/migrations.js

@@ -302,6 +302,7 @@ Migrations._migrateTo = function(version, rerun) {
 	function lock() {
 		const date = new Date();
 		const dateMinusInterval = moment(date).subtract(self.options.lockExpiration, 'minutes').toDate();
+		const build = RocketChat.Info ? RocketChat.Info.build.date : date;
 
 		// This is atomic. The selector ensures only one caller at a time will see
 		// the unlocked control, and locking occurs in the same update's modifier.
@@ -316,14 +317,14 @@ Migrations._migrateTo = function(version, rerun) {
 				}
 			}, {
 				buildAt: {
-					$ne: RocketChat.Info.build.date
+					$ne: build
 				}
 			}]
 		}, {
 			$set: {
 				locked: true,
 				lockedAt: date,
-				buildAt: RocketChat.Info.build.date
+				buildAt: build
 			}
 		}) === 1;
 	}

packages/rocketchat-ui-flextab/flex-tab/tabs/uploadedFilesList.coffee

@@ -54,7 +54,7 @@ Template.uploadedFilesList.events
 				showConfirmButton: false
 
 				msg = ChatMessage.findOne { file: { _id: self._id } }
-				fileCollection.remove self._id, () ->
+				RocketChat.models.Uploads.remove self._id, () ->
 					chatMessages[Session.get('openedRoom')].deleteMsg(msg);
 
 	'scroll .content': _.throttle (e, t) ->

packages/rocketchat-ui-login/login/form.coffee

@@ -40,8 +40,6 @@ Template.loginForm.helpers
 			when 'register'
 				return t('Submit')
 			when 'login'
-				if RocketChat.settings.get('LDAP_Enable')
-					return t('Login') + ' (LDAP)'
 				return t('Login')
 			when 'email-verification'
 				return t('Send_confirmation_email')

server/lib/accounts.coffee

@@ -1,9 +1,10 @@
 # Deny Account.createUser in client and set Meteor.loginTokenExpires
 accountsConfig = { forbidClientAccountCreation: true, loginExpirationInDays: RocketChat.settings.get 'Accounts_LoginExpiration' }
+Accounts.config accountsConfig
 
-if RocketChat.settings.get('Accounts_AllowedDomainsList')
-	domainWhiteList = _.map RocketChat.settings.get('Accounts_AllowedDomainsList').split(','), (domain) -> domain.trim()
-	accountsConfig.restrictCreationByEmailDomain = (email) ->
+RocketChat.settings.get 'Accounts_AllowedDomainsList', (_id, value) ->
+	domainWhiteList = _.map value.split(','), (domain) -> domain.trim()
+	restrictCreationByEmailDomain = (email) ->
 		ret = false
 		for domain in domainWhiteList
 			if email.match(domain + '$')
@@ -11,8 +12,8 @@ if RocketChat.settings.get('Accounts_AllowedDomainsList')
 				break;
 
 		return ret
-
-Accounts.config accountsConfig
+	delete Accounts._options['restrictCreationByEmailDomain']
+	Accounts.config({ restrictCreationByEmailDomain: restrictCreationByEmailDomain });
 
 Accounts.emailTemplates.siteName = RocketChat.settings.get 'Site_Name';
 Accounts.emailTemplates.from = "#{RocketChat.settings.get 'Site_Name'} <#{RocketChat.settings.get 'From_Email'}>";