1
0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-29 16:43:09 +03:00
Commit Graph

2643 Commits

Author SHA1 Message Date
David Baker
fee90bab66 Wording fix 2018-01-02 13:35:52 +00:00
David Baker
e26ade0e62 Wording fix 2018-01-02 13:32:51 +00:00
David Baker
c43ccb860b Always migrate inbound group sessions 2018-01-02 13:31:57 +00:00
Richard van der Hoff
f2b7e8b038 Remove spurious linty blank line 2017-12-14 22:36:53 +00:00
Stefan Parviainen
1863f1311b Disambiguate display name if it contains a mxid
Fixes https://github.com/vector-im/riot-web/issues/1811

Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-12-14 21:49:13 +01:00
David Baker
e5086f22d6 Merge remote-tracking branch 'origin/develop' into dbkr/inbound_sessions_to_cryptostore 2017-12-08 19:06:36 +00:00
David Baker
da90a3ca78 Merge pull request #585 from matrix-org/dbkr/count_sessions_before_migrate
Check for sessions in indexeddb before migrating
2017-12-08 18:29:50 +00:00
David Baker
d397c5a251 Merge pull request #586 from matrix-org/dbkr/crypto_store_migrate_warning
Emit an event for crypto store migration
2017-12-08 18:17:23 +00:00
David Baker
d26b4434b8 Merge pull request #575 from matrix-org/dbkr/udd_no_auto_show
Supporting fixes For making UnknownDeviceDialog not pop up automatically
2017-12-08 16:33:18 +00:00
David Baker
7188f17f9a more linting 2017-12-07 17:14:11 +00:00
David Baker
b0365f8b0e json encode before saving to localstorage 2017-12-07 17:07:06 +00:00
David Baker
a1ddeea00e Fix inbound group session migration
Apparently they are parsed at a different layer
2017-12-07 16:50:18 +00:00
David Baker
1414c24caf Missed txn 2017-12-07 15:03:02 +00:00
David Baker
0748c864cd Migrate inbound sessions from session store 2017-12-07 14:57:18 +00:00
David Baker
f80626a0fa lint 2017-12-07 14:32:23 +00:00
David Baker
0fffd64a7f Fix key export 2017-12-07 14:23:36 +00:00
David Baker
8da48211d9 Fix exportInboundGroupSession 2017-12-06 22:42:19 +00:00
David Baker
0dd8ffa3a0 Much tedious linting 2017-12-06 22:36:24 +00:00
David Baker
0362e61f36 Unused var 2017-12-06 22:24:57 +00:00
David Baker
d92a77f695 lint 2017-12-06 22:24:19 +00:00
David Baker
e6dd573e8a Fix test (needs a cryptostore now) 2017-12-06 19:42:01 +00:00
David Baker
b6330c3a4f er, this isn't an object 2017-12-06 19:41:44 +00:00
David Baker
10bc714f5c lint 2017-12-06 16:04:00 +00:00
David Baker
8f57723b88 Emit an event for crypto store migration
As we may want to warn the user to not go back to an older version.
2017-12-06 15:24:29 +00:00
David Baker
3d71bee85e Check for sessions in indexeddb before migrating
Don't migrate sessions from localstorage if we already have some
in indexeddb
2017-12-06 12:43:08 +00:00
David Baker
30e00d5fa7 Add impl to localstorage & memory store 2017-12-06 12:02:05 +00:00
David Baker
bc99a9d792 Merge remote-tracking branch 'origin/develop' into dbkr/inbound_sessions_to_cryptostore 2017-12-06 10:05:33 +00:00
David Baker
61df41d21f Merge pull request #584 from matrix-org/dbkr/sessions_to_cryptostore
Move sessions to the crypto store
2017-12-06 10:04:33 +00:00
David Baker
0b4ef8dcbb Migrate inbound group sessions to crypto store 2017-12-05 21:47:22 +00:00
David Baker
9d7d48b9b5 s/sessionStore/cryptoStore/ 2017-12-05 14:04:18 +00:00
David Baker
fb37150dfd Doc exception handling fun 2017-12-05 13:45:37 +00:00
David Baker
bd08ed898d Maybe slightly better exception handling 2017-12-05 11:11:14 +00:00
David Baker
d3bc525713 More doc 2017-12-05 10:23:26 +00:00
David Baker
ae27c553ac More sensible loop & logging 2017-12-05 10:13:34 +00:00
David Baker
27030ae1e9 Use _unpickleSession in _getSession 2017-12-05 10:09:54 +00:00
David Baker
fd083e1e66 doc 2017-12-05 10:04:06 +00:00
David Baker
5e4149ae76 Remove unused function 2017-12-04 18:14:56 +00:00
David Baker
859d462629 Lint 2017-12-04 18:08:38 +00:00
David Baker
8bfa81df42 Catch & rethrow decryption exceptions 2017-12-04 17:55:12 +00:00
David Baker
6782d53e28 Remove prefix from sessions store keys 2017-12-04 17:36:33 +00:00
David Baker
4796721d5c Migrate sessions from sessionStore 2017-12-04 17:12:13 +00:00
David Baker
55bbc71a17 Move sessionstore -> cryptostore migration
...into a separate function
2017-12-04 16:08:52 +00:00
David Baker
5372575b24 Implement session storage in memory & localstorage 2017-12-04 15:49:59 +00:00
David Baker
d995019c6e lint 2017-12-04 14:40:32 +00:00
David Baker
aa70da5659 Move sessions to the crypto store
This doesn't migrate existing ones yet
2017-12-04 14:33:03 +00:00
Luke Barnard
020b293068 Merge branch 'master' into develop 2017-12-04 11:58:30 +00:00
Luke Barnard
678ff23bcb v0.9.2 v0.9.2 2017-12-04 11:57:05 +00:00
Luke Barnard
f93d50dcd0 Prepare changelog for v0.9.2 2017-12-04 11:57:04 +00:00
Luke Barnard
aa3201ebb0 Send correct m.visibility flag in js-sdk 2017-12-04 11:54:42 +00:00
Luke Barnard
4ad153c425 Send correct m.visibility flag in js-sdk 2017-12-01 18:01:23 +00:00