Merge branch 'develop' into feature/vuejs

This commit is contained in:
Dane Everitt 2018-09-23 13:14:46 -07:00
commit b6205463db
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
33 changed files with 797 additions and 246 deletions

File diff suppressed because one or more lines are too long

View file

@ -26,7 +26,6 @@
#terminal > .cmd {
padding: 1px 0;
white-space: pre;
}
#terminal_input {

View file

@ -113,7 +113,7 @@ class FileManager {
addFolderButton() {
$('[data-action="add-folder"]').unbind().on('click', () => {
new ActionsClass().folder($('#file_listing').data('current-dir') || '/');
})
});
}
selectRow() {