t3chguy/matrix-js-sdk

Pull Requests Commits

Silence bluebird warnings

dbkr committed 7 years ago

264b2053

Merge pull request #750 from matrix-org/bwindels/allownonffmerge

bwindels committed 7 years ago

Verified 1dcc5127

Merge pull request #751 from matrix-org/dbkr/indexeddb_errors

dbkr committed 7 years ago

Verified 85e3d708

Reject with the actual error on indexeddb error

dbkr committed 7 years ago

bd2da08c

allow non-ff merge from release branch into master

bwindels committed 7 years ago

0a88d419

Merge branch 'master' into develop

bwindels committed 7 years ago

80c190db

Merge branch 'release-v0.11.1'

bwindels committed 7 years ago

550cf00e

bwindels committed 7 years ago

1e1358fc

Prepare changelog for v0.11.1

bwindels committed 7 years ago

fd1b3329

Merge pull request #744 from matrix-org/dbkr/update_mocha

bwindels committed 7 years ago

Verified 9c9d8468

Merge pull request #748 from matrix-org/bwindels/nollforguests

dbkr committed 7 years ago

Verified 6f59d62e

disable lazy loading for guests as they cant create filters

bwindels committed 7 years ago

1c348f0c

bwindels committed 7 years ago

63459625

bwindels committed 7 years ago

5e4973a1

Revert "v0.11.1-rc.1"

bwindels committed 7 years ago

19f023e0

bwindels committed 7 years ago

090c15fe

Prepare changelog for v0.11.1-rc.1

bwindels committed 7 years ago

e8b307dc

Revert "v0.11.1-rc.1"

bwindels committed 7 years ago

056479d4

Merge pull request #747 from matrix-org/bwindels/releasehubversion

bwindels committed 7 years ago

Verified e5ebe2f8

make usage of hub compatible with latest version (2.5)

bwindels committed 7 years ago

e8e1b431

bwindels committed 7 years ago

847d40e5

Prepare changelog for v0.11.1-rc.1

bwindels committed 7 years ago

cf6c555e

Merge pull request #746 from matrix-org/bwindels/resynconlltoggle

bwindels committed 7 years ago

Verified b508aa9e

Merge branch 'develop' into bwindels/resynconlltoggle

bwindels committed 7 years ago

5e763450

bwindels committed 7 years ago

ba39b64c

Merge branch 'hs/upload-limits' into develop

turt2live committed 7 years ago

fcebe89f

pass lazy loading flag into error, to format message based on it

bwindels committed 7 years ago

2d5eb920

Merge pull request #745 from matrix-org/revert-644-hs/upload-limits

turt2live committed 7 years ago

Verified 26de2c86

Revert "Add getMediaLimits to client"

turt2live committed 7 years ago

Verified cba1e95d

fix jsdoc lint and better naming

bwindels committed 7 years ago

78a5a886

Older