Richard van der Hoff
|
9eff426819
|
Merge commit '71e2495' into rav/roomview_works
Conflicts:
src/components/structures/RoomView.js
|
2016-02-23 13:24:38 +00:00 |
|
Richard van der Hoff
|
776b6a26c3
|
Merge commit '9a0ea56' into rav/roomview_works
Conflicts:
src/components/structures/RoomView.js
|
2016-02-23 13:02:02 +00:00 |
|
Richard van der Hoff
|
4c571cf1bf
|
Merge commit 'eb91faf' into rav/roomview_works
Conflicts:
src/components/structures/RoomView.js
|
2016-02-23 12:56:54 +00:00 |
|
Richard van der Hoff
|
db09d3d9e4
|
Move ghost-read-marker logic to MessagePanel
|
2016-02-15 23:05:58 +00:00 |
|
Richard van der Hoff
|
06133b0467
|
Add a null guard for matrix client TimelinePanel.componentWillUnmount
client can be null when unmounting
|
2016-02-15 23:04:21 +00:00 |
|
Richard van der Hoff
|
0e0d0cf4f5
|
post-review tweaks
|
2016-02-11 15:38:13 +00:00 |
|
Richard van der Hoff
|
f2377fa9fe
|
Factor out a TimelinePanel from RoomView
|
2016-02-10 18:41:48 +00:00 |
|