db7848c9ba
v6.2.2
2020-06-16 11:00:41 +01:00
97497ed9d5
Prepare changelog for v6.2.2
2020-06-16 11:00:41 +01:00
60fcc652de
Merge pull request #1407 from matrix-org/jryans/1403-release
...
Use existing session id for fetching flows as to not get a new session
2020-06-16 10:56:00 +01:00
cb57717424
undo that because {} sux
2020-06-16 10:38:41 +01:00
590f7786eb
clean up
2020-06-16 10:38:41 +01:00
0024edcb7f
Use existing session id for fetching flows as to not get a new session id
2020-06-16 10:38:41 +01:00
12b573bc63
v6.2.1
2020-06-05 15:07:04 +01:00
cc8c163e0f
Prepare changelog for v6.2.1
2020-06-05 15:07:04 +01:00
abc7f76679
Merge pull request #1399 from matrix-org/bwindels/backupformatbug-rc
...
Bring back backup key format migration
2020-06-05 13:32:58 +00:00
eee04895fe
take into account key can be an object now
2020-06-05 15:26:17 +02:00
f520b88f79
fix type check in migration code
2020-06-05 15:26:17 +02:00
f0f1c113e4
Revert "remove key backup format migration"
...
This reverts commit 8d81240c58
2020-06-05 15:26:17 +02:00
84a15761ad
Revert "lint"
...
This reverts commit 9fe0e1e85f
2020-06-05 15:26:17 +02:00
30720bfdd7
v6.2.0
2020-06-04 14:57:14 +01:00
234a18f016
Prepare changelog for v6.2.0
2020-06-04 14:57:14 +01:00
2c2d531e7f
v6.2.0-rc.1
2020-06-02 13:48:12 +01:00
91e0f7fbc4
Prepare changelog for v6.2.0-rc.1
2020-06-02 13:48:12 +01:00
bebeec7d84
Merge pull request #1304 from MTRNord/fix-register-auth-with-new-spec
...
Make auth argument in the register request compliant with r0.6.0
2020-06-02 10:13:57 +01:00
86d448c285
Merge pull request #1393 from matrix-org/travis/uia-3pid
...
Send the wrong auth params with the right auth params
2020-06-01 09:14:39 -06:00
73f8867a6f
Send the wrong auth params with the right auth params
...
Followon from https://github.com/matrix-org/matrix-react-sdk/pull/4667
2020-06-01 09:08:58 -06:00
0d7cb2bf25
Merge pull request #1387 from matrix-org/uhoreg/picklekey
...
encrypt cached keys with pickle key
2020-05-28 13:51:25 -04:00
991f590056
another unit fix test
2020-05-27 23:32:23 -04:00
0e6758ccbc
more unit test fixes
2020-05-27 23:21:15 -04:00
1d9c6520e5
fix unit tests
2020-05-27 20:02:40 -04:00
c81f11df0a
encrypt/decrypt cached private keys with pickle key
2020-05-27 19:34:28 -04:00
f39a1e70de
Fix the tests
2020-05-27 13:32:28 -06:00
f0fa249d36
Request fresh flows on the initial registration request
2020-05-27 13:16:10 -06:00
8f72197817
Merge branch 'develop' into fix-register-auth-with-new-spec
2020-05-27 12:14:42 -06:00
1556ac84da
add a pickle key option to the client
2020-05-27 12:57:00 -04:00
b6da6bb835
Merge pull request #1385 from Sorunome/patch-1
...
Fix replying to key share requests
2020-05-26 12:10:44 +01:00
b1a882ea79
Fix replying to key share requests
...
This check was meant to filter out key sharing requests from ourselves. Accidentally, it filtered out sharing requests from anyone *but* ourselves.
2020-05-26 13:04:31 +02:00
3305f2cc72
Merge pull request #1384 from matrix-org/t3chguy/cdn
...
Add dist to package.json files so CDNs can serve it
2020-05-25 15:56:26 +01:00
c589a5211b
Add dist to package.json files so CDNs can serve it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-25 14:29:50 +01:00
ff0d91979b
Merge pull request #1382 from matrix-org/t3chguy/fix_getVersion_warning
...
Fix getVersion warning saying undefined room
2020-05-22 14:44:11 +01:00
9d6888cf74
Fix getVersion warning saying undefined room
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-22 14:21:51 +01:00
a4a7097c10
Merge pull request #1379 from matrix-org/dbkr/combine_default_rules_processing
...
Combine the two places we processed client-level default push rules
2020-05-21 15:11:46 +01:00
cf2b058e7c
Update comment on default override rules
2020-05-21 10:06:12 +01:00
048d7a9b63
Merge pull request #1378 from matrix-org/uhoreg/fix_mac_check
...
make MAC check robust against unpadded vs padded base64 differences
2020-05-20 12:05:35 -04:00
d6e37d0288
Combine the two places we processed client-level default push rules
...
We did this in two places: updated existing rules when the rules
were stored and then added new ones every time we computed push
action for an event. Just do both when the rules are saved.
2020-05-20 14:52:37 +01:00
3cd562fa96
Merge pull request #1375 from matrix-org/bwindels/remove-keybackup-format-migration
...
Remove key backup format migration
2020-05-20 08:05:28 +00:00
bd569cb041
Merge pull request #1241 from matrix-org/t3chguy/fix_unhomoglyph_import
...
Add simple browserify browser-matrix.js tests
2020-05-19 11:58:35 +01:00
e3c6a0e1a0
Merge branch 'master' into develop
2020-05-19 11:04:15 +01:00
b29176507c
v6.1.0
2020-05-19 11:01:13 +01:00
db25e9719b
Prepare changelog for v6.1.0
2020-05-19 11:01:13 +01:00
661901b00d
tidy up
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-18 20:11:32 +01:00
b9352cfcc1
Fix tests
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-18 20:03:04 +01:00
e381b1901e
clean up test
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-18 19:39:30 +01:00
ebdff505eb
make MAC check robust against unpadded vs padded base64 differences
2020-05-15 16:52:53 -04:00
f806e4342e
Add simple browserify sync test
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-15 18:56:09 +01:00
7f32d7d320
revert
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-15 16:55:00 +01:00
RiotRobot