Bläddra i källkod

Merge pull request #7938 from jitsi/tavram/twa

Tavram/twa
master
Avram Tudor 5 år sedan
förälder
incheckning
8c67f1fdf3
Inget konto är kopplat till bidragsgivarens mejladress

+ 2
- 2
package-lock.json Visa fil

10824
       }
10824
       }
10825
     },
10825
     },
10826
     "lib-jitsi-meet": {
10826
     "lib-jitsi-meet": {
10827
-      "version": "github:jitsi/lib-jitsi-meet#4980889b24716c383311aadd760d958f6ff58277",
10828
-      "from": "github:jitsi/lib-jitsi-meet#4980889b24716c383311aadd760d958f6ff58277",
10827
+      "version": "github:jitsi/lib-jitsi-meet#de57cdfb6f2ac422901ade3cf0b4e130144c45ca",
10828
+      "from": "github:jitsi/lib-jitsi-meet#de57cdfb6f2ac422901ade3cf0b4e130144c45ca",
10829
       "requires": {
10829
       "requires": {
10830
         "@jitsi/js-utils": "1.0.2",
10830
         "@jitsi/js-utils": "1.0.2",
10831
         "@jitsi/sdp-interop": "1.0.3",
10831
         "@jitsi/sdp-interop": "1.0.3",

+ 1
- 1
package.json Visa fil

56
     "jquery-i18next": "1.2.1",
56
     "jquery-i18next": "1.2.1",
57
     "js-md5": "0.6.1",
57
     "js-md5": "0.6.1",
58
     "jwt-decode": "2.2.0",
58
     "jwt-decode": "2.2.0",
59
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#4980889b24716c383311aadd760d958f6ff58277",
59
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#de57cdfb6f2ac422901ade3cf0b4e130144c45ca",
60
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
60
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
61
     "lodash": "4.17.19",
61
     "lodash": "4.17.19",
62
     "moment": "2.19.4",
62
     "moment": "2.19.4",

+ 1
- 0
react/features/chrome-extension-banner/components/ChromeExtensionBanner.web.js Visa fil

152
     _isSupportedEnvironment() {
152
     _isSupportedEnvironment() {
153
         return interfaceConfig.SHOW_CHROME_EXTENSION_BANNER
153
         return interfaceConfig.SHOW_CHROME_EXTENSION_BANNER
154
             && browser.isChrome()
154
             && browser.isChrome()
155
+            && !browser.isTwa()
155
             && !isMobileBrowser()
156
             && !isMobileBrowser()
156
             && !this.props.isVpaas;
157
             && !this.props.isVpaas;
157
     }
158
     }

Laddar…
Avbryt
Spara