Commit Graph
46 Commits
Author SHA1 Message Date
Manuel Schmid faa09aea9d update readme PRs 2024-01-10 21:06:08 +01:00
Manuel Schmid 2f6c0a8ca1 Merge branch 'patch-2' 2024-01-10 20:57:24 +01:00
Manuel Schmid c69fd4df80 feat: update blue_pencil-XL to latest stable version 3.1.0
also see https://civitai.com/models/119012?modelVersionId=293405
2024-01-10 20:54:32 +01:00
Manuel Schmid 1ff3efd56b Merge branch 'feature/update-juggernaut-xl-to-v8'
# Conflicts:
#	css/style.css
2024-01-10 11:02:10 +01:00
Manuel Schmid 851de15f95 Merge branch 'main_upstream' into feature/update-juggernaut-xl-to-v8 2024-01-10 11:01:21 +01:00
Manuel Schmid 92684132b5 clean up model download URL query parameters 2024-01-10 11:00:39 +01:00
Manuel Schmid f136e78df7 Merge branch 'crohrer_main'
# Conflicts:
#	css/style.css
2024-01-09 14:35:01 +01:00
Manuel Schmid 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
Manuel Schmid 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
Manuel Schmid d6b5aa4dcd feat: optimise image filesize, compress jpg 80% 2024-01-08 16:44:10 +01:00
Manuel Schmid 88586ddfc8 fix: rename uppercase files to lowercase 2024-01-08 16:38:25 +01:00
Manuel Schmid 21bceb6d51 Merge branch 'feature/update-juggernaut-xl-to-v8' 2024-01-07 16:18:58 +01:00
Manuel Schmid 896fbc6185 feat: update JuggernautXL from v6 to v8 2024-01-07 15:47:07 +01:00
Manuel Schmid 1351e29eff Merge branch 'vikrantrathore/patch-2' 2024-01-07 15:42:36 +01:00
Manuel Schmid e8a2eb0bbc Merge branch 'crohrer_main' 2024-01-07 14:41:24 +01:00
Manuel Schmid 80b4c5d615 Merge branch 'hotfix/fix-file-sort' 2024-01-07 14:41:09 +01:00
Manuel Schmid 74eec84a61 fix: correctly sort files, display deepest dir level first 2024-01-07 14:28:12 +01:00
Manuel Schmid 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
Manuel Schmid bb57ed452c Merge branch 'crohrer_main' 2024-01-06 12:59:55 +01:00
Manuel Schmid 6a75a8347a Merge branch 'main' of github.com:mashb1t/Fooocus 2024-01-06 12:58:45 +01:00
Manuel Schmid 737bd9be9c add PR for preview of styles to readme 2024-01-05 17:49:53 +01:00
Manuel Schmid acffc6427c Merge branch 'crohrer_main' 2024-01-05 17:07:02 +01:00
Manuel Schmid 56d91f9b6a Merge branch 'main_upstream' 2024-01-05 17:06:55 +01:00
Manuel Schmid 04ba1604f4 fix: use currentTask instead of ctrls after merging upstream 2024-01-04 18:12:11 +01:00
Manuel Schmid 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
Manuel Schmid ee3d70ab87 fix: replace fcbh with ldm_patched 2024-01-04 18:03:12 +01:00
Manuel Schmid 925ba509f7 Merge branch 'main_upstream'
# Conflicts:
#	modules/advanced_parameters.py
2024-01-02 18:00:26 +01:00
Manuel Schmid 4d4a7c9241 Merge branch 'feature/template-improvements' 2023-12-28 14:01:48 +01:00
Manuel Schmid 37e3b93193 refactor and improve bug report and feature request issue templates 2023-12-28 14:00:47 +01:00
Manuel Schmid a5ed897e21 Merge branch 'main_upstream' 2023-12-20 18:11:07 +01:00
Manuel Schmid cdaaec3e71 use config to set cache dir for safety checker 2023-12-16 19:25:02 +01:00
Manuel Schmid 6ea37bec93 Merge branch 'main_upstream' 2023-12-16 16:17:37 +01:00
Manuel Schmid 96523e9397 fix config mapping for default_performance 2023-12-05 23:57:50 +01:00
Manuel Schmid 99f7b6e6d4 Merge branch 'feature/add-advanced-parameter-disable-intermediate-images' 2023-11-22 23:44:18 +01:00
Manuel Schmid a5f3e4af9b Merge branch 'hotfix/prevent-skipping-and-stopping-by-other-users'
# Conflicts:
#	modules/config.py
2023-11-20 22:01:40 +01:00
Manuel Schmid 8acb2d7537 Merge branch 'main_upstream' into hotfix/prevent-skipping-and-stopping-by-other-users
# Conflicts:
#	webui.py
2023-11-20 22:00:08 +01:00
Manuel Schmid 35be9adada Merge branch 'feature/add-animals-to-wildcards' 2023-11-19 23:02:57 +01:00
Manuel Schmid 9b680c51a8 Merge branch 'hotfix/prevent-skipping-and-stopping-by-other-users'
# Conflicts:
#	webui.py
2023-11-19 22:57:58 +01:00
Manuel Schmid 83efbbd2fa Revert "only make stop_button and skip_button interactive when rendering process starts"
This reverts commit d3f9156854.
2023-11-18 17:23:37 +01:00
Manuel Schmid 617255d040 use AsyncTask for last_stop handling instead of shared 2023-11-18 17:20:41 +01:00
Manuel Schmid 2856893e15 handle generate button visibility in generate_clicked 2023-11-18 14:32:42 +01:00
Manuel Schmid d3f9156854 only make stop_button and skip_button interactive when rendering process starts
fix inconsistency in behaviour of stop_button and skip_button as it was possible to skip or stop other users processes while still being in queue
2023-11-18 13:02:39 +01:00
Manuel Schmid 2e1e82941d rebase changes of main for easier handling 2023-11-18 12:58:05 +01:00
Manuel Schmid 3dc69a5293 fix progressbar call for nsfw output 2023-11-18 12:17:06 +01:00
Manuel Schmid 6893c8dd48 Merge commit '8f9f020e8f90efb3787f0feb0e544539110e40ce' into feature/add-nsfw-filter
# Conflicts:
#	modules/async_worker.py
2023-11-18 12:03:09 +01:00
Manuel Schmid 52ae346c9d add nsfw image censoring
activatable via config, uses CompVis/stable-diffusion-safety-checker
2023-11-15 22:00:45 +01:00