Merge branch 'core/RocketChat#8264-room-types' into feature/#19-decou…

…ple-help-requests # Conflicts: # packages/rocketchat-livechat/app/i18n/de.i18n.json
assistify · Oct 2, 2017 · a87b575 · a87b575
2 parents ccaf349 + b2a425f
commit a87b575
Show file tree

Hide file tree

Showing 116 changed files with 3,930 additions and 2,712 deletions.
diff --git a/.meteor/packages b/.meteor/packages
@@ -13,7 +13,7 @@ accounts-twitter@1.3.0
 blaze-html-templates
 check@1.2.5
 ddp-rate-limiter@1.0.7
-ecmascript@0.8.2
+ecmascript@0.8.3
 ejson@1.0.14
 email@1.2.3
 fastclick@1.0.13
@@ -22,8 +22,8 @@ jquery@1.11.10
 less@2.7.9
 logging@1.1.17
 meteor-base@1.1.0
-mobile-experience@1.0.4
-mongo@1.2.0
+mobile-experience@1.0.5
+mongo@1.2.2
 random@1.0.10
 rate-limit@1.0.8
 reactive-dict@1.1.9
@@ -33,7 +33,7 @@ service-configuration@1.0.11
 session@1.1.7
 shell-server@0.2.4
 spacebars
-standard-minifier-js@2.1.1
+standard-minifier-js@2.1.2
 tracker@1.1.3
 
 rocketchat:2fa
@@ -175,7 +175,7 @@ yasaricli:slugify
 yasinuslu:blaze-meta
 deepwell:bootstrap-datepicker2
 rocketchat:postcss
-dynamic-import@0.1.1
+dynamic-import@0.1.3
 keepnox:perfect-scrollbar
 
 dbs:common

diff --git a/.meteor/release b/.meteor/release
@@ -1 +1 @@
-METEOR@1.5.2
+METEOR@1.5.2.2
diff --git a/.meteor/versions b/.meteor/versions
@@ -1,4 +1,4 @@
-accounts-base@1.3.2
+accounts-base@1.3.4
 accounts-facebook@1.2.1
 accounts-github@1.3.0
 accounts-google@1.2.0
@@ -31,7 +31,7 @@ dandv:caret-position@2.1.1
 dbs:ai@0.0.1
 dbs:common@0.0.1
 ddp@1.3.1
-ddp-client@2.1.2
+ddp-client@2.1.3
 ddp-common@1.2.9
 ddp-rate-limiter@1.0.7
 ddp-server@2.0.2
@@ -40,7 +40,7 @@ deps@1.0.12
 diff-sequence@1.0.7
 dispatch:run-as-user@1.1.1
 dynamic-import@0.1.3
-ecmascript@0.8.2
+ecmascript@0.8.3
 ecmascript-runtime@0.4.1
 ecmascript-runtime-client@0.4.3
 ecmascript-runtime-server@0.4.1
@@ -89,11 +89,11 @@ meteorhacks:inject-initial@1.0.4
 meteorhacks:meteorx@1.4.1
 meteorspark:util@0.2.0
 minifier-css@1.2.16
-minifier-js@2.1.3
-minimongo@1.3.1
+minifier-js@2.1.4
+minimongo@1.3.2
 mizzao:autocomplete@0.5.1
 mizzao:timesync@0.3.4
-mobile-experience@1.0.4
+mobile-experience@1.0.5
 mobile-status-bar@1.0.14
 modules@0.10.0
 modules-runtime@0.8.0
@@ -244,7 +244,7 @@ smoral:sweetalert@1.1.1
 spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.0.10
-standard-minifier-js@2.1.1
+standard-minifier-js@2.1.2
 steffo:meteor-accounts-saml@0.0.1
 tap:i18n@1.8.2
 templating@1.3.2

diff --git a/.travis.yml b/.travis.yml
@@ -41,6 +41,7 @@ before_install:
 install:
 - export PATH="$HOME/.meteor:$PATH"
 before_script:
+- if [[ $TRAVIS_TAG ]]; then meteor reset; fi
 - echo "replication:" | sudo tee -a /etc/mongod.conf
 - |-
   echo "  replSetName: \"rs0\"" | sudo tee -a /etc/mongod.conf

diff --git a/package.json b/package.json
@@ -90,26 +90,26 @@
 		"babel-plugin-array-includes": "^2.0.3",
 		"chimp": "^0.50.0",
 		"conventional-changelog-cli": "^1.3.3",
-		"eslint": "^4.7.1",
+		"eslint": "^4.8.0",
 		"mock-require": "^2.0.2",
 		"postcss-cssnext": "^2.11.0",
 		"postcss-smart-import": "^0.7.5",
 		"proxyquire": "^1.8.0",
 		"simple-git": "^1.77.0",
 		"stylelint": "^8.1.1",
