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

693 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
fdb02b93e5 Merge branch 'dbkr/rebrand_step_2' into 'develop' 
Rebrand step 2

See merge request new-vector/element/element-desktop!2
 2020-07-02 14:01:17 +00:00
David Baker
c048dff4de Apply 1 suggestion(s) to 1 file(s) 2020-07-02 13:42:45 +00:00
David Baker
85dd2504db Rebrand step 2 
* Continue to use Riot user data directory if it exists and the new
   one doesn't, so users stay logged in.
 * Move the auto-launcher over to new name.
 * Look for keytar password under both names.
 2020-07-02 13:30:11 +01:00
David Baker
6d5ada7e3f Merge branch 'dbkr/rebrand_step_1' into 'develop' 
Rebrand step 1: s/riot/element/ in the places where it's reasonably simple

See merge request new-vector/element/element-desktop!1
 2020-07-01 16:49:46 +00:00
David Baker
72c88c8c87 change domain for fetching key 2020-07-01 17:46:17 +01:00
David Baker
ff84841b52 Apply suggestion to README.md 2020-07-01 16:42:50 +00:00
David Baker
3a2176443c Apply suggestion to README.md 2020-07-01 16:42:39 +00:00
David Baker
5b2139a048 Apply suggestion to README.md 2020-07-01 16:42:24 +00:00
David Baker
386e0be08d This one's easy too 2020-07-01 15:40:23 +01:00
David Baker
466a871094 Rebrand step 1: s/riot/element/ in the places where it's reasonably simple 2020-07-01 15:30:53 +01:00
RiotRobot
1ea9a9d8be v1.6.8-rc.1 2020-07-01 14:31:37 +01:00
RiotRobot
c859c78621 Prepare changelog for v1.6.8-rc.1 2020-07-01 14:31:37 +01:00
RiotRobot
c057dde907 Upgrade matrix-js-sdk to 7.1.0-rc.1 2020-07-01 14:23:47 +01:00
Michael Telatynski
4ca58eebf9
Merge pull request #106 from vector-im/t3chguy/download_toast 
Show expiring toast on completed downloads to prompt user to open
 2020-06-30 20:18:56 +01:00
J. Ryan Stinnett
b337f41a93
Merge pull request #107 from vector-im/jryans/e-9.0.5 
Upgrade to Electron 9.0.5
 2020-06-30 17:32:20 +01:00
J. Ryan Stinnett
60d01d1a33 Upgrade to Electron 9.0.5 2020-06-30 16:55:14 +01:00
Andrew Morgan
fb6c87200e
Merge pull request #105 from vector-im/anoa/new_spinner_feature_flag 
Add new spinner labs option to config.json
 2020-06-29 17:09:20 +01:00
RiotRobot
9c92b57193 Reset matrix-js-sdk back to develop branch 2020-06-29 16:17:45 +01:00
RiotRobot
910cd9824b Merge branch 'master' into develop 2020-06-29 16:17:16 +01:00
RiotRobot
e368f44ebb v1.6.7 2020-06-29 16:16:53 +01:00
RiotRobot
fda652deaf Prepare changelog for v1.6.7 2020-06-29 16:16:53 +01:00
Michael Telatynski
891e7ca234 Show expiring toast on completed downloads to prompt user to open 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-29 16:08:39 +01:00
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