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

Feature/2124 notification bar #2167

Merged
merged 13 commits into from
Mar 26, 2017
Merged

Feature/2124 notification bar #2167

merged 13 commits into from
Mar 26, 2017

Commits on Mar 25, 2017

  1. Working POC

    @crossan007
    crossan007 committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    e91b948 View commit details
    Browse the repository at this point in the history

  2. Fix styles

    @crossan007
    crossan007 committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    b2061c1 View commit details
    Browse the repository at this point in the history

  3. get data from web service

    @crossan007
    crossan007 committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    b63e46d View commit details
    Browse the repository at this point in the history

  4. Apply fixes from StyleCI

    @DawoudIO @StyleCIBot
    DawoudIO authored and StyleCIBot committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    3d48cdd View commit details
    Browse the repository at this point in the history

  5. Merge pull request #2166 from ChurchCRM/analysis-XVngLD 

    Apply fixes from StyleCI
    @crossan007
    crossan007 authored Mar 25, 2017
    Configuration menu
    Copy the full SHA
    db614bd View commit details
    Browse the repository at this point in the history

  6. allow for differentating admin vs all user notifications

    @crossan007
    crossan007 committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    72aae06 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature/2124-notification-bar' of https://github.com/Ch… 

    …urchCRM/CRM into feature/2124-notification-bar
    @crossan007
    crossan007 committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    81e12fe View commit details
    Browse the repository at this point in the history

  8. add TTL setting for notifications

    @crossan007
    crossan007 committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    ff83218 View commit details
    Browse the repository at this point in the history

  9. don't include system notifications locally

    @crossan007
    crossan007 committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    76dd173 View commit details
    Browse the repository at this point in the history

  10. cleanup

    @crossan007
    crossan007 committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    b253402 View commit details
    Browse the repository at this point in the history

  11. underp boolean call

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

Commits on Mar 26, 2017

  1. address comments - handle exceptions correctly

    @crossan007
    crossan007 committed Mar 26, 2017
    Configuration menu
    Copy the full SHA
    84873dd View commit details
    Browse the repository at this point in the history

  2. fix logic if captive portal intercepts notification request

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