Commit Graph

45 Commits

Author SHA1 Message Date
Manuel Schmid 6f479a5040
feat: add same functionality as inpaint image to mask upload element 2024-07-01 00:08:53 +02:00
Manuel Schmid 1c400b56e9
Merge branch 'main_upstream' 2024-05-29 20:33:41 +02:00
Manuel Schmid 3ef663c5b7
fix: do not set textContent on undefined when no translation was given #2 (#3046)
* fix: do not set textContent on undefined when no translation was given
2024-05-29 20:33:15 +02:00
Manuel Schmid f259f00ec5
Merge branch 'feat/build-docker-image-on-push-to-main-branch' 2024-05-28 00:22:37 +02:00
Manuel Schmid 0e621ae34e
fix: add type check for undefined, use fallback when no translation for aspect ratios was given (#3025) 2024-05-28 00:09:39 +02:00
Manuel Schmid 9c4e471a3d
Merge branch 'main_upstream'
# Conflicts:
#	webui.py
2024-05-26 19:42:24 +02:00
Manuel Schmid de34023c79
fix: use translation for aspect ratios label (#3001)
use javascript code instead of python handling for updates for https://github.com/lllyasviel/Fooocus/pull/2590
2024-05-26 19:23:21 +02:00
Manuel Schmid d687ea73c4
Merge branch 'upstream/develop'
# Conflicts:
#	webui.py
2024-04-30 15:34:16 +02:00
Manuel Schmid dbf49d323e
feat: add button to reconnect UI without having to reload the page (#2727)
* feat: add button to reconnect UI without having to reload the page

* qa: add missing semicolon
2024-04-17 22:23:18 +02:00
Manuel Schmid 679c02a09f
Merge branch 'main_upstream'
# Conflicts:
#	css/style.css
#	fooocus_colab.ipynb
#	fooocus_version.py
#	launch.py
#	modules/async_worker.py
#	modules/config.py
#	modules/flags.py
#	modules/meta_parser.py
#	webui.py
2024-03-18 21:27:56 +01:00
hswlab 2831dc70a7
feat: use scrollable 2 column layout for styles (#1883)
* Styles Grouping/Sorting #1770

* Update css/style.css

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>

* Update javascript/script.js

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>

* feat: use standard padding again

---------

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
Co-authored-by: Manuel Schmid <manuel.schmid@odt.net>
2024-03-11 16:35:03 +01:00
Manuel Schmid 267d5eee7d
Merge commit '1c999be8c8134fe01a75723ea933858435856950'
# Conflicts:
#	.github/ISSUE_TEMPLATE/bug_report.md
#	launch.py
#	modules/async_worker.py
#	modules/config.py
#	modules/private_logger.py
#	modules/util.py
#	webui.py
2024-02-12 21:13:36 +01:00
Dr. Christoph Mittendorf 231956065f
Removing unnecessary comments / old code (#1905) 2024-02-10 18:51:03 +01:00
Chris Rohrer dc5b5238c8
fix: prevent cutting off overlay (#1829)
Co-authored-by: Christoph Rohrer <christoph.rohrer@odt.net>
2024-01-09 17:50:47 -08: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
Christoph Rohrer cca4cf3574 fix: prevent cutting off overlay 2024-01-09 11:50:27 +01:00
lllyasviel 888cc08405
fix #1807 (#1814) 2024-01-08 10:41:02 -08:00
Chris Rohrer 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
Manuel Schmid bb57ed452c
Merge branch 'crohrer_main' 2024-01-06 12:59:55 +01:00
Chris Rohrer 4dd85d7d5d fix: makes preview overlay also work with other languages 2024-01-06 10:55:14 +01:00
Manuel Schmid acffc6427c
Merge branch 'crohrer_main' 2024-01-05 17:07:02 +01:00
Chris Rohrer a196a648ff feat: adds preview overlay for styles 2024-01-05 16:56:05 +01:00
Manuel Schmid 6ea37bec93
Merge branch 'main_upstream' 2023-12-16 16:17:37 +01:00
Danil Boldyrev 05ef3e6861
clean up, add undo and some small changes (#1432) 2023-12-15 13:27:14 -08:00
Manuel Schmid 07fba58c99
Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	modules/async_worker.py
#	requirements_versions.txt
#	webui.py
2023-12-14 22:49:29 +01:00
Zaldos f85c10338c
Fix generate shortcut bug and add interrupt shortcut (#1408)
* Fix generate shortcut bug and add interrupt shortcut

* Exit shortcut code early to avoid any issues
2023-12-14 09:21:50 -08:00
Manuel Schmid 87fc830981 add steps info to performance selection radio buttons 2023-11-22 22:17:24 +01:00
lllyasviel ab528b78cf --theme 2023-11-15 08:22:24 -08:00
lllyasviel 608fe3962c some js for lora UI 2023-11-15 07:30:16 -08:00
lllyasviel cec0c2a8df
2.1.808
* Aspect ratios now show aspect ratios.
* Added style search.
* Added style sorting/ordering/favorites.
2023-11-14 14:06:12 -08:00
lllyasviel 375b30f375 js 2023-11-13 23:49:10 -08:00
lllyasviel 5158463216 js 2023-11-13 23:44:15 -08:00
lllyasviel a8be5d7972 js 2023-11-13 11:01:09 -08:00
lllyasviel 7157c1a3ed better js 2023-11-13 10:49:01 -08:00
lllyasviel 7e0c6d3421 add some javascripts
add some javascripts
2023-11-12 01:52:37 -08:00
lllyasviel e19e01ae61 fix weight not working 2023-11-05 04:58:22 -08:00
lllyasviel 87de9edb1a Support Ctrl+Up/Down Arrow 2023-11-05 04:51:46 -08:00
lllyasviel 60c05342b2 safe check 2023-10-20 17:58:26 -07:00
lllyasviel adf134d446 100% cover all texts
100% cover all texts
2023-10-20 17:28:33 -07:00
lllyasviel df93f738de finally solve wide image inpaint UI problem, curse gradio 2023-10-20 10:44:02 -07:00
lllyasviel 9183cc0c71 I18N
I18N
2023-10-20 07:33:11 -07:00
MoonRide303 9cc2325891 Removed context menu from Stop button 2023-10-16 13:18:15 +02:00
MoonRide303 4e1441c07e Simplified stopping generate forever 2023-10-16 12:12:49 +02:00
MoonRide303 20b13b6a8b Merged some MRE features (generate hotkey, generate forever, notification sound) 2023-10-16 11:10:02 +02:00