CringeStudios/element-desktop
5
0
Fork 0
mirror of https://github.com/CringeStudios/element-desktop.git synced 2025-01-18 23:44:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,584 Commits 1 Branch 291 Tags 20 MiB
develop
Commit Graph

826 Commits

Author SHA1 Message Date
RiotRobot
a6c86b131d v1.7.1 2020-07-16 16:12:44 +01:00
RiotRobot
72334b8cd4 Upgrade matrix-js-sdk to 7.1.0 2020-07-16 16:12:07 +01:00
RiotRobot
78a601fbeb Reset matrix-js-sdk back to develop branch 2020-07-15 12:12:12 +01:00
RiotRobot
6c3edb9a13 v1.7.0 2020-07-15 12:11:21 +01:00
RiotRobot
b25479093b Upgrade matrix-js-sdk to 7.1.0 2020-07-15 12:08:07 +01:00
J. Ryan Stinnett
71c8ea417d Merge remote-tracking branch 'origin/develop' into element-develop 2020-07-15 10:44:25 +01:00
David Baker
3a253fe742 Some terribleness to make updating work on windows 
Squirrel doesn't handle the executable changing name, as hopefully
explained in comments
 2020-07-14 19:05:28 +01:00
Travis Ralston
5e2876649d Update npm to ^6.14.6 2020-07-07 14:48:36 -06:00
David Baker
4a488c9ab2 Add old app name in brackets 
And fix user data path to be non-bracketed version always.
 2020-07-07 18:57:29 +01:00
RiotRobot
4f844d9a64 Reset matrix-js-sdk back to develop branch 2020-07-03 13:23:36 +01:00
RiotRobot
d91034a938 v1.6.8 2020-07-03 13:23:00 +01:00
RiotRobot
ed3a07e61b Upgrade matrix-js-sdk to 7.1.0 2020-07-03 13:22:09 +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
c057dde907 Upgrade matrix-js-sdk to 7.1.0-rc.1 2020-07-01 14:23:47 +01:00
J. Ryan Stinnett
60d01d1a33 Upgrade to Electron 9.0.5 2020-06-30 16:55:14 +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
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
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
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
RiotRobot
0168182f5b 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
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
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
0beda0bb19 Upgrade matrix-js-sdk to 6.2.2 2020-06-16 11:10:50 +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
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
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
RiotRobot
aaa3e71077 v1.6.3-rc.1 2020-06-02 13:58:27 +01:00
RiotRobot
00cf95e86b Upgrade matrix-js-sdk to 6.2.0-rc.1 2020-06-02 13:53:28 +01:00
Hubert Chathi
19edcd436e use keytar to store pickle keys 2020-05-28 15:07:39 -04:00
Michael Telatynski
3da78268d8 Upgrade to Electron 9 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-23 11:57:10 +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
Michael Telatynski
1d339123e7
Merge pull request #59 from vector-im/t3chguy/script 
Add asar-webapp script
 2020-05-21 10:58:48 +01:00
