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

Conversation

andi34
Copy link
Collaborator

@andi34 andi34 commented Dec 8, 2019 •
edited
Loading

  • README: update formatting and cleanup
  • Fix undefined placeholder warnings
  • take picture: red error message
  • Allow admins to choose what gets deleted at reset (inspired by delete a session #178)
    • always:
      • delete db.txt
    • optional (but enabled by default):
      • delete images
      • delete "mail-addresses.txt
      • delete personal config (my.config.inc.php)
  • Add possibility to choose dark countdown background (inspired by Disable display while countdown #198 )
  • Allow defining Photobooth web server IP to fix image download via QR-Code if Photobooth is accessed via localhost/127.0.0.1

@andi34 andi34 changed the title Tiny changes Different changes Dec 9, 2019
@andi34
Copy link
Collaborator Author

andi34 commented Dec 10, 2019

andi34@fd0ebde

Add here too in main project?

@andi34 andi34 requested a review from sualko December 10, 2019 17:09
sualko
sualko reviewed Dec 11, 2019
View reviewed changes
README.md Outdated Show resolved Hide resolved
api/admin.php Outdated Show resolved Hide resolved
@sualko
Copy link
Collaborator

sualko commented Dec 11, 2019

andi34/photobooth@fd0ebde should not be merged, because inline styles are bad. Better use classes, so everyone can customize his error message.

@andi34
Copy link
Collaborator Author

andi34 commented Dec 11, 2019

andi34/photobooth@fd0ebde should not be merged, because inline styles are bad. Better use classes, so everyone can customize his error message.

No problem.

@andi34
Copy link
Collaborator Author

andi34 commented Dec 11, 2019

I'll try to update the PR later, else on weekend

@andi34 andi34 added the WIP label Dec 11, 2019
@andi34 andi34 requested a review from sualko December 11, 2019 17:36
@andi34 andi34 removed the WIP label Dec 11, 2019
andi34
andi34 commented Dec 11, 2019
View reviewed changes
resources/js/core.js Outdated Show resolved Hide resolved
andi34
andi34 commented Dec 12, 2019
View reviewed changes
resources/lang/en.js Outdated Show resolved Hide resolved
andi34
andi34 commented Dec 12, 2019
View reviewed changes
config/config.inc.php Outdated Show resolved Hide resolved
@andi34
Copy link
Collaborator Author

andi34 commented Dec 12, 2019

IMO good to go now @sualko

sualko
sualko reviewed Dec 16, 2019
View reviewed changes
lib/configsetup.inc.php Outdated Show resolved Hide resolved
andi34 and others added 9 commits December 16, 2019 20:20
@andi34
Fix undefined placeholder warnings
4434e9b 
- add default values as placeholder

Change-Id: I379ba771adc85962a8b34b8b5ab58f38d5dc3eda
@rawbertp @andi34
README: formatting update
a64c0ec 
Change-Id: I29ce61f49a338448dbda6cd4acbb715351158574
@andi34
admin: delete personal config at reset
10061ba 
Change-Id: I084329c1e2adc5f1b2220abdcbbab66f6370e1b5
@andi34
Allow admins to choose what gets deleted at reset
2ffeaff 
- always:
  delete db.txt

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

Change-Id: I4ffc925f5d38fd1c3db7409120f39c464163d8ce
@andi34
README: no need to name contributions
573f41b 
Contributions are visibil at https: //github.com/andreknieriem/photobooth/graphs/contributors
Change-Id: I5ebc6bb8aaa348c145a4f8dde7be685d0ef50ac3
@andi34
take picture: red error message
5e43da5 
Change-Id: Ibd557a2ae207244129f5c6d38f8059a2dc9456bc
@andi34
Add possibility to choose dark countdown background
531bb2c 
Change-Id: I86564d8aca632d929428b1844fbb60e12b90dfb1
@andi34
Config for Photobooths Webserver IP to fix Download via QR-Code
a6065fb 
- 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
configsetup: use defaultConfig as placeholder where possible
03875cb 
Change-Id: I129bc194f8df93d52251d0e623f2fd1da69b7cb4
@andi34 andi34 requested a review from sualko December 16, 2019 19:43
@andi34
Copy link
Collaborator Author

andi34 commented Dec 16, 2019 •
edited
Loading

IMO good to go. Replaced placeholder with $defaultConfig definition where possible.

@andi34
Copy link
Collaborator Author

andi34 commented Dec 17, 2019

Forgot andi34@1b91879 , will push in the evening

@andi34
Print: use webserver IP config on QR Code generation
e93b416 
Change-Id: I4438a802d6319b991e07e1bfc385734d30119a2f
@andi34 andi34 mentioned this pull request Dec 17, 2019
Merged
@andi34 andi34 merged commit e124531 into master Dec 18, 2019
@andi34 andi34 deleted the feature/misc branch December 18, 2019 09:50
@andi34 andi34 mentioned this pull request Dec 30, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sualko sualko Awaiting requested review from sualko

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@andi34 @sualko @rawbertp