Merge branch 'master' into frontend

2013-12-16 15:45:04 +01:00
parent 681ac83334 315ed1fb09
commit d6ba2b3d65
42 changed files with 541 additions and 64 deletions
--- a/templates/backOffice/default/folder-edit.html
+++ b/templates/backOffice/default/folder-edit.html
@@ -286,6 +286,9 @@
    {javascripts file='assets/js/document-upload.js'}
        <script src="{$asset_url}"></script>
    {/javascripts}
+    {javascripts file='assets/js/jquery-ui-1.10.3.custom.min.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}

    <script>
        $(function() {