search

andi34 / photobooth

A Photobooth web interface for Linux and Windows.
MIT License
72 stars 39 forks source link

Collage extensions and fixes #436

Closed s-dinda closed 2 years ago

s-dinda commented 2 years ago

Prerequisites checklist

What is the purpose of this pull request? (put an "x" next to an item)

What changes did you make? (Give an overview)

Is there anything you'd like reviewers to focus on?

andi34 commented 2 years ago

Hey and thanks a lot for your contribution! I've picked your changes already to https://github.com/andi34/photobooth/tree/s-dinda/collage-extension for local testing and need to adjust 2 things. Trying to do later and push from https://github.com/andi34/photobooth/tree/s-dinda/collage-extension to dev branch once it's ready. Would that be ok? From Android development I am used to rebase changes before merge /submit to avoid conflicts by accident and to prevent a big history of "merge branch y into x" and so on 😅🙈

s-dinda commented 2 years ago

Hi! Thanks a lot for your effort. Best Photobox! Sounds great, so I guess I should close the PR?

andi34 commented 2 years ago

Thanks a lot! I'll close this PR once ive finished it. I'll add a link to this PR inside the changelog.

andi34 commented 2 years ago

https://github.com/andi34/photobooth/commit/b3147607cb547b23ec96d8dbd5fceeb298ab02fa

https://github.com/andi34/photobooth/commit/fc73a427e076a882565938a61abafad66d0bdcec

https://github.com/andi34/photobooth/commit/c3dbd53b8799d82c26bc7484411a4534523ea13b

andi34 commented 2 years ago

Rebased and merged! Thanks a lot!