matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-02 17:02:31 +03:00
Code Activity
6,618 Commits 238 Branches 514 Tags
fcbbcc0398e0942b5d0816fcd6a88bfdc3e4ac25
Commit Graph

10 Commits

Author SHA1 Message Date
Hubert Chathi
2e27e247f3 Merge branch 'develop' into symmetric_backup 2021-07-08 15:16:07 -04:00
Hubert Chathi
17dc1bda19 Merge branch 'develop' into symmetric_backup 2021-07-07 19:19:56 -04:00
Michael Telatynski
40aa6ba96a Even moar typescriptification 2021-06-24 19:19:41 +01:00
Michael Telatynski
b4dc1e1555 Moar typescriptification 2021-06-24 17:41:52 +01:00
Michael Telatynski
3effeb7dc4 Merge branch 'develop' of github.com:matrix-org/matrix-js-sdk into t3chguy/ts/4 
 Conflicts:
	package.json
	src/@types/global.d.ts
	src/crypto/key_passphrase.ts
	src/crypto/olmlib.ts
	src/utils.ts
 2021-06-24 17:04:45 +01:00
Michael Telatynski
ad2f537887 Merge remote-tracking branch 'origin/t3chguy/ts/4' into t3chguy/ts/4 2020-10-13 22:34:22 +01:00
Michael Telatynski
df36f0dab4 fix couple more errors 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 22:34:06 +01:00
Hubert Chathi
608d7faa29 fix some typescript errors 2020-10-13 17:25:58 -04:00
Michael Telatynski
13c5c4e4f5 Use utf8 instead of utf-8 
as per https://nodejs.org/api/buffer.html#buffer_buffers_and_character_encodings

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 19:36:03 +01:00
Michael Telatynski
62114028d5 Convert aes, key_passphrase, olmlib, and recoverykey to TS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 19:28:16 +01:00