1ff3efd56b
Merge branch 'feature/update-juggernaut-xl-to-v8'
...
# Conflicts:
# css/style.css
2024-01-10 11:02:10 +01:00
851de15f95
Merge branch 'main_upstream' into feature/update-juggernaut-xl-to-v8
2024-01-10 11:01:21 +01:00
92684132b5
clean up model download URL query parameters
2024-01-10 11:00:39 +01:00
dc5b5238c8
fix: prevent cutting off overlay ( #1829 )
...
Co-authored-by: Christoph Rohrer <christoph.rohrer@odt.net>
2024-01-09 17:50:47 -08:00
f136e78df7
Merge branch 'crohrer_main'
...
# Conflicts:
# css/style.css
2024-01-09 14:35:01 +01:00
0299d04856
Merge branch 'hotfix/rename-preview-images'
...
# Conflicts:
# css/style.css
# javascript/script.js
# modules/ui_gradio_extensions.py
2024-01-09 14:33:02 +01:00
5a75599c63
Merge branch 'main_upstream' into hotfix/rename-preview-images
...
# Conflicts:
# sdxl_styles/samples/academia.jpg
# sdxl_styles/samples/baroque.jpg
# sdxl_styles/samples/caricature.jpg
# sdxl_styles/samples/constructivism.jpg
# sdxl_styles/samples/cubism.jpg
# sdxl_styles/samples/dadaism.jpg
# sdxl_styles/samples/expressionism.jpg
# sdxl_styles/samples/fauvism.jpg
# sdxl_styles/samples/futurism.jpg
# sdxl_styles/samples/glitchcore.jpg
# sdxl_styles/samples/idyllic.jpg
# sdxl_styles/samples/impressionism.jpg
# sdxl_styles/samples/medievalism.jpg
# sdxl_styles/samples/minimalism.jpg
# sdxl_styles/samples/neoclassicism.jpg
# sdxl_styles/samples/rococo.jpg
# sdxl_styles/samples/sketchup.jpg
# sdxl_styles/samples/suprematism.jpg
# sdxl_styles/samples/surrealism.jpg
# sdxl_styles/samples/terragen.jpg
2024-01-09 14:07:06 +01:00
cca4cf3574
fix: prevent cutting off overlay
2024-01-09 11:50:27 +01:00
6261f17561
Update Version ( #1821 )
2024-01-08 17:01:52 -08:00
fee997d929
git is now case sensitive ( #1820 )
2024-01-08 16:55:36 -08:00
c48d6e7404
fix --disable-in-browser ( #1718 )
2024-01-08 10:46:12 -08:00
888cc08405
fix #1807 ( #1814 )
2024-01-08 10:41:02 -08:00
d6b5aa4dcd
feat: optimise image filesize, compress jpg 80%
2024-01-08 16:44:10 +01:00
88586ddfc8
fix: rename uppercase files to lowercase
2024-01-08 16:38:25 +01:00
f298ebca76
feat: adds preview overlay for styles ( #1762 )
...
* feat: adds preview overlay for styles
* fix: implement correct path resolution for all OS
solves issues for Windows
* fix: makes preview overlay also work with other languages
* feat: scale down images to 258x200, fix aspect ratio in css
reduces file size from 19,6MB to 3,4MB
* fix: adjust z-index to correctly overlay gradio border pulse when generating images
* update files
* version
---------
Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
Co-authored-by: Manuel Schmid <manuel.schmid@odt.net>
Co-authored-by: lllyasviel <lyuminzhang@outlook.com>
2024-01-07 15:10:42 -08:00
21bceb6d51
Merge branch 'feature/update-juggernaut-xl-to-v8'
2024-01-07 16:18:58 +01:00
896fbc6185
feat: update JuggernautXL from v6 to v8
2024-01-07 15:47:07 +01:00
1351e29eff
Merge branch 'vikrantrathore/patch-2'
2024-01-07 15:42:36 +01:00
7bdb976bf9
Update presets/anime.json
2024-01-07 15:30:59 +01:00
e8a2eb0bbc
Merge branch 'crohrer_main'
2024-01-07 14:41:24 +01:00
80b4c5d615
Merge branch 'hotfix/fix-file-sort'
2024-01-07 14:41:09 +01:00
74eec84a61
fix: correctly sort files, display deepest dir level first
2024-01-07 14:28:12 +01:00
d5f25eedea
feat: scale down images to 258x200, fix aspect ratio in css
...
reduces file size from 19,6MB to 3,4MB
2024-01-07 12:03:18 +01:00
bb57ed452c
Merge branch 'crohrer_main'
2024-01-06 12:59:55 +01:00
6a75a8347a
Merge branch 'main' of github.com:mashb1t/Fooocus
2024-01-06 12:58:45 +01:00
d03441a079
Merge branch 'main' of github.com:crohrer/Fooocus
2024-01-06 10:55:28 +01:00
4dd85d7d5d
fix: makes preview overlay also work with other languages
2024-01-06 10:55:14 +01:00
2e16b0faa4
Merge remote-tracking branch 'origin/hotfix/prevent-skipping-and-stopping-by-other-users'
...
# Conflicts:
# modules/async_worker.py
2024-01-05 22:59:09 +01:00
b5bb4eb8b1
Merge branch 'feature/add-preset-selection'
...
# Conflicts:
# webui.py
2024-01-05 21:54:46 +01:00
4900837786
feat: add argument --disable-preset-selection
...
useful for cloud provisioning to prevent model switches and keep models loaded
2024-01-05 21:53:06 +01:00
7a01c8a5b2
Merge branch 'crohrer_main'
2024-01-05 20:18:19 +01:00
6d6b4dbd85
fix: implement correct path resolution for all OS
...
solves issues for Windows
2024-01-05 20:06:43 +01:00
f1e1257249
fix: implement correct path resolution for all OS
...
solves issues for Windows
2024-01-05 19:59:51 +01:00
737bd9be9c
add PR for preview of styles to readme
2024-01-05 17:49:53 +01:00
acffc6427c
Merge branch 'crohrer_main'
2024-01-05 17:07:02 +01:00
56d91f9b6a
Merge branch 'main_upstream'
2024-01-05 17:06:55 +01:00
a196a648ff
feat: adds preview overlay for styles
2024-01-05 16:56:05 +01:00
04ba1604f4
fix: use currentTask instead of ctrls after merging upstream
2024-01-04 18:12:11 +01:00
e68c8aa0a7
Merge branch 'main_upstream' into hotfix/prevent-skipping-and-stopping-by-other-users
...
# Conflicts:
# webui.py
2024-01-04 18:07:06 +01:00
ee3d70ab87
fix: replace fcbh with ldm_patched
2024-01-04 18:03:12 +01:00
176faf6f34
fixes https://github.com/lllyasviel/Fooocus/issues/1747 ( #1750 )
2024-01-04 05:46:17 -08:00
62d2a3a454
Merge branch 'feature/add-preset-selection'
...
# Conflicts:
# webui.py
2024-01-02 22:40:23 +01:00
e86b7f56bc
Merge branch 'main_upstream' into feature/add-preset-selection
2024-01-02 22:24:25 +01:00
2fa3cf6c3f
DRY output parameter handling
2024-01-02 22:23:11 +01:00
925ba509f7
Merge branch 'main_upstream'
...
# Conflicts:
# modules/advanced_parameters.py
2024-01-02 18:00:26 +01:00
624f74a1ed
(requested) Allow upload inpaint mask in developer mode.
2024-01-02 08:22:54 -08:00
e5af760db8
mask upload
2024-01-02 08:21:50 -08:00
b5163e057f
Fooocus mask enhance, mask upload and invert.蒙版增强功能，上传蒙版、反转手涂蒙版 ( #1645 )
...
* Update webui.py
Added a mask upload interface.添加蒙版上传界面。
* Add mask upload feature
Add mask upload feature.添加蒙版上传功能。
* Add mask upload feature
Add mask upload feature.添加蒙版上传功能。
* Try to fix the problem when drawing mates with external enrichment.
Swap the judgment criteria and try to fix the problem when drawing mates with external enrichment.
调换判断条件，尝试修复和外部扩充绘制配合时出现的问题
* 修改注释
* 修改注释
* Update readme.md
更新日志
* Add mask upload check box,
Add check box, default does not show mask upload box, check it and then show it.
添加复选框，默认不显示蒙版上传框，勾选后再显示。
* back to normal
还原
* Try adding a mask inversion feature
Try adding a mask inversion feature.
尝试添加蒙版反转功能。
增加一个复选框来决定是否将蒙版反转。
* Try adding a mask inversion feature
Try adding a mask inversion feature.
尝试添加蒙版反转功能。
增加一个复选框来决定是否将蒙版反转。
* Fixed word errors
* Fix the words of the description
2024-01-02 07:17:02 -08:00
0099dd4783
Merge branch 'feature/add-preset-selection'
...
# Conflicts:
# webui.py
2024-01-01 18:50:43 +01:00
55bb233a3e
use state_is_generating for preset selection change
2024-01-01 18:49:01 +01:00
Manuel Schmid
Chris Rohrer
Christoph Rohrer
lllyasviel
cocktailpeanut
Manuel Schmid
Chris Rohrer
Manuel Schmid
xhoxye