Richard van der Hoff
|
e634f98a13
|
Show spinners when forward/back paginating.
|
2016-02-25 18:44:07 +00:00 |
|
Richard van der Hoff
|
10b55036f9
|
Merge branch 'rav/roomview_works' into develop
Implementation of new read-marker semantics (PR #160).
|
2016-02-24 17:26:46 +00:00 |
|
Richard van der Hoff
|
68e0192acc
|
reinstate event-continuation logic
Forgot to set prevEvent in the merge from develop, so we were never applying
the correct continuation logic.
|
2016-02-23 18:43:51 +00:00 |
|
Richard van der Hoff
|
ac4b36c0dd
|
Merge commit '99d2392' into rav/roomview_works
Conflicts:
src/components/structures/RoomView.js
|
2016-02-23 13:32:23 +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
|
63511d4e71
|
Refactor the EventTile loop
... so that it's a bit more tractable.
|
2016-02-15 23:05:42 +00:00 |
|
Richard van der Hoff
|
0e0d0cf4f5
|
post-review tweaks
|
2016-02-11 15:38:13 +00:00 |
|
Richard van der Hoff
|
c3692378fa
|
Factor a stateless messagepanel out from RoomView
|
2016-02-10 18:41:47 +00:00 |
|