matrix-org/matrix-react-sdk

Pull Requests Commits

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

Don't load Inter UI from www

nadonomy committed 7 years ago

49ac350a

Added more styles

nadonomy committed 7 years ago

81cc6621

Set up themes with ugly first pass

nadonomy committed 7 years ago

86926c2c

Hardcode new theme

nadonomy committed 7 years ago

1fa251f1

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

first go at making thread look like in design

bwindels committed 7 years ago

4def2355

remove top timestamp from panel

bwindels committed 7 years ago

e809e8a9

make new thread banner look good

bwindels committed 7 years ago

7d886106

initial translations

bwindels committed 7 years ago

0d92201b

create new ThreadPanel when thread_id changes

bwindels committed 7 years ago

6c0047fd

give timelinepanel for thread available height

bwindels committed 7 years ago

217ab8bf

correct prop type

bwindels committed 7 years ago

4c43606f

show thread id for debugging

bwindels committed 7 years ago

3bb275e2

not a state event

bwindels committed 7 years ago

f7aeebce

Merge branch 'experimental2' into bwindels/threadingpanel

bwindels committed 7 years ago

d788a36e

first go at showing threads in right panel

bwindels committed 7 years ago

4fc10e53

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

Newer Older