matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-23 22:42:10 +03:00
Code Activity
4,436 Commits 241 Branches 517 Tags
7c84f421c5a88f55d95e329a6d4b84e91b2d0cdf
Commit Graph

4436 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
7c84f421c5 Turns out prepublish is deprecated and should be prepare 2020-01-22 20:58:25 +00:00
David Baker
42a1dea7ad Add a prepublish script 
So we actually build the lib directory before publishing it
 2020-01-22 20:58:18 +00:00
RiotRobot
43fee73924 v4.0.0-rc.1 v4.0.0-rc.1 2020-01-20 14:24:36 +00:00
RiotRobot
b72e9cb36c Prepare changelog for v4.0.0-rc.1 2020-01-20 14:24:35 +00:00
J. Ryan Stinnett
737dcc1d29 Merge pull request #1154 from matrix-org/jryans/complete-sec-confused 
Convert secret storage to new account data API
 2020-01-20 11:30:55 +00:00
Travis Ralston
dba08d230e Merge pull request #1157 from aaronraimist/v5-safe 
Add v5 as a safe room version
 2020-01-18 19:29:44 -07:00
Aaron Raimist
15fb363874 Add v5 as a safe room version 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-01-18 16:37:19 -06:00
J. Ryan Stinnett
ceb4581f91 Convert secret storage to new account data API 
This converts all secret storage to use a newer account data API which uses
cached data in stored when available, but also knows how to ask the homeserver
in case it's invoked during early client startup before the initial sync.

As a consequence, it means most secret storage APIs are now async.

Part of https://github.com/vector-im/riot-web/issues/11901
 2020-01-17 17:56:05 +00:00
J. Ryan Stinnett
8217c0f05f Merge pull request #1153 from matrix-org/jryans/cross-signing-setup 
Add API to get account data from server
 2020-01-16 16:42:12 +00:00
J. Ryan Stinnett
c5c27b3cb0 Add API to get account data from server 
This adds an API account data getter that bypasses the local store and goes
directly to the homeserver.

Part of https://github.com/vector-im/riot-web/issues/11214
 2020-01-15 21:17:53 +00:00
Travis Ralston
04bbfae08e Merge pull request #1151 from matrix-org/travis/sourcemaps 
Fix sourcemaps by refactoring the build system
 2020-01-15 10:11:25 -07:00
Travis Ralston
b3efa73eda Fix conflict in megolm.js 2020-01-15 09:06:30 -07:00
Travis Ralston
f3efac059c Merge branch 'develop' into travis/sourcemaps 2020-01-15 09:03:21 -07:00
Hubert Chathi
9fb4ed2ec0 Merge pull request #1146 from uhoreg/reporting_olm_error 
record, report, and notify about olm errors
 2020-01-15 09:37:43 -05:00
Hubert Chathi
f19013143a fix indexedDB storage and retry decryption when we get an olm error 2020-01-14 23:47:05 -05:00
Hubert Chathi
ea3ee9bea5 Merge pull request #1148 from matrix-org/erikj/per_user_device_messages 
Send device messages for the same user in same API call.
 2020-01-14 21:33:46 -05:00
Travis Ralston
ccca6f4b6d Re-add dist script usage to js-sdk and release script 2020-01-14 14:44:06 -07:00
David Baker
6a583d2ba6 Merge pull request #1150 from matrix-org/dbkr/dont_error_on_unknown_devices 
Add an option to ignore unverified devices
 2020-01-14 17:11:47 +00:00
