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

Resolve all conflicts for these commits #56

Merged
merged 11 commits into from
Apr 22, 2018
Merged

Resolve all conflicts for these commits #56

merged 11 commits into from
Apr 22, 2018

Commits on Apr 16, 2018

  1. Add FirmwareStatusNotification support.

    @sumlin
    sumlin committed Apr 16, 2018
    Configuration menu
    Copy the full SHA
    2d87ffd View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2018

  1. Add UpdateFirmware support. 

    Add some tests for DiagnosticsStatusNotification and FirmwareStatusNotification.
    @sumlin
    sumlin committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    c1f3fbc View commit details
    Browse the repository at this point in the history

  2. Add ReserveNow support.

    @sumlin
    sumlin committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    c7f2e8f View commit details
    Browse the repository at this point in the history

  3. Add CancelReservation.

    @sumlin
    sumlin committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    19bdcb0 View commit details
    Browse the repository at this point in the history

  4. Add tests for LocalAuthList and fixed issues.

    @sumlin
    sumlin committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    331f747 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2018

  1. Add UpdateFirmware support. 

    Add some tests for DiagnosticsStatusNotification and FirmwareStatusNotification.
    @sumlin
    sumlin committed Apr 19, 2018
    Configuration menu
    Copy the full SHA
    1c62457 View commit details
    Browse the repository at this point in the history

  2. Add ReserveNow support.

    @sumlin
    sumlin committed Apr 19, 2018
    Configuration menu
    Copy the full SHA
    7ad3d75 View commit details
    Browse the repository at this point in the history

  3. Add CancelReservation.

    @sumlin
    sumlin committed Apr 19, 2018
    Configuration menu
    Copy the full SHA
    1433d8e View commit details
    Browse the repository at this point in the history

  4. Add tests for LocalAuthList and fixed issues.

    @sumlin
    sumlin committed Apr 19, 2018
    Configuration menu
    Copy the full SHA
    1d58fdb View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/sumlin/Java-OCA-OCPP

    @sumlin
    sumlin committed Apr 19, 2018
    Configuration menu
    Copy the full SHA
    3e7e923 View commit details
    Browse the repository at this point in the history

  6. Add tests for SmartCharging.

    @sumlin
    sumlin committed Apr 19, 2018
    Configuration menu
    Copy the full SHA
    4ec5d13 View commit details
    Browse the repository at this point in the history