resolve conflicts from merge with staging

2018-06-20 14:29:13 +02:00
parent d03339f20b a5b207d57b
commit c3741f847d
12 changed files with 413 additions and 113 deletions
--- a/www/common/sframe-protocol.js
+++ b/www/common/sframe-protocol.js
@@ -90,6 +90,7 @@ define({
    // Request the full history from the server when the users clicks on the history button.
    // Callback is called when the FULL_HISTORY_END message is received in the outside.
    'Q_GET_FULL_HISTORY': true,
+    'Q_GET_HISTORY_RANGE': true,
    // When a (full) history message is received from the server.
    'EV_RT_HIST_MESSAGE': true,