Travis Ralston
4049a32871 Fix imports in crypto index post-merge 2020-01-14 10:08:26 -07:00
Travis Ralston
331c9ce1ff [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps 2020-01-14 10:04:36 -07:00
David Baker
81ab2aca37 spelling 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-14 14:10:17 +00:00
David Baker
564b8276bf Merge pull request #1144 from matrix-org/dbkr/key_backup_resign 
Sign key backup with cross-signing key on upgrade
 2020-01-14 11:30:06 +00:00
Erik Johnston
b4a93d2dc3 Also apply cahnge to '_splitBlockedDevices' 2020-01-14 10:09:19 +00:00
Erik Johnston
260040b919 Rename var to match new function 2020-01-14 10:07:54 +00:00
J. Ryan Stinnett
8dbef8b68e Merge pull request #1145 from aaronraimist/lock 
Emoji verification: Change name of 🔒 to lock
 2020-01-13 21:32:49 +00:00
Travis Ralston
458b2d422d Merge branch 'develop' into travis/sourcemaps 2020-01-13 11:17:27 -07:00
David Baker
ee51357dbc Add an option to ignore unverified devices 
Hopefully all necessary information is on the docstring.

Default behaviour remains unchanged.
 2020-01-13 17:37:38 +00:00
Hubert Chathi
fa679e873d Merge pull request #1147 from uhoreg/separate_encrypted_content 
use a separate object for each encrypted content
 2020-01-13 10:17:32 -05:00
Erik Johnston
ed3fded8e8 Send device messages for the same user in same API call. 
Currently we split the device messages up to limit the number per call,
but that can end up splitting messages to a given users device over
separate API calls. This is fine, but means that the server can't e.g.
bundle them into a single EDU for remote users or sanity check that the
client is sending to the right set of devices (i.e. its device list
cache isn't wrong).
 2020-01-13 13:43:00 +00:00
RiotRobot
92df82bfa9 Merge branch 'master' into develop 2020-01-13 12:55:18 +00:00
RiotRobot
0dc9c27651 v3.0.0 v3.0.0 2020-01-13 12:52:23 +00:00
RiotRobot
f6f54c35a3 Prepare changelog for v3.0.0 2020-01-13 12:52:22 +00:00
Hubert Chathi
0a9959bffb use a separate object for each encrypted content 
so that we don't duplicate the ciphertext for everyone
 2020-01-11 15:49:01 -05:00
Hubert Chathi
b3a16cb852 lint (and add a comment) 2020-01-10 13:36:11 -05:00
Aaron Raimist
9beb259333 Emoji verification: Change name of 🔒 to lock 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-01-09 21:55:43 -06:00
Hubert Chathi
63c57e8e02 record, report, and notify about olm errors 2020-01-09 22:19:35 -05:00
David Baker
0448a7ea68 Sign key backup with cross-signing key on upgrade 
Add a signature from the cross-signing master key to the key
backup when upgrading the key backup into cross-signing.

For https://github.com/vector-im/riot-web/issues/11747
 2020-01-09 20:46:36 +00:00
Travis Ralston
5bd005b28a Merge pull request #1143 from matrix-org/travis/sourcemaps-dev 
Sourcemaps: develop -> feature branch
 2020-01-07 15:30:56 -07:00
Travis Ralston
3aec6367d1 Fix OlmDevice import for "algorithms" to fix tests 2020-01-07 15:09:46 -07:00
Travis Ralston
cea3831c20 Fix merge conflicts 
This is done outside of the merge to highlight the changes, hopefully.
 2020-01-07 14:43:36 -07:00
Travis Ralston
18ccceca2d [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-dev 2020-01-07 14:37:17 -07:00
Travis Ralston
fffcdcb514 Merge pull request #1134 from matrix-org/travis/babel7-wp-media 
Use a safer import/export scheme for the ContentRepo utilities
 2020-01-07 14:27:36 -07:00
Hubert Chathi
efadf374d6 Merge pull request #1142 from uhoreg/reporting_no_key_fix 
Fix error handling in decryptGroupMessage
 2020-01-07 11:36:53 -05:00
Hubert Chathi
55ecb40190 don't keep processing if we have an error 2020-01-07 11:25:30 -05:00
Hubert Chathi
01f6b3dfc6 notify devices when we don't send them keys (#1135) 
and handle incoming notifications
 2020-01-06 17:47:22 -05:00
RiotRobot
786590eadc v3.0.0-rc.1 v3.0.0-rc.1 2020-01-06 13:54:48 +00:00
RiotRobot
c9174188ba Prepare changelog for v3.0.0-rc.1 2020-01-06 13:54:47 +00:00
Michael Telatynski
64fb79e0be Merge pull request #1141 from matrix-org/t3chguy/fuzzier_disambiguate 
Make displayName disambiguation more fuzzy especially against RTL/LTR content
 2020-01-06 13:12:39 +00:00
Michael Telatynski
088ff5d0aa Merge pull request #1129 from matrix-org/t3chguy/m_too_large 
stop trying to resend event if we get M_TOO_LARGE
 2020-01-06 11:42:27 +00:00
Michael Telatynski
99e58b0297 Make displayName disambiguation more fuzzy especially against RTL/LTR content 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-05 19:40:04 +00:00