Matrix/element-desktop
Matrix/element-desktop
1
0
Fork 0
mirror of https://github.com/vector-im/element-desktop.git synced 2024-07-13 01:34:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
347 commits 104 branches 261 tags 94 MiB
Commit graph

347 commits

This branch
This branch
All branches
Author SHA1 Message Date
RiotRobot f9d928a534 Reset matrix-js-sdk back to develop branch 2020-06-16 11:16:49 +01:00
RiotRobot 8f4ef2d332 Merge branch 'master' into develop 2020-06-16 11:16:18 +01:00
RiotRobot a5b809ab06 v1.6.5 2020-06-16 11:14:38 +01:00
RiotRobot 2891019044 Prepare changelog for v1.6.5 2020-06-16 11:14:38 +01:00
RiotRobot 0beda0bb19 Upgrade matrix-js-sdk to 6.2.2 2020-06-16 11:10:50 +01:00
Michael Telatynski 2c6000c49e
Merge pull request #99 from vector-im/t3chguy/remember-updates 
Fix riot-desktop manual update check getting stuck on Downloading...
 2020-06-08 09:44:23 +01:00
Michael Telatynski c2ecef12f2 Fix riot-desktop manual update check getting stuck on Downloading... 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-07 13:18:33 +01:00
Michael Telatynski 303a7f0bd0
Merge pull request #98 from vector-im/t3chguy/remember-updates 
Electron recall latest downloaded update for when the user manually asks
 2020-06-05 19:21:37 +01:00
Michael Telatynski 861c90c3d8 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-05 18:41:29 +01:00
Michael Telatynski 799ccc6197 Electron recall latest downloaded update for when the user manually checks for updates 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-05 18:36:10 +01:00
RiotRobot 1ca51ced9c Reset matrix-js-sdk back to develop branch 2020-06-05 15:17:55 +01:00
RiotRobot 50bb0b3694 Merge branch 'master' into develop 2020-06-05 15:17:09 +01:00
RiotRobot edb8b671f3 v1.6.4 2020-06-05 15:13:36 +01:00
RiotRobot 2f0b6ee984 Prepare changelog for v1.6.4 2020-06-05 15:13:36 +01:00
RiotRobot ece9040247 Upgrade matrix-js-sdk to 6.2.1 2020-06-05 15:13:04 +01:00
RiotRobot ffe9121589 Reset matrix-js-sdk back to develop branch 2020-06-04 15:21:41 +01:00
RiotRobot 2203f4628a Merge branch 'master' into develop 2020-06-04 15:19:58 +01:00
RiotRobot cf2925853c v1.6.3 2020-06-04 15:19:33 +01:00
RiotRobot e4aab36428 Prepare changelog for v1.6.3 2020-06-04 15:19:32 +01:00
RiotRobot d106d23e2e Upgrade matrix-js-sdk to 6.2.0 2020-06-04 15:06:20 +01:00
Hubert Chathi f841622e81
Merge pull request #95 from uhoreg/keytar 
use keytar to store pickle keys
 2020-06-03 16:54:48 -04:00
Hubert Chathi b4af8d9ce5 remove unneeded stuff 2020-06-03 16:47:09 -04:00
RiotRobot aaa3e71077 v1.6.3-rc.1 2020-06-02 13:58:27 +01:00
RiotRobot b9d00395ed Prepare changelog for v1.6.3-rc.1 2020-06-02 13:58:26 +01:00
RiotRobot 00cf95e86b Upgrade matrix-js-sdk to 6.2.0-rc.1 2020-06-02 13:53:28 +01:00
Michael Telatynski e56311fc06
Merge pull request #96 from vector-im/t3chguy/fix-save-as 
Fix electron context menu copy/save-as
 2020-06-01 17:09:03 +01:00
Travis Ralston 2e907b6e36
Merge pull request #97 from drlellinger/patch-1 
Fixed error in README.md/User-specified config.json
 2020-05-31 18:28:19 -06:00
drlellinger c82c80a2e0
Fixed error in User-specified config.json 
A / was missing
 2020-05-31 18:25:26 +02:00
