Commit Graph

286 Commits

Author SHA1 Message Date
yfszzx
5d8c59eee5 Merge branch 'master' of https://github.com/yfszzx/stable-diffusion-webui-plus 2022-10-16 12:34:05 +08:00
不会画画的中医不是好程序员
d41ac174e2
Merge branch 'AUTOMATIC1111:master' into master 2022-10-16 10:04:05 +08:00
yfszzx
763b893f31 images history sorting files by date 2022-10-16 10:03:09 +08:00
yfszzx
6e4f5566b5 sorting files 2022-10-15 23:53:49 +08:00
AUTOMATIC
73901c3f01 make attention edit only work with ctrl as was initially intended 2022-10-15 15:51:57 +03:00
AUTOMATIC
d3463bc59a change styling for top right corner UI
made save style button not die when you cancel
2022-10-15 14:22:30 +03:00
AUTOMATIC
3631adfe96 make dragging to prompt work again 2022-10-15 12:58:53 +03:00
aoirusann
db27b987a9 Add hint for ctrl/alt enter
And duplicate implementations are removed
2022-10-15 09:59:40 +03:00
ruocaled
661a61985c remove extra 100ms timeout 2022-10-15 09:32:01 +03:00
ruocaled
c7cd2fda5a re-attach full screen zoom listeners 2022-10-15 09:32:01 +03:00
ruocaled
b26efff8c4 allow re-open for multiple images gallery 2022-10-15 09:32:01 +03:00
ruocaled
c84eef8195 fix observer disconnect logic 2022-10-15 09:32:01 +03:00
ruocaled
6b5c54c187 remove console.log 2022-10-15 09:32:01 +03:00
ruocaled
3bd40bb77f auto re-open selected image after re-generation
attach an observer of gallery when generation in progress, if there was a image selected in gallery and gallery has only 1 image, auto re-select/open that image.

