Commit Graph

428 Commits

Author SHA1 Message Date
Michael Telatynski 9820e59559 Merge hide-to-tray-icon with show-tray-icon 2019-10-30 14:32:28 +00:00
David Baker cc840df352 Fix bug preventing display from sleeping after a call
Calls often transition from connected to connected after transitioning
into the connected state (when the ICE layer connects) so we ended up
creating two wake locks and then only stopping one of them.

Don't make another wake lock if we already have one.

Hopefully fixes https://github.com/vector-im/riot-web/issues/6814
2019-10-30 10:58:34 +00:00
Michael Telatynski 4b0fa940bb revert icon path change 2019-10-29 12:00:40 +00:00
Michael Telatynski 1498872214 Add ability to hide tray icon on non-Mac (which has no tray icon) 2019-10-29 11:37:42 +00:00
RiotRobot 36c07a1c3a Merge branch 'master' into develop 2019-10-18 15:01:21 +01:00
RiotRobot 6d32d0b322 v1.5.0 2019-10-18 14:55:00 +01:00
J. Ryan Stinnett 77731b5674 Merge 'dbkr/windows_signing' into v1.5.0 2019-10-18 14:24:57 +01:00
David Baker 8e81685a9f
Merge pull request #11126 from vector-im/dbkr/windows_signing
Sign main Windows executable
2019-10-18 12:02:04 +01:00
David Baker 94e721acf2 Update cert name & do bash globbing correctly 2019-10-18 10:31:45 +01:00
David Baker d6884d5b0f Make window signing work
Almost certainly won't work for cert names with spaces in them
2019-10-11 16:08:04 +01:00
Damir Jelić 1dbdd0a366 ElectronPlatform: Add support for a event index using Seshat. 2019-10-11 16:05:14 +02:00
David Baker 5a7efcd738 Sign the main executable on windows
and automate the signing of the installers
2019-10-11 12:01:50 +01:00
Erik Johnston 82286d45ed
Update config.json 2019-10-10 15:50:19 +01:00
RiotRobot f89fd9c888 v1.5.0-rc.1 2019-10-09 17:35:48 +01:00
RiotRobot ef473f930a v1.4.2 2019-10-04 10:40:15 +01:00
RiotRobot caac5466ba v1.4.2-rc.1 2019-10-02 10:32:13 +01:00
RiotRobot 2bb24892df v1.4.1 2019-10-01 11:48:11 +01:00
RiotRobot f2648927f2 v1.4.0 2019-09-27 12:32:52 +01:00
RiotRobot 0a884ab20b v1.4.0-rc.2 2019-09-26 12:18:39 +01:00
RiotRobot 6afd7e3b72 v1.4.0-rc.1 2019-09-25 17:43:47 +01:00
RiotRobot 6bd089c350 Merge branch 'master' into develop 2019-09-19 17:54:39 +01:00
RiotRobot 5feb4f9c89 v1.3.6 2019-09-19 17:50:59 +01:00
David Baker 42b756952e
Typo
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-09-19 17:42:43 +01:00
David Baker 6464bfe850 Remove the other listener when one fires 2019-09-19 17:41:08 +01:00
David Baker 835d7bfb9d Fix origin migrator for SSO logins
For some reason this was trying to close the same window twice
when the app was reloaded after an SSO login. Possibly also a
problem on electron < 6 - presumably a race condition.
2019-09-19 17:20:54 +01:00
RiotRobot b0934c9121 Merge branch 'master' into develop 2019-09-16 17:59:09 +01:00
RiotRobot 2298a61d76 v1.3.5 2019-09-16 17:52:48 +01:00
RiotRobot ece11993d7 v1.3.5-rc.3 2019-09-13 16:24:13 +01:00
RiotRobot 8feb51ebce v1.3.5-rc.2 2019-09-13 14:50:00 +01:00
RiotRobot f07c0488fe v1.3.5-rc.1 2019-09-12 18:44:00 +01:00
RiotRobot eaf3bdbf34 Merge branch 'master' into develop 2019-09-12 13:26:17 +01:00
RiotRobot 6588d0e4bb v1.3.4 2019-09-12 13:17:55 +01:00
RiotRobot 75aa1e02e5 v1.3.4-rc.1 2019-09-11 18:56:33 +01:00
Jason Robinson 334001c829 Add and prioritize the new "_matrix/integrations/v1" widget urls
As per MSC1961, add to the whitelisted integrations_widget_urls
the new paths. This allows us to switch Scalar over to use the
new path as default.

