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

Kiosk Checkin / Out #2333

Merged
merged 87 commits into from
May 27, 2017
Merged

Kiosk Checkin / Out #2333

merged 87 commits into from
May 27, 2017

Commits on Nov 12, 2016

  1. begin student classroom utils

    @crossan007
    crossan007 committed Nov 12, 2016
    Configuration menu
    Copy the full SHA
    87e29e0 View commit details
    Browse the repository at this point in the history

  2. begin schema changes

    @crossan007
    crossan007 committed Nov 12, 2016
    Configuration menu
    Copy the full SHA
    2b68317 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2016

  1. Merge branch 'develop' into 2.4.0-sundayschool-classroom-utilities

    @crossan007
    crossan007 committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    81056fc View commit details
    Browse the repository at this point in the history

  2. tweaks

    @crossan007
    crossan007 committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    a7db514 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2016

  1. Merge branch 'develop' into 2.4.0-sundayschool-classroom-utilities

    @crossan007
    crossan007 committed Nov 17, 2016
    Configuration menu
    Copy the full SHA
    409ecbd View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2016

  1. buttons and pictures!

    @crossan007
    crossan007 committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    7721a9f View commit details
    Browse the repository at this point in the history

  2. fight with joins for role names

    @crossan007
    crossan007 committed Nov 18, 2016
    Configuration menu
    Copy the full SHA
    7a36b34 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2017

  1. update from master

    @crossan007
    crossan007 committed Apr 20, 2017
    Configuration menu
    Copy the full SHA
    9bbd358 View commit details
    Browse the repository at this point in the history

  2. update to develop

    @crossan007
    crossan007 committed Apr 20, 2017
    Configuration menu
    Copy the full SHA
    5ee67db View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into 2.4.0-sundayschool-classroom-utilities

    @crossan007
    crossan007 authored Apr 20, 2017
    Configuration menu
    Copy the full SHA
    7b09d92 View commit details
    Browse the repository at this point in the history

  4. underp merge

    @crossan007
    crossan007 committed Apr 20, 2017
    Configuration menu
    Copy the full SHA
    233caf6 View commit details
    Browse the repository at this point in the history

  5. update with new photo and schema. still messy query.

    @crossan007
    crossan007 committed Apr 20, 2017
    Configuration menu
    Copy the full SHA
    ff33aab View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2017

  1. working kiddos page

    @crossan007
    crossan007 committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    ebaa966 View commit details
    Browse the repository at this point in the history

  2. cleanup

    @crossan007
    crossan007 committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    673e713 View commit details
    Browse the repository at this point in the history

  3. underp merge

    @crossan007
    crossan007 committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    0f53ec3 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2017

  1. ss kiosk docs

    @crossan007
    crossan007 committed Apr 22, 2017
    Configuration menu
    Copy the full SHA
    680885c View commit details
    Browse the repository at this point in the history

  2. tweak

    @crossan007
    crossan007 committed Apr 22, 2017
    Configuration menu
    Copy the full SHA
    caa5eab View commit details
    Browse the repository at this point in the history

  3. tweaks

    @crossan007
    crossan007 committed Apr 22, 2017
    Configuration menu
    Copy the full SHA
    b968a79 View commit details
    Browse the repository at this point in the history

  4. remove old

    @crossan007
    crossan007 committed Apr 22, 2017
    Configuration menu
    Copy the full SHA
    0ade297 View commit details
    Browse the repository at this point in the history

  5. move file

    @crossan007
    crossan007 committed Apr 22, 2017
    Configuration menu
    Copy the full SHA
    12a8b85 View commit details
    Browse the repository at this point in the history

  6. alerts

    @crossan007
    crossan007 committed Apr 22, 2017
    Configuration menu
    Copy the full SHA
    e8aa5f2 View commit details
    Browse the repository at this point in the history

  7. tweaks

    @crossan007
    crossan007 committed Apr 22, 2017
    Configuration menu
    Copy the full SHA
    92738b1 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2017

  1. Merge branch 'develop' into 2.4.0-sundayschool-classroom-utilities

    @crossan007
    crossan007 committed May 13, 2017
    Configuration menu
    Copy the full SHA
    4ce13d4 View commit details
    Browse the repository at this point in the history

  2. start adding event endpoints

    @crossan007
    crossan007 committed May 13, 2017
    Configuration menu
    Copy the full SHA
    5f562a6 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2017

  1. db tweaks

    @crossan007
    crossan007 committed May 14, 2017
    Configuration menu
    Copy the full SHA
    9bc836a View commit details
    Browse the repository at this point in the history

  2. ORM

    @crossan007
    crossan007 committed May 14, 2017
    Configuration menu
    Copy the full SHA
    2a44c4b View commit details
    Browse the repository at this point in the history

  3. ORM

    @crossan007
    crossan007 committed May 14, 2017
    Configuration menu
    Copy the full SHA
    6c80300 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2017

  1. More better

    @crossan007
    crossan007 committed May 15, 2017
    Configuration menu
    Copy the full SHA
    0a586d8 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2017

  1. More better

    @crossan007
    crossan007 committed May 16, 2017
    Configuration menu
    Copy the full SHA
    da3c7ef View commit details
    Browse the repository at this point in the history

  2. fix status logic

    @crossan007
    crossan007 committed May 16, 2017
    Configuration menu
    Copy the full SHA
    9941928 View commit details
    Browse the repository at this point in the history

  3. emergency emails

    @crossan007
    crossan007 committed May 16, 2017
    Configuration menu
    Copy the full SHA
    06049cd View commit details
    Browse the repository at this point in the history

  4. emergency emails

    @crossan007
    crossan007 committed May 16, 2017
    Configuration menu
    Copy the full SHA
    ba6730d View commit details
    Browse the repository at this point in the history

  5. working emergency notifs

    @crossan007
    crossan007 committed May 16, 2017
    Configuration menu
    Copy the full SHA
    0adb368 View commit details
    Browse the repository at this point in the history

  6. working emergency notifs

    @crossan007
    crossan007 committed May 16, 2017
    Configuration menu
    Copy the full SHA
    26a30b3 View commit details
    Browse the repository at this point in the history

  7. working emergency notifs

    @crossan007
    crossan007 committed May 16, 2017
    Configuration menu
    Copy the full SHA
    e9c82ec View commit details
    Browse the repository at this point in the history

  8. add nexmo

    @crossan007
    crossan007 committed May 16, 2017
    Configuration menu
    Copy the full SHA
    ce62701 View commit details
    Browse the repository at this point in the history

  9. add nexmo

    @crossan007
    crossan007 committed May 16, 2017
    Configuration menu
    Copy the full SHA
    0f935cb View commit details
    Browse the repository at this point in the history

  10. add nexmo

    @crossan007
    crossan007 committed May 16, 2017
    Configuration menu
    Copy the full SHA
    2846938 View commit details
    Browse the repository at this point in the history

  11. more config

    @crossan007
    crossan007 committed May 16, 2017
    Configuration menu
    Copy the full SHA
    61a8be7 View commit details
    Browse the repository at this point in the history

  12. add open LP notifications

    @crossan007
    crossan007 committed May 16, 2017
    Configuration menu
    Copy the full SHA
    e2e87ac View commit details
    Browse the repository at this point in the history

  13. Apply fixes from StyleCI

    @DawoudIO @StyleCIBot
    DawoudIO authored and StyleCIBot committed May 16, 2017
    Configuration menu
    Copy the full SHA
    886f9d5 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2017

  1. Merge pull request #2510 from ChurchCRM/analysis-q1lrr3 

    Apply fixes from StyleCI
    @crossan007
    crossan007 authored May 17, 2017
    Configuration menu
    Copy the full SHA
    421d2c5 View commit details
    Browse the repository at this point in the history

  2. move to /kiosk

    @crossan007
    crossan007 committed May 17, 2017
    Configuration menu
    Copy the full SHA
    75e42dd View commit details
    Browse the repository at this point in the history

  3. cleanup move to /kiosk

    @crossan007
    crossan007 committed May 17, 2017
    Configuration menu
    Copy the full SHA
    91999f2 View commit details
    Browse the repository at this point in the history

  4. begin kiosk manager

    @crossan007
    crossan007 committed May 17, 2017
    Configuration menu
    Copy the full SHA
    8d19487 View commit details
    Browse the repository at this point in the history

  5. kiosk manager

    @crossan007
    crossan007 committed May 17, 2017
    Configuration menu
    Copy the full SHA
    514fd2d View commit details
    Browse the repository at this point in the history

  6. kiosk remote commands

    @crossan007
    crossan007 committed May 17, 2017
    Configuration menu
    Copy the full SHA
    5e06efb View commit details
    Browse the repository at this point in the history

  7. fullscreen

    @crossan007
    crossan007 committed May 17, 2017
    Configuration menu
    Copy the full SHA
    4713040 View commit details
    Browse the repository at this point in the history

  8. add event kiosk editor

    @crossan007
    crossan007 committed May 17, 2017
    Configuration menu
    Copy the full SHA
    9d8052f View commit details
    Browse the repository at this point in the history

  9. Apply fixes from StyleCI

    @DawoudIO @StyleCIBot
    DawoudIO authored and StyleCIBot committed May 17, 2017
    Configuration menu
    Copy the full SHA
    4a71a4e View commit details
    Browse the repository at this point in the history

  10. Merge pull request #2513 from ChurchCRM/analysis-qByrbr 

    Apply fixes from StyleCI
    @crossan007
    crossan007 authored May 17, 2017
    Configuration menu
    Copy the full SHA
    15eeae7 View commit details
    Browse the repository at this point in the history

  11. API visiblilty counter

    @crossan007
    crossan007 committed May 17, 2017
    Configuration menu
    Copy the full SHA
    e700a5a View commit details
    Browse the repository at this point in the history

  12. windowed kiosk registration

    @crossan007
    crossan007 committed May 17, 2017
    Configuration menu
    Copy the full SHA
    d70cc14 View commit details
    Browse the repository at this point in the history

  13. guid

    @crossan007
    crossan007 committed May 17, 2017
    Configuration menu
    Copy the full SHA
    814d0b6 View commit details
    Browse the repository at this point in the history

  14. Merge branch '2.4.0-sundayschool-classroom-utilities' of https://gith… 

    …ub.com/ChurchCRM/CRM into 2.4.0-sundayschool-classroom-utilities

