Merge pull request #2 from RocketChat/develop

grab latest rocket

.docker/latest/Dockerfile

@@ -25,7 +25,6 @@ WORKDIR /app/bundle
 
 # needs a mongoinstance - defaults to container linking with alias 'mongo'
 ENV MONGO_URL=mongodb://mongo:27017/rocketchat \
-    MONGO_OPLOG_URL=mongodb://mongo:27017/local \
     HOME=/tmp \
     PORT=3000 \
     ROOT_URL=http://localhost:3000 \

.editorconfig

@@ -11,5 +11,9 @@ insert_final_newline = true
 [*.{js,coffee,html,less,json}]
 indent_style = tab
 
+[*.i18n.json]
+indent_style = space
+indent_size = 2
+
 [*.md]
 trim_trailing_whitespace = false

.eslintignore

@@ -9,10 +9,10 @@ packages/rocketchat-livechat/app/node_modules
 packages/rocketchat-livechat/assets/rocketchat-livechat.min.js
 packages/rocketchat-migrations/
 packages/rocketchat-theme/client/minicolors/jquery.minicolors.js
-packages/rocketchat-ui/lib/customEventPolyfill.js
-packages/rocketchat-ui/lib/Modernizr.js
-packages/rocketchat-ui/lib/recorderjs/recorder.js
-packages/rocketchat-ui/lib/textarea-autogrow.js
+packages/rocketchat-ui/client/lib/customEventPolyfill.js
+packages/rocketchat-ui/client/lib/Modernizr.js
+packages/rocketchat-ui/client/lib/recorderjs/recorder.js
+packages/rocketchat-ui/client/lib/textarea-autogrow.js
 packages/rocketchat-videobridge/client/public/external_api.js
 packages/rocketchat-theme/client/vendor/
 private/moment-locales/

.meteor/.finished-upgraders

@@ -14,3 +14,4 @@ notices-for-facebook-graph-api-2
 1.3.5-remove-old-dev-bundle-link
 1.4.0-remove-old-dev-bundle-link
 1.4.1-add-shell-server-package
+1.4.3-split-account-service-packages

.meteor/packages

@@ -4,45 +4,47 @@
 # but you can also edit it by hand.
 
 rocketchat:cors
-accounts-facebook
-accounts-github
-accounts-google
-accounts-meteor-developer
-accounts-password
-accounts-twitter
+accounts-facebook@1.1.0
+accounts-github@1.2.0
+accounts-google@1.1.0
+accounts-meteor-developer@1.2.0
+accounts-password@1.3.4
+accounts-twitter@1.2.0
 blaze-html-templates
-check
-coffeescript
-ddp-rate-limiter
-ecmascript
-ejson
-email
-fastclick
-http
-jquery
-less
-logging
-meteor-base
-mobile-experience
-mongo
-random
-rate-limit
-reactive-dict
-reactive-var
-reload
-service-configuration
-session
-shell-server
+check@1.2.4
+coffeescript@1.11.1_4
+ddp-rate-limiter@1.0.6
+ecmascript@0.6.3
+ejson@1.0.13
+email@1.1.18
+fastclick@1.0.13
+http@1.2.11
+jquery@1.11.10
+less@2.7.9
+logging@1.1.17
+meteor-base@1.0.4
+mobile-experience@1.0.4
+mongo@1.1.15
+random@1.0.10
+rate-limit@1.0.6
+reactive-dict@1.1.8
+reactive-var@1.0.11
+reload@1.1.11
+service-configuration@1.0.11
+session@1.1.7
+shell-server@0.2.2
 spacebars
-standard-minifier-css
-standard-minifier-js
-tracker
+standard-minifier-css@1.3.3
+standard-minifier-js@1.2.2
+tracker@1.1.2
 
 rocketchat:action-links
+rocketchat:analytics
 rocketchat:api
 rocketchat:assets
 rocketchat:authorization
 rocketchat:autolinker
+rocketchat:autotranslate
 rocketchat:bot-helpers
 rocketchat:cas
 rocketchat:channel-settings
@@ -76,6 +78,7 @@ rocketchat:ldap
 rocketchat:lib
 rocketchat:livechat
 rocketchat:logger
+rocketchat:login-token
 rocketchat:mailer
 rocketchat:mapview
 rocketchat:markdown
@@ -89,7 +92,6 @@ rocketchat:migrations
 rocketchat:oauth2-server-config
 rocketchat:oembed
 rocketchat:otr
-rocketchat:piwik
 rocketchat:push-notifications
 rocketchat:reactions
 rocketchat:sandstorm

.meteor/release

@@ -1 +1 @@
-METEOR@1.4.2.6
+METEOR@1.4.3.1

.meteor/versions

