t3chguy/matrix-js-sdk

Pull Requests Commits

Merge pull request #987 from matrix-org/bwindels/include-orig-in-history

bwindels committed 6 years ago

Verified 83b74070

End the verification timer when verification is done

turt2live committed 6 years ago

f80af686

Use the correct media endpoints

turt2live committed 6 years ago

fe4ac06f

Use unstable prefix for key backup

turt2live committed 6 years ago

eaaa3e98

unstable -> stable

turt2live committed 6 years ago

07629bfb

Merge pull request #989 from matrix-org/travis/edu-timeline

turt2live committed 6 years ago

Verified 88fdeca2

Process ephemeral events outside timeline handling

turt2live committed 6 years ago

a3c8eac3

Merge pull request #986 from matrix-org/bwindels/include-ssa-for-replace

bwindels committed 6 years ago

Verified bd5380c0

update comment to reflect right version

dbkr committed 6 years ago

c3b57679

consistent spacing

dbkr committed 6 years ago

9e5c2732

omit null params

dbkr committed 6 years ago

b8957fa9

Forgot /terms for ISes

dbkr committed 6 years ago

52c139dc

dbkr committed 6 years ago

39d4bf14

s/servicetypes/service-types/

dbkr committed 6 years ago

4c713e33

dbkr committed 6 years ago

Verified bb486f51

dbkr committed 6 years ago

524fea12

Support for MSC2140 (terms of service for IS/IM)

dbkr committed 6 years ago

e9528ebb

map, decrypt and return original_event if present

bwindels committed 6 years ago

de18283c

Merge pull request #984 from matrix-org/bwindels/replace-server-date

bwindels committed 6 years ago

Verified cc1c7561

don't accept any edit earlier than the server-side set edit.

bwindels committed 6 years ago

5d928f07

method to get edit date transparently from server aggregations or local echo

bwindels committed 6 years ago

01b88248

Merge pull request #982 from matrix-org/travis/soft-logout-keys

turt2live committed 6 years ago

Verified 21d52fdb

Merge branch 'master' into develop

RiotRobot committed 6 years ago

f9baff2a

RiotRobot committed 6 years ago

71eca4ff

Prepare changelog for v2.1.0

RiotRobot committed 6 years ago

bc8dca51

dbkr committed 6 years ago

3ae3dfff

Fix exception whilst syncing

dbkr committed 6 years ago

81c60239

Add a function to flag keys for backup without scheduling a backup

turt2live committed 6 years ago

3a0f27fa

Merge pull request #981 from matrix-org/jryans/reactions-send-marks-unread

jryans committed 6 years ago

Verified 60e339ba

Merge pull request #977 from matrix-org/jryans/upgrade-deps

jryans committed 6 years ago

Verified ecb88f45

Newer Older