aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* additional changes for merge conflict for #11337AUTOMATIC11112023-07-081-1/+1
|
* Merge pull request #11337 from FWeynschenk/img2img-batch-png-infoAUTOMATIC11112023-07-082-5/+50
|\ | | | | Img2img batch png info
| * Merge branch 'dev' into img2img-batch-png-infoAUTOMATIC11112023-07-08113-1310/+3866
| |\ | |/ |/|
* | fix for #11478AUTOMATIC11112023-07-081-2/+2
| |
* | Merge pull request #11478 from catalpaaa/subpathAUTOMATIC11112023-07-081-6/+6
|\ \ | | | | | | Fixing --subpath on newer gradio version
| * | fixing --subpath on newer gradio versioncatalpaaa2023-06-281-6/+6
| | |
* | | Merge pull request #11468 from NoCrypt/grid-colors-optionsAUTOMATIC11112023-07-082-7/+12
|\ \ \ | | | | | | | | Add options to change colors in grid
| * | | 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 ↵AUTOMATIC11112023-07-082-0/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | AUTOMATIC1111/callback-after_extra_networks_activate add callback after_extra_networks_activate
| * | | | 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` script callback
| * | | | | add 'before_hr callback' script callbackhako-mikan2023-06-282-0/+17
| | |_|/ / | |/| | |
* | | | | Merge pull request #11495 from missionfloyd/end-paren-fixAUTOMATIC11112023-07-081-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Correctly remove end parenthesis with ctrl+up/down
| * | | | | Correctly remove end parenthesis with ctrl+up/downmissionfloyd2023-06-281-2/+3
| |/ / / /
* | | | | Merge pull request #11503 from ↵AUTOMATIC11112023-07-083-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | AUTOMATIC1111/rename---add-stop-route-to---api-server-stop Rename --add-stop-route to --api-server-stop
| * | | | | rename --add-stop-route to --api-server-stopw-e-w2023-06-293-3/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #11513 from Akegarasu/devAUTOMATIC11112023-07-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fix can't get current hash
| * | | | | fix can't get current hashAkiba2023-06-291-1/+1
| |/ / / /
* | | | | Merge pull request #11520 from AUTOMATIC1111/extension-metadataAUTOMATIC11112023-07-082-4/+31
|\ \ \ \ \ | | | | | | | | | | | | Extension metadata
| * | | | | add extensions Update Created dates with sortingw-e-w2023-06-291-2/+14
| | | | | |
| * | | | | starts leftw-e-w2023-06-291-2/+15
| | | | | |
| * | | | | 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 api
| * | | | | 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 pull request #11593 from akx/better-status-reporting-1AUTOMATIC11112023-07-087-32/+47
|\ \ \ \ \ | | | | | | | | | | | | Better status reporting, part 1
| * \ \ \ \ Merge branch 'dev' into better-status-reporting-1AUTOMATIC11112023-07-0810-57/+121
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #11596 from akx/use-read-infoAUTOMATIC11112023-07-082-6/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | postprocessing: use read_info_from_image
| * | | | | | 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
| | |/ / / / | |/| | | | | | | | | | | | | | | | Avoids bad keys such as `exif` ending up in the "PNG info" passed forward
* | | | | | Merge pull request #11567 from AUTOMATIC1111/seed_resize_to_0AUTOMATIC11112023-07-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't add "Seed Resize: -1x-1" to API image metadata
| * | | | | | Check seed_resize_from <= 0missionfloyd2023-07-031-2/+2
| | | | | | |
| * | | | | | Change default seed_resize to 0missionfloyd2023-07-011-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #11592 from onyasumi/launchscript-directoryAUTOMATIC11112023-07-081-5/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed launch script to be runnable from any directory
| * | | | | | Update webui.shFrank Tao2023-07-031-1/+1
| | | | | | |
| * | | | | | Fix launch script to be runnable from any directoryonyasumi2023-07-031-5/+7
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #11535 from gshawn3/bugfix/11534AUTOMATIC11112023-07-082-1/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix for #11534: canvas zoom and pan extension hijacking shortcut keys
| * | | | | | made the blur function optional, added exclusion buttonsDanil Boldyrev2023-07-042-7/+14
| | | | | | |
| * | | | | | fixing the copy/paste function, correct codeDanil Boldyrev2023-07-021-28/+39
| | | | | | |
| * | | | | | fix for #11534: canvas zoom and pan extension hijacking shortcut keysgshawn32023-06-301-19/+30
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #11631 from AUTOMATIC1111/gif-previewAUTOMATIC11112023-07-081-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow gif for extra network previews
| * | | | | | 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 mode
| * | | | | | Fix throwing exception when trying to resize image with I;16 modesemjon002023-07-051-3/+9
| | |/ / / / | |/| | | |