From 5575fa76ac9e50e95034b7eee0f2e78f08cfd38e Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Mon, 15 Nov 2021 15:53:02 -0400 Subject: [PATCH 1/9] don't show spinner in case cancelled and can't remove --- navigator/components/NavDragDrop.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/navigator/components/NavDragDrop.js b/navigator/components/NavDragDrop.js index 31fea20..62f7941 100644 --- a/navigator/components/NavDragDrop.js +++ b/navigator/components/NavDragDrop.js @@ -47,9 +47,10 @@ export class NavDragDrop { uploader.using_webkit = false; uploads.push(uploader); } - uploads = await this.handle_conflicts(uploads); - this.upload_manager.add(... uploads); - this.nav_window_ref.stop_load(); + if (uploads.length) { + uploads = await this.handle_conflicts(uploads); + this.upload_manager.add(... uploads); + } } document.getElementById("nav-upload-btn").addEventListener("click", this.upload_dialog.bind(this)); } @@ -213,7 +214,6 @@ export class NavDragDrop { } upload_dialog() { - this.nav_window_ref.start_load(); this.upload_element.click(); } } From b7d2b91154435439fffa24cadcc3bb0abf20f8ba Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Mon, 15 Nov 2021 15:58:44 -0400 Subject: [PATCH 2/9] keep track of changes --- manifest.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index 54ea047..60b3151 100644 --- a/manifest.json +++ b/manifest.json @@ -54,11 +54,13 @@ ], "changelog": { "urgency": "medium", - "version": "0.5.6", + "version": "0.5.7", "buildVersion": "1", "ignore": [], - "date": null, - "packager": "Josh Boudreau ", - "changes": [] + "date": "2021-11-15T15:53:53.820222", + "packager": "Joshua Boudreau ", + "changes": [ + "Fix bug where loading spinner doesn't go away after upload dialog is cancelled." + ] } } \ No newline at end of file From 328caac7d2012adf5af6423665b797735ace54d7 Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Wed, 24 Nov 2021 16:07:59 -0400 Subject: [PATCH 3/9] update install URLs --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index bc2e462..4a5d543 100644 --- a/README.md +++ b/README.md @@ -23,17 +23,17 @@ With no command line use needed, you can: # Installation ## From Github Release ### Ubuntu -1. `$ wget https://github.com/45Drives/cockpit-navigator/releases/download/v0.5.5/cockpit-navigator_0.5.5-2focal_all.deb` -1. `# apt install ./cockpit-navigator_0.5.5-2focal_all.deb` +1. `$ wget https://github.com/45Drives/cockpit-navigator/releases/download/v0.5.6/cockpit-navigator_0.5.6-1focal_all.deb` +1. `# apt install ./cockpit-navigator_0.5.6-1focal_all.deb` ### EL7 -1. `# yum install https://github.com/45Drives/cockpit-navigator/releases/download/v0.5.5/cockpit-navigator-0.5.5-2.el7.noarch.rpm` +1. `# yum install https://github.com/45Drives/cockpit-navigator/releases/download/v0.5.6/cockpit-navigator-0.5.6-1.el7.noarch.rpm` ### EL8 -1. `# dnf install https://github.com/45Drives/cockpit-navigator/releases/download/v0.5.5/cockpit-navigator-0.5.5-2.el8.noarch.rpm` +1. `# dnf install https://github.com/45Drives/cockpit-navigator/releases/download/v0.5.6/cockpit-navigator-0.5.6-1.el8.noarch.rpm` ## From Source 1. Ensure dependencies are installed: `cockpit`, `python3`, `rsync`, `zip`. 1. `$ git clone https://github.com/45Drives/cockpit-navigator.git` 1. `$ cd cockpit-navigator` -1. `$ git checkout ` (v0.5.5 is latest) +1. `$ git checkout ` (v0.5.6 is latest) 1. `# make install` ## From 45Drives Repositories ### Automatic Repo Setup with Script From 2dc40b0940cc01a27a44393551c59b25ed7de496 Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Mon, 29 Nov 2021 12:50:34 -0400 Subject: [PATCH 4/9] fix alignment and add mod/creat headers --- navigator/index.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/navigator/index.html b/navigator/index.html index 71a5eb9..a8aee2d 100644 --- a/navigator/index.html +++ b/navigator/index.html @@ -75,10 +75,12 @@