Commit Graph

189 Commits

Author SHA1 Message Date
Damir Jelić defd4550e1 Merge branch 'poljar/seshat-1.2.0-updates' 2020-03-17 10:19:17 +01:00
Travis Ralston f02820ff23 Merge pull request #49 from vector-im/travis/theme-poc
Add custom themes labs flag
2020-03-13 09:48:05 -06:00
Travis Ralston 5fe69385ca Add custom themes labs flag
Per https://github.com/vector-im/riot-web/pull/12731
2020-03-13 09:40:30 -06:00
Damir Jelić 23bfa9262e electron-main: Add support to delete events from the index. 2020-03-12 11:46:14 +01:00
David Baker 093a2bb4a4 Merge pull request #46 from vector-im/dbkr/get_appid_from_context
Get the app ID from the cintext
2020-03-11 19:25:33 +00:00
David Baker 8b9314cc0d Get the app ID from the cintext
So we can use the right app ID for nightly
2020-03-11 19:21:14 +00:00
Damir Jelić 3509d3d5af electron-main: Fix a couple of lint errors. 2020-03-11 12:05:34 +01:00
Damir Jelić 4b35086028 electron-main: Reindex the event index if it indicates that this is needed. 2020-03-11 11:27:00 +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 cc083e3014 Merge pull request #45 from vector-im/dbkr/bump_seshat
Bump seshat dependency
2020-03-09 13:47:57 +00:00
David Baker 892258e340 Bump seshat dependency 2020-03-09 13:46:08 +00:00
David Baker 3f77d0c70e Merge pull request #44 from vector-im/dbkr/move_deb_control
Move deb control logic to builder
2020-03-09 12:43:20 +00:00
David Baker a1366992bc Remove things that now live in riot-builder 2020-03-07 16:12:59 +00:00
David Baker 3f89d545ed Template control file for nightly 2020-03-07 14:19:04 +00:00
David Baker cd89fed834 Move deb control stuff into builder
We need to change it between release & nightly and it's probably
not much use for anyone else, and gets rid of the confusing errors
about the 'control' file not existing.
2020-03-07 12:23:00 +00:00
David Baker 18f091af46 Merge pull request #43 from vector-im/dbkr/nightly_brand
Add 'nightly' to brand too
2020-03-07 00:00:49 +00:00
David Baker b21e8dec58 Add 'nightly' to brand too
Which should set the windows title on windows
2020-03-06 23:57:47 +00:00
David Baker c828f50e88 Merge pull request #42 from vector-im/dbkr/actally_enable_the_thing_we_did_all_this_for
Enable seshat in labs on nightly
2020-03-06 23:38:16 +00:00
David Baker c4f342b7b1 Enable seshat in labs on nightly 2020-03-06 23:26:38 +00:00
David Baker 77ab892430 Merge pull request #41 from vector-im/dbkr/config_of_the_night
Add config for Riot Nightly
2020-03-06 17:34:27 +00:00
David Baker 2fe6040c23 Merge pull request #40 from vector-im/dbkr/winsign
Add a windows signing script
2020-03-06 17:23:53 +00:00
David Baker e34736954c More sensible dir tree 2020-03-06 17:20:48 +00:00
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