Commit Graph

178 Commits

Author SHA1 Message Date
Dr.Lt.Data
3d834833bc
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-05-06 09:43:59 +09:00
comfyanonymous
9bd33b6bd4 Merge branch 'progress-shape-fix' of https://github.com/pythongosssss/ComfyUI 2023-05-05 13:14:55 -04:00
pythongosssss
de4623a8a4 actually fix card 2023-05-05 10:34:09 +01:00
pythongosssss
f31e31ee0a Fix box shape
Match card to litegraph selection
2023-05-05 10:12:06 +01:00
Dr.Lt.Data
6431639509 refresh fix related to FILE_COMBO 2023-05-05 16:23:43 +09:00
Dr.Lt.Data
575df2b7f7
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-05-05 15:53:56 +09:00
pythongosssss
7e51bbd07f automatic calculation of image pos from widgets 2023-05-04 19:42:07 +01:00
Lt.Dr.Data
66ace3b55b show "clipspace/filename.png" instead of 'filename.png [clipspace]' in LoadImage/LoadImageMask 2023-05-04 10:54:43 +09:00
Lt.Dr.Data
3a28a28000 save clipspace files to input/clipspace instead of temp 2023-05-02 15:32:39 +09:00
ltdrdata
2f943e6f23
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-05-01 11:53:41 +09:00
Dr.Lt.Data
06d8ffb71e make default img_paste_mode to 'selected'
refactor space -> tab
2023-05-01 08:39:05 +09:00
comfyanonymous
b04e16ef5a Make default workflow use an existing checkpoint if no SD1.5 checkpoint. 2023-04-30 18:19:03 -04:00
Dr.Lt.Data
9d332bec0e crash fix 2023-04-29 14:42:47 +09:00
Dr.Lt.Data
286b731de3 copy/paste bug fixes for batch images
enhance selector preview on clipspace menu
add img_paste_mode option into clipspace menu
2023-04-29 14:39:03 +09:00
ltdrdata
8d454f4785 support batch images on clipspace, maskeditor 2023-04-28 21:47:16 +09:00
ltdrdata
1ce7350304 fix copy (clipspace) action
imgs[0] copy -> whole imgs copy
2023-04-28 20:31:27 +09:00
ltdrdata
ce55aa784a
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-04-26 20:37:45 +09:00
ltdrdata
5cc97cf2bf various bug fixes
* paste action
- prevent opening upload popup
- ensure rendering after widget_value update

* view api update
- support annotated_filepath

