243bab7036
Merge branch 'dbkr/stop_devicelist' into dbkr/e2e_backups
2018-10-25 19:03:57 +01:00
88b39f4b67
Stop devicelist when client is stopped
...
To avoid the devicelist trying to save after the client has been
stopped
Hopefully will fix random test failures on node 11.
2018-10-25 19:00:03 +01:00
5e8061f846
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
2018-10-25 17:33:48 +01:00
4b9c6e6bd2
Merge remote-tracking branch 'origin/develop' into dbkr/wasm
2018-10-24 19:15:04 +01:00
3a316de9ef
Update to Olm 3 here too
2018-10-24 17:40:58 +01:00
f165b55a1d
Merge branch 'e2e_backups' of git://github.com/uhoreg/matrix-js-sdk into uhoreg-e2e_backups
2018-10-24 17:15:36 +01:00
b9e198c172
Oops: remove debug logging
2018-10-15 11:39:39 +01:00
91fb7b0a7c
fix unit tests for backup recovery
2018-10-12 12:03:51 -04:00
9b12c22823
de-lint plus some minor fixes
2018-10-12 10:38:10 -04:00
3957006fae
Merge remote-tracking branch 'upstream/dbkr/e2e_backups' into e2e_backups
2018-10-11 14:01:26 -04:00
2ed694b041
remove supersedes OOB logic
2018-10-11 14:32:03 +02:00
da65f43983
wrap backup sending in a try, and add delays
2018-10-10 19:31:28 -04:00
ada4b6ef16
Lint
2018-10-09 15:46:12 +01:00
258adda67c
retry key backups when they fail
2018-10-04 15:19:20 -04:00
9504cbcc4f
Merge remote-tracking branch 'origin/develop' into dbkr/wasm
2018-10-04 11:19:37 +01:00
ce2058aea9
Merge branch 'dbkr/wasm' into dbkr/e2e_backups
2018-10-02 16:54:36 +01:00
e9b0acaa8e
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
2018-10-02 16:50:37 +01:00
5e7634506e
Merge branch 'develop' into bwindels/resynconlltoggle
2018-09-26 18:23:07 +01:00
ba39b64ced
re-enable test
2018-09-26 18:00:40 +01:00
2560ba2980
dont clear the store if its a brand new one
2018-09-26 10:37:52 +01:00
1fd8c43d94
fix tests
2018-09-25 18:50:09 +01:00
63cc3fd890
lint
2018-09-25 18:14:11 +01:00
c556ca40b1
Support Olm with WebAssembly
...
wasm Olm has a new interface: it now has an init method that needs
to be called and the promise it returns waited on before the Olm
module is used. Support that, and allow Crypto etc to be imported
whether Olm is enabled or not. Change whether olm is enabled to
be async since now it will be unavailable if the async module init
fails. Don't call getOlmVersion() until the Olm.init() is done.
2018-09-25 17:49:54 +01:00
a08a3078da
Revert "room name should only take canonical alias into account"
2018-09-20 11:20:49 +01:00
574a6b68ae
Merge pull request #735 from matrix-org/bwindels/fixstalerr
...
Introduce Room.myMembership event
2018-09-19 13:35:11 +02:00
2f4c1dfcc4
Test all 3 code paths on backup restore
2018-09-18 17:33:47 +01:00
e4bb37b1a8
Fix lint mostly
2018-09-18 14:53:59 +01:00
54c443ac68
Make tests pass
2018-09-18 14:48:02 +01:00
fc3a00054f
add test for new event
2018-09-17 19:33:36 +02:00
84e41c2ade
fix tests
2018-09-17 18:28:07 +02:00
b829a39cd2
fix tests
2018-09-13 09:59:20 +02:00
72bd51f26e
Merge remote-tracking branch 'origin/develop' into uhoreg-e2e_backups
2018-09-11 12:02:47 +01:00
a0639a32c7
Revert "Revert "Don't rely on members to query if syncing user can post to room""
2018-09-06 11:47:40 +01:00
04ad3d7c3c
Revert "Don't rely on members to query if syncing user can post to room"
2018-09-05 18:04:19 +01:00
8b00083bca
check power levels without relying on membership
...
as this might not be known for the syncing user.
instead, add a method to room which always knows the syncing user's membership
2018-09-05 12:36:53 +02:00
3d98e324b5
Merge pull request #719 from matrix-org/bwindels/fixavatars-parttrois
...
Fixes for room.guessDMUserId
2018-09-04 18:17:39 +02:00
768c66313f
remove unneeded async keywords
2018-09-04 18:09:47 +02:00
a3567f0918
some tests for room.guessDMUserId()
2018-09-04 13:01:45 +02:00
1239485b30
fix test
2018-08-30 15:42:15 +02:00
60c01d7869
Revert b0b0291 and a6de395
...
To make tests pass again
2018-08-30 12:03:53 +01:00
a6de395cde
unbreak tests from b0b0291bc7
2018-08-28 18:03:59 +01:00
21e0c79f7d
Revert "Revert "Lazy loading: don't block on setting up room crypto""
...
This reverts commit 5cf2ebea4f
2018-08-27 10:54:08 +02:00
ec5fff2046
Merge branch 'e2e_backups' of git://github.com/uhoreg/matrix-js-sdk into uhoreg-e2e_backups
2018-08-24 13:29:29 +01:00
5cf2ebea4f
Revert "Lazy loading: don't block on setting up room crypto"
2018-08-23 14:05:57 +02:00
73e294b1bd
add copyright header to backup.spec
2018-08-23 00:29:29 -04:00
75107f99b2
pass in key rather than decryption object to restoreKeyBackups
2018-08-23 00:26:21 -04:00
1faf477537
fix formatting and fix authedRequest usage
2018-08-22 23:58:59 -04:00
e3d108454c
fix test
2018-08-22 23:25:37 +02:00
482eab0e2a
fix tests
2018-08-15 12:01:26 +02:00
07e87915ba
fix and add tests
2018-08-15 12:01:26 +02:00
