Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Different changes #206

Merged
merged 10 commits into from
Dec 18, 2019
Merged

Different changes #206

merged 10 commits into from
Dec 18, 2019

Commits on Dec 16, 2019

  1. Fix undefined placeholder warnings 

    - add default values as placeholder

Change-Id: I379ba771adc85962a8b34b8b5ab58f38d5dc3eda
    @andi34
    andi34 committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    4434e9b View commit details
    Browse the repository at this point in the history

  2. README: formatting update 

    Change-Id: I29ce61f49a338448dbda6cd4acbb715351158574
    @rawbertp @andi34
    rawbertp authored and andi34 committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    a64c0ec View commit details
    Browse the repository at this point in the history

  3. admin: delete personal config at reset 

    Change-Id: I084329c1e2adc5f1b2220abdcbbab66f6370e1b5
    @andi34
    andi34 committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    10061ba View commit details
    Browse the repository at this point in the history

  4. Allow admins to choose what gets deleted at reset 

    - always:
  delete db.txt

- optional:
  - delete images
  - delete "mail-addresses.txt"
  - delete personal config (my.config.inc.php)

Change-Id: I4ffc925f5d38fd1c3db7409120f39c464163d8ce
    @andi34
    andi34 committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    2ffeaff View commit details
    Browse the repository at this point in the history

  5. README: no need to name contributions 

    Contributions are visibil at https: //github.com/andreknieriem/photobooth/graphs/contributors
Change-Id: I5ebc6bb8aaa348c145a4f8dde7be685d0ef50ac3
    @andi34
    andi34 committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    573f41b View commit details
    Browse the repository at this point in the history

  6. take picture: red error message 

    Change-Id: Ibd557a2ae207244129f5c6d38f8059a2dc9456bc
    @andi34
    andi34 committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    5e43da5 View commit details
    Browse the repository at this point in the history

  7. Add possibility to choose dark countdown background 

    Change-Id: I86564d8aca632d929428b1844fbb60e12b90dfb1
    @andi34
    andi34 committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    531bb2c View commit details
    Browse the repository at this point in the history

  8. Config for Photobooths Webserver IP to fix Download via QR-Code 

    - if Photobooth is opened via localhost/127.0.0.1 it is not possible to
  download images via QR code using a different device

Change-Id: Ifc7dc6cb6bf26dd9c069fc017234dec58a93e62f
    @andi34
    andi34 committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    a6065fb View commit details
    Browse the repository at this point in the history

  9. configsetup: use defaultConfig as placeholder where possible 

    Change-Id: I129bc194f8df93d52251d0e623f2fd1da69b7cb4
    @andi34
    andi34 committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    03875cb View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2019

  1. Print: use webserver IP config on QR Code generation 

    Change-Id: I4438a802d6319b991e07e1bfc385734d30119a2f
    @andi34
    andi34 committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    e93b416 View commit details
    Browse the repository at this point in the history