aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'AUTOMATIC1111:master' into master不会画画的中医不是好程序员2022-10-143-14/+33
|\
| * add an ability to merge three checkpointsAUTOMATIC2022-10-143-13/+32
| * Update hints.jscrackfoo2022-10-141-1/+1
* | Merge branch 'master' of https://github.com/yfszzx/stable-diffusion-webui-plusyfszzx2022-10-1417-60/+210
|\ \
| * | Merge branch 'AUTOMATIC1111:master' into master不会画画的中医不是好程序员2022-10-1317-60/+210
| |\|
| | * emergency fix for broken send to buttonsAUTOMATIC2022-10-132-5/+5
| | * add hypernetwork multipliersAUTOMATIC2022-10-136-5/+27
| | * options to refresh list of models and hypernetworksAUTOMATIC2022-10-133-9/+54
| | * Update hints.jsTaithrah2022-10-131-1/+1
| | * [img2imgalt] Make sampler's override be optionalaoirusann2022-10-131-6/+7
| | * [img2imgalt] Add `override` in UI for convenience.aoirusann2022-10-131-3/+32
| | * Correct img gen count in notificationKalle2022-10-131-1/+1
| | * add option to change what's shown in quicksettings barAUTOMATIC2022-10-134-9/+14
| | * Revert "fix prompt in log.csv"Greg Fuller2022-10-131-6/+2
| | * fix prompt in log.csvGreg Fuller2022-10-131-2/+6
| | * Fix metadata contentsGreg Fuller2022-10-132-22/+35
| | * Fix save errorGreg Fuller2022-10-131-1/+4
| | * draw_xy_grid provides the option to also return lone imagesGreg Fuller2022-10-131-5/+12
| | * update #2336 to prevent reading params.txt when --hide-ui-dir-config option i...AUTOMATIC2022-10-131-1/+2
| | * Restore last generation paramsTrung Ngo2022-10-134-1/+14
| | * Merge branch 'master' of https://github.com/HunterVacui/stable-diffusion-webuiGreg Fuller2022-10-131-1/+1
| | * Merge pull request #2324 from HunterVacui/interrogate_include_ranks_in_outputAUTOMATIC11112022-10-134-14/+24
| | |\
| | | * [3/?] [wip] fix incorrect variable referenceGreg Fuller2022-10-121-1/+1
| | | * [2/?] [wip] ignore OPT_INCLUDE_RANKS for training filenamesGreg Fuller2022-10-122-2/+5
| | | * [1/?] [wip] Reintroduce opts.interrogate_return_ranksGreg Fuller2022-10-121-11/+14
| | | * Merge remote-tracking branch 'upstream/master' into interrogate_include_ranks...Greg Fuller2022-10-1220-224/+705
| | | |\
| | | * | Interrogate: add option to include ranks in outputGreg Fuller2022-10-124-10/+17
| | * | | add missing id propertyDepFA2022-10-131-1/+1
| | * | | remove interrogate option I accidentally deletedAUTOMATIC2022-10-131-0/+1
| | | |/ | | |/|
* | / | fix deep nesting directories problemyfszzx2022-10-141-34/+42
|/ / /
* | | images history fix all known bugyfszzx2022-10-135-41/+40
* | | Merge branch 'AUTOMATIC1111:master' into master不会画画的中医不是好程序员2022-10-139-133/+200
|\| |
| * | deepbooru: added option to use spaces or underscoresAUTOMATIC2022-10-124-71/+95
| * | train: change filename processing to be more simple and configurableAUTOMATIC2022-10-127-62/+105
* | | images history delete a number of images consecutively nextyfszzx2022-10-132-29/+39
* | | Merge branch 'master' of https://github.com/yfszzx/stable-diffusion-webui-plusyfszzx2022-10-124-2/+265
|\ \ \
| * | | Merge branch 'AUTOMATIC1111:master' into master不会画画的中医不是好程序员2022-10-124-2/+265
| |\| |
| | * | Merge pull request #2037 from AUTOMATIC1111/embed-embeddings-in-imagesAUTOMATIC11112022-10-124-2/+265
| | |\ \
| | | * | formattingDepFA2022-10-121-11/+11
| | | * | formattingDepFA2022-10-121-79/+91
| | | * | add file based testDepFA2022-10-111-0/+8
| | | * | Add files via uploadDepFA2022-10-111-0/+0
| | | * | spacingDepFA2022-10-111-1/+1
| | | * | update importsDepFA2022-10-111-0/+3
| | | * | correct conflict resolution typoDepFA2022-10-111-1/+1
| | | * | remove old caption methodDepFA2022-10-111-37/+2
| | | * | shift embedding logic out of textual_inversionDepFA2022-10-111-119/+6
| | | * | remove embedding related image functions from imagesDepFA2022-10-111-77/+0
| | | * | move embedding logic to separate fileDepFA2022-10-111-0/+234
| | | * | Merge branch 'master' into embed-embeddings-in-imagesDepFA2022-10-1131-251/+1775
| | | |\ \