aboutsummaryrefslogtreecommitdiffstats
path: root/modules
Commit message (Expand)AuthorAgeFilesLines
* additional changes for merge conflict for #11337AUTOMATIC11112023-07-081-1/+1
* Merge branch 'dev' into img2img-batch-png-infoAUTOMATIC11112023-07-0865-943/+1952
|\
| * Merge pull request #11468 from NoCrypt/grid-colors-optionsAUTOMATIC11112023-07-082-7/+12
| |\
| | * Move change colors options to Saving images/gridsNoCrypt2023-06-281-4/+4
| | * Fix lintNoCrypt2023-06-281-1/+1
| | * RevisionNoCrypt2023-06-282-7/+12
| | * Add options to change colors in gridNoCrypt2023-06-282-9/+9
| * | Merge pull request #11488 from AUTOMATIC1111/callback-after_extra_networks_ac...AUTOMATIC11112023-07-082-0/+26
| |\ \
| | * | add callback after_extra_networks_activatew-e-w2023-06-282-0/+26
| * | | whitespace for #11477AUTOMATIC11112023-07-081-1/+1
| * | | Merge pull request #11477 from hako-mikan/masterAUTOMATIC11112023-07-082-0/+17
| |\ \ \
| | * | | add 'before_hr callback' script callbackhako-mikan2023-06-282-0/+17
| * | | | Merge pull request #11503 from AUTOMATIC1111/rename---add-stop-route-to---api...AUTOMATIC11112023-07-082-2/+2
| |\ \ \ \
| | * | | | rename --add-stop-route to --api-server-stopw-e-w2023-06-292-2/+2
| | | |_|/ | | |/| |
| * | | | Merge pull request #11513 from Akegarasu/devAUTOMATIC11112023-07-081-1/+1
| |\ \ \ \
| | * | | | fix can't get current hashAkiba2023-06-291-1/+1
| | |/ / /
| * | | | Merge pull request #11520 from AUTOMATIC1111/extension-metadataAUTOMATIC11112023-07-081-2/+16
| |\ \ \ \
| | * | | | add extensions Update Created dates with sortingw-e-w2023-06-291-2/+14
| | * | | | add starsw-e-w2023-06-291-2/+4
| | |/ / /
| * | | | Merge pull request #11529 from hunshcn/sync-weightAUTOMATIC11112023-07-081-1/+1
| |\ \ \ \
| | * | | | sync default value of process_focal_crop_entropy_weight between ui and apihunshcn2023-06-291-1/+1
| | |/ / /
| * | | | lint fix for #11492AUTOMATIC11112023-07-081-1/+1
| * | | | Merge branch 'dev' into better-status-reporting-1AUTOMATIC11112023-07-087-51/+84
| |\ \ \ \
| | * \ \ \ Merge pull request #11596 from akx/use-read-infoAUTOMATIC11112023-07-082-6/+15
| | |\ \ \ \
| | | * | | | read_info_from_image: don't mutate info in passed-in imageAarni Koskela2023-07-031-1/+1
| | | * | | | read_info_from_image: add typeAarni Koskela2023-07-031-1/+3
| | | * | | | read_info_from_image: add `photoshop` to ignoredAarni Koskela2023-07-031-3/+8
| | | * | | | Use read_info_from_image in postprocessingAarni Koskela2023-07-031-1/+3
| | | |/ / /
| | * | | | Merge pull request #11567 from AUTOMATIC1111/seed_resize_to_0AUTOMATIC11112023-07-081-1/+1
| | |\ \ \ \
| | | * | | | Check seed_resize_from <= 0missionfloyd2023-07-031-2/+2
| | | * | | | Change default seed_resize to 0missionfloyd2023-07-011-1/+1
| | | | |/ / | | | |/| |
| | * | | | Merge pull request #11631 from AUTOMATIC1111/gif-previewAUTOMATIC11112023-07-081-2/+2
| | |\ \ \ \
| | | * | | | Allow gif for extra network previewsmissionfloyd2023-07-051-2/+2
| | | |/ / /
| | * | | | Merge pull request #11492 from semjon00/devAUTOMATIC11112023-07-081-3/+9
| | |\ \ \ \
| | | * | | | Fix throwing exception when trying to resize image with I;16 modesemjon002023-07-051-3/+9
| | | | |/ / | | | |/| |
| | * | | | fix problem with extra network saving images as previews losing generation infoAUTOMATIC11112023-07-081-2/+12
| | * | | | Merge pull request #11637 from Hao-Wu/fix-has-mps-deprecatedAUTOMATIC11112023-07-081-9/+14
| | |\ \ \ \
| | | * | | | Fix warning of 'has_mps' is deprecated from PyTorchHao-Wu2023-07-061-9/+14
| | | |/ / /
| | * | | | Merge pull request #11656 from jovijovi/devAUTOMATIC11112023-07-081-0/+2
| | |\ \ \ \
| | | * | | | fix(api): convert to "RGB" if image mode is "RGBA"jovijovi2023-07-061-0/+2
| | | | |/ / | | | |/| |
| | * | | | Merge pull request #11660 from neilmahaseth/patch-1AUTOMATIC11112023-07-081-1/+1
| | |\ \ \ \
| | | * | | | Fix UnicodeEncodeError when writing to file CLIP Interrogator Batch ModeNeil Mahseth2023-07-061-1/+1
| | | |/ / /
| | * | | | Use contextlib for closing the generation processramyma2023-07-031-8/+3
| | * | | | Handle cleanup in case there's an exception thrownramyma2023-07-031-26/+31
| | * | | | Hotfix: call processing close to cleanup API generation callsramyma2023-07-021-0/+2
| | | |/ / | | |/| |
| * | | | Add a status logger in modules.sharedAarni Koskela2023-07-031-0/+9
| * | | | API: use finally: for state.end()Aarni Koskela2023-07-031-15/+14
| * | | | Add job argument to State.begin()Aarni Koskela2023-07-036-16/+13
| |/ / /
| * | | Merge pull request #11325 from stablegeniusdiffuser/dev-batch-grid-metadataAUTOMATIC11112023-06-271-6/+7
| |\ \ \
| | * | | Add use_main_prompt parameter to use proper metadata for batch run grids or i...stablegeniusdiffuser2023-06-191-6/+7
| | | |/ | | |/|