Merge branch 'develop' into feature/vuejs

2026-04-19 14:53:45 +02:00 · 2018-09-23 13:14:46 -07:00
parent 3188782ce7 2d469cc951
commit b6205463db
33 changed files with 797 additions and 246 deletions
--- a/public/js/laroute.js
+++ b/public/js/laroute.js
--- a/public/themes/pterodactyl/css/terminal.css
+++ b/public/themes/pterodactyl/css/terminal.css
@@ -26,7 +26,6 @@

 #terminal > .cmd {
    padding: 1px 0;
-    white-space: pre;
 }

 #terminal_input {
--- a/public/themes/pterodactyl/js/frontend/files/src/index.js
+++ b/public/themes/pterodactyl/js/frontend/files/src/index.js
@@ -113,7 +113,7 @@ class FileManager {
    addFolderButton() {
        $('[data-action="add-folder"]').unbind().on('click', () => {
            new ActionsClass().folder($('#file_listing').data('current-dir') || '/');
-        })
+        });
    }

    selectRow() {