Michael Telatynski 20fb0f477b tidy comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-31 12:28:15 +01:00
Michael Telatynski c6620735b4 Fix electron context menu copy/save-as 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-31 12:23:23 +01:00
Michael Telatynski 27b7db2b30
Merge pull request #92 from vector-im/t3chguy/modular-utm 
Update Modular hosting link
 2020-05-29 20:16:16 +01:00
Hubert Chathi 188190888b more lint 2020-05-28 15:36:06 -04:00
Hubert Chathi b366dbb460 fix lint errors and add copyright info 2020-05-28 15:30:00 -04:00
Hubert Chathi 19edcd436e use keytar to store pickle keys 2020-05-28 15:07:39 -04:00
Travis Ralston d33ce95dd0
Merge pull request #91 from vector-im/travis/ipc-renderer 
Enforce sandbox on all spawned BrowserWindow objects
 2020-05-27 10:03:28 -06:00
Michael Telatynski be30a2fbab
Merge pull request #93 from vector-im/t3chguy/flush-on-update 
Run before-quit on updates too to flush rageshake
 2020-05-26 11:58:22 +01:00
Michael Telatynski 66d9204578 Run before-quit on updates too to flush rageshake 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-23 11:52:49 +01:00
Michael Telatynski ba0518005e Update Modular hosting link 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-23 08:48:29 +01:00
RiotRobot b543a2e496 Reset matrix-js-sdk back to develop branch 2020-05-22 14:22:01 +01:00
RiotRobot 91b4987d52 Merge branch 'master' into develop 2020-05-22 14:21:28 +01:00
RiotRobot 73b9dcbb89 v1.6.2 2020-05-22 14:21:03 +01:00
RiotRobot 460148e66c Prepare changelog for v1.6.2 2020-05-22 14:21:03 +01:00
Travis Ralston a568d766b0
Merge pull request #87 from vector-im/travis/room-list-2 
Enable new room list labs flag
 2020-05-21 13:30:45 -06:00
Travis Ralston 9635047c49
Merge branch 'develop' into travis/room-list-2 2020-05-21 13:28:35 -06:00
Michael Telatynski 1d339123e7
Merge pull request #59 from vector-im/t3chguy/script 
Add asar-webapp script
 2020-05-21 10:58:48 +01:00
J. Ryan Stinnett 0f6a42e250
Merge pull request #50 from vector-im/dependabot/npm_and_yarn/acorn-6.4.1 
Bump acorn from 6.4.0 to 6.4.1
 2020-05-21 10:55:51 +01:00
J. Ryan Stinnett 6e7919c6a0
Merge pull request #89 from vector-im/travis/scaling-labs 
Enable font scaling flag for nightly
 2020-05-21 10:52:54 +01:00
Travis Ralston 0269501d4f Enforce sandbox on all spawned BrowserWindow objects 
The docs (https://www.atom.pe/docs/api/sandbox-option/) say we should be using the browser-native `window.open` implementation, but in practice that appears very much false. Electron, no matter our set of options, appears to always make a hit to the ipcRenderer with `window.open` calls, causing the calling code to explode due to the sandbox making that impossible.

By using `app.enableSandbox()`, it puts the sandbox in place over all BrowserWindow objects, including the temporary ones which empirically are being created for `window.open`. We do not need to specify `sandbox: true` to the BrowserWindow with this approach, though uncommenting and therefore reintroducing the flag causes our lovely ipcRenderer error again.

As far as I can tell, the sandbox does actually get applied to the window though the fact that `sandbox: true` still does things despite the docs saying otherwise leaves me a bit uncomfortable.

Fixes https://github.com/vector-im/riot-web/issues/13719
 2020-05-20 16:16:57 -06:00
Travis Ralston 9b9b2ee847
Enable font scaling flag for nightly 2020-05-20 10:08:43 -06:00
Travis Ralston f9c8aa1753
Merge pull request #88 from vector-im/travis/irc-labs 
Enable IRC UI labs flag in nightly
 2020-05-19 15:00:38 -06:00