matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-28 05:03:59 +03:00
Code Activity
4,055 Commits 238 Branches 514 Tags
686a7a40f99f39ea8eb68762e18ff942f5ee7c54
Commit Graph

4055 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
686a7a40f9 Remove outdated comment 
uhoreg says this is fine now...
 2019-11-14 12:11:07 +00:00
David Baker
2a7b2835b6 remove unused function 2019-11-14 12:11:07 +00:00
David Baker
69ecf3b145 jsdoc formatting 2019-11-14 12:11:07 +00:00
David Baker
2cd748b50c Add matrix foundation copyright 
The creation of this file just predates matrix.org foundation so it
should have both
 2019-11-14 12:11:07 +00:00
David Baker
291133beb9 Fix comment 2019-11-14 12:11:07 +00:00
David Baker
e10c17c866 Use official name for SSSS 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-11-14 12:10:56 +00:00
David Baker
0048cbef08 Mark cross siging / SSSS APIs as unstable 
also add missing jsdoc
 2019-11-14 11:51:44 +00:00
David Baker
d9d65309b3 More s/cross-signing/crossSigning/ 2019-11-14 11:29:08 +00:00
David Baker
d5d8032b5b Camelcase event names 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-11-14 11:04:37 +00:00
David Baker
693c749da0 lint 2019-11-13 17:59:25 +00:00
David Baker
7218e31a9c Sign & verify SSSS keys 2019-11-13 17:52:24 +00:00
David Baker
1798f3921f Make setDeafultKeyId wait for event 2019-11-13 14:42:08 +00:00
David Baker
d12c56a623 lint 2019-11-13 14:11:50 +00:00
David Baker
26aa3d3ce7 Support default keys 2019-11-13 14:09:40 +00:00
David Baker
c97a87d1f6 Throw if an unknown key is specified 
It's probably important that the app knows if a secret isn't going
to be stored under one or more of the keys it thought it was going
to be stored under.

Also add a test to assert it.
 2019-11-12 14:07:05 +00:00
David Baker
9bc185d459 Fix what was probablyt a c+p fail 2019-11-12 13:21:37 +00:00
David Baker
4c651c15ea Convert secrets events to callbacks too 2019-11-11 20:01:11 +00:00
David Baker
a98e6964ef Missed bits of callback renaming 2019-11-11 16:51:49 +00:00
David Baker
6f8d9c4693 Rename getPrivateKeys to getCrossSigningKeys 2019-11-11 16:45:01 +00:00
David Baker
3a983271d6 add comments 2019-11-07 16:21:53 +00:00
David Baker
03fe4afe32 lint 2019-11-07 15:20:07 +00:00
David Baker
12627022d1 Convert sas verification test to callbacks 2019-11-07 15:18:16 +00:00
David Baker
fabfe16d45 lint 2019-11-07 12:35:39 +00:00
David Baker
a34758f938 Convert event interface to callbacks 
Use options.cryptoCallbacks for things that require information
from the app rather than events, since events can have zero, one
or many listeners and the emitter doesn't know how many, so if
nobody's listening then we would have just waited forever for a
response.

Also a collection of other changes like renaming 'fu' to 'firstUse'
 2019-11-07 12:31:44 +00:00
David Baker
f3073e120d Space 2019-11-01 10:51:49 +00:00
David Baker
a571624e13 Typo 2019-11-01 10:46:43 +00:00
David Baker
74b649c04c Typo 2019-11-01 10:45:41 +00:00
David Baker
49588da73d Fix more tests 2019-10-29 19:39:31 +00:00
David Baker
3e2d845342 Merge remote-tracking branch 'origin/develop' into dbkr/cross_signing 2019-10-28 16:47:16 +00:00
David Baker
e92d2bd70a Fix test again 
That one was part of the protocol - don't camelcase that
 2019-10-28 16:07:26 +00:00
David Baker
de1b545df1 lint 2019-10-28 15:42:42 +00:00
David Baker
3bec28b2ff make other tests pass 2019-10-28 15:23:58 +00:00
David Baker
8cad116dd7 Make tests pass 
* Pass the http backend out of makeTestClients so we can tell it
   to expect queries and flush requests out
 * Change colons to dots in the key events
 2019-10-28 14:56:35 +00:00
Hubert Chathi
35adb75d80 Merge pull request #1056 from uhoreg/fix_logger_path 
fix the path in references to logger.js
 2019-10-26 13:45:24 -04:00
Hubert Chathi
e9908b1d97 fix the path in references to logger.js 2019-10-25 23:24:30 -04:00
Hubert Chathi
fffd2eb70a Merge pull request #1050 from uhoreg/verification_in_dms 
verification in DMs
 2019-10-23 12:09:52 -04:00
Hubert Chathi
136b9c0f50 remove unnecessary async 2019-10-23 12:03:17 -04:00
Hubert Chathi
0f1206b4ee apply suggestions from review 2019-10-22 13:29:24 -04:00
RiotRobot
46d7e4c707 Merge branch 'master' into develop 2019-10-18 14:38:58 +01:00
RiotRobot
c874783742 v2.4.2 v2.4.2 2019-10-18 14:36:57 +01:00
RiotRobot
bb296f50d9 Prepare changelog for v2.4.2 2019-10-18 14:36:57 +01:00
Michael Telatynski
da68b53ff9 Merge pull request #1054 from rcsm/develop 
Properly document the function possible returns for getRelationsForEvent
 2019-10-17 15:35:33 +01:00
Rafael Cascalho
bbe141d44e chore: updated throws docs in function getRelationsForEvent 2019-10-17 11:30:41 -03:00
Rafael Cascalho
8a03e41a7c chore: corrected the docs the getRelationsForEvent function 2019-10-17 10:51:34 -03:00
Rafael Cascalho
a79e1bc976 Merge remote-tracking branch 'upstream/develop' into develop 2019-10-17 10:15:10 -03:00
J. Ryan Stinnett
056bfbf7a3 Merge pull request #1055 from matrix-org/jryans/bluebird-3.5 
Downgrade to Bluebird 3.5.5 to fix Firefox
 2019-10-17 00:10:54 +02:00
J. Ryan Stinnett
e0b64a487d Downgrade to Bluebird 3.5.5 to fix Firefox 
Bluebird 3.6.0+ currently breaks in at least Firefox with errors in their
rejection tracking approach. For now, this retreats back to the version we had
used for a long time.

Regressed by https://github.com/matrix-org/matrix-js-sdk/pull/1053
Fixes https://github.com/vector-im/riot-web/issues/11148
 2019-10-17 00:05:47 +02:00
Rafael Cascalho
d47d1d8f26 Merge remote-tracking branch 'upstream/develop' into develop 2019-10-15 11:12:00 -03:00
Rafael Cascalho
42a07de9a7 chore: corrected getRelationForEvent return docs 2019-10-15 10:28:23 -03:00
J. Ryan Stinnett
aead855470 Merge pull request #1053 from matrix-org/jryans/major-deps-2 
Upgrade safe deps to latest major version
 2019-10-11 13:53:58 +01:00