Merge branch 'test-filemanager' into login

2016-12-19 12:37:28 +01:00
parent 5de926493a dd46b9425a
commit 5a14db9f07
18 changed files with 517 additions and 166 deletions
--- a/customize.dist/index.html
+++ b/customize.dist/index.html
@@ -67,7 +67,7 @@
        </noscript>
        <h5 id="tryit" data-localization="tryIt"></h5>

-        <table class="recent scroll" style="display:none">
+<!--        <table class="recent scroll" style="display:none">
            <tbody>

            <tr>
@@ -80,6 +80,8 @@

            </tbody>
        </table>
+-->
+        <iframe src="/file#iframe" style="width: 100%; height: 500px;"></iframe>

        <div id="buttons" class="buttons">
          <a id="create-pad" class="button create" href="/pad/" data-localization="button_newpad"></a>