Merge branch 'newpoll' into staging

2017-10-05 17:56:17 +02:00
parent 7559bc062e 1c4f1c785d
commit ab3648a30a
20 changed files with 3350 additions and 928 deletions
--- a/www/whiteboard/inner.js
+++ b/www/whiteboard/inner.js
@@ -363,7 +363,7 @@ define([
            updateLocalPalette(palette);
            readOnly = metadataMgr.getPrivateData().readOnly;

-            Title = common.createTitle({}, config.onLocal);
+            Title = common.createTitle({});

            var configTb = {
                displayed: ['title', 'useradmin', 'spinner', 'share', 'userlist', 'newpad', 'limit'],