 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 |
|