aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)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
| | | | | | typo
* | 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
| | | | | | | | | typo
| | * [img2imgalt] Make sampler's override be optionalaoirusann2022-10-131-6/+7
| | |
| | * [img2imgalt] Add `override` in UI for convenience.aoirusann2022-10-131-3/+32
| | | | | | | | | | | | | | | | | | Some params in img2imgalt are fixed, such as `Sampling method` and `Denosing Strength`. And some params should be matched with those in decode, such as `steps`.
| | * Correct img gen count in notificationKalle2022-10-131-1/+1
| | | | | | | | | Display correct count of images generated in browser notification regardless of "Show grid in results for web" setting.
| | * 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
| | | | | | | | | | | | This reverts commit e4b5d1696429ab78dae9779420ce6ec4cd9c5f67.
| | * 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 ↵AUTOMATIC2022-10-131-1/+2
| | | | | | | | | | | | is enabled (for servers, since this will let some users access others' params)
| | * 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
| | |\ | | | | | | | | Interrogate: add option to include ranks in output
| | | * [3/?] [wip] fix incorrect variable referenceGreg Fuller2022-10-121-1/+1
| | | | | | | | | | | | | | | | still needs testing
| | | * [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
| | | | | | | | | | | | | | | | | | | | | | | | looks functionally correct, needs testing Needs particular testing care around whether the colon usage (:) will break anything in whatever new use cases were introduced by https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/2143
| | | * Merge remote-tracking branch 'upstream/master' into ↵Greg Fuller2022-10-1220-224/+705
| | | |\ | | | | | | | | | | | | | | | interrogate_include_ranks_in_output
| | | * | Interrogate: add option to include ranks in outputGreg Fuller2022-10-124-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the UI also allows users to specify ranks, it can be useful to show people what ranks are being returned by interrogate This can also give much better results when feeding the interrogate results back into either img2img or txt2img, especially when trying to generate a specific character or scene for which you have a similar concept image Testing Steps: Launch Webui with command line arg: --deepdanbooru Navigate to img2img tab, use interrogate DeepBooru, verify tags appears as before. Use "Interrogate CLIP", verify prompt appears as before Navigate to Settings tab, enable new option, click "apply settings" Navigate to img2img, Interrogate DeepBooru again, verify that weights appear and are properly formatted. Note that "Interrogate CLIP" prompt is still unchanged In my testing, this change has no effect to "Interrogate CLIP", as it seems to generate a sentence-structured caption, and not a set of tags. (reproduce changes from https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/2149/commits/6ed4faac46c45ca7353f228aca9b436bbaba7bc7)
| | * | | 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
| | | | | | | | | | | | | | | | | | | | | deepbooru: added option to quote (\) in tags deepbooru/BLIP: write caption to file instead of image filename deepbooru/BLIP: now possible to use both for captions deepbooru: process is stopped even if an exception occurs
| * | train: change filename processing to be more simple and configurableAUTOMATIC2022-10-127-62/+105
| | | | | | | | | | | | | | | | | | train: make it possible to make text files with prompts train: rework scheduler so that there's less repeating code in textual inversion and hypernets train: move epochs setting to options
* | | 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
| | |\ \ | | | | | | | | | | Add option to store TI embeddings in png chunks, and load from same.
| | | * | 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
| | | |\ \