Merge branch 'staging' into slide2

2017-09-08 16:23:07 +02:00
parent 05793c220c fc069dac48
commit c3a07e879c
21 changed files with 436 additions and 89 deletions
--- a/www/common/sframe-protocol.js
+++ b/www/common/sframe-protocol.js
@@ -107,6 +107,8 @@ define({

    // Template picked, replace the content of the pad
    'Q_TEMPLATE_USE': true,
+    // Check if we have template(s) for the selected pad type
+    'Q_TEMPLATE_EXIST': true,

    // File upload queries and events
    'Q_UPLOAD_FILE': true,