Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jitsi/jitsi-meet-electron
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2023.2.0
Choose a base ref
...
head repository: jitsi/jitsi-meet-electron
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2023.5.0
Choose a head ref
  • 11 commits
  • 8 files changed
  • 4 contributors

Commits on Mar 7, 2023

  1. feat(reload) refactor opening external links

    Use IPC to send a message to the main process instead of opening them
    from the renderer process.
    saghul committed Mar 7, 2023
    Copy the full SHA
    a261fd4 View commit details
  2. Copy the full SHA
    07df8d1 View commit details

Commits on Apr 17, 2023

  1. chore(deps-dev): bump webpack from 5.70.0 to 5.76.0

    Bumps [webpack](https://github.com/webpack/webpack) from 5.70.0 to 5.76.0.
    - [Release notes](https://github.com/webpack/webpack/releases)
    - [Commits](webpack/webpack@v5.70.0...v5.76.0)
    
    ---
    updated-dependencies:
    - dependency-name: webpack
      dependency-type: direct:development
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    dependabot[bot] authored and saghul committed Apr 17, 2023
    Copy the full SHA
    9ab7e91 View commit details

Commits on Apr 18, 2023

  1. Copy the full SHA
    9fe1461 View commit details

Commits on Apr 22, 2023

  1. Copy the full SHA
    9a73c1e View commit details

Commits on May 9, 2023

  1. Copy the full SHA
    df4bd25 View commit details
  2. Copy the full SHA
    2202530 View commit details
  3. Copy the full SHA
    d98082d View commit details
  4. fix(external-api) enable iframe sandbox after update

    The sandbox can now be manually enabled, so let's do that.
    saghul committed May 9, 2023
    Copy the full SHA
    c6ffffa View commit details

Commits on May 10, 2023

  1. chore(deps) update Electron to 24 (#862)

    * chore(deps) update Electron to 24
    * docs: document broken screensharing on wayland
    
    See #829
    
    ---------
    
    Co-authored-by: Christoph Settgast <[email protected]>
    saghul and csett86 authored May 10, 2023
    Copy the full SHA
    8f34cca View commit details
  2. 2023.5.0

    csett86 authored May 10, 2023
    Copy the full SHA
    f98fc10 View commit details
Showing with 600 additions and 236 deletions.
  1. +4 −10 README.md
  2. +2 −1 app/features/conference/components/Conference.js
  3. +1 −1 app/features/conference/external_api.js
  4. +9 −9 app/i18n/lang/zh-TW.json
  5. +10 −1 app/preload/preload.js
  6. +48 −0 main.js
  7. +521 −209 package-lock.json
  8. +5 −5 package.json
14 changes: 4 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ Desktop application for [Jitsi Meet] built with [Electron].
- [End-to-End Encryption](https://jitsi.org/blog/e2ee/) support (BETA)
- Works with any Jitsi Meet deployment
- Builtin auto-updates
- Screensharing (Windows, Mac, X11 only. Not supported under Wayland, see known issues below)
- ~Remote control~ (currently [disabled](https://github.com/jitsi/jitsi-meet-electron/issues/483) due to [security issues](https://github.com/jitsi/security-advisories/blob/master/advisories/JSA-2020-0001.md))
- Always-On-Top window
- Support for deeplinks such as `jitsi-meet://myroom` (will open `myroom` on the configured Jitsi instance) or `jitsi-meet://jitsi.mycompany.com/myroom` (will open `myroom` on the Jitsi instance running on `jitsi.mycompany.com`)
@@ -25,7 +26,7 @@ NOTE: The GNU/Linux builds are 64-bit only.

### Third-Party builds

[<img src="https://flathub.org/assets/badges/flathub-badge-en.svg"
[<img src="https://dl.flathub.org/assets/badges/flathub-badge-en.svg"
alt="Download On Flathub"
height="60">](https://flathub.org/apps/details/org.jitsi.jitsi-meet)

@@ -145,6 +146,8 @@ On macOS Catalina, a warning will be displayed on first install. The app won't o

* If you can't execute the file directly after downloading it, try running `chmod u+x ./jitsi-meet-x86_64.AppImage`

* Under wayland, screensharing is not currently supported (due to https://github.com/electron/electron/issues/37463), and the app will crash with a segfault!

* On Ubuntu 22.04, the AppImage will fail with a fuse error (as the AppImage uses `libfuse2`, while 22.04 comes with `libfuse3` by default):

```
@@ -157,15 +160,6 @@ On macOS Catalina, a warning will be displayed on first install. The app won't o
sudo apt install libfuse2
```


* Under wayland, experimental native wayland support can be enabled with the command-line switch `--ozone-platform-hint` set to `auto`:

```
./jitsi-meet-x86_64.AppImage --ozone-platform-hint=auto
```

Note that screen-sharing is not currently supported under wayland, and the permissions prompt may loop endlessly.

* If you experience a blank page after jitsi server upgrades, try removing the local cache files:

```
3 changes: 2 additions & 1 deletion app/features/conference/components/Conference.js
Original file line number Diff line number Diff line change
@@ -211,7 +211,8 @@ class Conference extends Component<Props, State> {
configOverwrite,
onload: this._onIframeLoad,
parentNode: this._ref.current,
roomName
roomName,
sandbox: 'allow-scripts allow-same-origin allow-popups allow-forms'
};

this._api = new JitsiMeetExternalAPI(host, {
Loading