Merge branch 'develop' into feature/mention-names

.editorconfig

@@ -8,7 +8,7 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.{js,coffee,html,less,json}]
+[*.{js,coffee,html,less,css,json}]
 indent_style = tab
 
 [*.i18n.json]

.eslintrc

@@ -27,6 +27,7 @@
 		"no-delete-var": 2,
 		"no-dupe-keys": 2,
 		"no-dupe-args": 2,
+		"no-dupe-class-members": 2,
 		"no-duplicate-case": 2,
 		"no-empty": 2,
 		"no-empty-character-class": 2,

.meteor/packages

@@ -34,7 +34,6 @@ service-configuration@1.0.11
 session@1.1.7
 shell-server@0.2.3
 spacebars
-standard-minifier-css@1.3.4
 standard-minifier-js@2.0.0
 tracker@1.1.3
 
@@ -132,7 +131,7 @@ rocketchat:videobridge
 rocketchat:webrtc
 rocketchat:wordpress
 rocketchat:message-snippet
-rocketchat:google-natural-language
+#rocketchat:google-natural-language
 rocketchat:drupal
 rocketchat:monitoring
 #rocketchat:chatops
@@ -172,3 +171,4 @@ underscorestring:underscore.string
 yasaricli:slugify
 yasinuslu:blaze-meta
 deepwell:bootstrap-datepicker2
+rocketchat:postcss

.meteor/versions

@@ -102,7 +102,7 @@ oauth1@1.1.11
 oauth2@1.1.11
 observe-sequence@1.0.16
 ordered-dict@1.0.9
-ostrio:cookies@2.2.0
+ostrio:cookies@2.2.1
 pauli:accounts-linkedin@2.1.2
 pauli:linkedin-oauth@1.1.0
 peerlibrary:aws-sdk@2.4.9_1
@@ -148,7 +148,6 @@ rocketchat:file@0.0.1
 rocketchat:file-upload@0.0.1
 rocketchat:github-enterprise@0.0.1
 rocketchat:gitlab@0.0.1
-rocketchat:google-natural-language@0.0.1
 rocketchat:highlight-words@0.0.1
 rocketchat:i18n@0.0.1
 rocketchat:iframe-login@1.0.0
@@ -183,6 +182,7 @@ rocketchat:oauth2-server@2.0.0
 rocketchat:oauth2-server-config@1.0.0
 rocketchat:oembed@0.0.1
 rocketchat:otr@0.0.1
+rocketchat:postcss@1.0.0
 rocketchat:push-notifications@0.0.1
 rocketchat:reactions@0.0.1
 rocketchat:sandstorm@0.0.1
@@ -232,7 +232,6 @@ smoral:sweetalert@1.1.1
 spacebars@1.0.15
 spacebars-compiler@1.1.2
 srp@1.0.10
-standard-minifier-css@1.3.4
 standard-minifier-js@2.0.0
 steffo:meteor-accounts-saml@0.0.1
 tap:i18n@1.8.2

.postcssrc

@@ -0,0 +1,20 @@
+{
+	"plugins": {
+		"postcss-smart-import": {},
+		"postcss-cssnext": {
+			"browsers": [
+				"ie > 10",
+				"last 2 Edge versions",
+				"last 2 Firefox versions",
+				"last 1 FirefoxAndroid versions",
+				"last 2 Chrome versions",
+				"last 1 ChromeAndroid versions",
+				"last 2 Safari versions",
+				"last 2 Opera versions",
+				"last 2 iOS versions",
+				"last 1 Android version"
+			]
+		}
+	},
+	"excludedPackages": ["deepwell:bootstrap-datepicker2", "smoral:sweetalert"]
+}

.stylelintignore

@@ -0,0 +1,2 @@
+packages/rocketchat-theme/client/vendor/fontello/css/fontello.css
+packages/meteor-autocomplete/client/autocomplete.css

.travis.yml

@@ -50,6 +50,7 @@ before_script:
 - |-
   mongo --eval 'rs.initiate({_id:"rs0", members: [{"_id":1, "host":"localhost:27017"}]})'
 - meteor npm run lint
+- meteor npm run testunit
 - meteor npm run stylelint
 - travis_retry meteor build --headless /tmp/build
 - mkdir /tmp/build-test

mocha.opts

@@ -0,0 +1,3 @@
+--compilers js:babel-mocha-es6-compiler
+--reporter spec
+--ui bdd

package.json

@@ -28,6 +28,15 @@
 		"name": "Sing Li",
 		"email": "sing.li@rocket.chat"
 	}],
