Matrix/element-desktop
Matrix/element-desktop
1
0
Fork 0
mirror of https://github.com/vector-im/element-desktop.git synced 2024-09-05 20:10:06 +00:00
Code Issues Projects Releases Packages Wiki Activity
471 commits 108 branches 271 tags 101 MiB
Commit graph

471 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Morgan
6c04a56579
Add new spinner labs option to config.json 
Previously added to Riot Web's config.json: https://github.com/vector-im/riot-web/pull/14213
 2020-06-28 19:26:25 +01:00
Damir Jelić
a11feaca32 Merge branch 'poljar/skip-unneeded-reindex' into develop 2020-06-24 16:59:29 +02:00
Damir Jelić
b23cc417e1 package.json: Bump the required Seshat version. 2020-06-24 16:31:49 +02:00
Damir Jelić
2da6bc6a1e electron-main: Rename the deletion method for the index. 2020-06-24 11:06:09 +02:00
Damir Jelić
141107c678 electron-main: Skip the reindex if we're going to delete the db anyways. 2020-06-23 16:42:27 +02:00
RiotRobot
503442e189 Reset matrix-js-sdk back to develop branch 2020-06-23 15:20:45 +01:00
RiotRobot
43e9c19f8d Merge branch 'master' into develop 2020-06-23 15:20:01 +01:00
RiotRobot
ef94a61b5d v1.6.6 2020-06-23 15:19:38 +01:00
RiotRobot
dde4e2da9b Prepare changelog for v1.6.6 2020-06-23 15:19:38 +01:00
RiotRobot
c1e20617f5 Upgrade matrix-js-sdk to 7.0.0 2020-06-23 14:49:49 +01:00
Damir Jelić
748f4dccb4 riot-desktop: Bump the required seshat version. 2020-06-19 10:52:02 +02:00
Damir Jelić
069f009d85 Merge remote-tracking branch 'origin/poljar/eventindex-user-version' into develop 2020-06-19 09:54:29 +02:00
Damir Jelić
c1646e882a Merge remote-tracking branch 'origin/poljar/eventindex-newly-encrypted-room' into develop 2020-06-19 09:54:19 +02:00
RiotRobot
0168182f5b v1.6.6-rc.1 2020-06-17 21:40:42 +01:00
RiotRobot
9cf829730f Prepare changelog for v1.6.6-rc.1 2020-06-17 21:40:42 +01:00
RiotRobot
ab2a1e5fdd Upgrade matrix-js-sdk to 7.0.0-rc.1 2020-06-17 21:38:17 +01:00
Michael Telatynski
3597f43b73
Merge pull request #94 from vector-im/t3chguy/electron9 
Upgrade to Electron 9
 2020-06-17 20:59:14 +01:00
Michael Telatynski
17cbc88d39 Bump to electron 9.0.4 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-17 16:58:36 +01:00
Michael Telatynski
a95e40506b Merge branches 'develop' and 't3chguy/electron9' of https://github.com/vector-im/riot-desktop into t3chguy/electron9 2020-06-17 16:57:17 +01:00
Damir Jelić
a9b4110d65 electron-main: Add support to set and get the user version. 2020-06-17 17:19:47 +02:00
Michael Telatynski
e10582749b
Merge pull request #101 from vector-im/t3chguy/needle 
Upgrade needle to avoid bugs with modern Node
 2020-06-16 13:46:10 +01:00
Michael Telatynski
d0d14e80ce Upgrade needle to avoid bugs with modern Node 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-16 12:41:58 +01:00
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
Damir Jelić
193dd0f9e3 main: Add an event index IPC method to check if a room is being indexed. 2020-06-08 16:41:15 +02: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