Skip to content

combined pull requests#299

Merged
Vegita2 merged 28 commits into
masterfrom
gigamerge
Aug 25, 2023
Merged

combined pull requests#299
Vegita2 merged 28 commits into
masterfrom
gigamerge

Conversation

@Vegita2
Copy link
Copy Markdown
Member

@Vegita2 Vegita2 commented Aug 24, 2023

combined a bunch of pull requests:
#293
#287
#285
#283
#282

Also made person expression editable without opening the widget. This makes the behaviour similar to the manual input pull request.

Here is the commit for the change:
8a0d64f

The review should only be for this commit, the other changes already had a review in their respective pr

Vegita2 and others added 28 commits August 5, 2023 03:02
Co-authored-by: 2767mr <2767mr@users.noreply.github.com>
moved manual input outside of image select widget
# Conflicts:
#	CHANGELOG.md
#	webapp/src/app/components/layers/layers.component.html
# Conflicts:
#	CHANGELOG.md
#	webapp/src/app/app.module.ts
@Vegita2 Vegita2 requested a review from 2767mr August 24, 2023 02:19
@Vegita2 Vegita2 merged commit 642b142 into master Aug 25, 2023
@Vegita2 Vegita2 deleted the gigamerge branch August 25, 2023 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants