Matrix/element-desktop
Matrix/element-desktop
1
0
Fork 0
mirror of https://github.com/vector-im/element-desktop.git synced 2024-08-08 06:23:45 +00:00
Code Issues Projects Releases Packages Wiki Activity
574 commits 104 branches 266 tags 97 MiB
Commit graph

574 commits

This branch
This branch
All branches
Author SHA1 Message Date
RiotRobot
ed00cfada3 Merge branch 'master' into develop 2020-12-07 13:05:07 +00:00
RiotRobot
3a660b2461 v1.7.15 2020-12-07 13:04:50 +00:00
RiotRobot
c6bbff5ffe Prepare changelog for v1.7.15 2020-12-07 13:04:50 +00:00
J. Ryan Stinnett
fa8aef94af
Merge pull request #157 from vector-im/jryans/add-gitter 
Add gitter.im to room directory
 2020-12-04 11:06:23 +00:00
J. Ryan Stinnett
b7c31f17b5 Add gitter.im to room directory 2020-12-04 11:01:33 +00:00
RiotRobot
d69f2a6d44 v1.7.15-rc.1 2020-12-02 15:07:44 +00:00
J. Ryan Stinnett
c1ed8ab377
Merge pull request #156 from vector-im/jryans/electron-10.x-rollback 
Revert back to the 10.x series
 2020-12-02 12:22:08 +00:00
J. Ryan Stinnett
df1c7f2498 Revert back to the 10.x series 
The latest 11.x still exhibits
https://github.com/vector-im/element-web/issues/15869, so let's try the latest
10.x version instead.
 2020-12-02 12:17:03 +00:00
J. Ryan Stinnett
99c13923ea
Merge pull request #155 from vector-im/jryans/electron-11.0.3 
Upgrade to Electron 11.0.3
 2020-12-01 12:42:52 +00:00
J. Ryan Stinnett
80cb503c48 Upgrade to Electron 11.0.3 
We're hoping this may help with frozen window issues in https://github.com/vector-im/element-web/issues/15869.
 2020-12-01 12:40:04 +00:00
J. Ryan Stinnett
239bab38ca
Merge pull request #153 from vector-im/jryans/rebrand-packaged-artifact 
Update branding of packaging artifacts
 2020-11-25 11:16:57 +00:00
J. Ryan Stinnett
e952b479ac Update branding of packaging artifacts 
This updates the names of various packaging and build artifacts to match current
branding.

Part of https://github.com/vector-im/element-web/issues/14896
 2020-11-24 12:48:37 +00:00
J. Ryan Stinnett
231ac2bbb9
Merge pull request #152 from vector-im/jryans/electron-11.0.1 
Upgrade to Electron 11.0.1
 2020-11-23 19:00:25 +00:00
RiotRobot
58543cacc8 v1.7.14 2020-11-23 16:54:03 +00:00
RiotRobot
8582e360b5 Prepare changelog for v1.7.14 2020-11-23 16:54:03 +00:00
J. Ryan Stinnett
0e919f9992 Upgrade to Electron 11.0.1 
No breaking changes we need to adjust for as far as I can tell. Tested on macOS
only so far, appears to be working.
 2020-11-18 16:56:35 +00:00
RiotRobot
b0a5003eaa v1.7.14-rc.1 2020-11-18 16:38:21 +00:00
RiotRobot
6c0d8d5bda Prepare changelog for v1.7.14-rc.1 2020-11-18 16:38:21 +00:00
J. Ryan Stinnett
302f25054a
Merge pull request #151 from EdwardBetts/spelling 
Correct spelling mistakes
 2020-11-16 13:27:47 +00:00
Edward Betts
82c88ca654 Correct spelling mistakes 2020-11-14 21:54:07 +00:00
RiotRobot
b9b7dcb264 v1.7.13 2020-11-09 16:44:51 +00:00
RiotRobot
90d5612548 Prepare changelog for v1.7.13 2020-11-09 16:44:50 +00:00
RiotRobot
e4583ed752 v1.7.13-rc.1 2020-11-04 14:25:33 +00:00
RiotRobot
20dace2679 Prepare changelog for v1.7.13-rc.1 2020-11-04 14:25:32 +00:00
Michael Telatynski
bc7231fb00
Merge pull request #150 from vector-im/t3chguy/countly 
Add countly experiment to develop/nightly configs
 2020-10-30 13:09:09 +00:00