This matches behavior of prior to Gradio 3.4.1 version bump, is a quality of life feature many people enjoyed.
2022-10-15 09:32:01 +03:00
AUTOMATIC
acedbe67d2 bring history tab back, make it behave; it's still slow but won't fuck anything up until you use it 2022-10-15 00:43:15 +03:00
AUTOMATIC
c250cb289c change checkpoint merger to work in a more obvious way
remove sigmoid and inverse sigmoid because they just did the same thing as weighed sum only with changed multiplier
2022-10-14 22:02:32 +03:00
AUTOMATIC1111
6b77af7a43
Merge pull request #2396 from yfszzx/master
Add a "History" tab
2022-10-14 19:32:19 +03:00
AUTOMATIC
33ae6be55e fix paste not working in firefox
fix paste always going into txt2img field
2022-10-14 17:53:34 +03:00
AUTOMATIC
a156c097ab Merge branch 'param-loading' 2022-10-14 17:14:24 +03:00
不会画画的中医不是好程序员
f7712e28e5 Merge branch 'AUTOMATIC1111:master' into master 2022-10-14 14:43:44 +08:00
AUTOMATIC
fdecb63685 add an ability to merge three checkpoints 2022-10-14 09:20:24 +03:00
crackfoo
494afccbc1 Update hints.js
typo
2022-10-14 07:22:53 +03:00
不会画画的中医不是好程序员
7c8903367c
Merge branch 'AUTOMATIC1111:master' into master 2022-10-14 07:35:07 +08:00
yfszzx
a1489f9428 images history fix all known bug 2022-10-14 07:13:38 +08:00
AUTOMATIC
08b3f7aef1 emergency fix for broken send to buttons 2022-10-13 20:42:27 +03:00
Taithrah
dccc181b55 Update hints.js
typo
2022-10-13 18:03:56 +03:00
Kalle
cf1e8fcb30 Correct img gen count in notification
Display correct count of images generated in browser notification regardless of "Show grid in results for web" setting.
2022-10-13 17:36:49 +03:00
AUTOMATIC
bb7baf6b9c add option to change what's shown in quicksettings bar 2022-10-13 16:22:25 +03:00
Trung Ngo
e72adc999b Restore last generation params 2022-10-13 12:21:20 +03:00
DepFA
490494320e add missing id property 2022-10-13 07:47:41 +03:00
不会画画的中医不是好程序员
0186db178e
Merge branch 'AUTOMATIC1111:master' into master 2022-10-13 12:35:39 +08:00
yfszzx
716a9e034f images history delete a number of images consecutively next 2022-10-13 12:19:50 +08:00
d8ahazard
54e0051bdd Add drag/drop param loading.
Drop an image or generational text onto the prompt bar, it loads the info for parsing.
2022-10-12 18:17:26 -05:00
AUTOMATIC
c3c8eef9fd train: change filename processing to be more simple and configurable
train: make it possible to make text files with prompts
train: rework scheduler so that there's less repeating code in textual inversion and hypernets
train: move epochs setting to options
2022-10-12 20:49:47 +03:00
yfszzx
717ba4c71c images history improvement 2022-10-13 00:27:45 +08:00
yfszzx
a1a94b8b5f images history improvement 2022-10-13 00:19:34 +08:00
yfszzx
c87c3b9c11 test 2022-10-12 21:24:40 +08:00
yfszzx
511ca57e37 Merge branch 'master' of https://github.com/yfszzx/stable-diffusion-webui-plus 2022-10-12 20:48:03 +08:00
yfszzx
e05573e1ad images history improvement 2022-10-12 20:47:55 +08:00
AUTOMATIC1111
dc1432e0dd
Merge branch 'master' into feature/scale_to 2022-10-12 10:35:42 +03:00
LunixWasTaken
ca5efc316b Typo fix in watermark hint. 2022-10-12 10:11:06 +03:00
DepFA
6d408c06c6
Prevent nans from failed float parsing from overwriting weights 2022-10-12 00:19:28 +01:00
nai-degen
9e5f6b5580 triggers 'input' event when using arrow keys to edit attention 2022-10-11 21:19:30 +03:00
不会画画的中医不是好程序员
a36dea9596
Merge branch 'master' into master 2022-10-11 21:03:41 +08:00
yfszzx
87d63bbab5 images history improvement 2022-10-11 20:37:03 +08:00
DepFA
9b8faefde0 context menus closure 2022-10-11 15:34:48 +03:00
DepFA
45ada1c910 Correct list style, apply gen forever to both tabs, roll3 on both tabs 2022-10-11 15:34:48 +03:00
yfszzx
594ab4ba53 images history improvement 2022-10-11 20:23:41 +08:00
yfszzx
7b1db45e1f images history improvement 2022-10-11 20:17:27 +08:00
DepFA
42bf5fa325
Make cancel generate forever let the current gen complete (#2206) 2022-10-10 21:54:21 +01:00
AUTOMATIC
f98338faa8 add an option to not add watermark to created images 2022-10-10 23:15:48 +03:00
AUTOMATIC
39919c40dd add eta noise seed delta option 2022-10-10 20:32:44 +03:00
不会画画的中医不是好程序员
1e18a5ffcc
Merge branch 'AUTOMATIC1111:master' into master 2022-10-10 20:21:25 +08:00
yfszzx
23f2989799 images history over 2022-10-10 18:33:49 +08:00
yfszzx
8a7c07a214 show image history 2022-10-10 15:39:39 +08:00
Justin Maier
6435691bb1 Add "Scale to" option to Extras 2022-10-09 19:26:52 -06:00
DepFA
d3cd46b038
Update lightbox to change displayed image as soon as generation is complete (#1933)
* add updateOnBackgroundChange
* typo fixes.
* reindent to 4 spaces
2022-10-09 16:19:33 +01:00
Aidan Holland
432782163a chore: Fix typos 2022-10-08 22:42:30 +03:00
guaneec
32e428ff19 Remove duplicate event listeners 2022-10-08 15:47:24 +03:00
Trung Ngo
786d9f63aa Add button to skip the current iteration 2022-10-08 13:40:39 +03:00
DepFA
21679435e5 implement removal 2022-10-08 09:43:31 +03:00
DepFA
e21e473253 Context Menus 2022-10-08 09:43:31 +03:00
Jairo Correa
a958f9b3fd edit-attention browser compatibility and readme typo 2022-10-08 09:38:44 +03:00
AUTOMATIC
2995107fa2 added ctrl+up or ctrl+down hotkeys for attention 2022-10-06 23:44:54 +03:00
DepFA
c06298d1d0 add check for progress in title setting 2022-10-06 17:58:52 +03:00
DepFA
67d011b02e Show generation progress in window title 2022-10-05 11:42:11 +03:00
AUTOMATIC
556c36b960 add hint, refactor code for #1607 2022-10-04 09:18:00 +03:00
Hanusz Leszek
e615d4f9d1 Convert folder icon surrogate pair to valid utf8 2022-10-03 07:59:13 +03:00
AUTOMATIC1111
688c4a914a
Merge branch 'master' into 1404-script-reload-without-restart 2022-10-02 21:33:22 +03:00
liamkerr
7308aeefd9
Merge branch 'master' into token_updates 2022-10-02 10:02:38 -04:00
AUTOMATIC
820f1dc96b initial support for training textual inversion 2022-10-02 15:03:39 +03:00
DepFA
55b046312c
move JavaScript into ui.js 2022-10-02 00:12:49 +01:00
Liam
3c6a049fc3 consolidated token counter functions 2022-09-30 18:22:50 -04:00
Liam
abdbf1de64 token counters now update when roll artist and style buttons are pressed https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/1194#issuecomment-1261203893 2022-09-30 18:22:40 -04:00
AUTOMATIC
6b02966fcd fix #1405 submitting both tabs 2022-10-01 00:14:44 +03:00
Trung Ngo
d1db330010 ALT + return will submit prompt when it's in focus 2022-09-30 15:39:57 -05:00
RnDMonkey
ff4df06c57 refined [styles] pattern and added [prompt_no_styles] 2022-09-30 13:00:43 +03:00
Michoko
f8acbb8f88 Add output folder icons
Adds icons on the first 3 tabs to directly open the corresponding images output directory
2022-09-29 12:10:00 +03:00
Liam
7ca9858c4c removed unused import; now using javascript to watch prompt textarea 2022-09-28 09:43:54 -04:00
Liam
e5707b66d6 switched the token counter to use hidden buttons instead of api call 2022-09-27 19:29:53 -04:00
Liam
981fe9c4a3 Merge remote-tracking branch 'upstream/master' into token_count 2022-09-27 16:37:24 -04:00
Liam
5034f7d759 added token counter next to txt2img and img2img prompts 2022-09-27 15:56:18 -04:00
48DESIGN
e4145c8453
Merge branch 'master' into notification-sound 2022-09-27 08:05:19 +02:00
Connum
c0b1177a32 refactored image paste handling to fill unset images successively, then replace last existing image (fixes #981) 2022-09-27 08:59:40 +03:00
Alexandre Simard
c74becca23 Solve issue #962
Fix by @MrAcademy
2022-09-27 08:52:43 +03:00
Connum
2846ca5702 adds support for a notification.mp3 in the root directory that will play upon completion (fixes #1013) 2022-09-26 22:57:31 +02:00
tateisu
78d6aef302 use strftime. update hints.js 2022-09-26 16:24:21 +03:00
Eyrie
1877a3767e Changed job_id to timestamp 2022-09-25 17:11:07 +03:00
Eyrie
ba34b790d3 Added hints for file & dir patterns 2022-09-25 17:11:07 +03:00
Eyrie
40166dbf08 Added job_id pattern for directories 2022-09-25 17:11:07 +03:00
RnDMonkey
a2bea2f97a added [styles] filename pattern 2022-09-24 11:12:58 +03:00
DepFA
e560eb8b60 Only switch between visible gallery entries
Since the other tabs are kept in the dom now filtering is needed.
2022-09-23 23:38:45 +03:00
AUTOMATIC
e12793e937 delete unwanted console.log 2022-09-23 23:34:33 +03:00
AUTOMATIC
39ce23f42d add the bitton to paste parameters into UI for txt2img, img2img, and pnginfo tabs
fixed some [send to..] buttons to work properly with all tabs
2022-09-23 22:49:21 +03:00
AUTOMATIC
0065327726 upgrade to gradio==3.4b3 t fixthe inpain bugs
rework progressbar/preview to work with new gradio
remove unnecessary create style button
added link to alternative colab
2022-09-23 20:46:02 +03:00
innovaciones
6e86fc9fd0 Show interrupt button without progress bar 2022-09-23 08:33:08 +03:00
Connum
e16b9dc819 resize mask canvases to fit underlying image (fixes #668) 2022-09-22 22:36:47 +03:00
Prof-Cheese
ae32b8a53f Fixed directory name generation process.
'Max prompt words' has been added to config and modified to be used in the directory name generation process.
2022-09-22 20:15:37 +03:00
DepFA
cae09e1651 Update selectors after ui and core overhaul 2022-09-22 19:29:20 +03:00
AUTOMATIC
3582befdcd move Notification.requestPermission() entirely to javascript to possibly fix problem with secure context people are having on non-localhost 2022-09-22 13:15:33 +03:00
AUTOMATIC
91bfc71261 A big rework, just what you were secretly hoping for!
SD upscale moved to scripts
Batch processing script removed
Batch processing added to main img2img and now works with scripts
img2img page UI reworked to use tabs
2022-09-22 12:11:48 +03:00
AUTOMATIC1111
013e9a4bda
Merge branch 'master' into patch-6 2022-09-22 08:15:22 +03:00
innovaciones
c9ee98440b New position and interrupt integration 2022-09-22 08:12:10 +03:00
innovaciones
057206cb73 Update progressbar.js 2022-09-22 08:12:10 +03:00
innovaciones
f183e09fcc Fix progress bar position 2022-09-22 08:12:10 +03:00
DepFA
2d271c0e62
Add aspect ratio overlay js 2022-09-22 01:51:49 +01:00
AUTOMATIC
1ebb5cc669 update tiling button for imageviewer.js to use an icon in same style as others, add mouseover hints 2022-09-21 14:22:16 +03:00
Adam Snodgrass
390ead187c add button to toggle tiling images in the imageviewer modal 2022-09-21 14:09:25 +03:00
Connum
b5693699b8 Revert "Reset image input when dragover new image"
This reverts commit 9035afbab5.
2022-09-21 09:13:13 +03:00
Connum
e9ba2d42d6 fix image replacement via clipboard paste or drag and drop on PNG Info tab 2022-09-21 09:13:13 +03:00
trufty
9035afbab5 Reset image input when dragover new image 2022-09-20 23:30:36 +03:00
Dave Sescleifer
d7f36dac21 Send a browser notification when the images are ready 2022-09-20 09:52:52 +03:00
AUTOMATIC
028fc25f28 fix the issue with incorrect js options on page load
add a setting for lightbox max size images
use setting for lightbox max size images late to let user change it and see results
2022-09-19 17:16:04 +03:00
DepFA
bf1f3b8daf Rely on opts being pre-populated 2022-09-19 16:43:08 +03:00
DepFA
931e5aebb3 initialize modal state from options 2022-09-19 16:43:08 +03:00
DepFA
2f35b1c6be Add logic for zoom toggle 2022-09-19 16:43:08 +03:00
AUTOMATIC
6d7ca54a1a added highres fix feature 2022-09-19 16:42:56 +03:00
EyeDeck
5a759687a2 Move memmon tooltip to hints.js
Move memmon tooltip to hints.js

so it's with the other tooltips, and doesn't have to be re-sent from the server every time.

Also, allowed tooltips to be applied by matching a class name if all else fails.
2022-09-19 07:29:22 +03:00
AUTOMATIC1111
8e3caace74
Merge pull request #672 from 48design/fix-inpaint-dragdrop-paste
replace existing image via paste or drop in inpaint mode (fixes #649)
2022-09-18 22:38:52 +03:00
AUTOMATIC
f3d83fd68a add read access to settings for jsavascript
add an option to disable lightbox modal
2022-09-18 22:25:18 +03:00
Connum
ce47976249 replace existing image via paste or drop in inpaint mode (fixes #649) 2022-09-18 20:00:51 +02:00
Adam Snodgrass
7e42a0f35a close on escape 2022-09-18 11:42:55 -05:00
Johan Aires Rastén
a96076f49c Add buttons for random and reuse seed.
Random button sets seed to -1, reuse copies the seed from the last
generated image.
2022-09-18 15:13:28 +02:00
Connum
3b56b54557 fix pasting of images from the clipboard in img2img (fixes #645) 2022-09-18 11:42:05 +02:00
AUTOMATIC
3f29aa791b altered progressbar to not rely on first progress request coming after the job has started; may help with broken progressbar some people say they have 2022-09-18 11:14:42 +03:00
AUTOMATIC
5e80c286ee script.js split work - ui.js 2022-09-18 09:00:06 +03:00
Andrey
b0c9a097f2 Split history script.js to javascript/ui.js 2022-09-18 08:51:47 +03:00
AUTOMATIC
ae63d82741 script.js split work - progress.js 2022-09-18 08:51:11 +03:00
Andrey
8b734949ba Split history script.js to javascript/progressbar.js 2022-09-18 08:48:47 +03:00
AUTOMATIC
26b52fd1ec script.js split work - hints.js 2022-09-18 08:48:13 +03:00
Andrey
85abd7c175 Split history script.js to javascript/hints.js 2022-09-18 08:41:23 +03:00
AUTOMATIC
74c538e84f script.js split work - dragdrop.js 2022-09-18 08:41:08 +03:00
Andrey
7a0bcd3893 Split history script.js to javascript/dragdrop.js 2022-09-18 08:37:57 +03:00
AUTOMATIC
be0bfa871b script.js split work 2022-09-18 08:37:26 +03:00
AUTOMATIC
a86c279419 script.js split work 2022-09-18 08:37:03 +03:00
Andrey
4133472a6e Split history script.js to javascript/dragdrop.js 2022-09-18 07:55:07 +03:00