matrix-org/matrix-react-sdk

Pull Requests Commits

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

style new theme banner

bwindels committed 7 years ago

fd3e049e

style threadpanel

bwindels committed 7 years ago

e54cbfbe

fix typo in darkroom theme

bwindels committed 7 years ago

2f52d11a

Merge pull request #2289 from matrix-org/bwindels/threadingpanel

bwindels committed 7 years ago

Verified e2f48f46

Merge branch 'experimental2' into bwindels/threadingpanel

bwindels committed 7 years ago

0565239a

Merge pull request #2271 from matrix-org/roomgridview

bwindels committed 7 years ago

Verified 1d1729de

Merge pull request #2293 from matrix-org/nadonomy/darkroom

bwindels committed 7 years ago

Verified 1e252823

Merge branch 'experimental2' into roomgridview

bwindels committed 7 years ago

1ea9d02c

Polished theme switcher. Various updates to styles.

nadonomy committed 7 years ago

ab8891b6

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 #2291 from matrix-org/dbkr/create_key_backup_async

dbkr committed 7 years ago

Verified 0c6e9854

Make create key backup dialog async

dbkr committed 7 years ago

4f8c4f1c

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

nadonomy committed 7 years ago

ccc27abc

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

dbkr committed 7 years ago

Verified b7974c4f

Merge pull request #2288 from matrix-org/dbkr/fix_continue_disabled_download

dbkr committed 7 years ago

Verified a9ae7f3e

Hide excess membership events for merged users

turt2live committed 7 years ago

90ef933d

Merge branch 'experimental2' into roomgridview

bwindels committed 7 years ago

0d231bab

Forgot to enable continue button on download

dbkr committed 7 years ago

d443d617

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

Newer Older