# Conflicts:
#	src/kiosk/index.php
    @crossan007
    crossan007 committed May 17, 2017
    Configuration menu
    Copy the full SHA
    12b958a View commit details
    Browse the repository at this point in the history

  15. fix kiosk point

    @crossan007
    crossan007 committed May 17, 2017
    Configuration menu
    Copy the full SHA
    f17e59a View commit details
    Browse the repository at this point in the history

  16. fix kiosk point

    @crossan007
    crossan007 committed May 17, 2017
    Configuration menu
    Copy the full SHA
    ba298a5 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2017

  1. kiosk assignments, and correct location for checkin/out

    @crossan007
    crossan007 committed May 18, 2017
    Configuration menu
    Copy the full SHA
    1b0b1bf View commit details
    Browse the repository at this point in the history

  2. fix notification

    @crossan007
    crossan007 committed May 18, 2017
    Configuration menu
    Copy the full SHA
    8b6ed1d View commit details
    Browse the repository at this point in the history

  3. unlink kiosk/events

    @crossan007
    crossan007 committed May 18, 2017
    Configuration menu
    Copy the full SHA
    d5f64a0 View commit details
    Browse the repository at this point in the history

  4. cleanup

    @crossan007
    crossan007 committed May 18, 2017
    Configuration menu
    Copy the full SHA
    cb87669 View commit details
    Browse the repository at this point in the history

  5. cleanup

    @crossan007
    crossan007 committed May 18, 2017
    Configuration menu
    Copy the full SHA
    e9e223a View commit details
    Browse the repository at this point in the history

  6. fix menu add

    @crossan007
    crossan007 committed May 18, 2017
    Configuration menu
    Copy the full SHA
    34909de View commit details
    Browse the repository at this point in the history

  7. kiosk random initial names and other cleanup

    @crossan007
    crossan007 committed May 18, 2017
    Configuration menu
    Copy the full SHA
    1c1ea8f View commit details
    Browse the repository at this point in the history

  8. start working on assignment handler and events api

    @crossan007
    crossan007 committed May 18, 2017
    Configuration menu
    Copy the full SHA
    d648d5f View commit details
    Browse the repository at this point in the history