-		"stylelint-order": "^0.6.0",
+		"stylelint-order": "^0.7.0",
 		"supertest": "^3.0.0",
 		"underscore": "^1.8.3",
 		"underscore.string": "^3.3.4"
 	},
 	"dependencies": {
-		"@google-cloud/storage": "^1.2.1",
-		"aws-sdk": "^2.118.0",
+		"@google-cloud/storage": "^1.3.1",
+		"aws-sdk": "^2.125.0",
 		"babel-runtime": "^6.26.0",
 		"bcrypt": "^1.0.3",
-		"codemirror": "^5.29.0",
+		"codemirror": "^5.30.0",
 		"emailreplyparser": "0.0.5",
-		"file-type": "^6.1.0",
+		"file-type": "^6.2.0",
 		"highlight.js": "^9.12.0",
 		"imap": "^0.8.19",
 		"jquery": "^3.2.1",
@@ -120,7 +120,7 @@
 		"moment-timezone": "^0.5.13",
 		"photoswipe": "^4.1.2",
 		"poplib": "^0.1.7",
-		"prom-client": "^10.1.0",
+		"prom-client": "^10.1.1",
 		"semver": "^5.4.1",
 		"toastr": "^2.1.2",
 		"wolfy87-eventemitter": "^5.2.2"

diff --git a/packages/rocketchat-authorization/client/startup.js b/packages/rocketchat-authorization/client/startup.js
@@ -3,6 +3,7 @@ Meteor.subscribe('roles');
 RocketChat.AdminBox.addOption({
 	href: 'admin-permissions',
 	i18nLabel: 'Permissions',
+	icon: 'lock',
 	permissionGranted() {
 		return RocketChat.authz.hasAllPermission('access-permissions');
 	}

diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.js b/packages/rocketchat-channel-settings/client/views/channelSettings.js
@@ -54,7 +54,7 @@ Template.channelSettings.helpers({
 			}
 		});
 		const roomType = room && room.t;
-		return roomType && RocketChat.authz.hasAtLeastOnePermission(`delete-${ roomType }`, this.rid);
+		return roomType && RocketChat.roomTypes.roomTypes[room.t].canBeDeleted(room);
 	},
 	readOnly() {
 		const room = ChatRoom.findOne(this.rid, {

diff --git a/packages/rocketchat-channel-settings/server/functions/saveRoomName.js b/packages/rocketchat-channel-settings/server/functions/saveRoomName.js
@@ -1,12 +1,10 @@
+
 RocketChat.saveRoomName = function(rid, displayName, user, sendMessage = true) {
 	const room = RocketChat.models.Rooms.findOneById(rid);
-	if (room.t !== 'c' && room.t !== 'p') {
-		// custom room types can explicitly state they don't want to be renamed
-		if (!(RocketChat.roomTypes[room.t].preventRenaming && RocketChat.roomTypes[room.t].preventRenaming())) {
-			throw new Meteor.Error('error-not-allowed', 'Not allowed', {
-				'function': 'RocketChat.saveRoomName'
-			});
-		}
+	if (RocketChat.roomTypes.roomTypes[room.t].preventRenaming()) {
+		throw new Meteor.Error('error-not-allowed', 'Not allowed', {
+			'function': 'RocketChat.saveRoomdisplayName'
+		});
 	}
 	if (displayName === room.name) {
 		return;

diff --git a/packages/rocketchat-custom-sounds/client/admin/startup.js b/packages/rocketchat-custom-sounds/client/admin/startup.js
@@ -1,6 +1,7 @@
 RocketChat.AdminBox.addOption({
 	href: 'custom-sounds',
 	i18nLabel: 'Custom_Sounds',
+	icon: 'volume',
 	permissionGranted() {
 		return RocketChat.authz.hasAtLeastOnePermission(['manage-sounds']);
 	}

diff --git a/packages/rocketchat-emoji-custom/admin/startup.js b/packages/rocketchat-emoji-custom/admin/startup.js
@@ -1,6 +1,7 @@
 RocketChat.AdminBox.addOption({
 	href: 'emoji-custom',
 	i18nLabel: 'Custom_Emoji',
+	icon: 'emoji',
 	permissionGranted() {
 		return RocketChat.authz.hasAtLeastOnePermission(['manage-emoji']);
 	}

diff --git a/packages/rocketchat-emoji/client/emojiPicker.css b/packages/rocketchat-emoji/client/emojiPicker.css
@@ -16,6 +16,7 @@
 
 .emoji-picker {
 	position: absolute;
+	z-index: 100;
 
 	display: none;
 

diff --git a/packages/rocketchat-file-upload/ufs/AmazonS3/server.js b/packages/rocketchat-file-upload/ufs/AmazonS3/server.js
@@ -137,7 +137,8 @@ export class AmazonS3Store extends UploadFS.Store {
 			s3.putObject({
 				Key: this.getPath(file),
 				Body: writeStream,
-				ContentType: file.type
+				ContentType: file.type,
+				ContentDisposition: `inline; filename=${ file.name }`
 
 			}, (error) => {
 				if (error) {

diff --git a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json