matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-07 23:02:56 +03:00
Code Activity
10,444 Commits 249 Branches 493 Tags
toger5/use-logspan-instead-of-child-logger
Commit Graph

1879 Commits

Author SHA1 Message Date
David Baker
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
David Baker
b9e198c172 Oops: remove debug logging 2018-10-15 11:39:39 +01:00
Hubert Chathi
91fb7b0a7c fix unit tests for backup recovery 2018-10-12 12:03:51 -04:00
Hubert Chathi
9b12c22823 de-lint plus some minor fixes 2018-10-12 10:38:10 -04:00
Hubert Chathi
3957006fae Merge remote-tracking branch 'upstream/dbkr/e2e_backups' into e2e_backups 2018-10-11 14:01:26 -04:00
Bruno Windels
2ed694b041 remove supersedes OOB logic 2018-10-11 14:32:03 +02:00
Hubert Chathi
da65f43983 wrap backup sending in a try, and add delays 2018-10-10 19:31:28 -04:00
David Baker
ada4b6ef16 Lint 2018-10-09 15:46:12 +01:00
Hubert Chathi
258adda67c retry key backups when they fail 2018-10-04 15:19:20 -04:00
David Baker
9504cbcc4f Merge remote-tracking branch 'origin/develop' into dbkr/wasm 2018-10-04 11:19:37 +01:00
David Baker
ce2058aea9 Merge branch 'dbkr/wasm' into dbkr/e2e_backups 2018-10-02 16:54:36 +01:00
David Baker
e9b0acaa8e Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups 2018-10-02 16:50:37 +01:00
Bruno Windels
5e7634506e Merge branch 'develop' into bwindels/resynconlltoggle 2018-09-26 18:23:07 +01:00
Bruno Windels
ba39b64ced re-enable test 2018-09-26 18:00:40 +01:00
Bruno Windels
2560ba2980 dont clear the store if its a brand new one 2018-09-26 10:37:52 +01:00
Bruno Windels
1fd8c43d94 fix tests 2018-09-25 18:50:09 +01:00
David Baker
63cc3fd890 lint 2018-09-25 18:14:11 +01:00
David Baker
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
Bruno Windels
0519c4c6b1 await startClient and use promises also so error gets shown 2018-09-25 15:53:14 +01:00
David Baker
a08a3078da Revert "room name should only take canonical alias into account" 2018-09-20 11:20:49 +01:00
Bruno Windels
574a6b68ae Merge pull request #735 from matrix-org/bwindels/fixstalerr 
Introduce Room.myMembership event
 2018-09-19 13:35:11 +02:00
David Baker
2f4c1dfcc4 Test all 3 code paths on backup restore 2018-09-18 17:33:47 +01:00
David Baker
e4bb37b1a8 Fix lint mostly 2018-09-18 14:53:59 +01:00
David Baker
54c443ac68 Make tests pass 2018-09-18 14:48:02 +01:00
Bruno Windels
fc3a00054f add test for new event 2018-09-17 19:33:36 +02:00
Bruno Windels
84e41c2ade fix tests 2018-09-17 18:28:07 +02:00
Bruno Windels
b829a39cd2 fix tests 2018-09-13 09:59:20 +02:00
David Baker
72bd51f26e Merge remote-tracking branch 'origin/develop' into uhoreg-e2e_backups 2018-09-11 12:02:47 +01:00
David Baker
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
David Baker
04ad3d7c3c Revert "Don't rely on members to query if syncing user can post to room" 2018-09-05 18:04:19 +01:00
Bruno Windels
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
Bruno Windels
3d98e324b5 Merge pull request #719 from matrix-org/bwindels/fixavatars-parttrois 
Fixes for room.guessDMUserId
 2018-09-04 18:17:39 +02:00
Bruno Windels
768c66313f remove unneeded async keywords 2018-09-04 18:09:47 +02:00
Bruno Windels
a3567f0918 some tests for room.guessDMUserId() 2018-09-04 13:01:45 +02:00
Bruno Windels
1239485b30 fix test 2018-08-30 15:42:15 +02:00
David Baker
60c01d7869 Revert b0b0291 and a6de395 
To make tests pass again
 2018-08-30 12:03:53 +01:00
Matthew Hodgson
a6de395cde unbreak tests from b0b0291bc7 2018-08-28 18:03:59 +01:00
Bruno Windels
85f1da1f10 revert unnecesary changes 2018-08-27 12:09:10 +02:00
Bruno Windels
5e5994f166 try and fix tests 2018-08-27 10:54:08 +02:00
Bruno Windels
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
David Baker
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
Bruno Windels
5cf2ebea4f Revert "Lazy loading: don't block on setting up room crypto" 2018-08-23 14:05:57 +02:00
Hubert Chathi
73e294b1bd add copyright header to backup.spec 2018-08-23 00:29:29 -04:00
Hubert Chathi
75107f99b2 pass in key rather than decryption object to restoreKeyBackups 2018-08-23 00:26:21 -04:00
Hubert Chathi
1faf477537 fix formatting and fix authedRequest usage 2018-08-22 23:58:59 -04:00
Bruno Windels
e3d108454c fix test 2018-08-22 23:25:37 +02:00
Bruno Windels
482eab0e2a fix tests 2018-08-15 12:01:26 +02:00
Bruno Windels
07e87915ba fix and add tests 2018-08-15 12:01:26 +02:00
Bruno Windels
827db37eef fixup 2018-08-15 12:01:26 +02:00
Bruno Windels
864ea749e5 Move /members fetching to room as getEncryptionTargetMembers needs it 2018-08-15 12:01:26 +02:00