Skip to content

Commit

Permalink
Merge pull request #73 from freifunkMUC/ffmuc_v2024.1.0
Browse files Browse the repository at this point in the history
Update to v2024.1.0
  • Loading branch information
krombel authored Jan 13, 2024
2 parents 1c66c5e + c03d101 commit 3c7d8d8
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 13 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Download our latest release and you're off to the races!

| Windows | macOS | GNU/Linux (AppImage) | GNU/Linux (Deb) |
| -- | -- | -- | -- |
| [Download](https://github.com/freifunkMUC/jitsi-meet-electron/releases/latest/download/ffmuc-meet.exe) | [Download](https://github.com/freifunkMUC/jitsi-meet-electron/releases/latest/download/ffmuc-meet.dmg) | [x64_64](https://github.com/freifunkMUC/jitsi-meet-electron/releases/latest/download/ffmuc-meet-x86_64.AppImage) [arm64](https://github.com/freifunkMUC/jitsi-meet-electron/releases/latest/download/ffmuc-meet-arm64.AppImage) | [x86_64](https://github.com/jitsi/jitsi-meet-electron/releases/latest/download/ffmuc-meet-amd64.deb) [arm64](https://github.com/freifunkMUC/jitsi-meet-electron/releases/latest/download/ffmuc-meet-arm64.deb) |
| [Download](https://github.com/freifunkMUC/jitsi-meet-electron/releases/latest/download/ffmuc-meet.exe) | [Download](https://github.com/freifunkMUC/jitsi-meet-electron/releases/latest/download/ffmuc-meet.dmg) | [x64_64](https://github.com/freifunkMUC/jitsi-meet-electron/releases/latest/download/ffmuc-meet-x86_64.AppImage) [arm64](https://github.com/freifunkMUC/jitsi-meet-electron/releases/latest/download/ffmuc-meet-arm64.AppImage) | [x86_64](https://github.com/freifunkMUC/jitsi-meet-electron/releases/latest/download/ffmuc-meet-amd64.deb) [arm64](https://github.com/freifunkMUC/jitsi-meet-electron/releases/latest/download/ffmuc-meet-arm64.deb) |

NOTE: The GNU/Linux builds are 64-bit only.

Expand Down
2 changes: 1 addition & 1 deletion app/features/conference/components/Conference.js
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ class Conference extends Component<Props, State> {
configOverwrite,
parentNode: this._ref.current,
roomName,
sandbox: 'allow-scripts allow-same-origin allow-popups allow-forms'
sandbox: 'allow-scripts allow-same-origin allow-popups allow-forms allow-downloads'
};

this._api = new JitsiMeetExternalAPI(host, {
Expand Down
33 changes: 33 additions & 0 deletions app/i18n/lang/zh-TW.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"enterConferenceNameOrUrl": "輸入會議室名稱或 Jitsi 網址",
"go": "開始",
"help": "協助",
"termsLink": "條款",
"privacyLink": "隱私權",
"recentListLabel": "或重新加入最近參加過的會議",
"sendFeedbackLink": "傳送意見反應",
"aboutLink": "關於",
"sourceLink": "原始碼",
"versionLabel": "版本:{{version}}",
"onboarding": {
"startTour": "開始導覽",
"skip": "跳過",
"welcome": "歡迎使用 {{appName}}",
"letUsShowYouAround": "讓我們帶您四處逛逛!",
"next": "下一步",
"conferenceUrl": "請輸入您想加入的會議室名稱(或完整網址),您可以想一個名稱來建立會議室,只要其他人輸入相同的名稱就能加入會議室喔。",
"settingsDrawerButton": "按一下這裡開啟設定。",
"serverSetting": "這將是您開始會議的伺服器,您可以使用自己的伺服器,但這不是必需的!",
"serverTimeout": "加入會議的逾時設定,如果在逾時之前沒有加入會議,則會議將被取消。",
"alwaysOnTop": "您可以選擇是否啟用「保持在最上層」,該視窗將在主視窗失去焦點時顯示,這將適用於所有會議。"
},
"settings": {
"back": "返回",
"alwaysOnTopWindow": "保持在最上層",
"invalidServer": "伺服器網址無效",
"invalidServerTimeout": "伺服器逾時值無效",
"serverUrl": "伺服器網址",
"serverTimeout": "伺服器逾時(秒)",
"disableAGC": "停用自動增益控制"
}
}
9 changes: 9 additions & 0 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,15 @@ function createJitsiMeetWindow() {
details.responseHeaders['content-security-policy'] = [ cspFiltered ];
}

if (details.responseHeaders['Content-Security-Policy']) {
const cspFiltered = details.responseHeaders['Content-Security-Policy'][0]
.split(';')
.filter(x => x.indexOf('frame-ancestors') === -1)
.join(';');

details.responseHeaders['Content-Security-Policy'] = [ cspFiltered ];
}

callback({
responseHeaders: details.responseHeaders
});
Expand Down
18 changes: 9 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ffmuc-meet",
"version": "2023.11.3",
"version": "2024.1.0",
"description": "Electron application for Freifunk Meet",
"main": "./build/main.js",
"productName": "FreifunkMeet",
Expand Down Expand Up @@ -179,7 +179,7 @@
"babel-loader": "^8.2.3",
"concurrently": "5.1.0",
"css-loader": "^6.7.1",
"electron": "27.0.4",
"electron": "28.1.3",
"electron-builder": "24.4.0",
"electron-context-menu": "^2.5.0",
"electron-is-dev": "^1.2.0",
Expand Down

0 comments on commit 3c7d8d8

Please sign in to comment.