matrix-org/matrix-react-sdk

Pull Requests Commits

Merge branch 'experimental2' into roomgridview

bwindels committed 7 years ago

1ea9d02c

Merge pull request #2292 from matrix-org/bwindels/dontusermergebigrooms

bwindels committed 7 years ago

Verified f6537ebe

disable user merge tracking for bigger rooms, because it locks up the browser :)

bwindels committed 7 years ago

82b0d285

Merge pull request #2290 from matrix-org/travis/account-merging-improvements

dbkr committed 7 years ago

Verified b7974c4f

Hide excess membership events for merged users

turt2live committed 7 years ago

90ef933d

Merge branch 'experimental2' into roomgridview

bwindels committed 7 years ago

0d231bab

fix correct room being highlighted in left panel

bwindels committed 7 years ago

686d737a

remove trace, add comment, ...

bwindels committed 7 years ago

dfe05b69

emit join error over own dispatcher, meh

bwindels committed 7 years ago

366375ed

hack so we don't revert to single room view when viewing grid

bwindels committed 7 years ago

dd975a17

make menu option look somewhat better

bwindels committed 7 years ago

a5922d50

show focus glow below dialogs (at z-index 4000)

bwindels committed 7 years ago

36a4bc3b

disable editor history/persistence when in grid to avoid pesky bug

bwindels committed 7 years ago

cd38be09

show right panel tabs inside panel instead of room header in grid mode

bwindels committed 7 years ago

4b205ad3

Merge pull request #2287 from matrix-org/travis/fix-account-merging-spam

turt2live committed 7 years ago

Verified e1df748a

Cache failed profile lookups for some time

turt2live committed 7 years ago

a536250c

use % instead of fr units for grid, make size independant of content

bwindels committed 7 years ago

4a10b63d

add right panel back to grid view

bwindels committed 7 years ago

a4430a4e

only listen and dispatch to room-local dispatcher in room view, composer

bwindels committed 7 years ago

bb47e656

emit focus_composer after updating the active room in GroupGridView

bwindels committed 7 years ago

6048d28c

also forward actions from room dispatcher to global one

bwindels committed 7 years ago

4f5a7d20

style active room rect, and make it not jump

bwindels committed 7 years ago

5c315aca

also give empty tiles a key

bwindels committed 7 years ago

af62c212

Merge pull request #2285 from matrix-org/travis/account-portability

turt2live committed 7 years ago

Verified c12496ec

Merge remote-tracking branch 'origin/experimental2' into travis/account-portability

turt2live committed 7 years ago

69476276

Enable the MergedUsers setting by default

turt2live committed 7 years ago

0c76d237

allow changing active room in grid by clicking it

bwindels committed 7 years ago

5c955dd5

Only consider parents when calculating the room name

turt2live committed 7 years ago

33913a66

Fix a bug where new parents aren't discovered

turt2live committed 7 years ago

79d29fa9

Use the parent's profile in autocomplete suggestions

turt2live committed 7 years ago

f0e86364

Older