matrix-org/matrix-react-sdk

Pull Requests Commits

Fix https://github.com/matrix-org/matrix-react-sdk/pull/2299

dbkr committed 7 years ago

46e0c6e0

Merge pull request #2302 from matrix-org/dbkr/jump_to_time

bwindels committed 7 years ago

Verified 7849c987

Fix statement order

dbkr committed 7 years ago

b2e40fbb

Merge pull request #2303 from matrix-org/bwindels/mergedusersroomquickfix

bwindels committed 7 years ago

Verified 4f3ee0ec

quickfix to avoid said exception

bwindels committed 7 years ago

1238c9d5

Merge branch 'experimental2' of github.com:matrix-org/matrix-react-sdk into experimental2

bwindels committed 7 years ago

75198240

add missing vars from develop to dharma darkroom

bwindels committed 7 years ago

e60d45ac

remaining merge conflict

bwindels committed 7 years ago

48d871f5

Merge branch 'experimental' into experimental2

bwindels committed 7 years ago

7c6c3c8a

And also the new files

dbkr committed 7 years ago

b5fd5eca

Add 'jump to time' feature

dbkr committed 7 years ago

0cad5a52

Merge pull request #2298 from matrix-org/bwindels/makeroomsettingsusable

bwindels committed 7 years ago

Verified 31902b25

Merge pull request #2301 from matrix-org/travis/more-merging

bwindels committed 7 years ago

Verified bd614f3e

Merge pull request #2300 from matrix-org/travis/merge-faster

bwindels committed 7 years ago

Verified dd4f2da5

Merge pull request #2299 from matrix-org/travis/finite-logout

bwindels committed 7 years ago

Verified 5a1c8c4f

Ensure user directory lookups show the correctly merged results

turt2live committed 7 years ago

7fc4b698

Skip even more checks if the host isn't a mergable one

turt2live committed 7 years ago

16d2e39f

Support a simple wildcard on mergable hosts

turt2live committed 7 years ago

55d19b2c

Fix misc bugs with MergedUsers

turt2live committed 7 years ago

642f3dc6

Don't bother tracking users we know are not applicable for merging

turt2live committed 7 years ago

88266dfc

Ensure events forwarded by a previous dispatch are not re-dispatched

turt2live committed 7 years ago

5cf915f0

Deduplicate requests to track users instead of arbitrarily not tracking them

turt2live committed 7 years ago

cc8cf64c

temp solution to make room settings usable

bwindels committed 7 years ago

887defda

add new style vars from develop

bwindels committed 7 years ago

231d8fff

Merge branch 'develop' into experimental

bwindels committed 7 years ago

67e0030c

Merge pull request #2296 from matrix-org/bwindels/gridfixesandothers

bwindels committed 7 years ago

Verified 7a7fe3a9

fix add room icon

bwindels committed 7 years ago

be29e23e

cleanup while at it

bwindels committed 7 years ago

87a6a0b7

see if this causes the grid to not rebel out of the given boundaries

bwindels committed 7 years ago

c8178347

make search room box not shrink when left panel is full

bwindels committed 7 years ago

84d11b8e

Older