matrix-org/matrix-react-sdk

Pull Requests Commits

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 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

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

nadonomy committed 7 years ago

3187d73e

Style code blocks

nadonomy committed 7 years ago

29f5477d

pointer-events to make button work & switch theme between dharma / dharma-darkroom

dbkr committed 7 years ago

3b54df74

WIP CSS hacking, added (ugly) button for theme switching

nadonomy committed 7 years ago

c20bde56

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

Older