Merge branch 'master' of https://github.com/RocketChat/Rocket.Chat

client/views/login/form.coffee

@@ -44,7 +44,7 @@ Template.loginForm.helpers
 
 	loginTerms: ->
 		return RocketChat.settings.get 'Layout_Login_Terms'
-		
+
 Template.loginForm.events
 	'submit #login-card': (event, instance) ->
 		event.preventDefault()
@@ -98,7 +98,7 @@ Template.loginForm.events
 						if error.error is 'no-valid-email'
 							instance.state.set 'email-verification'
 						else
-							toastr.error error.reason
+							toastr.error t 'User_not_found_or_incorrect_password'
 						return
 					FlowRouter.go 'index'
 

i18n/en.i18n.json

@@ -363,6 +363,7 @@
   "User_left_female" : "User <em>__user_left__</em> left.",
   "User_left_male" : "User <em>__user_left__</em> left.",
   "User_logged_out" : "User is logged out",
+  "User_not_found_or_incorrect_password": "User not found or incorrect password",
   "User_removed_by" : "User <em>__user_removed__</em> removed by <em>__user_by__</em>.",
   "User_Settings" : "User Settings",
   "User_updated_successfully" : "User updated successfully",

server/startup/avatar.coffee

@@ -74,13 +74,13 @@ Meteor.startup ->
 
 		reqModifiedHeader = req.headers["if-modified-since"];
 		if reqModifiedHeader?
-			if reqModifiedHeader == file.uploadDate.toUTCString()?
+			if reqModifiedHeader == file.uploadDate?.toUTCString()
 				res.setHeader 'Last-Modified', reqModifiedHeader
 				res.writeHead 304
 				res.end()
 				return
 
-		res.setHeader 'Last-Modified', file.uploadDate.toUTCString()
+		res.setHeader 'Last-Modified', file.uploadDate?.toUTCString() or new Date().toUTCString()
 		res.setHeader 'content-type', 'image/jpeg'
 		res.setHeader 'Content-Length', file.length