@@ -8,7 +8,7 @@ accounts-password@1.3.4
 accounts-twitter@1.2.0
 aldeed:simple-schema@1.5.3
 allow-deny@1.0.5
-autoupdate@1.2.11
+autoupdate@1.3.12
 babel-compiler@6.14.1
 babel-runtime@1.0.1
 base64@1.0.10
@@ -21,8 +21,8 @@ caching-compiler@1.1.9
 caching-html-compiler@1.1.0
 callback-hook@1.0.10
 cfs:http-methods@0.0.32
-check@1.2.4
-coffeescript@1.12.0_1
+check@1.2.5
+coffeescript@1.12.3_1
 dandv:caret-position@2.1.1
 ddp@1.2.5
 ddp-client@1.3.3
@@ -50,7 +50,7 @@ html-tools@1.0.11
 htmljs@1.0.11
 http@1.2.11
 id-map@1.0.9
-jalik:ufs@0.7.3
+jalik:ufs@0.7.4_1
 jalik:ufs-gridfs@0.1.4
 jalik:ufs-local@0.2.8
 jparker:crypto-core@0.1.0
@@ -79,7 +79,7 @@ meteor-developer-oauth@1.2.0
 meteorhacks:inject-initial@1.0.4
 meteorspark:util@0.2.0
 minifier-css@1.2.16
-minifier-js@1.2.17
+minifier-js@1.2.18
 minimongo@1.0.20
 mizzao:autocomplete@0.5.1
 mizzao:timesync@0.3.4
@@ -120,10 +120,12 @@ reactive-var@1.0.11
 reload@1.1.11
 retry@1.0.9
 rocketchat:action-links@0.0.1
+rocketchat:analytics@0.0.2
 rocketchat:api@0.0.1
 rocketchat:assets@0.0.1
 rocketchat:authorization@0.0.1
 rocketchat:autolinker@0.0.1
+rocketchat:autotranslate@0.0.1
 rocketchat:bot-helpers@0.0.1
 rocketchat:cas@1.0.0
 rocketchat:channel-settings@0.0.1
@@ -160,6 +162,7 @@ rocketchat:ldapjs@1.0.0
 rocketchat:lib@0.0.1
 rocketchat:livechat@0.0.1
 rocketchat:logger@0.0.1
+rocketchat:login-token@1.0.0
 rocketchat:mailer@0.0.1
 rocketchat:mapview@0.0.1
 rocketchat:markdown@0.0.1
@@ -175,7 +178,6 @@ rocketchat:oauth2-server@2.0.0
 rocketchat:oauth2-server-config@1.0.0
 rocketchat:oembed@0.0.1
 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
@@ -225,8 +227,8 @@ smoral:sweetalert@1.1.1
 spacebars@1.0.13
 spacebars-compiler@1.1.0
 srp@1.0.10
-standard-minifier-css@1.3.3
-standard-minifier-js@1.2.2
+standard-minifier-css@1.3.4
+standard-minifier-js@1.2.3
 steffo:meteor-accounts-saml@0.0.1
 tap:i18n@1.8.2
 templating@1.3.0

.sandstorm/sandstorm-pkgdef.capnp

@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appTitle = (defaultText = "Rocket.Chat"),
 
-		appVersion = 57,  # Increment this for every release.
+		appVersion = 58,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.53.0-develop"),
+		appMarketingVersion = (defaultText = "0.53.0"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
@@ -108,6 +108,7 @@ const myCommand :Spk.Manifest.Command = (
 		(key = "SANDSTORM", value = "1"),
 		(key = "Statistics_reporting", value = "false"),
 		(key = "Accounts_AllowUserAvatarChange", value = "false"),
-		(key = "Accounts_AllowUserProfileChange", value = "false")
+		(key = "Accounts_AllowUserProfileChange", value = "false"),
+		(key = "BABEL_CACHE_DIR", value = "/var/babel_cache")
 	]
 );

.snapcraft/edge/snapcraft.yaml

@@ -7,7 +7,7 @@
 # 5.  `snapcraft snap`
 
 name: rocketchat-server
-version: 0.53.0-develop
+version: 0.53.0
 summary: Rocket.Chat server
 description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
 confinement: strict

.snapcraft/stable/snapcraft.yaml

@@ -7,7 +7,7 @@
 # 5.  `snapcraft snap`
 
 name: rocketchat-server
-version: 0.53.0-develop
+version: 0.53.0
 summary: Rocket.Chat server
 description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
 confinement: strict

.stylelintrc

@@ -78,13 +78,10 @@
 		"number-no-trailing-zeros": true,
 		"property-case": "lower",
 		"property-no-unknown": true,