Note, the legacy "scalar-staging.riot.im" is these days just a redirect
to scalar-staging.vector.im, so there is no addition for that. It still
needs Riot side whitelisting though for existing widgets.
2019-08-26 10:01:37 +03:00
RiotRobot c65ebd5e83 Merge branch 'master' into develop 2019-08-16 15:28:33 +01:00
RiotRobot 8a58ba2374 v1.3.3 2019-08-16 15:23:11 +01:00
J. Ryan Stinnett aa67a3ba2a Tweak comment about upstream 2019-08-16 15:21:59 +01:00
J. Ryan Stinnett 26d70b1bd4 Set SUID bit on chrome-sandbox for Debian
This tweaks Linux packages for Riot to SUID `chrome-sandbox` after install. This
is required as of Electron 5 for certain distros, such as Debian.

This change has also been provided to `electron-builder` upstream, so ideally
they'll include it in the future and this becomes redundant.

Fixes https://github.com/vector-im/riot-web/issues/10509
2019-08-16 15:21:59 +01:00
J. Ryan Stinnett 0617c1cd13 Tweak comment about upstream 2019-08-16 14:30:47 +01:00
J. Ryan Stinnett 56674ea708 Set SUID bit on chrome-sandbox for Debian
This tweaks Linux packages for Riot to SUID `chrome-sandbox` after install. This
is required as of Electron 5 for certain distros, such as Debian.

This change has also been provided to `electron-builder` upstream, so ideally
they'll include it in the future and this becomes redundant.

Fixes https://github.com/vector-im/riot-web/issues/10509
2019-08-16 13:34:12 +01:00
Michael Telatynski 906045b215
Merge pull request #10530 from vector-im/t3chguy/electron_help
Add --help to electron app
2019-08-09 17:02:51 +01:00
Michael Telatynski 12f087401b Add --help to electron app
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-09 12:08:56 +01:00
Michael Telatynski 76606256a2
Merge pull request #10503 from vector-im/t3chguy/electron_keep_alt_menu
Allow setting electron autoHideMenuBar and persist it
2019-08-06 18:20:24 +01:00
RiotRobot 634e556cfa v1.3.2 2019-08-05 14:45:02 +01:00
RiotRobot bf2a298da7 v1.3.1 2019-08-05 12:06:10 +01:00
Michael Telatynski 509839e79e Allow setting electron autoHideMenuBar and persist it
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-05 11:58:16 +01:00
RiotRobot 964c1922cd v1.3.1-rc.1 2019-07-31 16:54:03 +01:00
J. Ryan Stinnett 88e8fbb39a Upgrade to Electron 5
The APIs related to custom protocols went through some changes for Electron 5.x,
so adjusts Riot's usages to match.

I have scanned the Electron 5.x release notes, and I can't see anything else
that requires immediate changes. Things appear to be working well after the
upgrade.

Fixes https://github.com/vector-im/riot-web/issues/10296
Fixes https://github.com/vector-im/riot-web/issues/9562
2019-07-22 15:38:08 +01:00
RiotRobot e71fcc33f9 Merge branch 'master' into develop 2019-07-18 15:58:43 +01:00
RiotRobot 1bd846454c v1.3.0 2019-07-18 15:53:39 +01:00
J. Ryan Stinnett 06ce10b351 Remove reactions feature flag from docs and config
Part of https://github.com/vector-im/riot-web/issues/10282
2019-07-18 14:24:00 +01:00
J. Ryan Stinnett b403828791 Remove edits feature flag from docs and config
Part of https://github.com/vector-im/riot-web/issues/10282
2019-07-18 14:23:24 +01:00
J. Ryan Stinnett 8398ec5358 Remove reactions feature flag from docs and config
Part of https://github.com/vector-im/riot-web/issues/10282
2019-07-18 10:48:43 +01:00
J. Ryan Stinnett 7731f93676 Remove edits feature flag from docs and config
Part of https://github.com/vector-im/riot-web/issues/10282
2019-07-18 10:46:19 +01:00
RiotRobot f20d38f131 v1.3.0-rc.3 2019-07-15 17:32:06 +01:00
RiotRobot 88c8ea0d5a v1.3.0-rc.2 2019-07-12 17:38:06 +01:00
RiotRobot a23386bdb4 v1.3.0-rc.1 2019-07-12 11:39:59 +01:00
J. Ryan Stinnett f1a680322b Add riot.im configuration files 2019-07-12 10:48:34 +01:00
J. Ryan Stinnett d47d0e4097 Enable reactions and edits for desktop 2019-07-12 10:23:14 +01:00
RiotRobot e5ffb8de4c v1.2.4 2019-07-11 11:24:52 +01:00
RiotRobot a53d7edc7f v1.2.3 2019-07-08 11:10:31 +01:00
RiotRobot 1ce8f3844b v1.2.3-rc.1 2019-07-03 17:47:41 +01:00
J. Ryan Stinnett c9bd1b8510 Change update URL to match new host 2019-07-03 15:47:52 +01:00
Michael Telatynski 320f3198ea Fix Electron vector: links
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-27 20:33:15 +01:00
Michael Telatynski 974797648f Move config-getting to VectorBasePlatform
in Electron get config via IPC from main process
which has access to the "local" config.json override file
and can make people happy :D

