Skip to content

Commit

Permalink
Merge pull request #65 from csett86/ffmuc-release-2023-1-0
Browse files Browse the repository at this point in the history
Merge upstream release v2023.1.0
  • Loading branch information
GoliathLabs authored Jan 18, 2023
2 parents ea9ab9d + a43d443 commit 4732720
Show file tree
Hide file tree
Showing 5 changed files with 511 additions and 191 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run: |
npm ci
npm run dist
- uses: actions/upload-artifact@v3.1.0
- uses: actions/upload-artifact@v3
with:
name: linux-binaries
path: |
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
npm ci
npm run lint
npm run dist
- uses: actions/upload-artifact@v3.1.0
- uses: actions/upload-artifact@v3
with:
name: mac-binaries
path: |
Expand All @@ -80,7 +80,7 @@ jobs:
run: |
npm ci
npm run dist
- uses: actions/upload-artifact@v3.1.0
- uses: actions/upload-artifact@v3
with:
name: windows-binaries
path: |
Expand Down
10 changes: 6 additions & 4 deletions app/i18n/lang/sq.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
{
"enterConferenceNameOrUrl": "Jepni një emër për konferencën tuaj ose një URL Jitsi",
"enterConferenceNameOrUrl": "Jepni një emër për konferencën tuaj, ose një URL Jitsi",
"go": "SHKO",
"help": "Ndihmë",
"termsLink": "Kushte",
"privacyLink": "Privatësi",
"sendFeedbackLink": "Dërgo Përshtypje",
"recentListLabel": "ose rihyni në një nga dhomat tuaja përdorur së fundi",
"sendFeedbackLink": "Dërgoni Përshtypje",
"aboutLink": "Mbi",
"sourceLink": "Kod Burim",
"versionLabel": "Version: {{version}}",
"onboarding": {
"startTour": "Nisni Turin",
"skip": "Anashkaloje",
"welcome": "Mirë se vini te {{appName}}",
"welcome": "Mirë se vini {{appName}}",
"letUsShowYouAround": "Le t’ju tregojmë gjërat!",
"next": "Pasuesi",
"conferenceUrl": "Jepni emrin (ose URL-në) e plotë të dhomës ku doni të hyni. Një emër mund ta sajoni, thjesht bëjuani të ditur të tjerëve, që të japin të njëjtin emër.",
Expand All @@ -26,6 +27,7 @@
"invalidServer": "URL e Pavlefshme Shërbyesi",
"invalidServerTimeout": "Vlerë e pavlefshme për Mbarim Kohe Shërbyesi",
"serverUrl": "URL Shërbyesi",
"serverTimeout": "Mbarim Kohe Shërbyesi (në sekonda)"
"serverTimeout": "Mbarim Kohe Shërbyesi (në sekonda)",
"disableAGC": "Çaktivizoni kontroll të automatizuar gain-i"
}
}
6 changes: 6 additions & 0 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,12 @@ function createJitsiMeetWindow() {

if (!target || target === 'browser') {
openExternalLink(url);

return { action: 'deny' };
}

if (target === 'electron') {
return { action: 'allow' };
}

return { action: 'deny' };
Expand Down
Loading

0 comments on commit 4732720

Please sign in to comment.