-		"rule-nested-empty-line-before": [ "always", {
+		"rule-empty-line-before": [ "always", {
 			except: ["first-nested"],
 			ignore: ["after-comment"],
 		} ],
-		"rule-non-nested-empty-line-before": [ "always", {
-			ignore: ["after-comment"],
-		} ],
 		"selector-attribute-brackets-space-inside": "never",
 		"selector-attribute-operator-space-after": "never",
 		"selector-attribute-operator-space-before": "never",

HISTORY.md

@@ -1,5 +1,37 @@
 # History
 
+## 0.53.0 - 2017-Mar-01
+
+- Add 'Unread Messages' to i18n translation files
+- Add CMD/Ctrl+k (#6034)
+- Add default oauth role (#6028)
+- Add getS3Url (#5410)
+- Add livechat events (#6070)
+- Add minified version of livechat widget code (#6071)
+- Add new behavior to ESC on toolbar search (#6056)
+- Add option to not overwrite livechat custom fields
+- Add preference for Enter key (#6075)
+- Add support for uploads to Google Cloud Storage (#6060)
+- Add the admin missing settings sections to i18n translation files
+- Add translate sweetalert buttons on send files and update password
+- Add user preference to hide roles
+- Fix codemiror css (#6058)
+- Fix ctrl/alt/cmd+enter line break (#6057)
+- Fix keydown when photoswipe is open
+- Fix livechat appearance page by not saving settings directly from client (#6077)
+- Fix livechat knowledge base by properly initiating it's model
+- Fix livechat widget being displayed when offline
+- Fix renamed template folder to `client` to allows faster hot-reloads
+- Fix the directive conflicts for aws and google storage (#6084)
+- Fix the edit message (#6086)
+- Fix to remove error-color class when creating new channel
+- Fix undefined exception in the channelSettings flex-tab
+- Fix updating a message with @all by copying "u" property
+- Improve outgoing webhooks and add history (#5823)
+- Improve report abuse to pass the message id instead of message object
+- Use highlight.js from npm
+- Use katex from npm (#5962)
+
 ## 0.52.0 - 2017-Fev-14
 
 ### Meteor update to 1.4.2.6

client/methods/updateMessage.js

@@ -51,17 +51,17 @@ Meteor.methods({
 			};
 
 			message = RocketChat.callbacks.run('beforeSaveMessage', message);
+			var messageObject = {'editedAt': message.editedAt, 'editedBy': message.editedBy, msg: message.msg};
 
+			if (originalMessage.attachments) {
+				if (originalMessage.attachments[0].description !== undefined) {
+					delete messageObject.$set.msg;
+				}
+			}
 			ChatMessage.update({
 				_id: message._id,
 				'u._id': Meteor.userId()
-			}, {
-				$set: {
-					'editedAt': message.editedAt,
-					'editedBy': message.editedBy,
-					msg: message.msg
-				}
-			});
+			}, {$set : messageObject});
 		});
 	}
 });

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.53.0-develop",
+	"version": "0.53.0",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
@@ -55,14 +55,14 @@
 	},
 	"devDependencies": {
 		"chimp": "^0.47.2",
-		"eslint": "^3.15.0",
-		"stylelint": "^7.8.0",
+		"eslint": "^3.17.0",
+		"stylelint": "^7.9.0",
 		"supertest": "^3.0.0"
 	},
 	"dependencies": {
-		"babel-runtime": "^6.22.0",
+		"babel-runtime": "^6.23.0",
 		"bcrypt": "^1.0.2",
-		"codemirror": "^5.23.0",
+		"codemirror": "^5.24.2",
 		"file-type": "^4.1.0",
 		"highlight.js": "^9.9.0",
 		"jquery": "^3.1.1",
@@ -71,7 +71,7 @@
 		"moment": "^2.17.1",
 		"moment-timezone": "^0.5.11",
 		"photoswipe": "^4.1.1",
-		"prom-client": "^7.0.1",
+		"prom-client": "^7.1.0",
 		"semver": "^5.3.0",
 		"toastr": "^2.1.2"
 	}

packages/autoupdate/README.md

@@ -1,4 +1,6 @@
 # autoupdate
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/autoupdate) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/autoupdate)
+***
 
 This package is the heart of Meteor's Hot Code Push functionality. It has a
 client component and a server component component. The client component uses a
@@ -7,5 +9,5 @@ build of the app's client. When it sees that a new version is available, it uses
 the [reload](https://atmospherejs.com/meteor/reload) package (if included in the
 app) to gracefully save the app's state and reload it in place.
 
-`autoupdate` is part of the [Webapp](https://www.meteor.com/webapp)
+`autoupdate` is part of the [Webapp](https://github.com/meteor/meteor/tree/master/packages/webapp)
 project.