Merge pull request #1 from RocketChat/develop

Merge RocketChat develop

.eslintrc

@@ -46,7 +46,7 @@
 		}],
 		"no-lonely-if": 2,
 		"no-trailing-spaces": 2,
-		"complexity": [1, 11],
+		"complexity": [1, 31],
 		"space-in-parens": [2, "never"],
 		"space-before-function-paren": [2, "never"],
 		"space-before-blocks": [2, "always"],
@@ -123,6 +123,7 @@
 		"swal"                        : false,
 		"t"                           : false,
 		"TAPi18n"                     : false,
+		"TAPi18next"                  : false,
 		"Template"                    : false,
 		"TimeSync"                    : false,
 		"toastr"                      : false,

.gitignore

@@ -2,6 +2,7 @@
 **/build/*
 **/node_modules/*
 **/tmp/*
+**/.meteor/dev_bundle
 /private/certs/*
 *.bak
 *.iml

.meteor/packages

@@ -41,10 +41,12 @@ rocketchat:api
 rocketchat:assets
 rocketchat:authorization
 rocketchat:autolinker
+#rocketchat:bot-helpers
 rocketchat:cas
 rocketchat:channel-settings
 rocketchat:channel-settings-mail-messages
 rocketchat:colors
+rocketchat:crowd
 rocketchat:custom-oauth
 rocketchat:emojione
 rocketchat:favico
@@ -68,6 +70,7 @@ rocketchat:markdown
 rocketchat:mentions
 rocketchat:mentions-flextab
 rocketchat:message-attachments
+rocketchat:message-mark-as-unread
 rocketchat:message-pin
 rocketchat:message-star
 rocketchat:migrations
@@ -77,6 +80,7 @@ rocketchat:otr
 rocketchat:piwik
 rocketchat:push-notifications
 rocketchat:reactions
+rocketchat:sandstorm
 rocketchat:slackbridge
 rocketchat:slashcommands-archive
 rocketchat:slashcommands-asciiarts
@@ -151,3 +155,4 @@ underscorestring:underscore.string
 yasaricli:slugify
 yasinuslu:blaze-meta
 rocketchat:slashcommands-open
+rocketchat:mapview

.meteor/versions

@@ -61,7 +61,7 @@ jparker:gravatar@0.4.1
 jquery@1.11.4
 kadira:blaze-layout@2.3.0
 kadira:flow-router@2.10.1
-kenton:accounts-sandstorm@0.4.1
+kenton:accounts-sandstorm@0.5.1
 konecty:change-case@2.3.0
 konecty:delayed-task@1.0.0
 konecty:mongo-counter@0.0.3
@@ -138,6 +138,7 @@ rocketchat:channel-settings@0.0.1
 rocketchat:channel-settings-mail-messages@0.0.1
 rocketchat:colors@0.0.1
 rocketchat:cors@0.0.1
+rocketchat:crowd@1.0.0
 rocketchat:custom-oauth@1.0.0
 rocketchat:emojione@0.0.1
 rocketchat:favico@0.0.1
@@ -158,10 +159,12 @@ rocketchat:lib@0.0.1
 rocketchat:livechat@0.0.1
 rocketchat:logger@0.0.1
 rocketchat:mailer@0.0.1
+rocketchat:mapview@0.0.1
 rocketchat:markdown@0.0.1
 rocketchat:mentions@0.0.1
 rocketchat:mentions-flextab@0.0.1
 rocketchat:message-attachments@0.0.1
+rocketchat:message-mark-as-unread@0.0.1
 rocketchat:message-pin@0.0.1
 rocketchat:message-star@0.0.1
 rocketchat:migrations@0.0.1
@@ -172,6 +175,7 @@ rocketchat:otr@0.0.1
 rocketchat:piwik@0.0.1
 rocketchat:push-notifications@0.0.1
 rocketchat:reactions@0.0.1
+rocketchat:sandstorm@0.0.1
 rocketchat:slackbridge@0.0.1
 rocketchat:slashcommands-archive@0.0.1
 rocketchat:slashcommands-asciiarts@0.0.1