aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* switched the token counter to use hidden buttons instead of api callLiam2022-09-274-64/+25
|
* Merge remote-tracking branch 'upstream/master' into token_countLiam2022-09-2718-47/+280
|\
| * Merge pull request #1165 from baumandm/patch-1AUTOMATIC11112022-09-271-1/+1
| |\ | | | | | | Fix downssample typo in options
| | * Fix downssample typo in optionsDave Bauman2022-09-271-1/+1
| | | | | | | | | Updated `downssample` to `down-sample`, matching spelling in other places.
| * | Merge pull request #1166 from bmaltais/model-merge-updAUTOMATIC11112022-09-271-1/+1
| |\ \ | | | | | | | | Add interpolation method and weight to merged model output filename
| | * | Add interpolation method and weight to output filenameBernard Maltais2022-09-271-1/+1
| | |/
| * | Merge pull request #1170 from offshore/patch-1AUTOMATIC11112022-09-271-1/+1
| |\ \ | | |/ | |/| Fix COMMANDINE_ARGS -> COMMANDLINE_ARGS
| | * Fix variable name typo in error message for launch.pyAlex Offshore2022-09-271-1/+1
| |/ | | | | COMMANDINE_ARGS -> COMMANDLINE_ARGS
| * added console outputs, more clear indication of progress, and ability to ↵AUTOMATIC2022-09-272-16/+35
| | | | | | | | | | | | specify full filename to checkpoint merger restore "Loading..." text
| * Merge pull request #1066 from moorehousew/masterAUTOMATIC11112022-09-273-2/+70
| |\ | | | | | | Add support for checkpoint merging
| | * Added smoothstep interpolation to checkpoint mergingWilliam Moorehouse2022-09-262-4/+21
| | |
| | * Add support for checkpoint mergingWilliam Moorehouse2022-09-253-2/+53
| | |
| * | Merge pull request #1126 from AUTOMATIC1111/notification-soundAUTOMATIC11112022-09-273-3/+10
| |\ \ | | | | | | | | adds support for a notification.mp3 in the root directory that will play upon completion (fixes #1013)
| | * \ Merge branch 'master' into notification-sound48DESIGN2022-09-277-20/+104
| | |\ \
| | * | | adds support for a notification.mp3 in the root directory that will play ↵Connum2022-09-263-4/+11
| | | | | | | | | | | | | | | | | | | | upon completion (fixes #1013)
| * | | | add missing s_tmaxDepFA2022-09-271-3/+3
| | | | |
| * | | | pass eta to tex2img samplerDepFA2022-09-271-2/+2
| | | | |
| * | | | Add DDIM Eta to txt2img in xy_gridDepFA2022-09-271-2/+2
| | | | |
| * | | | rename DDIM eta labelDepFA2022-09-271-2/+2
| | | | |
| * | | | Add extra sampler params to xy_gridDepFA2022-09-271-1/+6
| | | | |
| * | | | take extra sampler properties from StableDiffusionProcessingDepFA2022-09-271-6/+6
| | | | |
| * | | | add sampler properties to StableDiffusionProcessing and ProcessedDepFA2022-09-271-1/+15
| | | | |
| * | | | pass extra KDiffusionSampler function parametersDepFA2022-09-271-2/+18
| | | | |
| * | | | Add extra kdiffusion parametersDepFA2022-09-271-0/+3
| | | | |
| * | | | pass ddim_eta and ddim_discretizeDepFA2022-09-271-2/+2
| | | | |
| * | | | Add options for exposed ddim sampler paramsDepFA2022-09-271-0/+4
| | | | | | | | | | | | | | | ddim_eta & ddim_discretize
| * | | | xy_grid - Show blank cells when grid is incompleteDepFA2022-09-271-1/+5
| | |/ / | |/| |
| * | | refactored image paste handling to fill unset images successively, then ↵Connum2022-09-272-9/+36
| | | | | | | | | | | | | | | | replace last existing image (fixes #981)
| * | | Grids saving to subdirectory when setting uncheckedDaniel2022-09-271-1/+1
| | | | | | | | | | | | | | | | Fixed grids saving to subdirectory when the setting is unchecked but "save images to subdirectory" was checked.
| * | | Add option to img2imgalt.py to use sigma adjustment instead of original ↵Martin Cairns2022-09-271-6/+62
| | | | | | | | | | | | | | | | method for #736
| * | | Solve issue #962Alexandre Simard2022-09-272-4/+4
| | | | | | | | | | | | | | | | Fix by @MrAcademy
| * | | job_timestamp initialization changeDepFA2022-09-271-1/+2
| |/ /
| * | use strftime. update hints.jstateisu2022-09-262-3/+3
| | |
| * | add [datetime] to image file name patterntateisu2022-09-261-0/+1
| | |
| * | Disable sentry loggingDepFA2022-09-261-0/+3
| | |
| * | Update webui.batDepFA2022-09-261-0/+2
| | |
| * | copy over fields when sending to img2img: ↵Liam2022-09-261-8/+11
| |/ | | | | | | https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/1029
* / added token counter next to txt2img and img2img promptsLiam2022-09-275-9/+92
|/
* Merge remote-tracking branch 'origin/master'AUTOMATIC2022-09-256-3/+12
|\
| * Changed job_id to timestampEyrie2022-09-254-11/+8
| |
| * fix formattingEyrie2022-09-251-1/+1
| |
| * fix formattingEyrie2022-09-251-0/+1
| |
| * Added hints for file & dir patternsEyrie2022-09-251-2/+2
| |
| * Added job_id pattern for directoriesEyrie2022-09-254-1/+8
| |
| * add custom script source to config path keysDepFA2022-09-251-0/+3
| |
| * add attribute to custom script controlsDepFA2022-09-251-0/+1
| |
* | added hiding items to ui-config.jsonAUTOMATIC2022-09-251-2/+5
| |
* | potential fix for embeddings no loading on AMD cardsAUTOMATIC2022-09-251-2/+2
|/
* Fix token max lengthguaneec2022-09-251-1/+1
|
* Merge remote-tracking branch 'origin/master'AUTOMATIC2022-09-252-14/+24
|\