apitech
/
Rocket.Chat
mirror of https://github.com/RocketChat/Rocket.Chat
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into release-candidate

Browse Source
pull/21842/head
Diego Sampaio 4 years ago
parent 2ba1fb6021 4453c09da9
commit 0a2803d97f
No known key found for this signature in database
GPG Key ID: E060152B30502562
5 changed files with 69 additions and 95 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      client/views/admin/users/UserInfo.js
  2. 2
      client/views/room/Header/HeaderIconWithRoom.js
  3. 1
      imports/client/sodium-plus
  4. 137
      package-lock.json
  5. 22
      package.json

2
client/views/admin/users/UserInfo.js
Unescape View File

@ -11,7 +11,7 @@ import { AsyncStatePhase } from '../../../hooks/useAsyncState';
import { useEndpointData } from '../../../hooks/useEndpointData';
import { getUserEmailAddress } from '../../../lib/getUserEmailAddress';
import { getUserEmailVerified } from '../../../lib/getUserEmailVerified';
import UserInfo from '../../room/contextualBar/UserInfo';
import UserInfo from '../../room/contextualBar/UserInfo/UserInfo';
import { UserInfoActions } from './UserInfoActions';
export function UserInfoWithData({ uid, username, ...props }) {

2
client/views/room/Header/HeaderIconWithRoom.js
Unescape View File

@ -6,6 +6,6 @@ import { useRoomIcon } from '../../../hooks/useRoomIcon';
const HeaderIconWithRoom = ({ room }) => {
const icon = useRoomIcon(room);
return <Header.Tag.Icon icon={icon} />;
return <Header.Icon icon={icon} />;
};
export default HeaderIconWithRoom;

1
imports/client/sodium-plus
Unescape View File

@ -0,0 +1 @@
../../node_modules/sodium-plus

137
package-lock.json generated
Unescape View File

@ -6285,12 +6285,12 @@
}
},
"@rocket.chat/css-in-js": {
"version": "0.6.3-dev.234",
"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.6.3-dev.234.tgz",
"integrity": "sha512-WwUTgoCxvyEP3/aDegX5dp2fJsmalUl0sbBYOAJ+w28ybrVXLtkFjlAmZY54vfNpM2SE0F+RD4D+yxQ4ccucvQ==",
"version": "0.24.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.24.0.tgz",
"integrity": "sha512-AoBFDkdps+kjYeTSQMqv4uIiHE93YXdCfKfUclyc12RKtjtzwok5LanBBoh+tjAsg2BD79l9mGa2hmbcIWTWPw==",
"requires": {
"@emotion/hash": "^0.8.0",
"@rocket.chat/memo": "^0.6.3-dev.234+255284a8",
"@rocket.chat/memo": "^0.24.0",
"stylis": "^4.0.6"
},
"dependencies": {
@ -6302,9 +6302,9 @@
}
},
"@rocket.chat/emitter": {
"version": "0.6.3-dev.234",
"resolved": "https://registry.npmjs.org/@rocket.chat/emitter/-/emitter-0.6.3-dev.234.tgz",
"integrity": "sha512-/Wjt2RGwcHab3Y28FAIC0n4hJStJjwypVofEviukclcYKLWHsXDNZzc4bIX3v6WbLyePAnfzDDTwbPfaKW78QQ=="
"version": "0.24.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/emitter/-/emitter-0.24.0.tgz",
"integrity": "sha512-SzRmDsfnQfriEhZAI3eXg7GtSOo86yH5mV+KhRyq2gvN81WeDsER8SWnGAAG27ykC794h6pn6zPDE2OXHQ/tYw=="
},
"@rocket.chat/eslint-config": {
"version": "0.3.0",
@ -6316,53 +6316,26 @@
}
},
"@rocket.chat/fuselage": {
"version": "0.6.3-dev.236",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.6.3-dev.236.tgz",
"integrity": "sha512-2lewPIuEFaJQFAWoUMtG3FlLh7jVM3BVtsY1/HHMjlCbu/1UtDhBwDX8oQ5zWOrZ8Ne3aVEMCl9dn4js5VzYgA==",
"version": "0.24.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.24.0.tgz",
"integrity": "sha512-VcAJGVyhKicq/N62e3m/MnoMIdlwRaAJDPDsQhRzCLZNYCYz0RCobTdQ7AHLBFkJh3UTizXVGYAYGP2IVJaA+g==",
"requires": {
"@rocket.chat/css-in-js": "^0.6.3-dev.236+bf0c0ee9",
"@rocket.chat/fuselage-tokens": "^0.6.3-dev.236+bf0c0ee9",
"@rocket.chat/memo": "^0.6.3-dev.236+bf0c0ee9",
"@rocket.chat/css-in-js": "^0.24.0",
"@rocket.chat/fuselage-tokens": "^0.24.0",
"@rocket.chat/memo": "^0.24.0",
"invariant": "^2.2.4",
"react-keyed-flatten-children": "^1.3.0"
},
"dependencies": {
"@rocket.chat/css-in-js": {
"version": "0.6.3-dev.236",
"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.6.3-dev.236.tgz",
"integrity": "sha512-JT2DBSbeIUD8QJGkHMesWJwYlq+aGXIisswsgFKE6fAGGhjqsrC3VlRXOkC6xyjQAwvaZJo67L4tN7FYQIHCkA==",
"requires": {
"@emotion/hash": "^0.8.0",
"@rocket.chat/memo": "^0.6.3-dev.236+bf0c0ee9",
"stylis": "^4.0.6"
}
},
"@rocket.chat/fuselage-tokens": {
"version": "0.6.3-dev.236",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.6.3-dev.236.tgz",
"integrity": "sha512-byUmYQ9yuG9iMSwwnvMdfmPGzHQtfht5N+CJtA7/pfD8olqaQ+78Mv45TAIAC9b19QY3Z2GzQj5ZDcMDpeblig=="
},
"@rocket.chat/memo": {
"version": "0.6.3-dev.236",
"resolved": "https://registry.npmjs.org/@rocket.chat/memo/-/memo-0.6.3-dev.236.tgz",
"integrity": "sha512-daOarDMIF+VqiLRlcjLI7L+dywVc1FQtaVaVj11I/Yxht7cP54PsnAnRAyTWWEt1sI5UW/FEyiAmOjDQQxBcVg=="
},
"stylis": {
"version": "4.0.10",
"resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.10.tgz",
"integrity": "sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg=="
}
}
},
"@rocket.chat/fuselage-hooks": {
"version": "0.6.3-dev.234",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.6.3-dev.234.tgz",
"integrity": "sha512-luWVbNbkLz6VTlwCftfJGddIDlT18gIzTiO5V9oxnJeRS/2mLAmOezSlZncpx2wvlCSk9FGuVvGT6XPGU0h8nw=="
"version": "0.24.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.24.0.tgz",
"integrity": "sha512-+G7uY+pIxSfCq3q5hlUNYyow4maa7yrUivoLqpTgQ4tOe0LeHutKBxTrZUpiq5CcbUoNYERKynelf6RuSPkL8g=="
},
"@rocket.chat/fuselage-polyfills": {
"version": "0.6.3-dev.234",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-polyfills/-/fuselage-polyfills-0.6.3-dev.234.tgz",
"integrity": "sha512-wZItuUfhGgn76S/jF7cuiRpJxd0N2GpZl8BwvJ/uViC355q4W4h7CBHLet0V4Qn1zQxdGybHhcrEwGh/m9sJ1g==",
"version": "0.24.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-polyfills/-/fuselage-polyfills-0.24.0.tgz",
"integrity": "sha512-hYN8A9L/BB6oNGUqcoHYq6VSGprCkanOXC6vvp1buK8RB2RTOzzMMh+M94KUA8eC//c6Z8jpeSLpiuCfSFu4fw==",
"requires": {
"@juggle/resize-observer": "^3.2.0",
"clipboard-polyfill": "^3.0.1",
@ -6373,19 +6346,19 @@
}
},
"@rocket.chat/fuselage-tokens": {
"version": "0.6.3-dev.234",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.6.3-dev.234.tgz",
"integrity": "sha512-/7y8VwUUrj7gK72l9pRHrfLN6EoNPYE+iYmSJaH3oP1WSsIWXaBzwZfPE84Lu0ce23mFTFwWlsB9sTkSrzywQw=="
"version": "0.24.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.24.0.tgz",
"integrity": "sha512-bpMqlI+9tVZaySejGKV/LkvSVU3zurkDwkk45tIEoK2UymkKVZAxzg+tccIpk221D1dpru+6W3TFy12VxyX79w=="
},
"@rocket.chat/fuselage-ui-kit": {
"version": "0.6.3-dev.234",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.6.3-dev.234.tgz",
"integrity": "sha512-f07H8Xz4eljzbOqZiiDiU/2GK9CJ3RmnCd6kyxaxqTO/UzB2PzdSiehzXeBLLgBye/0wkSogkREXk0Tz99NT7w=="
"version": "0.24.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.24.0.tgz",
"integrity": "sha512-fDoeVjVmsPS078yLLBj9ivBoUS/lEOSSsW6Vd15Z+jN75xvdgliViZ0Seia58vU6SglY0me2hd350WFzmmX2wg=="
},
"@rocket.chat/icons": {
"version": "0.23.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.23.0.tgz",
"integrity": "sha512-kX4t8C2LtfxY7KxFqt9Yb+jQHcBGJ/9VLWVhxvVLGv6P3DpCUBdsqeRNi8q9xq0pegYTgwSX7XhVh+NFKCVEcw==",
"version": "0.24.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.24.0.tgz",
"integrity": "sha512-WnQDSVn4eqVsF8KAmW5mVMrag9r/BGTxvyoeq1+Dv8kbtyqKZU/kmSSELct7J12Rk+aDGHZ+jViTMPBql3Y1bQ==",
"dev": true
},
"@rocket.chat/livechat": {
@ -6441,14 +6414,14 @@
}
},
"@rocket.chat/memo": {
"version": "0.6.3-dev.234",
"resolved": "https://registry.npmjs.org/@rocket.chat/memo/-/memo-0.6.3-dev.234.tgz",
"integrity": "sha512-QuG+8qv0DMsVA2VM3GSDUTUOyRZCMSQzGQaqNd5wHyXJEuLDrJzRJMQZbfvfYpYCPc8MAcrcH6sijr2zxH+jvg=="
"version": "0.24.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/memo/-/memo-0.24.0.tgz",
"integrity": "sha512-6K+XrEaW/SJNq1wb6wygonuJl0VGrZSa6CJa0vlA+xGOmkEcL6Z2KTCsTNEinh8SRlQ692meWmovWnnSKMjszw=="
},
"@rocket.chat/mp3-encoder": {
"version": "0.6.3-dev.234",
"resolved": "https://registry.npmjs.org/@rocket.chat/mp3-encoder/-/mp3-encoder-0.6.3-dev.234.tgz",
"integrity": "sha512-pZitgonwqy9bM8smmF72q7bZo5v4uPuAPlVNZVsVYyS7ydOsjKFGbzWXVR6MbnnoWxVB0gKnTQeIEulhh242UQ==",
"version": "0.24.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/mp3-encoder/-/mp3-encoder-0.24.0.tgz",
"integrity": "sha512-evrPEZP2FgZxQoHbIZrmOZtlvJ0JAjDnFKGaQBEpt49KJA82+qHOpyfALtWsvROyYUvo/xaia7XB4aXfLc+gxw==",
"requires": {
"lamejs": "git+https://github.com/zhuker/lamejs.git"
}
@ -6496,9 +6469,9 @@
}
},
"@rocket.chat/ui-kit": {
"version": "0.6.3-dev.234",
"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.6.3-dev.234.tgz",
"integrity": "sha512-ZoT80q94oqAeyjLhIfEbVhFZEPVWbfV4lcD/Igyk02bfMCKXEFFcMo/dcLPgc2Dq5sMWXQp5q5oxg+1N9+69+g=="
"version": "0.24.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.24.0.tgz",
"integrity": "sha512-xiQykskI4Gge3kSTaqUB79BjtUGR39H5/mLwRyl9S41yGWAth7iV2mCzPoaimf6SKo8FxZDp1y7Sw9QnsTJsvQ=="
},
"@samverschueren/stream-to-observable": {
"version": "0.3.1",
@ -22943,7 +22916,7 @@
},
"chownr": {
"version": "1.1.1",
"resolved": "",
"resolved": false,
"integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
"dev": true,
"optional": true
@ -22978,7 +22951,7 @@
},
"debug": {
"version": "4.1.1",
"resolved": "",
"resolved": false,
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"dev": true,
"optional": true,
@ -23009,7 +22982,7 @@
},
"fs-minipass": {
"version": "1.2.5",
"resolved": "",
"resolved": false,
"integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
"dev": true,
"optional": true,
@ -23043,7 +23016,7 @@
},
"glob": {
"version": "7.1.3",
"resolved": "",
"resolved": false,
"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
"dev": true,
"optional": true,
@ -23075,7 +23048,7 @@
},
"ignore-walk": {
"version": "3.0.1",
"resolved": "",
"resolved": false,
"integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
"dev": true,
"optional": true,
@ -23096,7 +23069,7 @@
},
"inherits": {
"version": "2.0.3",
"resolved": "",
"resolved": false,
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
"dev": true,
"optional": true
@ -23144,7 +23117,7 @@
},
"minipass": {
"version": "2.3.5",
"resolved": "",
"resolved": false,
"integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
"dev": true,
"optional": true,
@ -23155,7 +23128,7 @@
},
"minizlib": {
"version": "1.2.1",
"resolved": "",
"resolved": false,
"integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
"dev": true,
"optional": true,
@ -23175,7 +23148,7 @@
},
"ms": {
"version": "2.1.1",
"resolved": "",
"resolved": false,
"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
"dev": true,
"optional": true
@ -23189,7 +23162,7 @@
},
"needle": {
"version": "2.3.0",
"resolved": "",
"resolved": false,
"integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
"dev": true,
"optional": true,
@ -23201,7 +23174,7 @@
},
"node-pre-gyp": {
"version": "0.12.0",
"resolved": "",
"resolved": false,
"integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
"dev": true,
"optional": true,
@ -23231,14 +23204,14 @@
},
"npm-bundled": {
"version": "1.0.6",
"resolved": "",
"resolved": false,
"integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
"dev": true,
"optional": true
},
"npm-packlist": {
"version": "1.4.1",
"resolved": "",
"resolved": false,
"integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
"dev": true,
"optional": true,
@ -23318,7 +23291,7 @@
},
"process-nextick-args": {
"version": "2.0.0",
"resolved": "",
"resolved": false,
"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
"dev": true,
"optional": true
@ -23363,7 +23336,7 @@
},
"rimraf": {
"version": "2.6.3",
"resolved": "",
"resolved": false,
"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
"dev": true,
"optional": true,
@ -23394,7 +23367,7 @@
},
"semver": {
"version": "5.7.0",
"resolved": "",
"resolved": false,
"integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
"dev": true,
"optional": true
@ -23454,7 +23427,7 @@
},
"tar": {
"version": "4.4.8",
"resolved": "",
"resolved": false,
"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
"dev": true,
"optional": true,
@ -23494,7 +23467,7 @@
},
"yallist": {
"version": "3.0.3",
"resolved": "",
"resolved": false,
"integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
"dev": true,
"optional": true

22
package.json
Unescape View File

@ -54,7 +54,7 @@
"@babel/register": "^7.12.1",
"@octokit/rest": "^16.43.2",
"@rocket.chat/eslint-config": "^0.3.0",
"@rocket.chat/icons": "^0.23.0",
"@rocket.chat/icons": "^0.24.0",
"@rocket.chat/livechat": "^1.9.3",
"@settlin/spacebars-loader": "^1.0.8",
"@storybook/addon-essentials": "^6.2.2",
@ -141,16 +141,16 @@
"@nivo/line": "^0.61.1",
"@nivo/pie": "^0.61.1",
"@rocket.chat/apps-engine": "1.25.0",
"@rocket.chat/css-in-js": "^0.6.3-dev.234",
"@rocket.chat/emitter": "^0.6.3-dev.234",
"@rocket.chat/fuselage": "^0.6.3-dev.236",
"@rocket.chat/fuselage-hooks": "^0.6.3-dev.234",
"@rocket.chat/fuselage-polyfills": "^0.6.3-dev.234",
"@rocket.chat/fuselage-tokens": "^0.6.3-dev.234",
"@rocket.chat/fuselage-ui-kit": "^0.6.3-dev.234",
"@rocket.chat/memo": "^0.6.3-dev.234",
"@rocket.chat/mp3-encoder": "^0.6.3-dev.234",
"@rocket.chat/ui-kit": "^0.6.3-dev.234",
"@rocket.chat/css-in-js": "^0.24.0",
"@rocket.chat/emitter": "^0.24.0",
"@rocket.chat/fuselage": "^0.24.0",
"@rocket.chat/fuselage-hooks": "^0.24.0",
"@rocket.chat/fuselage-polyfills": "^0.24.0",
"@rocket.chat/fuselage-tokens": "^0.24.0",
"@rocket.chat/fuselage-ui-kit": "^0.24.0",
"@rocket.chat/memo": "^0.24.0",
"@rocket.chat/mp3-encoder": "^0.24.0",
"@rocket.chat/ui-kit": "^0.24.0",
"@slack/client": "^4.12.0",
"@types/dompurify": "^2.2.1",
"@types/fibers": "^3.1.0",

Write Preview
Loading…
Cancel
Save