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

334 commits

Author SHA1 Message Date
RiotRobot
a933331f82 Merge branch 'master' into develop 2022-04-26 12:24:50 +01:00
RiotRobot
ed885b043b v1.10.11 2022-04-26 12:24:17 +01:00
Michael Telatynski
ef075489b4
Upgrade node-kaytar for modern Visual Studio support & CI native building (#347) 2022-04-25 18:58:34 +01:00
Michael Telatynski
9838d89bdf
Revert "Upgrade to Electron 18" (#346) 
This reverts commit 4d67e0561d.
 2022-04-22 19:33:22 +01:00
Michael Telatynski
7ad5c9b01c
Fix macOS and Linux build regressions (#345) 
* Fix macOS builds by pinning Typescript

Due to https://github.com/joyent/node-verror/issues/86

* Fix linux build, we no longer use tclsh

* Correct fix for linux build issue

* fix it for realsies this time
 2022-04-22 14:40:16 +01:00
Michael Telatynski
4d67e0561d
Upgrade to Electron 18 (#343) 2022-04-22 09:07:54 +00:00
RiotRobot
bb973ead3f v1.10.11-rc.1 2022-04-19 15:28:59 +01:00
PF4Public
961a6f47cd
Prevent packing of native modules (#337) 2022-04-19 10:04:30 +01:00
RiotRobot
b11d1d7224 v1.10.10 2022-04-14 14:10:18 +01:00
RiotRobot
6d422df45c v1.10.9 2022-04-12 10:50:46 +01:00
RiotRobot
31b0bc1d06 v1.10.8 2022-03-28 16:32:55 +01:00
dependabot[bot]
281ecc0662
Bump minimist from 1.2.5 to 1.2.6 (#331) 
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-03-25 17:26:22 -06:00
RiotRobot
153d0badf5 v1.10.7 2022-03-15 14:47:32 +00:00
RiotRobot
e1651f30b4 v1.10.6 2022-03-01 12:09:26 +00:00
RiotRobot
07c11853f5 v1.10.5 2022-02-28 17:38:11 +00:00
RiotRobot
0f54e90250 Merge branch 'master' into develop 2022-02-17 12:23:38 +00:00
RiotRobot
467e6189f7 v1.10.4 2022-02-17 12:23:26 +00:00
RiotRobot
fb8fff7799 Merge branch 'master' into develop 2022-02-14 18:32:49 +00:00
RiotRobot
031043f2d8 v1.10.3 2022-02-14 18:32:37 +00:00
RiotRobot
ca91532635 Merge branch 'master' into develop 2022-02-14 15:59:15 +00:00
RiotRobot
8f71628533 v1.10.2 2022-02-14 15:59:02 +00:00
David Baker
a80bc76e22
Upgrade to electron 17 (#318) 
In theory, this might make https://github.com/vector-im/element-web/issues/20467 go away
 2022-02-08 19:25:06 +00:00
RiotRobot
3421979db4 v1.10.1 2022-02-01 16:08:14 +00:00
RiotRobot
ec4057f7e5 v1.10.0 2022-01-31 15:09:41 +00:00
David Baker
8fd24d2fa2
Downgrade to electron 15 (#311) 
Attempt 2 of https://github.com/vector-im/element-desktop/pull/310 after conflicting dependabot PR

Due to https://github.com/vector-im/element-web/issues/20467
 2022-01-26 16:45:58 +00:00
David Baker
0d37d8d8e9
Upgrade to electron 16.0.7 (#308) 
Couple of minor fixes (although doesn't look like it fixes https://github.com/vector-im/element-web/issues/20467)

Also un-pin the version as we now can (and should) upgrade electron
as we would a regular dependency.
 2022-01-26 13:31:39 +00:00
RiotRobot
8027988239 Merge branch 'master' into develop 2022-01-17 14:37:10 +00:00
RiotRobot
025a8808b8 v1.9.9 2022-01-17 14:36:53 +00:00
J. Ryan Stinnett
9aaeab2221
Use published matrix-web-i18n (#301) 2022-01-13 10:30:19 +00:00
Michael Telatynski
90359643ba
Upgrade to Electron 16 (#299) 2022-01-11 16:15:08 +00:00
J. Ryan Stinnett
989e030d97
Update linting plugin (#294) 2022-01-10 12:57:33 +00:00
RiotRobot
f18be113c3 Merge branch 'master' into develop 2021-12-20 14:43:15 +00:00
RiotRobot
8b25178aed v1.9.8 2021-12-20 14:43:02 +00:00
David Baker
326e6577e1
Convert hak to TypeScript (#289) 
* Convert hak to TypeScript

* Fix linter & remove stray log line

* Fix more linting errors

In one case by switching to import() and hence esnext

* Return type for getNodeModuleBin

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>

* More types

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-12-14 14:32:27 +00:00
Michael Telatynski
1cd299b98e
Update typescript-eslint plugin & parser (#286) 2021-12-13 23:34:46 +00:00
David Baker
3c8650065c
Use app-builder-lib to get electron version (#288) 
So we can get it the same way electron-builder does and not need
electronVersion in package.json
 2021-12-13 21:15:17 +00:00
David Baker
e2bdedfec1 Put electronVersion back (#287) 
seems letting electron builder take it from the dependencies confuses
the keytar build process
 2021-12-13 17:04:03 +00:00
RiotRobot
aa6e4d5ce2 Merge branch 'master' into develop 2021-12-13 15:45:09 +00:00
RiotRobot
846a8df9a6 v1.9.7 2021-12-13 15:44:56 +00:00
David Baker
89b1e39b80 Merge pull request from GHSA-mjrg-9f8r-h3m7 
* Patch part 1: remove electronVersion

We no longer need to specify electronVersion at all since electron
is now in devDependencies. Removing it means electron can be updated
the same way as any other dependency.

* Only allow main app page to be opened via URL

We previously allowed any URL to be opened in the main electron
window. Allow only the main app page, as commented.

* use exact equals

* Make url logic clearer
 2021-12-13 15:35:27 +00:00
David Baker
b9880e2463
Merge pull request from GHSA-mjrg-9f8r-h3m7 
* Patch part 1: remove electronVersion

We no longer need to specify electronVersion at all since electron
is now in devDependencies. Removing it means electron can be updated
the same way as any other dependency.

* Only allow main app page to be opened via URL

We previously allowed any URL to be opened in the main electron
window. Allow only the main app page, as commented.

* use exact equals

* Make url logic clearer
 2021-12-13 15:09:53 +00:00
Michael Telatynski
7f292b12ea
Update Typescript to 4.5 (#285) 2021-12-13 13:39:24 +00:00
RiotRobot
b79645adb4 v1.9.6 2021-12-06 15:43:57 +00:00
J. Ryan Stinnett
e100388495
Upgrade allchange to 1.0.6 (#280) 2021-11-30 17:56:12 +00:00
RiotRobot
20d9e2b14b v1.9.5 2021-11-22 14:44:25 +00:00
RiotRobot
548f22d438 v1.9.4 2021-11-08 18:05:01 +00:00
David Baker
8dd564a7dc
Update allchange to 1.0.5 (#276) 2021-11-02 13:30:28 +00:00
RiotRobot
26e02eff94 Merge branch 'master' into develop 2021-10-25 11:49:06 +01:00
RiotRobot
4b23aaa31e v1.9.3 2021-10-25 11:48:54 +01:00
Travis Ralston
0af82dbbbd
Update allchange (#273) 2021-10-19 18:21:33 +01:00