aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2 from w-e-w/badge_styleGerschel2023-02-112-6/+6
|\ | | | | remove Badge background and ⚠️ ->📏
| * remove Badge color and ⚠️ ->📏w-e-w2023-02-092-6/+6
|/
* Squashed commit of the following:Gerschel2023-02-095-21/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit b030b67ad005bfe29bcda692238a00042dcae816 Author: Gerschel <Gerschel_Payne@hotmail.com> Date: Wed Feb 8 16:38:56 2023 -0800 styling adjustements commit 80a2acb0230dd77489b0eb466f2efe827a053f6d Author: Gerschel <Gerschel_Payne@hotmail.com> Date: Wed Feb 8 10:49:47 2023 -0800 badge indicator toggles visibility by selection commit 898922e025a6422ac947fb45c1fa4f1109882f0a Merge: 745382a0 31bbfa72 Author: Gerschel <9631031+Gerschel@users.noreply.github.com> Date: Wed Feb 8 08:35:26 2023 -0800 Merge pull request #1 from w-e-w/Rounding-Method Rounding Method commit 31bbfa729a15ef35fa1f905345d3ba2b17b26ab9 Author: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Wed Feb 8 19:41:45 2023 +0900 use switch commit 85dbe511c33521d3ac62224bf0e0f3a48194ce63 Author: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Wed Feb 8 16:47:52 2023 +0900 Rounding Method commit 745382a0f4b8d16241545a3460d5206915959255 Author: Gerschel <Gerschel_Payne@hotmail.com> Date: Tue Feb 7 21:19:20 2023 -0800 default set to round commit 728579c618af30ec98a5af0991bd3f28bdaca399 Author: Gerschel <Gerschel_Payne@hotmail.com> Date: Tue Feb 7 21:17:03 2023 -0800 cleaned some commented code out; added indicator commit 5b288c24a1edd8a5c2f35214b9634316d05b8dae Author: Gerschel <Gerschel_Payne@hotmail.com> Date: Tue Feb 7 18:19:00 2023 -0800 needs cleaning; attempt at rounding commit d9f18ae92b929576b0b8c5f1ef8b3b38e441e381 Author: Gerschel <Gerschel_Payne@hotmail.com> Date: Tue Feb 7 15:46:25 2023 -0800 add rounding option in setting for aspect ratio commit af22106802c9e42205649e4c71c23fcf5b8c62f6 Author: Gerschel <Gerschel_Payne@hotmail.com> Date: Tue Feb 7 13:18:45 2023 -0800 added some ratios, sorted ratios by commonality commit 11e2fba73cffe8cdbf4cd0860641b94428ca0e74 Author: Gerschel <Gerschel_Payne@hotmail.com> Date: Tue Feb 7 10:46:53 2023 -0800 snaps to mulitples of 8 and along ratio commit fa00387e07460b10ee82671a1bfa8687e00ee60b Author: Gerschel <Gerschel_Payne@hotmail.com> Date: Mon Feb 6 14:54:59 2023 -0800 updated slidercomponentcontroller commit 8059bc111c3e2d1edb3314e05ab21b65120fa1dd Author: Gerschel <Gerschel_Payne@hotmail.com> Date: Mon Feb 6 14:29:11 2023 -0800 added step size adjustment on number field commit 641157b9f27a874a24ee7b0a854a092e9eac3eec Author: Gerschel <Gerschel_Payne@hotmail.com> Date: Mon Feb 6 14:12:03 2023 -0800 added return step size to default when ratio is disabled commit 5fb75ad28f2476f36100ec93922a8199adbd2a68 Author: Gerschel <Gerschel_Payne@hotmail.com> Date: Mon Feb 6 14:09:34 2023 -0800 added step size adjustment commit e33532883bc4709cd41c3775cbb646d1d5ab0584 Author: Gerschel <Gerschel_Payne@hotmail.com> Date: Mon Feb 6 11:56:15 2023 -0800 adjusted dropdown size, padding, text-align commit 81937329cee77f466c5a5b23c268d0c810128f84 Author: Gerschel <Gerschel_Payne@hotmail.com> Date: Mon Feb 6 11:39:57 2023 -0800 added positioning and styling commit 86eb4583782d92880a9a113a54ffbac9d92f3753 Author: Gerschel <Gerschel_Payne@hotmail.com> Date: Mon Feb 6 08:54:45 2023 -0800 fix typo in defaults; added preventDefault in event
* aspect ratio for dim's; sliders adjust by ratioGerschel2023-02-064-0/+318
| | | | | | | | | | | | | | | | | | | | Default choices added to settings in user interface section Choices are editable by user User selects from dropdown. When you move one slider, the other adjusts according to the ratio chosen. Vice versa for the other slider. Number fields for changes work as well. For disabling ratio, an unlock pad "🔓" is available as a default. This string can be changed to anything to serve as a disable, as long as there is no colon ":". Ratios are entered in this format, floats or ints with a colon "1:1". The string is split at the colon, parses left and right as floats to perform the math.
* Merge pull request #7556 from EllangoK/masterAUTOMATIC11112023-02-053-27/+28
|\ | | | | Adds options for grid margins to XYZ Plot and Prompt Matrix
| * adds grid margins to xyz plot and prompt matrixEllangoK2023-02-053-27/+28
|/
* Merge pull request #7535 from mcmonkey4eva/fix-symlink-extra-networkAUTOMATIC11112023-02-051-1/+1
|\ | | | | fix symlinks in extra networks ui
| * fix symlinks in extra networks uiAlex "mcmonkey" Goodwin2023-02-041-1/+1
| | | | | | | | 'absolute' and 'resolve' are equivalent, but 'resolve' resolves symlinks (which is an obscure specialty behavior usually not wanted) whereas 'absolute' treats symlinks as folders (which is the expected behavior). This commit allows you to symlink folders within your models/embeddings/etc. dirs and have preview images load as expected without issue.
* | Merge pull request #7554 from techneconn/feature/prompt_hash_optionAUTOMATIC11112023-02-052-2/+4
|\ \ | | | | | | Add prompt_hash option for file/dir name pattern
| * | Add prompt_hash option for file/dir name patterntechneconn2023-02-052-2/+4
| |/
* | Merge pull request #7528 from spezialspezial/patch-1AUTOMATIC11112023-02-051-0/+3
|\ \ | | | | | | Catch broken model symlinks early | Quickfix modelloader.py
| * | Update modelloader.pyspezialspezial2023-02-041-0/+3
| |/ | | | | os.path.getmtime(filename) throws exception later in codepath when meeting broken symlink. For now catch it here early but more checks could be added for robustness.
* / make it possible to load SD1 checkpoints without CLIPAUTOMATIC2023-02-052-8/+15
|/
* fix issue with switching back to checkpoint that had its checksum calculated ↵AUTOMATIC2023-02-041-2/+3
| | | | during runtime mentioned in #7506
* add margin parameter to draw_grid_annotationsAUTOMATIC2023-02-041-7/+10
|
* Merge pull request #7466 from ctwrs/masterAUTOMATIC11112023-02-041-2/+3
|\ | | | | Add .jpg to allowed thumb formats
| * Add .jpg to allowed thumb formatsctwrs2023-02-011-2/+3
| |
* | Merge pull request #7470 from ↵AUTOMATIC11112023-02-041-1/+1
|\ \ | | | | | | | | | | | | cbrownstein-lambda/update-error-message-no-checkpoint Update error message WRT missing checkpoint file
| * | Update error message WRT missing checkpoint fileCody Brownstein2023-02-011-1/+1
| |/ | | | | | | The Safetensors format is also supported.
* | Merge pull request #7509 from mezotaken/fix-img2imgaltAUTOMATIC11112023-02-041-3/+3
|\ \ | | | | | | Fix img2imgalt after samplers separation
| * | Fix img2imgalt after samplers separationVladimir Repin2023-02-031-3/+3
| |/
* | add --no-hashingAUTOMATIC2023-02-044-2/+9
| |
* | Merge pull request #7461 from brkirch/mac-fixesAUTOMATIC11112023-02-043-61/+60
|\ \ | | | | | | Move Mac related code to separate file
| * | Remove unused codebrkirch2023-02-042-6/+0
| | |
| * | Refactor Mac specific code to a separate filebrkirch2023-02-014-61/+66
| |/ | | | | | | Move most Mac related code to a separate file, don't even load it unless web UI is run under macOS.
* | make Image CFG Scale only show if instrutpix2pix model is loadedAUTOMATIC2023-02-041-2/+9
| |
* | merge CFGDenoiserEdit and CFGDenoiser into single objectAUTOMATIC2023-02-041-96/+37
| |
* | Merge pull request #7481 from Klace/masterAUTOMATIC11112023-02-044-8/+107
|\ \ | |/ |/| img2img instruct-pix2pix support
| * Use original CFGDenoiser if image_cfg_scale = 1Kyle2023-02-041-2/+5
| | | | | | | | | | | | If image_cfg_scale is =1 then the original image is not used for the output. We can then use the original CFGDenoiser to get the same result to support AND functionality. Maybe in the future AND can be supported with "Image CFG Scale"
| * txt2img Hires FixKyle2023-02-042-1/+2
| |
| * Image CFG Added (Full Implementation)Kyle2023-02-034-8/+103
| | | | | | | | | | | | | | | | Uses separate denoiser for edit (instruct-pix2pix) models No impact to txt2img or regular img2img "Image CFG Scale" will only apply to instruct-pix2pix models and metadata will only be added if using such model
| * Processing only, no CFGDenoiser changeKyle2023-02-031-1/+1
| | | | | | | | Allows instruct-pix2pix
| * Revert "instruct-pix2pix support"Kyle2023-02-032-5/+5
| | | | | | | | This reverts commit 269833067de1e7d0b6a6bd65724743d6b88a133f.
| * instruct-pix2pix supportKyle2023-02-022-5/+5
|/
* Merge pull request #7334 from EllangoK/masterAUTOMATIC11112023-02-011-8/+13
|\ | | | | X/Y/Z plot now saves sub grids if opts.grid_save and honors draw_legend
| * xyz plot now saves sub grids if opts.grid_saveEllangoK2023-01-281-8/+13
| | | | | | | | also fixed no draw legend for z grid
* | Merge pull request #7357 from EllangoK/btn-fixAUTOMATIC11112023-02-011-2/+2
|\ \ | | | | | | Fixes switch height/width btn unbound error
| * | fixes #7284 btn unbound errorEllangoK2023-01-291-2/+2
| | |
* | | Merge pull request #7371 from hoblin/masterAUTOMATIC11112023-02-011-11/+38
|\ \ \ | | | | | | | | [Prompt Matrix] Support for negative prompt + delimiter selector
| * | | Cleanup changes made by formatterYevhenii Hurin2023-01-291-17/+8
| | | |
| * | | Compact options UI for Prompt MatrixYevhenii Hurin2023-01-291-10/+17
| | | |
| * | | Add delimiter selector to the Prompt Matrix scriptYevhenii Hurin2023-01-291-15/+34
| | | |
| * | | Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webuiYevhenii Hurin2023-01-2912-10/+70
| |\ \ \
| * | | | Prompt selector for Prompt Matrix scriptYevhenii Hurin2023-01-291-7/+17
| | |_|/ | |/| |
* | | | Merge pull request #7412 from Pomierski/masterAUTOMATIC11112023-02-011-1/+1
|\ \ \ \ | | | | | | | | | | Fix missing tooltip for 'Clear prompt' button
| * | | | Fix missing tooltip for 'Clear prompt' buttonPiotr Pomierski2023-01-311-1/+1
| | | | |
* | | | | Merge pull request #7414 from joecodecreations/masterAUTOMATIC11112023-02-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Changes use_original_name_batch to default to True
| * | | | | Adding default true to use_original_name_batch as images should by default ↵Joey Sanchez2023-01-311-1/+1
| |/ / / / | | | | | | | | | | | | | | | hold the same name to help keep sequenced images in their correct order
* | | | | Merge pull request #7455 from brkirch/put-fix-backAUTOMATIC11112023-02-011-34/+15
|\ \ \ \ \ | |/ / / / |/| | | | Refactor MPS PyTorch fixes, add fix still required for PyTorch nightly builds back
| * | | | Refactor MPS fixes to CondFuncbrkirch2023-02-011-36/+14
| | | | |