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

2117 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
0304096e46 lint 2020-03-06 16:42:24 +00:00
David Baker
450afde85e Add config for Riot Nightly 
And also 1) revert an accidental commit to the main config file, and
2) port over some forgotten things to the main config file
 2020-03-06 16:37:17 +00:00
David Baker
dd59fd586a Merge remote-tracking branch 'origin/master' into dbkr/winsign 2020-03-06 16:31:25 +00:00
David Baker
ecbfbe73a0 Add really useful stackoverflow link 2020-03-06 16:18:55 +00:00
David Baker
e2a6cc3196 Remove certificateSubjectName which didn't work 
and comment cert file hard-coded hack
 2020-03-06 16:14:51 +00:00
David Baker
aad1e8388e Nope, that didn't work. Try the cert file, 2020-03-06 15:57:25 +00:00
David Baker
83746b5709 let's try this format 2020-03-06 15:52:54 +00:00
David Baker
781eff95ac hardcode cert sha1 to test 2020-03-06 15:51:39 +00:00
David Baker
d403b86690 Removing logging 2020-03-06 15:34:36 +00:00
David Baker
bffee2d4c3 Add csp option which is apparently required 2020-03-06 15:01:50 +00:00
David Baker
1585e370d3 It's options.options in the original so keep it that way 2020-03-06 14:55:14 +00:00
David Baker
7f25e23878 Also try actually returning the value 2020-03-06 14:50:53 +00:00
David Baker
763b176b2e variable name 2020-03-06 14:49:55 +00:00
David Baker
5c85de4934 Fix synatx hopefully 2020-03-06 14:47:09 +00:00
David Baker
f961513212 args, not options 2020-03-06 14:38:13 +00:00
David Baker
6e8f8dcdce Define the args variable 
also it's not osslsigncode anymore
 2020-03-06 14:35:09 +00:00
David Baker
cee7410388 also just one level of options 2020-03-06 14:32:02 +00:00
David Baker
8cbef5b5e5 name the function the same thing 2020-03-06 14:29:11 +00:00
David Baker
da606bcd6d Too many dots 2020-03-06 14:22:06 +00:00
Michael Telatynski
ec33fb4509
Merge branch 'master' into t3chguy/depr8 2020-03-05 11:12:39 +00:00
Michael Telatynski
825d90e27b move the setter from the deprecated method also 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-05 11:12:01 +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
88e51bd458
Merge pull request #39 from vector-im/dbkr/remove_win_certificate 
Remove the certificate config for windows
 2020-03-03 10:45:21 +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
c91a39097d Migrate from deprecated BrowserWindow::isMenuBarAutoHide() 2020-03-03 10:00:09 +00:00
Michael Telatynski
4b8b32c3e5 only register open-url handler on macos 2020-03-02 16:49:55 +00:00
Michael Telatynski
dd45008291 update comments and win32 specialcase 2020-03-02 16:49:04 +00:00
Michael Telatynski
d7ebad284e update comment 2020-03-02 16:46:50 +00:00
Michael Telatynski
eac8118452 Small comment tweaks 2020-03-02 16:45:28 +00:00
Michael Telatynski
1f1cf95906 Fix entitlements.mac.plist 2020-03-02 16:34:04 +00:00
Michael Telatynski
bbc44801c2 add missing protocol.js 2020-03-02 15:49:37 +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
40eec12b86
Merge pull request #36 from vector-im/dbkr/missed_await 
Missed an await
 2020-03-02 10:38:08 +00:00
David Baker
5b3ecd34a3 Missed an await 2020-03-01 14:19:34 +00:00
David Baker
638fcabf16
Merge pull request #35 from vector-im/dbkr/exitcode 
Exit with exit code on exception
 2020-02-28 09:36:44 +00:00
David Baker
8aac5928a2
Merge pull request #34 from vector-im/dbkr/fix-set-version 
Fix the set-version script
 2020-02-28 09:31:59 +00:00
David Baker
c4f6ff4dcd
Merge pull request #33 from vector-im/dbkr/docker-env 
Pass through the env var we actually use to docker
 2020-02-28 09:31:49 +00:00
David Baker
de1090cc18 Actually pass a function 2020-02-27 21:43:19 +00:00
David Baker
8b8203cea8 Exit with exit code on exception 
Otherwise running the check script will just exit with 0 which is
pointless.
 2020-02-27 21:37:07 +00:00
David Baker
67a4c99907 Fix the set-version script 
Call the right function to set package version and await
 2020-02-27 17:34:34 +00:00
David Baker
f48692bddb Merge branch 'master' into dbkr/docker-env 2020-02-27 17:30:55 +00:00
David Baker
18dbad4e8c Revert e0631770b5 & 9ec2407957 
Which were accidentally comitted to master and also completely wrong
as it sets the version to the literal 'develop' which is silly.
 2020-02-27 17:30:00 +00:00
David Baker
fca983cc7d Merge branch 'master' into dbkr/docker-env 2020-02-27 17:22:38 +00:00
David Baker
9ec2407957 Don't shadow the import 2020-02-27 17:22:10 +00:00
David Baker
a76ebed5d2 Merge branch 'master' into dbkr/docker-env 2020-02-27 17:19:49 +00:00
David Baker
e0631770b5 Always update deb version 
We always need the debian version to be correct.
 2020-02-27 17:17:51 +00:00
David Baker
af1f4715be Pass through the env var we actually use to docker 2020-02-27 16:52:09 +00:00