Merge branch 'test-filemanager' into login

This commit is contained in:
ansuz committed 2016-12-19 12:37:28 +01:00
commit 5a14db9f07
18 files changed
+517 -166

No files matched your search

+3 -1
View File
@@ -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>