Remove bunch of duplicated code,
and move comments around to put them in the right place

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-26 21:08:04 +01:00
RiotRobot 6f1ce750bf Merge branch 'master' into develop 2019-06-19 16:03:22 +01:00
RiotRobot 80262314f3 v1.2.2 2019-06-19 15:59:10 +01:00
J. Ryan Stinnett f3bfb08280 Update Electron's runtime PNG icon to match others
This runtime PNG icon (the default window and tray icon) was not updated to
remove the white background when we last changed the branding. This copies a 265
px PNG from elsewhere to ensure it matches.

Part of https://github.com/vector-im/riot-web/issues/9897
2019-06-18 16:59:04 +01:00
J. Ryan Stinnett 292427c275 Move default Electron icons outside asar
Electron doesn't seem to want to load icons from within `asar`s, so this changes
the default icons (used for window and tray) so that they are just regular files
on disk and updates the reference to match.

Part of https://github.com/vector-im/riot-web/issues/9897
2019-06-18 16:58:43 +01:00
RiotRobot a86f1e8a90 v1.2.2-rc.2 2019-06-18 15:58:36 +01:00
J. Ryan Stinnett f10e7ac224 Fix reference to main window when setting Electron window icon
This fixes the fallback path which sets the Electron window icon to the default
icon in case there's no data URI based icon coming content. This is true
immediately after startup, for example.

Part of https://github.com/vector-im/riot-web/issues/9897
2019-06-18 14:31:19 +01:00
RiotRobot b751383702 v1.2.2-rc.1 2019-06-12 12:11:12 +01:00
RiotRobot 6b93053a80 v1.2.1 2019-05-31 11:53:34 +01:00
RiotRobot d6fb0bc24f v1.2.0 2019-05-29 16:19:59 +01:00
RiotRobot 7f7b3e747c v1.2.0-rc.1 2019-05-23 17:40:08 +01:00
David Baker 8ac5957186 v1.1.2 2019-05-15 14:34:59 +01:00
David Baker 875d1b209a v1.1.1 2019-05-14 13:53:31 +01:00
David Baker 5c46bd37e8 v1.1.0 2019-05-07 15:54:38 +01:00
David Baker 7c5e39e170 Add new scalar staging url 2019-05-01 11:45:11 +01:00
David Baker 49efece6c6 v1.1.0-rc.1 2019-04-30 12:48:52 +01:00
David Baker f400cea437 Merge branch 'master' into develop 2019-04-16 01:26:24 +01:00
David Baker 29cb8c42b0 v1.0.8 2019-04-16 01:22:02 +01:00
pacien 2c9b51f29d Add support for custom profile directory
A custom user data directory can now be specified using the "profile-dir"
command line argument.

Github ref: closes #6175

Signed-off-by: Pacien TRAN-GIRARD <pacien.trangirard@pacien.net>
2019-04-09 19:35:14 +02:00
Bruno Windels a41a14b975 Merge branch 'master' into develop 2019-04-08 16:21:13 +02:00
Bruno Windels 659c29cf77 v1.0.7 2019-04-08 16:16:46 +02:00
Travis Ralston f36a24fef0 Fix autolaunch setting appearing toggled off
Fixes https://github.com/vector-im/riot-web/issues/9123

