Commit graph

212 commits

Author SHA1 Message Date
J. Ryan Stinnett
e975a1af50
Merge pull request #63 from vector-im/jryans/extract-versions-to-hak
Extract dep versions out to hak.json
2020-04-03 23:37:29 +01:00
J. Ryan Stinnett
fdd44e9796 Extract dep versions out to hak.json 2020-04-03 23:20:56 +01:00
J. Ryan Stinnett
1c025de393
Merge pull request #62 from vector-im/dbkr/ossl_version_const
Make the openssl version a variable
2020-04-03 20:44:58 +01:00
David Baker
18b8685e87 Make the openssl version a variable
At least just hardcode it once rather than three times
2020-04-03 19:21:39 +01:00
J. Ryan Stinnett
b0e15a9f0b
Merge pull request #61 from vector-im/dbkr/update_openssl
Update openssl
2020-04-03 19:12:55 +01:00
David Baker
280871d0fb Update openssl
Apparently openssl move tarballs to /old/ once there's a new version
so all the links break. I guess we should detect what the latest version
is and use that. For now, update the URL.
2020-04-03 19:08:39 +01:00
Michael Telatynski
8996c308dc
Merge pull request #60 from vector-im/t3chguy/fix_spellcheck
Fix spellcheck language fallback algorithm
2020-04-01 17:47:29 +01:00
Michael Telatynski
9ebf217160 Fix spellcheck language fallback algorithm
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 16:35:53 +01:00
Damir Jelić
c2be98e3df Merge branch 'poljar/seshat-1.3.1-bump' 2020-03-27 15:28:40 +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
David Baker
8fe4070d15
Merge pull request #56 from vector-im/dbkr/kill_riotbot
Remove welcome user from config
2020-03-26 15:05:41 +00:00
David Baker
4a81c3c844 Remove welcome user from config
Until we update its tutorial videos to the current interface

See also https://github.com/vector-im/riot-web/pull/12894
2020-03-26 14:53:44 +00:00
Damir Jelić
2571c26372 electron-main: Use const instead of let for the index variable. 2020-03-24 14:23:49 +01:00
Damir Jelić
1e05af203c electron-main: Immediatelly set the eventIndex variable to null when closing.
The react-sdk doesn't await the closing of the event index, this is done
so because of limitations in the lifecycle module. This wasn't a problem
since we used to just set the eventIndex variable to null. Nowadays we
wait for Tantivy to shutdown using a close() method on the index.

To avoid this being called multiple times while we're already closing the
index set the eventIndex variable to null before awaiting.

This fixes https://github.com/vector-im/riot-web/issues/12838.
2020-03-24 14:21:04 +01:00
David Baker
39656bb622
Merge pull request #54 from vector-im/dbkr/enable_event_indexing_nightly
Enable Seshat on Nightly
2020-03-23 13:29:05 +00:00
David Baker
f90f36ee66 Enable Seshat on Nightly 2020-03-23 13:26:16 +00:00
Michael Telatynski
fc7223511e
Merge pull request #53 from vector-im/t3chguy/shortcuts2
Register Mac electron specific Cmd+, shortcut to User Settings
2020-03-20 10:45:09 +00:00
Michael Telatynski
f1ff04c8bc Register Mac electron specific Cmd+, shortcut to User Settings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 23:42:09 +00:00
Travis Ralston
1219138800
Merge pull request #52 from vector-im/dependabot/npm_and_yarn/minimist-1.2.2
Bump minimist from 1.2.0 to 1.2.2
2020-03-17 10:40:53 -06: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
Damir Jelić
95930cb34c Merge branch 'poljar/shutdown' 2020-03-17 10:19:25 +01:00
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ć
19c02610fd electron-main: Use the new shutdown method. 2020-03-13 11:32:25 +01: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