Michael Telatynski
270daf1356 Add countly experiment to develop/nightly configs 2020-10-30 10:32:21 +00:00
RiotRobot
4957e9e24f v1.7.12 2020-10-28 15:12:32 +00:00
RiotRobot
7be314caf8 Prepare changelog for v1.7.12 2020-10-28 15:12:32 +00:00
RiotRobot
2b0ec9eb2f v1.7.11 2020-10-26 17:24:28 +00:00
RiotRobot
5220abbfd4 Prepare changelog for v1.7.11 2020-10-26 17:24:28 +00:00
RiotRobot
272f317415 v1.7.11-rc.1 2020-10-21 14:54:46 +01:00
RiotRobot
0023fb25a2 Prepare changelog for v1.7.11-rc.1 2020-10-21 14:54:46 +01:00
RiotRobot
783117fea9 Merge branch 'master' into develop 2020-10-20 11:31:41 +01:00
RiotRobot
4e61aad299 v1.7.10 2020-10-20 11:31:22 +01:00
RiotRobot
94dee7bece Prepare changelog for v1.7.10 2020-10-20 11:31:22 +01:00
Travis Ralston
92f57ca880
Merge pull request #148 from vector-im/dependabot/npm_and_yarn/npm-user-validate-1.0.1 
Bump npm-user-validate from 1.0.0 to 1.0.1
 2020-10-16 13:40:10 -06:00
dependabot[bot]
7bd70e2eb6
Bump npm-user-validate from 1.0.0 to 1.0.1 
Bumps [npm-user-validate](https://github.com/npm/npm-user-validate) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/npm/npm-user-validate/releases)
- [Commits](https://github.com/npm/npm-user-validate/compare/v1.0.0...v1.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-16 19:33:28 +00:00
Damir Jelić
8add8d7717 electron-main: Fix some lint issues. 2020-10-13 17:07:39 +02:00
Damir Jelić
1d811b6f4b electron-main: Use keytar to for the seshat passphrase. 
This will also change the passphrase for existing setups if no
passphrase is found in the secret store.
 2020-10-13 15:59:21 +02:00
Damir Jelić
50a4069893 electron-main: Refactor out the randomArray method. 2020-10-13 15:58:35 +02:00
RiotRobot
14415e2707 Merge branch 'master' into develop 2020-10-12 13:52:44 +01:00
RiotRobot
367dd5640c v1.7.9 2020-10-12 13:52:24 +01:00
RiotRobot
08ee24dfb6 Prepare changelog for v1.7.9 2020-10-12 13:52:23 +01:00
J. Ryan Stinnett
9bb386f2b5
Merge pull request #146 from vector-im/jryans/electron-10.1.3 
Upgrade to Electron 10.1.3
 2020-10-07 15:24:19 +01:00
J. Ryan Stinnett
0f94667dea Upgrade to Electron 10.1.3 2020-10-07 15:02:51 +01:00
RiotRobot
a71ac70a13 v1.7.9-rc.1 2020-10-07 14:23:43 +01:00
RiotRobot
5a0f686b28 Prepare changelog for v1.7.9-rc.1 2020-10-07 14:23:43 +01:00
poljar
2170e494fb
Merge pull request #145 from vector-im/poljar/seshat-bump 
package.json: Bump the seshat version.
 2020-10-05 18:30:27 +02:00
Damir Jelić
6ced94914f package.json: Bump the seshat version. 2020-10-05 18:23:32 +02:00
Michael Telatynski
5ca16bf2fc
Merge pull request #144 from vector-im/t3chguy/fix/15311 
Explicitly depend on `request` as webcontents-handler requires it
 2020-09-29 13:03:41 +01:00