The value used here is a function which returns a promise, not a flag.
2019-04-02 17:59:47 -06:00
Travis Ralston 8b2d33ac0a Don't try to save files the user didn't want to save
Fixes https://github.com/vector-im/riot-web/issues/9350
2019-04-01 13:24:17 -06:00
David Baker 2bac72fa36 v1.0.6 2019-04-01 13:53:18 +01:00
Travis Ralston 7a9cea4baa Add "Save image as..." button to context menu on images
Fixes https://github.com/vector-im/riot-web/issues/9324
Requires https://github.com/matrix-org/matrix-react-sdk/pull/2848
2019-03-29 16:21:25 -06:00
David Baker f392a00138 v1.0.6-rc.1 2019-03-27 17:46:32 +00:00
Bruno Windels f777c2c9bc Merge branch 'master' into develop 2019-03-21 11:40:43 +01:00
Bruno Windels 0dd1a7b309 v1.0.5 2019-03-21 11:34:17 +01:00
David Baker 42c2692d28 Merge branch 'master' into develop 2019-03-18 14:20:09 +00:00
David Baker 5254cef980 v1.0.4 2019-03-18 14:11:52 +00:00
Aaron Raimist b40ed7cb11
Update Electron help menu link
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-03-13 14:43:24 -05:00
David Baker 958e8662d9 v1.0.4-rc.1 2019-03-13 14:58:28 +00:00
J. Ryan Stinnett 13aca0716a Add yarn lock file for Electron app
We did not previously commit lock files for the Electron app, so there is no
correct copy to import from. For this directory, I created a fresh yarn lock
file using yarn install.
2019-03-11 15:33:00 +00:00
David Baker acb8afaeb7 Merge branch 'master' into develop 2019-03-06 16:07:05 +00:00
David Baker 8e9d73fb5b v1.0.3 2019-03-06 15:55:40 +00:00
David Baker b2d417d7ef Merge branch 'master' into develop 2019-03-06 11:38:17 +00:00
David Baker ea86359c41 v1.0.2 2019-03-06 11:31:02 +00:00
David Baker b7d2159d60 v1.0.2-rc.3 2019-03-05 19:20:57 +00:00
David Baker 5474a5e0c7 utm_campaign is now added automatically 2019-03-05 18:27:22 +00:00
David Baker 9235b5a861 Add modular.im hosting link to electron app config 2019-03-05 18:27:15 +00:00
David Baker 116f1d7d92 utm_campaign is now added automatically 2019-03-05 16:45:46 +00:00
David Baker 3c123a064b Add modular.im hosting link to electron app config 2019-03-05 16:18:04 +00:00
David Baker 29ff95cccc v1.0.2-rc.2 2019-03-01 17:39:57 +00:00
David Baker ab1ceff242 v1.0.2-rc.1 2019-03-01 12:20:32 +00:00
Michael Telatynski baa034230f
Merge pull request #8983 from vector-im/t3chguy/local-config
Add support for localConfig at $appData/config.json.
2019-03-01 07:54:49 +00:00
Nad Chishtie f020995ac4 Updated install spinner referenced in #8913 2019-02-28 11:19:00 +01:00
Michael Telatynski 0e0c1cfad3 Add support for localConfig at $appData/config.json.
Move electron-config to $appData/electron-config.json

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-02-28 00:17:33 +00:00
Travis Ralston a5a4c167e8
Merge pull request #8911 from vector-im/t3chguy/no-update
Allow disabling update mechanism
2019-02-24 18:00:54 -07:00
Michael Telatynski ffacf30722 Allow disabling update mechanism
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-02-24 04:52:07 +00:00
Michael Telatynski 714570443d Allow configuration of whether closing window closes or minimizes to tray
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-02-24 01:08:01 +00:00
Bruno Windels 77b317b3cf v1.0.1 2019-02-15 14:00:01 +01:00
J. Ryan Stinnett 55da52debd v1.0.0 2019-02-14 17:07:27 +00:00
J. Ryan Stinnett 21f11f02a4 v1.0.0-rc.2 2019-02-14 11:19:06 +00:00
J. Ryan Stinnett 32c958e2f2 Merge branch 'develop' into release-v1.0.0 2019-02-14 11:17:18 +00:00
Nad Chishtie db30c24b9f Updated app icons 2019-02-13 17:58:57 +00:00
David Baker bbbb4c7861 run icons script on new icon 2019-02-13 17:28:28 +00:00
David Baker a51c0744e6 v1.0.0-rc.1 2019-02-08 18:45:53 +00:00
Aaron Raimist a03a738317
Only allow Electron to zoom with CommandOrControl+=
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-02-06 13:20:40 -06:00
Aaron Raimist bfdffc653e
Allow Electron to zoom with CommandOrControl+=
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-02-02 15:53:10 -06:00
Bruno Windels 90140f6361
Merge pull request #8321 from vector-im/experimental
Merge redesign into develop
2019-01-30 12:49:37 +00:00
David Baker 2aaed5d4c3 Doc broken will-navigate listener 2019-01-24 11:36:36 +00:00
David Baker a0c205e4c9 v0.17.9 2019-01-22 11:44:13 +00:00
David Baker e94e712d49 v0.17.9-rc.1 2019-01-17 11:07:42 +00:00
Michael Telatynski 8c895cd435 Correct the copying of e-mail addresses in the electron app
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-01-15 08:37:01 +00:00
David Baker 62a49af23f Only serve origin migrator whilst migrating
as per comment
2018-12-21 22:21:06 +00:00
David Baker 751a1dc543 Add tool to migrate logins between origins
App checks at startup for an existing session, if there isn't one,
it will start the tool to check for a login in the file:// origin.
If there is one, it will copy the login over to the vector://vector
origin.

