t3chguy/matrix-js-sdk

Pull Requests Commits

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

turt2live committed 5 years ago

Verified 5bd005b2

Fix OlmDevice import for "algorithms" to fix tests

turt2live committed 5 years ago

3aec6367

Fix merge conflicts

turt2live committed 5 years ago

cea3831c

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

turt2live committed 5 years ago

18ccceca

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

turt2live committed 5 years ago

Verified fffcdcb5

Merge pull request #1142 from uhoreg/reporting_no_key_fix

uhoreg committed 5 years ago

Verified efadf374

don't keep processing if we have an error

uhoreg committed 5 years ago

55ecb401

notify devices when we don't send them keys (#1135)

uhoreg committed 5 years ago

Verified 01f6b3df

RiotRobot committed 5 years ago

786590ea

Prepare changelog for v3.0.0-rc.1

RiotRobot committed 5 years ago

c9174188

Merge pull request #1141 from matrix-org/t3chguy/fuzzier_disambiguate

t3chguy committed 5 years ago

Verified 64fb79e0

Merge pull request #1129 from matrix-org/t3chguy/m_too_large

t3chguy committed 5 years ago

Verified 088ff5d0

Make displayName disambiguation more fuzzy especially against RTL/LTR content

t3chguy committed 5 years ago

99e58b02

Switch back to plain export functions instead of class

turt2live committed 5 years ago

f4d1c5c0

Merge pull request #1139 from matrix-org/dbkr/fix_create_key_backup_crosssigning_disabled

dbkr committed 5 years ago

Verified f8a1e98d

Fix callback check

dbkr committed 5 years ago

5487cf20

Fix typos in comments

jryans committed 5 years ago

e998be3a

Merge pull request #1138 from matrix-org/dbkr/key_backup_checkdevicetrust

dbkr committed 5 years ago

Verified d70767ef

Thank you once again, o great linter, for saving our lines from being too long

dbkr committed 5 years ago

fbb355c5

Fix creating a key backup with cross signing diabled

dbkr committed 5 years ago

20bc8071

Oh great linter, your wisdom knows no bounds.

dbkr committed 5 years ago

0438c6c5

Use checkDeviceTrust with key backup

dbkr committed 5 years ago

b39abba4

Merge pull request #1131 from matrix-org/travis/babel7-wp-main

turt2live committed 5 years ago

Verified e52e2f10

Merge pull request #1133 from matrix-org/travis/babel7-wp-idb

turt2live committed 5 years ago

Verified dfc19e79

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

turt2live committed 5 years ago

Verified f59bd3da

Make ContentRepo a class for easier importing

turt2live committed 5 years ago

50791e3a

Fix import for indexeddb crypto store

turt2live committed 5 years ago

8211b235

Add additional properties to package.json for riot-web's webpack

turt2live committed 5 years ago

f2e1f339

Use the right request when creating clients

turt2live committed 5 years ago

0ffec0a3

turt2live committed 5 years ago

1e5e7054

Newer Older