Commits on May 19, 2017

  1. assignment menus

    @crossan007
    crossan007 committed May 19, 2017
    Configuration menu
    Copy the full SHA
    b691c97 View commit details
    Browse the repository at this point in the history

  2. add kiosk ID button

    @crossan007
    crossan007 committed May 19, 2017
    Configuration menu
    Copy the full SHA
    3055336 View commit details
    Browse the repository at this point in the history

  3. misc

    @crossan007
    crossan007 committed May 19, 2017
    Configuration menu
    Copy the full SHA
    b9319fe View commit details
    Browse the repository at this point in the history

Commits on May 20, 2017

  1. Apply fixes from StyleCI (#2520)

    @DawoudIO
    DawoudIO authored May 20, 2017
    Configuration menu
    Copy the full SHA
    4e4bd8f View commit details
    Browse the repository at this point in the history

  2. fix installer

    @crossan007
    crossan007 committed May 20, 2017
    Configuration menu
    Copy the full SHA
    e53823f View commit details
    Browse the repository at this point in the history

  3. underp install

    @crossan007
    crossan007 committed May 20, 2017
    Configuration menu
    Copy the full SHA
    5293a64 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into 2.4.0-sundayschool-classroom-utilities

    @crossan007
    crossan007 authored May 20, 2017
    Configuration menu
    Copy the full SHA
    e9fc72b View commit details
    Browse the repository at this point in the history

  5. cleanup docs - moved to wiki

    @crossan007
    crossan007 committed May 20, 2017
    Configuration menu
    Copy the full SHA
    f5f2568 View commit details
    Browse the repository at this point in the history

  6. remove emergency wording

    @crossan007
    crossan007 committed May 20, 2017
    Configuration menu
    Copy the full SHA
    9835bb3 View commit details
    Browse the repository at this point in the history

  7. cleanup

    @crossan007
    crossan007 committed May 20, 2017
    Configuration menu
    Copy the full SHA
    694cf61 View commit details
    Browse the repository at this point in the history

  8. fix email notifications

    @crossan007
    crossan007 committed May 20, 2017
    Configuration menu
    Copy the full SHA
    b5a7bc5 View commit details
    Browse the repository at this point in the history

  9. email and sms works

    @crossan007
    crossan007 committed May 20, 2017
    Configuration menu
    Copy the full SHA
    970e7ce View commit details
    Browse the repository at this point in the history

  10. proejctor working.

    @crossan007
    crossan007 committed May 20, 2017
    Configuration menu
    Copy the full SHA
    5c811b0 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2017

  1. allow auth'd openLP messages.

    @crossan007
    crossan007 committed May 21, 2017
    Configuration menu
    Copy the full SHA
    050424f View commit details
    Browse the repository at this point in the history

  2. cleanup returns

    @crossan007
    crossan007 committed May 21, 2017
    Configuration menu
    Copy the full SHA
    5e420e0 View commit details
    Browse the repository at this point in the history

  3. linux is case sensitive.

    @crossan007
    crossan007 committed May 21, 2017
    Configuration menu
    Copy the full SHA
    2223630 View commit details
    Browse the repository at this point in the history

  4. fix duplicate PK on kiosk config

    @crossan007
    crossan007 committed May 21, 2017
    Configuration menu
    Copy the full SHA
    f31b996 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into 2.4.0-sundayschool-classroom-utilities

    @crossan007
    crossan007 authored May 21, 2017
    Configuration menu
    Copy the full SHA
    ca7b4dd View commit details
    Browse the repository at this point in the history

  6. allow self signed ssl

    @crossan007
    crossan007 committed May 21, 2017
    Configuration menu
    Copy the full SHA
    2062ef2 View commit details
    Browse the repository at this point in the history

  7. Merge branch '2.4.0-sundayschool-classroom-utilities' of https://gith… 

    …ub.com/ChurchCRM/CRM into 2.4.0-sundayschool-classroom-utilities
    @crossan007
    crossan007 committed May 21, 2017
    Configuration menu
    Copy the full SHA
    13f6a12 View commit details
    Browse the repository at this point in the history

  8. fix bad merge

    @crossan007
    crossan007 authored May 21, 2017
    Configuration menu
    Copy the full SHA
    ad93a57 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2017

  1. start address comments

    @crossan007
    crossan007 committed May 26, 2017
    Configuration menu
    Copy the full SHA
    42426b8 View commit details
    Browse the repository at this point in the history