In principle this could also be used to migrate logins between
other origins on the web if this were ever required.

This includes a minified copy of the browserified js-sdk with
a getAllEndToEndSessions() function added to the crypto store
(https://github.com/matrix-org/matrix-js-sdk/pull/812). This is
not great, but for a short-lived tool this seems better than
introducing more entry points into webpack only used for the
electron app.
2018-12-21 19:14:25 +00:00
David Baker b6d70f4434 Missing include 2018-12-19 12:25:32 +00:00
David Baker fc4e1485ad Electron: Load app from custom protocol
This puts the app into its own origin so it doesn't have access
to the filesystem via file:// URIs.

Next step: migrate over localstorage & indexeddb data from the old
origin...
2018-12-19 12:04:40 +00:00
David Baker b35903bb19
Merge pull request #7907 from vector-im/dbkr/electron_sandbox
Run the Desktop app in a sandbox
2018-12-19 09:48:10 +00:00
David Baker 60d3076038 Update to new electron single instance API 2018-12-18 18:10:09 +00:00
David Baker 19f1489c92 Run the Desktop app in a sandbox
* Turn off node integration in the electron renderer process
 * Enable the chromium sandbox to put the renderer into its own process
 * Expose just the ipc module with a preload script
 * Introduce a little IPC call wrapper so we can call into the
   renderer process and await on the result.
 * Use this in a bunch of places we previously used direct calls
   to electron modules.
 * Convert other uses of node, eg. use of process to derive the
   platform (just look at the user agent)
 * Strip out the desktopCapturer integration which doesn't appear
   to have ever worked (probably best to just wait until
   getDisplayMedia() is available in chrome at this point:
   https://github.com/vector-im/riot-web/issues/4880).
2018-12-18 17:42:55 +00:00
David Baker 7c4f67b1a1 v0.17.8 2018-12-10 13:46:57 +00:00
David Baker 74c81d6921 v0.17.8-rc.1 2018-12-06 12:48:34 +00:00
David Baker 02eb8a284c Actually revert electron app version bump
last one was in fasct the main version file
2018-12-06 12:47:18 +00:00
David Baker 6ba471421f v0.17.8-rc.1 2018-12-06 11:20:33 +00:00
David Baker 58f927538f v0.17.7 2018-11-22 16:56:41 +00:00
David Baker 07ed2e8d0a v0.17.6 2018-11-19 15:23:08 +00:00
David Baker a4a6f070e4 v0.17.6-rc.2 2018-11-15 15:38:42 +00:00
David Baker 154e8bdb50 v0.17.6-rc.1 2018-11-15 12:21:16 +00:00
David Baker cc4d0af713 Merge branch 'master' into develop 2018-11-13 19:02:34 +00:00
David Baker a1e5c72eb9 v0.17.5 2018-11-13 18:52:59 +00:00
David Baker 061838bdab Merge branch 'master' into develop 2018-11-13 18:19:10 +00:00
David Baker 71403980cc v0.17.4 2018-11-13 18:09:48 +00:00
David Baker 409c48efcb Merge branch 'master' into develop 2018-10-29 14:27:46 +00:00
David Baker 4574415e97 v0.17.3 2018-10-29 14:20:59 +00:00
Michael Telatynski c80f5ddcd1 Correct the author of the electron app
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-10-27 11:04:05 +01:00