diff --git a/type/__jitsi_meet_domain/files/_update_jitsi_configurations.sh b/type/__jitsi_meet_domain/files/_update_jitsi_configurations.sh index 7fcc7cf..2f93b72 100755 --- a/type/__jitsi_meet_domain/files/_update_jitsi_configurations.sh +++ b/type/__jitsi_meet_domain/files/_update_jitsi_configurations.sh @@ -7,7 +7,7 @@ # We could automate this, but are using it as an indicator for the # latest branch with which we conciliated changes. -BRANCH="jitsi-meet_10184" +BRANCH="jitsi-meet_10314" REPO="https://github.com/jitsi/jitsi-meet" get_url() { diff --git a/type/__jitsi_meet_domain/files/config.js.sh b/type/__jitsi_meet_domain/files/config.js.sh index d703ddd..193bd8e 100644 --- a/type/__jitsi_meet_domain/files/config.js.sh +++ b/type/__jitsi_meet_domain/files/config.js.sh @@ -96,6 +96,9 @@ var config = { // Enables use of getDisplayMedia in electron // electronUseGetDisplayMedia: false, + // Enables AV1 codec for FF. Note: By default it is disabled. + // enableAV1ForFF: false, + // Enables the use of the codec selection API supported by the browsers . // enableCodecSelectionAPI: false, @@ -132,6 +135,9 @@ var config = { // Disables the reactions moderation feature. // disableReactionsModeration: false, + // Disables the reactions in chat feature. + disableReactionsInChat: true, // This has been annoying =D + // Disables polls feature. // disablePolls: false, @@ -406,6 +412,10 @@ $(if [ -n "${VIDEO_CONSTRAINTS}" ]; then echo "${VIDEO_CONSTRAINTS},"; fi) // // If true, mutes audio and video when a recording begins and displays a dialog // // explaining the effect of unmuting. // // requireConsent: true, + // // If true consent will be skipped for users who are already in the meeting. + // // skipConsentInMeeting: true, + // // Link for the recording consent dialog's "Learn more" link. + // // consentLearnMoreLink: 'https://jitsi.org/meet/consent', // }, // recordingService: { @@ -503,6 +513,14 @@ $(if [ -n "${VIDEO_CONSTRAINTS}" ]; then echo "${VIDEO_CONSTRAINTS},"; fi) // // Enables automatic request of subtitles when transcriber is present in the meeting, uses the default // // language that is set // autoCaptionOnTranscribe: false, + // + // // Disables everything related to closed captions - the tab in the chat area, the button in the menu, + // // subtitles on stage and the "Show subtitles on stage" checkbox in the settings. + // // Note: Starting transcriptions from the recording dialog will still work. + // disableClosedCaptions: false, + + // // Whether to invite jigasi when backend transcriptions are enabled. By default, we invite it. + // inviteJigasiOnBackendTranscribing: true, // }, // Misc @@ -614,6 +632,7 @@ $(if [ -n "${VIDEO_CONSTRAINTS}" ]; then echo "${VIDEO_CONSTRAINTS},"; fi) // medium: 5000, // long: 10000, // extraLong: 60000, + // sticky: 0, // }, // // Options for the recording limit notification. @@ -831,8 +850,7 @@ $(if [ -n "${VIDEO_CONSTRAINTS}" ]; then echo "${VIDEO_CONSTRAINTS},"; fi) // some other values in config.js to be enabled. Also, the "profile" button will // not display for users with a JWT. // Notes: - // - it's impossible to choose which buttons go in the "More actions" menu - // - it's impossible to control the placement of buttons + // - it's possible to reorder the buttons in the maintoolbar by changing the order of the mainToolbarButtons // - 'desktop' controls the "Share your screen" button // - if \`toolbarButtons\` is undefined, we fallback to enabling all buttons on the UI // toolbarButtons: [ @@ -1263,9 +1281,6 @@ ${ANALYTICS_SETTINGS} // disableDeepLinking: false, // The deeplinking config. - // For information about the properties of - // deeplinking.[ios/android].dynamicLink check: - // https://firebase.google.com/docs/dynamic-links/create-manually // deeplinking: { // // // The desktop deeplinking config, disabled by default. @@ -1294,13 +1309,6 @@ ${ANALYTICS_SETTINGS} // appScheme: 'org.jitsi.meet', // // Custom URL for downloading ios mobile app. // downloadLink: 'https://itunes.apple.com/us/app/jitsi-meet/id1165103905', - // dynamicLink: { - // apn: 'org.jitsi.meet', - // appCode: 'w2atb', - // customDomain: undefined, - // ibi: 'com.atlassian.JitsiMeet.ios', - // isi: '1165103905' - // } // }, // // The android deeplinking config. @@ -1313,13 +1321,6 @@ ${ANALYTICS_SETTINGS} // // Android app package name. // appPackage: 'org.jitsi.meet', // fDroidUrl: 'https://f-droid.org/en/packages/org.jitsi.meet/', - // dynamicLink: { - // apn: 'org.jitsi.meet', - // appCode: 'w2atb', - // customDomain: undefined, - // ibi: 'com.atlassian.JitsiMeet.ios', - // isi: '1165103905' - // } // } // }, @@ -1393,9 +1394,9 @@ ${ANALYTICS_SETTINGS} The config file should be in JSON. None of the fields are mandatory and the response must have the shape: { - // Whether participant can only send group chat message if `send-groupchat` feature is enabled in jwt. + // Whether participant can only send group chat message if \`send-groupchat\` feature is enabled in jwt. groupChatRequiresPermission: false, - // Whether participant can only create polls if `create-polls` feature is enabled in jwt. + // Whether participant can only create polls if \`create-polls\` feature is enabled in jwt. pollCreationRequiresPermission: false, // The domain url to apply (will replace the domain in the sharing conference link/embed section) inviteDomain: 'example-company.org', @@ -1588,6 +1589,9 @@ ${ANALYTICS_SETTINGS} // tokenAuthUrlAutoRedirect: false // An option to respect the context.tenant jwt field compared to the current tenant from the url // tokenRespectTenant: false, + // An option to get for user info (name, picture, email) in the token outside the user context. + // Can be used with Firebase tokens. + // tokenGetUserInfoOutOfContext: false, // You can put an array of values to target different entity types in the invite dialog. // Valid values are "phone", "room", "sip", "user", "videosipgw" and "email" @@ -1888,7 +1892,16 @@ ${ANALYTICS_SETTINGS} // If true remove the tint foreground on focused user camera in filmstrip // disableCameraTintForeground: false, -}; + + // File sharign service. + // fileSharing: { + // // The URL of the file sharing service API. See resources/file-sharing.yaml for more details. + // apiUrl: 'https://example.com', + // // Whether the file sharing service is enabled or not. + // enabled: true, + // // Maximum file size limit (-1 value disables any file size limit check) + // maxFileSize: 50, + // },}; // Set the default values for JaaS customers if (enableJaaS) { diff --git a/type/__jitsi_meet_domain/files/config.js.sh.orig b/type/__jitsi_meet_domain/files/config.js.sh.orig index 5b62ced..21de0c5 100644 --- a/type/__jitsi_meet_domain/files/config.js.sh.orig +++ b/type/__jitsi_meet_domain/files/config.js.sh.orig @@ -89,6 +89,9 @@ var config = { // Enables use of getDisplayMedia in electron // electronUseGetDisplayMedia: false, + // Enables AV1 codec for FF. Note: By default it is disabled. + // enableAV1ForFF: false, + // Enables the use of the codec selection API supported by the browsers . // enableCodecSelectionAPI: false, @@ -125,6 +128,9 @@ var config = { // Disables the reactions moderation feature. // disableReactionsModeration: false, + // Disables the reactions in chat feature. + // disableReactionsInChat: false, + // Disables polls feature. // disablePolls: false, @@ -398,6 +404,10 @@ var config = { // // If true, mutes audio and video when a recording begins and displays a dialog // // explaining the effect of unmuting. // // requireConsent: true, + // // If true consent will be skipped for users who are already in the meeting. + // // skipConsentInMeeting: true, + // // Link for the recording consent dialog's "Learn more" link. + // // consentLearnMoreLink: 'https://jitsi.org/meet/consent', // }, // recordingService: { @@ -495,6 +505,14 @@ var config = { // // Enables automatic request of subtitles when transcriber is present in the meeting, uses the default // // language that is set // autoCaptionOnTranscribe: false, + // + // // Disables everything related to closed captions - the tab in the chat area, the button in the menu, + // // subtitles on stage and the "Show subtitles on stage" checkbox in the settings. + // // Note: Starting transcriptions from the recording dialog will still work. + // disableClosedCaptions: false, + + // // Whether to invite jigasi when backend transcriptions are enabled. By default, we invite it. + // inviteJigasiOnBackendTranscribing: true, // }, // Misc @@ -606,6 +624,7 @@ var config = { // medium: 5000, // long: 10000, // extraLong: 60000, + // sticky: 0, // }, // // Options for the recording limit notification. @@ -823,8 +842,7 @@ var config = { // some other values in config.js to be enabled. Also, the "profile" button will // not display for users with a JWT. // Notes: - // - it's impossible to choose which buttons go in the "More actions" menu - // - it's impossible to control the placement of buttons + // - it's possible to reorder the buttons in the maintoolbar by changing the order of the mainToolbarButtons // - 'desktop' controls the "Share your screen" button // - if `toolbarButtons` is undefined, we fallback to enabling all buttons on the UI // toolbarButtons: [ @@ -1254,9 +1272,6 @@ var config = { // disableDeepLinking: false, // The deeplinking config. - // For information about the properties of - // deeplinking.[ios/android].dynamicLink check: - // https://firebase.google.com/docs/dynamic-links/create-manually // deeplinking: { // // // The desktop deeplinking config, disabled by default. @@ -1285,13 +1300,6 @@ var config = { // appScheme: 'org.jitsi.meet', // // Custom URL for downloading ios mobile app. // downloadLink: 'https://itunes.apple.com/us/app/jitsi-meet/id1165103905', - // dynamicLink: { - // apn: 'org.jitsi.meet', - // appCode: 'w2atb', - // customDomain: undefined, - // ibi: 'com.atlassian.JitsiMeet.ios', - // isi: '1165103905' - // } // }, // // The android deeplinking config. @@ -1304,13 +1312,6 @@ var config = { // // Android app package name. // appPackage: 'org.jitsi.meet', // fDroidUrl: 'https://f-droid.org/en/packages/org.jitsi.meet/', - // dynamicLink: { - // apn: 'org.jitsi.meet', - // appCode: 'w2atb', - // customDomain: undefined, - // ibi: 'com.atlassian.JitsiMeet.ios', - // isi: '1165103905' - // } // } // }, @@ -1575,6 +1576,9 @@ var config = { // tokenAuthUrlAutoRedirect: false // An option to respect the context.tenant jwt field compared to the current tenant from the url // tokenRespectTenant: false, + // An option to get for user info (name, picture, email) in the token outside the user context. + // Can be used with Firebase tokens. + // tokenGetUserInfoOutOfContext: false, // You can put an array of values to target different entity types in the invite dialog. // Valid values are "phone", "room", "sip", "user", "videosipgw" and "email" @@ -1875,6 +1879,16 @@ var config = { // If true remove the tint foreground on focused user camera in filmstrip // disableCameraTintForeground: false, + + // File sharign service. + // fileSharing: { + // // The URL of the file sharing service API. See resources/file-sharing.yaml for more details. + // apiUrl: 'https://example.com', + // // Whether the file sharing service is enabled or not. + // enabled: true, + // // Maximum file size limit (-1 value disables any file size limit check) + // maxFileSize: 50, + // }, }; // Set the default values for JaaS customers diff --git a/type/__jitsi_meet_domain/files/interface_config.js.sh b/type/__jitsi_meet_domain/files/interface_config.js.sh index 6142281..d2ebaa3 100644 --- a/type/__jitsi_meet_domain/files/interface_config.js.sh +++ b/type/__jitsi_meet_domain/files/interface_config.js.sh @@ -203,17 +203,6 @@ var interfaceConfig = { // NATIVE_APP_NAME: 'Jitsi Meet', - /** - * Specify Firebase dynamic link properties for the mobile apps. - */ - // MOBILE_DYNAMIC_LINK: { - // APN: 'org.jitsi.meet', - // APP_CODE: 'w2atb', - // CUSTOM_DOMAIN: undefined, - // IBI: 'com.atlassian.JitsiMeet.ios', - // ISI: '1165103905' - // }, - /** * Hide the logo on the deep linking pages. */ diff --git a/type/__jitsi_meet_domain/files/interface_config.js.sh.orig b/type/__jitsi_meet_domain/files/interface_config.js.sh.orig index 07fa56d..1e774b3 100644 --- a/type/__jitsi_meet_domain/files/interface_config.js.sh.orig +++ b/type/__jitsi_meet_domain/files/interface_config.js.sh.orig @@ -192,17 +192,6 @@ var interfaceConfig = { // NATIVE_APP_NAME: 'Jitsi Meet', - /** - * Specify Firebase dynamic link properties for the mobile apps. - */ - // MOBILE_DYNAMIC_LINK: { - // APN: 'org.jitsi.meet', - // APP_CODE: 'w2atb', - // CUSTOM_DOMAIN: undefined, - // IBI: 'com.atlassian.JitsiMeet.ios', - // ISI: '1165103905' - // }, - /** * Hide the logo on the deep linking pages. */ diff --git a/type/__jitsi_meet_domain/files/jitsi-version b/type/__jitsi_meet_domain/files/jitsi-version index ce2e564..0983883 100644 --- a/type/__jitsi_meet_domain/files/jitsi-version +++ b/type/__jitsi_meet_domain/files/jitsi-version @@ -1 +1 @@ -2.0.10184-1 \ No newline at end of file +2.0.10314-1 \ No newline at end of file diff --git a/type/__jitsi_meet_domain/files/prosody.cfg.lua.sh.orig b/type/__jitsi_meet_domain/files/prosody.cfg.lua.sh.orig index eb421f9..d794391 100644 --- a/type/__jitsi_meet_domain/files/prosody.cfg.lua.sh.orig +++ b/type/__jitsi_meet_domain/files/prosody.cfg.lua.sh.orig @@ -15,6 +15,7 @@ external_services = { cross_domain_bosh = false; consider_bosh_secure = true; +consider_websocket_secure = true; -- https_ports = { }; -- Remove this line to prevent listening on port 5284 -- by default prosody 0.12 sends cors headers, if you want to disable it uncomment the following (the config is available on 0.12.1)