aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* launch.py: Don't involve shell for running Python or Git for outputAarni Koskela2023-05-141-3/+3
* Merge pull request #10382 from AUTOMATIC1111/fix_xyz_checkpointAUTOMATIC11112023-05-141-1/+1
|\
| * fix xyz checkpointw-e-w2023-05-141-1/+1
* | Merge branch 'master' into devAUTOMATIC2023-05-142-1/+7
|\|
| * Merge branch 'release_candidate'AUTOMATIC2023-05-1412-61/+94
| |\
| | * update readme for releaseAUTOMATIC2023-05-141-1/+1
| | * add a possible fix for 'LatentDiffusion' object has no attribute 'lora_layer_...AUTOMATIC2023-05-142-0/+5
| | * update readmeAUTOMATIC2023-05-131-0/+1
| | * Merge pull request #10335 from akx/l10n-dis-take-2AUTOMATIC11112023-05-133-35/+41
* | | fix model loading twice in some situationsAUTOMATIC2023-05-142-0/+6
* | | Merge pull request #10218 from micky2be/find_vaeAUTOMATIC11112023-05-141-4/+4
|\ \ \
| * \ \ Merge branch 'dev' into find_vaeAUTOMATIC11112023-05-14132-1476/+2223
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #10367 from AUTOMATIC1111/jpeg-extra-network-previewAUTOMATIC11112023-05-141-2/+2
|\ \ \ \
| * | | | allow jpeg for extra network previeww-e-w2023-05-141-2/+2
* | | | | remove auto live previews format option, fix slow PNG generationAUTOMATIC2023-05-142-11/+10
* | | | | add a bunch of descriptions and reword a lot of settings (sorry, localizers)AUTOMATIC2023-05-144-49/+65
|/ / / /
* | | | set up a system to provide extra info for settings elements in python rather ...AUTOMATIC2023-05-143-42/+103
* | | | updates for #9256AUTOMATIC2023-05-144-4/+5
* | | | Merge pull request #9256 from papuSpartan/tomesdAUTOMATIC11112023-05-145-1/+63
|\ \ \ \
| * | | | fix for img2imgpapuSpartan2023-05-131-2/+3
| * | | | move to stable-diffusion tabpapuSpartan2023-05-131-10/+2
| * | | | heavily simplifypapuSpartan2023-05-134-101/+23
| * | | | remove command line optionpapuSpartan2023-05-132-6/+5
| * | | | Merge branch 'dev' of https://github.com/AUTOMATIC1111/stable-diffusion-webui...papuSpartan2023-05-12119-1243/+1753
| |\ \ \ \
| * | | | | not being cast properly every time, swap to intspapuSpartan2023-05-041-1/+1
| * | | | | fix maximum downsampling optionpapuSpartan2023-05-033-5/+5
| * | | | | resolve merge conflicts and swap to dev branch for nowpapuSpartan2023-05-0373-491/+1756
| |\ \ \ \ \
| * | | | | | Update sd_models.pypapuSpartan2023-04-101-1/+0
| * | | | | | Update generation_parameters_copypaste.pypapuSpartan2023-04-101-1/+0
| * | | | | | Update shared.pypapuSpartan2023-04-101-1/+1
| * | | | | | add token merging options to infotext when necessary. Bump tomesdpapuSpartan2023-04-104-6/+57
| * | | | | | :ppapuSpartan2023-04-041-1/+1
| * | | | | | bump tomesd package versionpapuSpartan2023-04-041-1/+1
| * | | | | | Allow different merge ratios to be used for each pass. Make toggle cmd flag w...papuSpartan2023-04-044-33/+49
| * | | | | | remove excess conditionpapuSpartan2023-04-021-14/+15
| * | | | | | Transition to using settings through UI instead of cmd line args. Added featu...papuSpartan2023-04-025-10/+80
| * | | | | | use pypi package for tomesd intead of manually cloning repopapuSpartan2023-04-012-6/+2
| * | | | | | delay importpapuSpartan2023-04-011-1/+1
| * | | | | | forgot to add reinstall arg back earlier since args moved out of sharedpapuSpartan2023-04-011-0/+1
| * | | | | | firstpapuSpartan2023-04-013-0/+18
* | | | | | | remove output_altered flag from AfterCFGCallbackParamsAUTOMATIC2023-05-142-5/+1
* | | | | | | Merge pull request #10357 from catboxanon/sagAUTOMATIC11112023-05-142-1/+42
|\ \ \ \ \ \ \
| * | | | | | | Update script_callbacks.pySakura-Luna2023-05-141-4/+4
| * | | | | | | Add/modify CFG callbackscatboxanon2023-05-142-1/+42
* | | | | | | | Merge pull request #10292 from akx/smol-bumpAUTOMATIC11112023-05-141-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Bump versions to avoid downgrading themAarni Koskela2023-05-111-2/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'release_candidate' into devAUTOMATIC2023-05-134-1/+25
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'v1.2.0-hotfix' into release_candidateAUTOMATIC2023-05-139-26/+47
| |\ \ \ \ \ \
| | * | | | | | update readmeAUTOMATIC2023-05-131-0/+11
| | * | | | | | Merge pull request #10324 from catboxanon/offlineAUTOMATIC11112023-05-132-2/+10