From 7fa3e2d2f9591b126cea0d861bc412699109bfad Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sun, 12 Mar 2023 13:25:08 +0530 Subject: [PATCH 1/7] Update README.md --- README.md | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 6dcca139..9f264f30 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Does not require technical knowledge, does not require pre-installed software. 1 ![t2i](https://raw.githubusercontent.com/Stability-AI/stablediffusion/main/assets/stable-samples/txt2img/768/merged-0006.png) -# Step 1: Download and extract the installer +# Installation Click the download button for your operating system:

@@ -16,29 +16,23 @@ Click the download button for your operating system:

+The installer will take care of whatever is needed. If you face any problems, you can join the friendly [Discord community](https://discord.com/invite/u9yhsFmEkB) and ask for assistance. + ## On Windows: 1. Run the downloaded `Easy-Diffusion-Windows.exe` file. +2. Run `Easy Diffusion` once the installation finishes. You can also start from your Start Menu, or from your desktop (if you created a shortcut). + +If Windows SmartScreen prevents you from running the program click `More info` and then `Run anyway`. **Tip:** On Windows 10, please install at the top level in your drive, e.g. `C:\EasyDiffusion` or `D:\EasyDiffusion`. This will avoid a common problem with Windows 10 (file path length limits). ## On Linux/Mac: -1. Unzip/extract the folder `stable-diffusion-ui` which should be in your downloads folder, unless you changed your default downloads destination. -2. Open a terminal window, and navigate to the `stable-diffusion-ui` directory. +1. Unzip/extract the folder `easy-diffusion` which should be in your downloads folder, unless you changed your default downloads destination. +2. Open a terminal window, and navigate to the `easy-diffusion` directory. +3. Run `./start.sh` (or `bash start.sh`) in a terminal. -# Step 2: Run the program -## On Windows: -Run `Easy Diffusion` once the installation finishes. You can also start from your Start Menu, or from your desktop (if you created a shortcut). - -**Tip:** If Windows SmartScreen prevents you from running the program click `More info` and then `Run anyway`. - -## On Linux/Mac: -Run `./start.sh` (or `bash start.sh`) in a terminal. - -The installer will take care of whatever is needed. If you face any problems, you can join the friendly [Discord community](https://discord.com/invite/u9yhsFmEkB) and ask for assistance. - -# Step 3: There is no Step 3. It's that simple! - -**To Uninstall:** Just delete the `stable-diffusion-ui` folder to uninstall all the downloaded packages. +# To remove/uninstall: +Just delete the `EasyDiffusion` folder to uninstall all the downloaded packages. ---- From 250afd23554909db8f30d96b0bc395e922b00fc8 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sun, 12 Mar 2023 13:25:29 +0530 Subject: [PATCH 2/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9f264f30..51ba812a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Does not require technical knowledge, does not require pre-installed software. 1-click install, powerful features, friendly community. -[Installation guide](#step-1-download-and-extract-the-installer) | [Troubleshooting guide](https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting) | [![Discord Server](https://img.shields.io/discord/1014774730907209781?label=Discord)](https://discord.com/invite/u9yhsFmEkB) (for support queries, and development discussions) +[Installation guide](#installation) | [Troubleshooting guide](https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting) | [![Discord Server](https://img.shields.io/discord/1014774730907209781?label=Discord)](https://discord.com/invite/u9yhsFmEkB) (for support queries, and development discussions) ![t2i](https://raw.githubusercontent.com/Stability-AI/stablediffusion/main/assets/stable-samples/txt2img/768/merged-0006.png) From 512b160fc01d20a1a6a6c870c2a815460d0705e0 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sun, 12 Mar 2023 13:46:14 +0530 Subject: [PATCH 3/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 51ba812a..57e36384 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Easy Diffusion 2.5 ### The easiest way to install and use [Stable Diffusion](https://github.com/CompVis/stable-diffusion) on your own computer. -Does not require technical knowledge, does not require pre-installed software. 1-click install, powerful features, friendly community. +Does not require technical knowledge, does not require pre-installed software. 1-click install, powerful features, friendly community. Windows/Linux/Mac. [Installation guide](#installation) | [Troubleshooting guide](https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting) | [![Discord Server](https://img.shields.io/discord/1014774730907209781?label=Discord)](https://discord.com/invite/u9yhsFmEkB) (for support queries, and development discussions) From 4e35580bd6e8f3408a8a993b024472c9e4b3d94e Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sun, 12 Mar 2023 13:46:29 +0530 Subject: [PATCH 4/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 57e36384..51ba812a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Easy Diffusion 2.5 ### The easiest way to install and use [Stable Diffusion](https://github.com/CompVis/stable-diffusion) on your own computer. -Does not require technical knowledge, does not require pre-installed software. 1-click install, powerful features, friendly community. Windows/Linux/Mac. +Does not require technical knowledge, does not require pre-installed software. 1-click install, powerful features, friendly community. [Installation guide](#installation) | [Troubleshooting guide](https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting) | [![Discord Server](https://img.shields.io/discord/1014774730907209781?label=Discord)](https://discord.com/invite/u9yhsFmEkB) (for support queries, and development discussions) From 7917ac8ebcfbaaaa729d700ec563e07a93402245 Mon Sep 17 00:00:00 2001 From: JeLuF Date: Sun, 19 Mar 2023 16:21:17 +0100 Subject: [PATCH 5/7] Load prompt: support JSON and TXT metadata Also, allow prompt files (one line per prompt) to be dnd'ed --- ui/media/js/dnd.js | 1 + ui/media/js/main.js | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/media/js/dnd.js b/ui/media/js/dnd.js index e3b8cc9f..f1f00911 100644 --- a/ui/media/js/dnd.js +++ b/ui/media/js/dnd.js @@ -490,6 +490,7 @@ async function parseContent(text) { return true } else { console.warn(`Raw text content couldn't be parsed.`) + promptField.value = text return false } } diff --git a/ui/media/js/main.js b/ui/media/js/main.js index 55c42af6..0ba5a336 100644 --- a/ui/media/js/main.js +++ b/ui/media/js/main.js @@ -1582,7 +1582,7 @@ promptsFromFileBtn.addEventListener('click', function() { promptsFromFileSelector.click() }) -promptsFromFileSelector.addEventListener('change', function() { +promptsFromFileSelector.addEventListener('change', async function() { if (promptsFromFileSelector.files.length === 0) { return } @@ -1590,8 +1590,8 @@ promptsFromFileSelector.addEventListener('change', function() { let reader = new FileReader() let file = promptsFromFileSelector.files[0] - reader.addEventListener('load', function() { - promptField.value = reader.result + reader.addEventListener('load', async function() { + await parseContent(reader.result) }) if (file) { From bcaa624b9bd0b578e69c3db538ba35834877b652 Mon Sep 17 00:00:00 2001 From: JeLuF Date: Sun, 19 Mar 2023 17:42:08 +0100 Subject: [PATCH 6/7] Prevent collisions of 'What's new' and the server status --- ui/media/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/media/css/main.css b/ui/media/css/main.css index 95b8d5c5..c5e7c251 100644 --- a/ui/media/css/main.css +++ b/ui/media/css/main.css @@ -831,7 +831,7 @@ input::file-selector-button { } /* Small screens */ -@media screen and (max-width: 1265px) { +@media screen and (max-width: 1365px) { #top-nav { flex-direction: column; } From c9a05e0290ade18624eceaf80212ee56047ba0be Mon Sep 17 00:00:00 2001 From: JeLuF Date: Mon, 20 Mar 2023 14:52:45 +0100 Subject: [PATCH 7/7] Add 'Karras' tag to DPM samplers --- ui/index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/index.html b/ui/index.html index 7112c022..d2b836b1 100644 --- a/ui/index.html +++ b/ui/index.html @@ -154,11 +154,11 @@ - - - - - + + + + +