t3chguy/matrix-js-sdk

Pull Requests Commits

Merge branch 'develop' into travis/sourcemaps

turt2live committed 6 years ago

f3efac05

Merge pull request #1146 from uhoreg/reporting_olm_error

uhoreg committed 6 years ago

Verified 9fb4ed2e

fix indexedDB storage and retry decryption when we get an olm error

uhoreg committed 6 years ago

f1901314

Merge pull request #1148 from matrix-org/erikj/per_user_device_messages

uhoreg committed 6 years ago

Verified ea3ee9be

Re-add dist script usage to js-sdk and release script

turt2live committed 6 years ago

ccca6f4b

Merge pull request #1150 from matrix-org/dbkr/dont_error_on_unknown_devices

dbkr committed 6 years ago

Verified 6a583d2b

Fix imports in crypto index post-merge

turt2live committed 6 years ago

4049a328

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps

turt2live committed 6 years ago

331c9ce1

dbkr committed 6 years ago

Verified 81ab2aca

Merge pull request #1144 from matrix-org/dbkr/key_backup_resign

dbkr committed 6 years ago

Verified 564b8276

Also apply cahnge to '_splitBlockedDevices'

erikjohnston committed 6 years ago

b4a93d2d

Rename var to match new function

erikjohnston committed 6 years ago

260040b9

Merge pull request #1145 from aaronraimist/lock

jryans committed 6 years ago

Verified 8dbef8b6

Merge branch 'develop' into travis/sourcemaps

turt2live committed 6 years ago

458b2d42

Add an option to ignore unverified devices

dbkr committed 6 years ago

ee51357d

Merge pull request #1147 from uhoreg/separate_encrypted_content

uhoreg committed 6 years ago

Verified fa679e87

Send device messages for the same user in same API call.

erikjohnston committed 6 years ago

ed3fded8

Merge branch 'master' into develop

RiotRobot committed 6 years ago

92df82bf

RiotRobot committed 6 years ago

0dc9c276

Prepare changelog for v3.0.0

RiotRobot committed 6 years ago

f6f54c35

use a separate object for each encrypted content

uhoreg committed 6 years ago

0a9959bf

lint (and add a comment)

uhoreg committed 6 years ago

b3a16cb8

Emoji verification: Change name of 🔒 to lock

aaronraimist committed 6 years ago

9beb2593

record, report, and notify about olm errors

uhoreg committed 6 years ago

63c57e8e

Sign key backup with cross-signing key on upgrade

dbkr committed 6 years ago

0448a7ea

Merge pull request #1143 from matrix-org/travis/sourcemaps-dev

turt2live committed 6 years ago

Verified 5bd005b2

Fix OlmDevice import for "algorithms" to fix tests

turt2live committed 6 years ago

3aec6367

Fix merge conflicts

turt2live committed 6 years ago

cea3831c

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-dev

turt2live committed 6 years ago

18ccceca

Merge pull request #1134 from matrix-org/travis/babel7-wp-media

turt2live committed 6 years ago

Verified fffcdcb5

Newer Older