* maskeditor layout
- prevent covering button by hidden div
2023-04-26 20:36:58 +09:00
Jake D
54251ad85e
Colored MultilineWidget (#524)
* fixes colors and z-index

* light mode fix

* Update widgets.js
2023-04-26 01:22:36 -04:00
ltdrdata
7dc1dd6503
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-04-25 16:21:17 +09:00
Lt.Dr.Data
79a07bb813 clean commit 2023-04-25 12:01:32 +09:00
Lt.Dr.Data
55e46e708e Merge branch 'Main' into feature/maskpainting 2023-04-25 11:52:53 +09:00
comfyanonymous
36acce58e7 Auto increase the size of the image upload widget when there's an image. 2023-04-24 18:13:18 -04:00
comfyanonymous
ccad603b2e Add a way for nodes to validate their own inputs. 2023-04-23 16:03:26 -04:00
ltdrdata
f7a8218814
Add clipspace feature. (#541)
* Add clipspace feature.
* feat: copy content to clipspace
* feat: paste content from clipspace

Extend validation to allow for validating annotated_path in addition to other parameters.

Add support for annotated_filepath in folder_paths function.

Generalize the '/upload/image' API to allow for uploading images to the 'input', 'temp', or 'output' directories.

* rename contentClipboard -> clipspace

* Do deep copy for imgs on copy to clipspace.

* add original_imgs into clipspace
* Preserve the original image when 'imgs' are modified

* robust patch & refactoring folder_paths about annotated_filepath

* Only show the Paste menu if the ComfyApp.clipspace is not empty

* instant refresh on paste

force triggering 'changed' on paste action

* subfolder fix on paste logic

attach subfolder if subfolder isn't empty

---------

Co-authored-by: Lt.Dr.Data <lt.dr.data@gmail.com>
2023-04-23 15:58:55 -04:00
ltdrdata
cc7ad627a8 Merge branch 'feature/clipspace' into feature/maskpainting 2023-04-23 23:34:39 +09:00
ltdrdata
b2abfa6ad7 subfolder fix on paste logic
attach subfolder if subfolder isn't empty
2023-04-23 23:32:48 +09:00
ltdrdata
f8e6adac06 Merge branch 'feature/clipspace' into feature/maskpainting 2023-04-23 21:23:25 +09:00
ltdrdata
8af0b2b52e instant refresh on paste
force triggering 'changed' on paste action
2023-04-23 21:04:06 +09:00
pythongosssss
c8355ed39f use window.name instead of session storage
- prevents duplicate stealing session id
2023-04-23 10:31:21 +01:00
Lt.Dr.Data
f5af731ffd Merge branch 'feature/clipspace' into feature/maskpainting 2023-04-21 15:46:57 +09:00
Lt.Dr.Data
5920edba3a Only show the Paste menu if the ComfyApp.clipspace is not empty 2023-04-21 15:45:22 +09:00
Lt.Dr.Data
10f17f97a6 Merge branch 'feature/clipspace' into feature/maskpainting 2023-04-21 15:17:46 +09:00
Lt.Dr.Data
4d93ef8a0a robust patch & refactoring folder_paths about annotated_filepath 2023-04-21 15:13:18 +09:00
Lt.Dr.Data
d0952e84fe Merge branch 'feature/clipspace' into feature/maskpainting 2023-04-21 13:41:46 +09:00
Lt.Dr.Data
2c21210c72 add original_imgs into clipspace
* Preserve the original image when 'imgs' are modified
2023-04-21 13:40:07 +09:00
Dr.Lt.Data
2e9976fbd9 mask painting on clipspace 2023-04-20 23:24:47 +09:00
Dr.Lt.Data
254aa024f6 Do deep copy for imgs on copy to clipspace. 2023-04-20 23:21:29 +09:00
Dr.Lt.Data
65a005e9a2 rename contentClipboard -> clipspace 2023-04-20 22:36:13 +09:00
Lt.Dr.Data
9e8c60e9f3 Add clipspace feature.
* feat: copy content to clipspace
* feat: paste content from clipspace

Extend validation to allow for validating annotated_path in addition to other parameters.

Add support for annotated_filepath in folder_paths function.

Generalize the '/upload/image' API to allow for uploading images to the 'input', 'temp', or 'output' directories.
2023-04-20 21:54:05 +09:00
comfyanonymous
c8afa7e9fb Merge branch 'settings-slider' of https://github.com/missionfloyd/ComfyUI 2023-04-17 22:45:46 -04:00
Karun
bc16b70bde
Adds several keybinds that interact with ComfyUI (#491)
* adds keybinds that interact w/ comfy menu

* adds remaining keybinds

* adds keybinds to readme and converts to table

* ctrl s and o save and open workflow

* moves keybinds to sep file, update readme

* remap load default, support keycodes

* update keybinds table, prepends comfy to ids

* escape exits out of modals

* modifier keys also use map

* adds setting for filename prompt

* better handle filename prompt

Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>
2023-04-16 01:25:11 -04:00
pythongosssss
2dd28d4d20 style 2023-04-15 21:41:21 +01:00
pythongosssss
eb4035c8bd Adds jsdoc for better dev experience 2023-04-15 21:40:39 +01:00
pythongosssss
5186b3266a Prevent generating bad replacement regex 2023-04-15 10:29:32 +01:00
comfyanonymous
501f200d86 Fix widgets not getting converted correctly in workflows. 2023-04-13 10:38:41 -04:00
missionfloyd
8810e1b4b9 Fix indentation 2023-04-12 21:15:21 -06:00
missionfloyd
e87aa1873f Add slider setting type 2023-04-12 19:36:35 -06:00
FizzleDorf
3f52e7cbb1
Seed controls added to Ksamplers (#296)
Co-authored-by: flyingshutter <flyingshutter@users.noreply.github.com>
2023-04-12 20:57:13 -04:00
pythongosssss
d6a3c0d424 Add support for dropping images from urls 2023-04-12 13:49:32 +01:00