From a660c03f9732e2e656340d6a57e678d94a693915 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 21 Nov 2017 17:42:50 +0100
Subject: [PATCH 1/2] Fix scrollbar in the debug app

---
 www/debug/app-debug.less | 1 +
 www/debug/inner.js       | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/www/debug/app-debug.less b/www/debug/app-debug.less
index b7c6b009e..da305f120 100644
--- a/www/debug/app-debug.less
+++ b/www/debug/app-debug.less
@@ -20,6 +20,7 @@
     #cp-app-debug {
         flex: 1;
         display: flex;
+        min-height: 0;
     }
     #cp-app-debug-content {
         flex: 1;
diff --git a/www/debug/inner.js b/www/debug/inner.js
index 4f68d2969..f45670b41 100644
--- a/www/debug/inner.js
+++ b/www/debug/inner.js
@@ -39,7 +39,8 @@ define([
         $: $,
         AppConfig: AppConfig,
         SFCommon: SFCommon,
-        Crypto: Crypto
+        Crypto: Crypto,
+        ApiConfig: ApiConfig
     };
 
     var toolbar;
@@ -167,8 +168,8 @@ define([
             console.log('onConnectionChange', info.state);
         };
 
-        cpNfInner = common.startRealtime(config);
-        metadataMgr = cpNfInner.metadataMgr;
+        cpNfInner = APP.cpNfInner = common.startRealtime(config);
+        metadataMgr = APP.metadataMgr = cpNfInner.metadataMgr;
 
         cpNfInner.onInfiniteSpinner(function () {
             console.error('infinite spinner');

From cdd8c6e11002bba702aae8b46d6b2054e37cca31 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 21 Nov 2017 17:48:43 +0100
Subject: [PATCH 2/2] Fix history mode not centered

---
 customize.dist/src/less2/include/toolbar-history.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/customize.dist/src/less2/include/toolbar-history.less b/customize.dist/src/less2/include/toolbar-history.less
index 0388f6401..d553caa3f 100644
--- a/customize.dist/src/less2/include/toolbar-history.less
+++ b/customize.dist/src/less2/include/toolbar-history.less
@@ -4,6 +4,7 @@
     .cp-toolbar-history {
         display: none;
         text-align: center;
+        width: 100%;
         * {
             font: @colortheme_app-font;
         }