aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12023 from AUTOMATIC1111/create_infotext_fixAUTOMATIC11112023-07-261-38/+25
|\ | | | | Create infotext fix
| * simplify PostprocessBatchListArgsAUTOMATIC11112023-07-262-22/+9
| |
| * attempt 2AUTOMATIC11112023-07-261-12/+16
| |
| * doc updateAUTOMATIC11112023-07-261-5/+5
| |
| * alternative solution for infotext issueAUTOMATIC11112023-07-262-36/+32
| |
* | Merge pull request #12024 from ↵AUTOMATIC11112023-07-261-1/+1
|\ \ | |/ |/| | | | | AUTOMATIC1111/fix-check-for-updates-status-always-unknown- fix check for updates status always "unknown"
| * fix check for updates status always "unknown"w-e-w2023-07-261-1/+1
|/
* fix for #11963AUTOMATIC11112023-07-251-1/+6
|
* Merge pull request #11963 from catboxanon/fix/lora-teAUTOMATIC11112023-07-251-1/+1
|\ | | | | Fix parsing text encoder blocks in some LoRAs
| * Fix to parse TE in some LoRAscatboxanon2023-07-241-1/+1
| |
* | Merge pull request #11979 from ↵AUTOMATIC11112023-07-251-3/+5
|\ \ | | | | | | | | | | | | AUTOMATIC1111/catch-exception-for-non-git-extensions catch exception for non git extensions
| * | catch exception for non git extensionsw-e-w2023-07-251-3/+5
| | |
* | | Merge pull request #11984 from AUTOMATIC1111/api-only-subpath-(root_path)AUTOMATIC11112023-07-252-3/+3
|\ \ \ | |/ / |/| | api only subpath (rootpath)
| * | api only subpath (rootpath)w-e-w2023-07-252-3/+3
|/ / | | | | | | Co-Authored-By: 陈杰 <pythias@gmail.com>
* | Merge branch 'master' into devAUTOMATIC11112023-07-250-0/+0
|\ \ | |/ |/|
| * Merge branch 'release_candidate'AUTOMATIC11112023-07-2597-1368/+3611
| |\
* | \ Merge pull request #11957 from ljleb/pp-batch-listAUTOMATIC11112023-07-242-1/+57
|\ \ \ | | | | | | | | Add postprocess_batch_list script callback
| * | | simplifyljleb2023-07-241-3/+5
| | | |
| * | | use local varsljleb2023-07-241-6/+6
| | | |
| * | | add postprocess_batch_list callbackljleb2023-07-242-1/+55
|/ / /
* | | Merge branch 'release_candidate' into devAUTOMATIC11112023-07-242-4/+5
|\ \ \ | | |/ | |/|
| * | repair --medvram for SD2.x too after SDXL updateAUTOMATIC11112023-07-242-4/+5
| | |
* | | restyle Startup profile for black usersAUTOMATIC11112023-07-221-3/+4
| | |
* | | add --log-startup option to print detailed startup progressAUTOMATIC11112023-07-223-6/+25
| | |
* | | Merge pull request #11926 from wfjsw/fix-env-get-1AUTOMATIC11112023-07-221-1/+1
|\ \ \ | | | | | | | | fix 11291#issuecomment-1646547908
| * | | nopJabasukuriputo Wang2023-07-221-1/+1
| | | |
| * | | fix ↵Jabasukuriputo Wang2023-07-221-1/+1
| | | | | | | | | | | | | | | | https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/11921#issuecomment-1646547908
* | | | Merge pull request #11927 from ljleb/fix-ANDAUTOMATIC11112023-07-221-1/+1
|\ \ \ \ | | | | | | | | | | Fix composable diffusion weight parsing
| * | | | fix AND linebreaksljleb2023-07-221-1/+1
| | | | |
| * | | | fix AND linebreaksljleb2023-07-221-1/+1
| | |_|/ | |/| |
* | | | more info for startup timingsAUTOMATIC11112023-07-222-5/+27
| |/ / |/| |
* | | start timer early anywayAUTOMATIC11112023-07-222-3/+1
| | |
* | | Merge pull request #11856 from wfjsw/move-start-timerAUTOMATIC11112023-07-222-3/+3
|\ \ \ | | | | | | | | Only start timer when actually starting
| * | | avoid importing timer when it is not strictly neededJabasukuriputo Wang2023-07-211-1/+2
| | | |
| * | | Merge branch 'dev' into move-start-timerJabasukuriputo Wang2023-07-1913-18/+30
| |\ \ \
| * | | | move start timerwfjsw2023-07-183-5/+4
| | | | |
* | | | | Merge pull request #11923 from AnyISalIn/devAUTOMATIC11112023-07-221-16/+20
|\ \ \ \ \ | | | | | | | | | | | | [bug] If txt2img/img2img raises an exception, finally call state.end()
| * | | | | [bug] If txt2img/img2img raises an exception, finally call state.end()AnyISalIn2023-07-221-16/+20
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: AnyISalIn <anyisalin@gmail.com>
* | | | | Merge pull request #11920 from wfjsw/typo-fix-1AUTOMATIC11112023-07-213-5/+5
|\ \ \ \ \ | | | | | | | | | | | | typo fix
| * | | | | typo fixw-e-w2023-07-211-1/+1
| | | | | |
| * | | | | typo fixJabasukuriputo Wang2023-07-212-4/+4
| | | | | |
* | | | | | Merge pull request #11921 from wfjsw/prepend-pythonpathAUTOMATIC11112023-07-211-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | prepend the pythonpath instead of overriding it
| * | | | | prepend the pythonpath instead of overriding itJabasukuriputo Wang2023-07-211-1/+1
| | | | | |
* | | | | | Merge branch 'release_candidate' into devAUTOMATIC11112023-07-201-2/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #11898 from janekm/janekm-patch-1AUTOMATIC11112023-07-201-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | Update sd_models_xl.py
| | * | | | | Update sd_models_xl.pyJanek Mann2023-07-201-2/+2
| | | | | | | | | | | | | | | | | | | | | Fix width/height not getting fed into the conditioning
* | | | | | | Merge branch 'release_candidate' into devAUTOMATIC11112023-07-193-6/+39
|\| | | | | |
| * | | | | | automatically switch to 32-bit float VAE if the generated picture has NaNs.AUTOMATIC11112023-07-193-6/+39
| | | | | | |
| * | | | | | Merge branch 'dev' into release_candidateAUTOMATIC11112023-07-192-5/+12
| |\ \ \ \ \ \
| * | | | | | | bugfix: model name was added together with directory name to infotext and to ↵AUTOMATIC11112023-07-193-2/+3
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | [model_name] filename pattern