Merge branch 'develop' into color-variables

.meteor/versions

@@ -75,7 +75,7 @@ localstorage@1.1.1
 logging@1.1.17
 matb33:collection-hooks@0.8.4
 mdg:validation-error@0.5.1
-meteor@1.7.0
+meteor@1.7.1
 meteor-base@1.1.0
 meteor-developer-oauth@1.2.0
 meteorhacks:inject-initial@1.0.4
@@ -90,7 +90,7 @@ mobile-experience@1.0.4
 mobile-status-bar@1.0.14
 modules@0.9.2
 modules-runtime@0.8.0
-mongo@1.1.19
+mongo@1.1.22
 mongo-id@1.0.6
 mongo-livedata@1.0.12
 mrt:reactive-store@0.0.1
@@ -98,7 +98,7 @@ mystor:device-detection@0.2.0
 nimble:restivus@0.8.12
 nooitaf:colors@1.1.2_1
 npm-bcrypt@0.9.3
-npm-mongo@2.2.24
+npm-mongo@2.2.30
 oauth@1.1.13
 oauth1@1.1.11
 oauth2@1.1.11

package.json

@@ -89,20 +89,20 @@
 		"babel-plugin-array-includes": "^2.0.3",
 		"chimp": "^0.49.1",
 		"conventional-changelog-cli": "^1.3.2",
-		"eslint": "^4.2.0",
+		"eslint": "^4.4.1",
 		"postcss-cssnext": "^2.11.0",
 		"postcss-smart-import": "^0.7.5",
-		"simple-git": "^1.73.0",
+		"simple-git": "^1.75.0",
 		"stylelint": "^7.13.0",
 		"stylelint-order": "^0.6.0",
 		"supertest": "^3.0.0"
 	},
 	"dependencies": {
-		"@google-cloud/storage": "^1.2.0",
-		"aws-sdk": "^2.86.0",
-		"babel-runtime": "^6.23.0",
+		"@google-cloud/storage": "^1.2.1",
+		"aws-sdk": "^2.94.0",
+		"babel-runtime": "^6.25.0",
 		"bcrypt": "^1.0.2",
-		"codemirror": "^5.27.4",
+		"codemirror": "^5.28.0",
 		"file-type": "^5.2.0",
 		"highlight.js": "^9.12.0",
 		"jquery": "^3.2.1",
@@ -111,9 +111,8 @@
 		"moment": "^2.18.1",
 		"moment-timezone": "^0.5.13",
 		"photoswipe": "^4.1.2",
-		"prom-client": "^10.0.2",
-		"semver": "^5.3.0",
-		"toastr": "^2.1.2",
-		"wolfy87-eventemitter": "^5.1.0"
+		"prom-client": "^10.0.3",
+		"semver": "^5.4.1",
+		"toastr": "^2.1.2"
 	}
 }

packages/rocketchat-autolinker/client/client.js

@@ -23,8 +23,10 @@ function AutoLinker(message) {
 				if (match.getType() === 'url') {
 					if (regUrls.test(match.matchedText)) {
 						if (match.matchedText.indexOf(Meteor.absoluteUrl()) === 0) {
-							const tag = match.buildTag();				// returns an `Autolinker.HtmlTag` instance for an <a> tag
-							tag.setAttr('target', '');					// sets target to empty, instead of _blank
+							// returns an `Autolinker.HtmlTag` instance for an <a> tag
+							const tag = match.buildTag();
+							// sets target to empty, instead of _blank
+							tag.setAttr('target', '');
 							return tag;
 						}
 

packages/rocketchat-livechat/app/.meteor/versions

@@ -44,7 +44,7 @@ livedata@1.0.18
 localstorage@1.1.1
 logging@1.1.17
 mdg:validation-error@0.5.1
-meteor@1.7.0
+meteor@1.7.1
 meteorspark:util@0.2.0
 minifier-css@1.2.16
 minifier-js@2.1.1
@@ -53,10 +53,10 @@ mizzao:timesync@0.5.0
 modules@0.9.2
 modules-runtime@0.8.0
 momentjs:moment@2.18.1
-mongo@1.1.19
+mongo@1.1.22
 mongo-id@1.0.6
 npm-bcrypt@0.9.3
-npm-mongo@2.2.24
+npm-mongo@2.2.30
 observe-sequence@1.0.16
 ordered-dict@1.0.9
 promise@0.8.9

packages/rocketchat-livechat/app/package.json

@@ -22,7 +22,7 @@
   "dependencies": {
     "autolinker": "^1.4.3",
     "jquery": "^3.2.1",
-    "babel-runtime": "^6.23.0",
+    "babel-runtime": "^6.25.0",
     "bcrypt": "^1.0.2",
     "moment": "^2.18.1",
     "toastr": "^2.1.2"