RiotRobot
3e8feef642 Reset matrix-js-sdk back to develop branch 2020-05-19 11:16:19 +01:00
RiotRobot
defac64eff v1.6.1 2020-05-19 11:14:58 +01:00
RiotRobot
89318e403a Upgrade matrix-js-sdk to 6.1.0 2020-05-19 11:11:17 +01:00
RiotRobot
d391ce6202 v1.6.1-rc.1 2020-05-14 16:22:36 +01:00
RiotRobot
3f3e0213a7 Upgrade matrix-js-sdk to 6.1.0-rc.1 2020-05-14 16:22:05 +01:00
RiotRobot
d88cbeaae0 v1.6.0 2020-05-05 11:06:57 +01:00
RiotRobot
3354f15b2c Upgrade matrix-js-sdk to 6.0.0 2020-05-05 11:05:35 +01:00
RiotRobot
491cf680e9 v1.6.0-rc.6 2020-05-01 16:24:41 +01:00
RiotRobot
f01c25d01d Upgrade matrix-js-sdk to 6.0.0-rc.2 2020-05-01 16:23:45 +01:00
RiotRobot
63f30c57e4 v1.6.0-rc.5 2020-04-30 11:25:21 +01:00
RiotRobot
d621c32230 Upgrade matrix-js-sdk to 6.0.0-rc.1 2020-04-30 11:24:49 +01:00
Damir Jelić
ee8d7aaeec package.json: Bump the Seshat dep. 2020-04-24 12:05:26 +02:00
RiotRobot
7a41aa89fb v1.6.0-rc.4 2020-04-23 15:48:51 +01:00
RiotRobot
73a316740e Upgrade matrix-js-sdk to 5.3.1-rc.4 2020-04-23 15:45:04 +01:00
RiotRobot
4452b025b8 v1.6.0-rc.3 2020-04-17 17:54:32 +01:00
RiotRobot
bd020d7d22 Upgrade matrix-js-sdk to 5.3.1-rc.3 2020-04-17 17:51:22 +01:00
RiotRobot
43205a721c v1.6.0-rc.2 2020-04-16 19:39:24 +01:00
RiotRobot
03792896f5 Upgrade matrix-js-sdk to 5.3.1-rc.2 2020-04-16 19:39:12 +01:00
RiotRobot
4c3cdfd104 v1.6.0-rc.1 2020-04-15 19:40:50 +01:00
RiotRobot
efe2ddd1b8 Upgrade matrix-js-sdk to 5.3.1-rc.1 2020-04-15 19:30:03 +01:00
Damir Jelić
90eb472e50 package.json: Bump the Seshat version. 2020-04-09 16:33:33 +02:00
dependabot[bot]
587cfdd1fd
Bump minimist from 1.2.2 to 1.2.3 
Bumps [minimist](https://github.com/substack/minimist) from 1.2.2 to 1.2.3.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.2...1.2.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-04-03 22:39:01 +00:00
Michael Telatynski
d73915e8f2 Add asar-webapp script 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-01 12:33:06 +01:00
Damir Jelić
323f4bf1a3 package.json: Bump the required Seshat version. 
This bump enables getting the number of search hits and should remove
the database locked errors while searching.
 2020-03-27 14:16:57 +01:00
dependabot[bot]
6f5eaf7df4
Bump minimist from 1.2.0 to 1.2.2 
Bumps [minimist](https://github.com/substack/minimist) from 1.2.0 to 1.2.2.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.0...1.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-03-17 10:41:48 +00:00
Damir Jelić
a03fe0d383 package.json: Bump the required Seshat version. 2020-03-17 11:37:43 +01:00
Michael Telatynski
1dd7c168cf
Merge pull request #38 from vector-im/t3chguy/depr8 
Electron 8 changes. Deprecations. Updates.
 2020-03-09 18:00:22 +00:00
David Baker
892258e340 Bump seshat dependency 2020-03-09 13:46:08 +00:00
David Baker
a1366992bc Remove things that now live in riot-builder 2020-03-07 16:12:59 +00:00
David Baker
dd59fd586a Merge remote-tracking branch 'origin/master' into dbkr/winsign 2020-03-06 16:31:25 +00:00
Michael Telatynski
ec33fb4509
Merge branch 'master' into t3chguy/depr8 2020-03-05 11:12:39 +00:00
David Baker
4dbbf2bb15 Add a windows signing script 
As electron builder doesn't support supplying a key container name
which is the only way we can supply the token passphrase
 2020-03-04 16:55:12 +00:00
Michael Telatynski
6637787366
Merge pull request #37 from vector-im/t3chguy/sso 
riot-desktop open SSO in browser so user doesn't have to auth twice
 2020-03-03 22:28:05 +00:00
David Baker
5816a07617 Remove the certificate config for windows 
We override a lot of the config in our builder so we'll override
this there too, then the riot-desktop repo builds an unsigned
windows app by default rather than erroring if you don't have our
cert installed, which means other people don't have to patch
package.json to build it.
 2020-03-03 10:40:53 +00:00
Michael Telatynski
15a9a3f704 update to electron 8.0.3 for VoiceOver fixes 2020-03-03 10:02:56 +00:00
Michael Telatynski
d4dec89d24 bump to electron 8.0.2 2020-03-02 15:20:51 +00:00
Michael Telatynski
abe074e43e riot-desktop open SSO in browser so user doesn't have to auth twice 2020-03-02 15:04:51 +00:00
David Baker
dffb74f3fd
Merge pull request #32 from vector-im/dbkr/setversion_mk_2 
Set version in fetch script
 2020-02-27 14:30:41 +00:00
David Baker
40dc1d9384 Set version in fetch script 
Which plays better with doing develop builds.
 2020-02-26 11:56:59 +00:00
Michael Telatynski
c644f665f3
Merge pull request #30 from vector-im/t3chguy/spellcheck 
Upgrade to electron 8.0.1 and implement spellchecking
 2020-02-26 09:52:59 +00:00
Michael Telatynski
0d2b7ee157 Upgrade to electron 8.0.1 and implement spellchecking 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-24 17:16:35 +00:00
David Baker
b94c52c244 Support fetching the latest develop build 
Frustratingly, this requires a buildkite API token, even though
the builds & artifacts are available without auth on the buildkite
website.
 2020-02-21 18:17:31 +00:00
David Baker
90913256f5 Add our native modules separately into the files 
And also the package.json which, for reasons I'm not going to spend
the next two hours of my life wading through the electron-builder
source to discover, is no longer automatically included after adding
the files pattern. The node_modules folder is handled automatically
though, so is redundant.

Change the output directory structure so we have one directory with
all the built native modules under that we can just add to the files,
rather than having to add each one separately.

NB. electron-builder add its own filters to node_modules so that only
runtime (ie. not devDependencies) are copied. These seem to apply
even for manually specified path within node_modules. We can copy *to*
the node_modules directory, however...
 2020-02-21 10:57:52 +00:00
David Baker
53b7966590 Be more consistent (and match README) 2020-02-20 17:40:19 +00:00
David Baker
8843116357 Split 32/64 bit building 
As they'll need different native deps
 2020-02-19 14:21:33 +00:00
David Baker
28b17d0ec3 More doc 2020-02-17 20:25:10 +00:00
David Baker
b98bf4d302 Remove the in-docker yarn script 
because for some reason it would take too long to find out, docker
does not set the PATH correctly when run from a yarn script.
 2020-02-17 20:12:02 +00:00
David Baker
52032aac14 Docker powered linux building 2020-02-17 20:10:58 +00:00
David Baker
e2280ddf0e Merge remote-tracking branch 'origin/master' into dbkr/hak 2020-02-17 17:27:42 +00:00
David Baker
fa3925194d Lint hak scripts 2020-02-17 14:52:24 +00:00
David Baker
ef517ee76b Use the same one as riot-web 2020-02-17 12:00:28 +00:00
David Baker
11e75d0490 better upgrade squirrel-windows too 2020-02-17 11:40:49 +00:00
David Baker
9e59f38dfc Update electron-builder 2020-02-17 11:23:40 +00:00
David Baker
a13fb235c9 Port 2c0968e40e from riot-web 2020-02-17 09:57:48 +00:00
David Baker
a0d9359ef0 Working seshat building on Windows 2020-02-15 16:52:41 +00:00
David Baker
0258d456e6 Initial commit of native dependency building. 2020-02-13 23:52:16 +00:00
David Baker
4f1586ed81 Bump to 1.5.6 
Not that it makes a lot of difference at this stage, but for general
sanity.
 2019-12-13 17:24:12 +00:00
David Baker
54421f8dc6 Merge remote-tracking branch 'origin/master' into dbkr/debrepo 2019-12-13 17:19:38 +00:00
David Baker
9a3c0f7cdc rename indocker script 2019-12-13 16:37:07 +00:00
David Baker
39c5e64406 Bundle deb into a repo 2019-12-13 16:14:33 +00:00
David Baker
6def288521 Slightly better docker support 
So you can run yarn install in the docker container
 2019-12-13 12:17:54 +00:00
David Baker
6e6e7d82c8 Use a custom control file for the Debian package 
So we can say we replace the riot-web package
 2019-12-13 10:45:27 +00:00
David Baker
3b58fdc8d9 Set version automatically 
Convert the check script to a script that sets the version to match
whatever Riot is being packaged.

Add a README because the two ways of interacting with versions are
starting to get complex to reason about.

Also add a docker build script.
 2019-12-12 19:33:29 +00:00
David Baker
dff36277c4 Sign natively on Windows 
* Replace the windows signing script with certificateSubjectName
   option which finds the right certificate from the smart card
 * Remove the windows signing script as electron-builder does it
   out-of-the-box on windows
 * Remove the cert file which isn't necessary with native signing
 2019-12-11 17:34:19 +00:00
David Baker
8d3529787a Search for the webapp resources on startup 
and error if we can't find them.
 2019-12-10 17:40:17 +00:00
David Baker
8322676df7 Oops, don't remove the aftersign script 2019-12-10 16:04:16 +00:00
David Baker
672b846364 Pack the webapp into an asar 2019-12-10 15:54:17 +00:00
David Baker
cb41f2d66d Sanitise scripts 
* Remove install:electron - it ran install-app-deps which makes sure
   native deps are installed but the native deps we use don't work
   with electron-builder anyway (they don't use binding.gyp) so this
   does absolutely nothing at all.
 * Rename build:electron to build (there is only one thing to build
   now).
 2019-12-10 15:01:04 +00:00
David Baker
c30c0e126d
Merge branch 'master' into dbkr/mkdirp 2019-12-10 14:43:57 +00:00
David Baker
faecf171e0 Use portable mkdirp 
Works on both *nix / Windows
 2019-12-10 14:38:09 +00:00
David Baker
e361292b96 Add explicit 'node' to scripts 
Otherwise they just get run with the windows scripting host
on Windows which does not go so well.
 2019-12-10 14:33:41 +00:00
David Baker
fbe8652fb1 Check properly 
yarn check != yarn run check
 2019-12-09 17:57:45 +00:00
David Baker
611e130ac7 Add rimraf 
Needed for clean
 2019-12-09 17:20:32 +00:00
David Baker
ecbaf144b2 Remove build resource config 
We use the default now
 2019-12-09 13:58:18 +00:00
David Baker
6874f5cdb1 Remove separate platform build commands 
Just always build for the native platform
 2019-12-09 13:38:14 +00:00
David Baker
5a0c1cda22 Files I've added 
This still won't work, still a WIP
 2019-12-06 18:20:31 +00:00