+	"mocha": {
+		"tests": [
+			"packages/**/*.tests.js"
+		],
+		"files": [
+			"packages/**/*.js",
+			"!packages/**/*.tests.js"
+		]
+	},
 	"keywords": [
 		"rocketchat",
 		"rocket",
@@ -37,12 +46,15 @@
 		"start": "meteor npm i && meteor",
 		"lint": "eslint .",
 		"lint-fix": "eslint . --fix",
-		"stylelint": "stylelint **/*.less",
+		"stylelint": "stylelint packages/**/*.{less,css}",
 		"test": "node .scripts/start.js",
 		"deploy": "npm run build && pm2 startOrRestart pm2.json",
 		"chimp-watch": "chimp --ddp=http://localhost:3000 --watch --mocha --path=tests/end-to-end",
 		"chimp-test": "chimp tests/chimp-config.js",
 		"postinstall": "cd packages/rocketchat-katex && npm i",
+		"testunit-watch": "mocha --watch --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"",
+		"coverage": "nyc -r html mocha --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"",
+		"testunit": "mocha --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"",
 		"version": "node .scripts/version.js",
 		"set-version": "node .scripts/set-version.js",
 		"release": "npm run set-version --silent"
@@ -57,11 +69,15 @@
 		"email": "support@rocket.chat"
 	},
 	"devDependencies": {
+		"babel-mocha-es6-compiler": "^0.1.0",
+		"babel-plugin-array-includes": "^2.0.3",
 		"chimp": "^0.49.0",
+		"conventional-changelog": "^1.1.3",
 		"eslint": "^3.19.0",
+		"postcss-cssnext": "^2.11.0",
+		"postcss-smart-import": "^0.7.0",
 		"stylelint": "^7.10.1",
-		"supertest": "^3.0.0",
-		"conventional-changelog": "^1.1.3"
+		"supertest": "^3.0.0"
 	},
 	"dependencies": {
 		"babel-runtime": "^6.23.0",
@@ -71,7 +87,7 @@
 		"highlight.js": "^9.11.0",
 		"jquery": "^3.2.1",
 		"mime-db": "^1.28.0",
-		"mime-type": "^3.0.4",
+		"mime-type": "^3.0.5",
 		"moment": "^2.18.1",
 		"moment-timezone": "^0.5.13",
 		"photoswipe": "^4.1.2",

packages/rocketchat-api/server/v1/users.js

@@ -219,8 +219,8 @@ RocketChat.API.v1.addRoute('users.setAvatar', { authRequired: true }, {
 						callback();
 					}));
 
-					this.request.pipe(busboy);
 				}));
+				this.request.pipe(busboy);
 			})();
 		}
 

packages/rocketchat-chatops/client/views/stylesheets/chatops.css

@@ -1,9 +1,9 @@
 
 .map-container {
-  width: 670px;
-  max-width: 100%;
-  height: 500px;
-  padding: 5px, 5px, 5px 5px;
+	width: 670px;
+	max-width: 100%;
+	height: 500px;
+	padding: 5px;
 }
 
 .red {
@@ -12,4 +12,4 @@
 
 .green {
 	color: green;
-}
+}

packages/rocketchat-colors/style.css

@@ -10,7 +10,7 @@
 	border-radius: 3px;
 	margin-right: 3px;
 	margin-left: 2px;
-	border: 1px solid rgba(0, 0, 0, .2);
+	border: 1px solid rgba(0, 0, 0, 0.2);
 	position: relative;
 	top: 2px;
 }

packages/rocketchat-dolphin/login-button.css

@@ -4,10 +4,10 @@
 	height: 20px;
 	background-image: url(data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgNDMwIDQzMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4NCjxnIGlkPSJzaWduLWluIiB0cmFuc2Zvcm09Im1hdHJpeCgwLjUgMCAwIDAuNSAwIDApIj4NCjxwYXRoIGZpbGw9IiNmZmZmZmYiIGQ9Ik02NjAuNjcyIDUwMC4wMzJxMCAxNC41MDggLTEwLjYwMiAyNS4xMWwtMzAzLjU1MiAzMDMuNTUycS0xMC42MDIgMTAuNjAyIC0yNS4xMSAxMC42MDJ0LTI1LjExIC0xMC42MDIgLTEwLjYwMiAtMjUuMTF2LTE2MC43MDRoLTI0OS45ODRxLTE0LjUwOCAwIC0yNS4xMSAtMTAuNjAydC0xMC42MDIgLTI1LjExdi0yMTQuMjcycTAgLTE0LjUwOCAxMC42MDIgLTI1LjExdDI1LjExIC0xMC42MDJoMjQ5Ljk4NHYtMTYwLjcwNHEwIC0xNC41MDggMTAuNjAyIC0yNS4xMXQyNS4xMSAtMTAuNjAyIDI1LjExIDEwLjYwMmwzMDMuNTUyIDMwMy41NTJxMTAuNjAyIDEwLjYwMiAxMC42MDIgMjUuMTF6bTE5Ni40MTYgLTE5Ni40MTZ2MzkyLjgzMnEwIDY2LjQwMiAtNDcuMTUxIDExMy41NTN0LTExMy41NTMgNDcuMTUxaC0xNzguNTZxLTcuMjU0IDAgLTEyLjU1NSAtNS4zMDF0LTUuMzAxIC0xMi41NTVxMCAtMi4yMzIgLS41NTggLTExLjE2dC0uMjc5IC0xNC43ODcgMS42NzQgLTEzLjExMyA1LjU4IC0xMC44ODEgMTEuNDM5IC0zLjYyN2gxNzguNTZxMzYuODI4IDAgNjMuMDU0IC0yNi4yMjZ0MjYuMjI2IC02My4wNTR2LTM5Mi44MzJxMCAtMzYuODI4IC0yNi4yMjYgLTYzLjA1NHQtNjMuMDU0IC0yNi4yMjZoLTE3NC4wOTZ0LTYuNDE3IC0uNTU4IC02LjQxNyAtMS42NzQgLTQuNDY0IC0zLjA2OSAtMy45MDYgLTUuMDIyIC0xLjExNiAtNy41MzNxMCAtMi4yMzIgLS41NTggLTExLjE2dC0uMjc5IC0xNC43ODcgMS42NzQgLTEzLjExMyA1LjU4IC0xMC44ODEgMTEuNDM5IC0zLjYyN2gxNzguNTZxNjYuNDAyIDAgMTEzLjU1MyA0Ny4xNTF0NDcuMTUxIDExMy41NTN6Ii8+DQo8L2c+DQo8L3N2Zz4=);
 	background-repeat: no-repeat;
-        vertical-align: middle;
+	vertical-align: middle;
 }
 
 .icon-dolphin ~ .icon-spin,
 .icon-dolphin ~ span {
-        vertical-align: middle;
+	vertical-align: middle;
 }