diff --git a/.drone.yml b/.drone.yml index 8c2873d8..60e51d33 100644 --- a/.drone.yml +++ b/.drone.yml @@ -68,7 +68,7 @@ steps: image: machines/puppeteer depends_on: [ build_prepare, build_js, build_go ] environment: - ADMIN_PASSWORD: PLKr3FcPUdUNVhNImO6QOSKQ.tkLRniUYWMnV84rlb8Fhvib8C2W + ADMIN_PASSWORD: $$2a$$10$$9OFbPZV4lYpYjU5eUi91o.kgeMyCuW11j878YBRri3gBwccq2lSFy APP_URL: http://127.0.0.1:8334 CI: true commands: @@ -98,7 +98,7 @@ steps: when: branch: master settings: - command_timeout: 1000 + command_timeout: 5m host: hal.kerjean.me user: from_secret: SSH_USERNAME diff --git a/client/pages/filespage.helper.js b/client/pages/filespage.helper.js index 24616f9d..1c4b4236 100644 --- a/client/pages/filespage.helper.js +++ b/client/pages/filespage.helper.js @@ -105,6 +105,11 @@ export const onDelete = function(path, type){ export const onUpload = function(path, e){ const MAX_POOL_SIZE = 15; let PRIOR_STATUS = {}; + if(e.dataTransfer.types && e.dataTransfer.types.length >= 0){ + if(e.dataTransfer.types[0] === "text/uri-list"){ + return + } + } extract_upload_directory_the_way_that_works_but_non_official(e.dataTransfer.items || [], []) .then((files) => { if(files.length === 0){ diff --git a/client/pages/filespage/filesystem.js b/client/pages/filespage/filesystem.js index 1dfa2b79..3622abf2 100644 --- a/client/pages/filespage/filesystem.js +++ b/client/pages/filespage/filesystem.js @@ -21,7 +21,7 @@ export class FileSystem extends React.PureComponent {