Merge branch 'develop' into fix-rest-pin-message

.circleci/setartname.sh

@@ -15,7 +15,7 @@ elif [[ $CIRCLE_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
 else
   SNAP_CHANNEL=edge
   RC_RELEASE=develop
-  RC_VERSION=0.66.0-develop
+  RC_VERSION="$(npm run version --silent)"
 fi
 
 export SNAP_CHANNEL

.circleci/snap.sh

@@ -16,12 +16,12 @@ echo -e "Tag: $CIRCLE_TAG\r\nBranch: $CIRCLE_BRANCH\r\nBuild: $CIRCLE_BUILD_NUM\
 git clone -b $SNAP_CHANNEL git+ssh://rocket.chat.buildmaster@git.launchpad.net/rocket.chat launchpad
 
 # Rarely will change, but just incase we copy it all
-cp -r resources buildinfo launchpad/
-sed s/#{RC_VERSION}/$RC_VERSION/ snapcraft.yaml > launchpad/snapcraft.yaml
+cp -r resources buildinfo snap launchpad/
+sed s/#{RC_VERSION}/$RC_VERSION/ snap/snapcraft.yaml > launchpad/snap/snapcraft.yaml
 sed s/#{RC_VERSION}/$RC_VERSION/ resources/prepareRocketChat > launchpad/resources/prepareRocketChat
 
 cd launchpad
-git add resources snapcraft.yaml buildinfo
+git add resources snap buildinfo
 
 # Set commit author details
 git config user.email "buildmaster@rocket.chat"

.circleci/update-releases.sh

@@ -5,3 +5,6 @@ IFS=$'\n\t'
 curl -X POST \
 -H "X-Update-Token: ${UPDATE_TOKEN}" \
 https://releases.rocket.chat/update
+
+# Makes build fail if the release isn't there
+curl --fail https://releases.rocket.chat/$RC_VERSION/info

.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 0.72.0-develop
+ENV RC_VERSION 0.73.0-develop
 
 MAINTAINER buildmaster@rocket.chat
 

.eslintignore

@@ -10,7 +10,6 @@ packages/rocketchat-livechat/.app/.meteor
 packages/rocketchat-livechat/assets/rocketchat-livechat.min.js
 packages/rocketchat-livechat/assets/rocket-livechat.js
 packages/rocketchat_theme/client/minicolors/jquery.minicolors.js
-packages/rocketchat_theme/client/minicolors/jquery.minicolors.js
 packages/rocketchat_theme/client/vendor/
 packages/rocketchat-ui/client/lib/customEventPolyfill.js
 packages/rocketchat-ui/client/lib/Modernizr.js

.eslintrc

@@ -2,45 +2,61 @@
 	"extends": ["@rocket.chat/eslint-config"],
 	"parser": "babel-eslint",
 	"globals": {
+		"__meteor_bootstrap__"        : false,
 		"__meteor_runtime_config__"   : false,
 		"AccountBox"                  : false,
-		"AgentUsers"                  : false,
+		"alerts"                      : false,
 		"Apps"                        : false,
 		"Assets"                      : false,
-		"browser"                     : false,
+		"AudioRecorder"               : false,
+		"CachedChatSubscription"      : false,
 		"ChatMessage"                 : false,
 		"ChatMessages"                : false,
+		"chatMessages"                : false,
 		"ChatRoom"                    : false,
 		"ChatSubscription"            : false,
-		"Department"                  : false,
+		"chrome"                      : false,
+		"cordova"                     : false,
+		"device"                      : false,
+		"DynamicCss"                  : false,
+		"facebookConnectPlugin"       : false,
 		"FileUpload"                  : false,
-		"getNextAgent"                : false,
+		"fileUpload"                  : false,
+		"fileUploadHandler"           : false,
+		"fireGlobalEvent"             : false,
 		"handleError"                 : false,
 		"getAvatarUrlFromUsername"    : false,
-		"LivechatCustomField"         : false,
-		"LivechatDepartment"          : false,
-		"LivechatDepartmentAgents"    : false,
-		"livechatManagerRoutes"       : true,
-		"LivechatMonitoring"          : false,
-		"LivechatPageVisited"         : false,
-		"LivechatTrigger"             : false,
-		"Logger"                      : false,
+		"getAvatarSuggestionForUser"  : false,
+		"globals"                     : true,
+		"JitsiMeetExternalAPI"        : false,
+		"jscolor"                     : false,
+		"KonchatNotification"         : false,
+		"language_names"              : true,
+		"msgStream"                   : false,
+		"MsgTyping"                   : false,
 		"modal"                       : false,
+		"Modernizr"                   : false,
+		"menu"                        : false,
 		"Npm"                         : false,
+		"openRoom"                    : false,
+		"OnePassword"                 : false,
 		"Package"                     : false,
-		"parentCall"                  : false,
+		"popout"                      : false,
+		"popover"                     : false,
+		"readMessage"                 : false,
 		"RocketChat"                  : true,
+		"roomExit"                    : true,
 		"RoomHistoryManager"          : false,
 		"RoomManager"                 : false,
-		"ServiceConfiguration"        : false,
+		"RoomRoles"                   : false,
+		"Servers"                     : false,
 		"Settings"                    : false,
 		"SideNav"                     : false,
-		"t"                           : false,
-		"TimeSync"                    : false,
-		"toastr"                      : false,
-		"Trigger"                     : false,
-		"Triggers"                    : false,
-		"visitor"                     : false,
+		"TAPi18next"                  : false,
+		"toolbarSearch"               : false,
+		"TwitterConnect"              : false,
+		"updateAvatarOfUsername"      : false,
+		"UserRoles"                   : false,
 		"VideoRecorder"               : false,
 		"VRecDialog"                  : false
 	}

.github/history-manual.json

@@ -12,7 +12,7 @@
 		"userLogin": "rodrigok",
 		"contributors": []
 	}],
-	"0.72.0": [{
+	"0.72.0-rc.0": [{
 		"title": "[BREAK] Support for Cordova (Rocket.Chat Legacy app) has reached End-of-life, support has been discontinued",
 		"userLogin": "sampaiodiego",
 		"contributors": []