Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: gfwilliams/Gadgetbridge
base: master
Choose a base ref
...
head repository: gfwilliams/Gadgetbridge
compare: banglejs_and_local_notify
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 13 commits
  • 14 files changed
  • 1 contributor

Commits on Dec 4, 2020

  1. Add ability to pass 'local' notifications right through (fix #1827, fix… 

    … #1109)
    @gfwilliams
    gfwilliams committed Dec 4, 2020
    Copy the full SHA
    1869b56 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2021

  1. Merge branch 'master' into allow_local_notifications

    @gfwilliams
    gfwilliams committed Aug 4, 2021
    Copy the full SHA
    fc70447 View commit details
    Browse the repository at this point in the history

  2. Add functions for pushing bitmaps to Bangle.js, also add configurable… 

    … MTU. If we receive a bigger data packet then we know we can send a bigger one too
    @gfwilliams
    gfwilliams committed Aug 4, 2021
    Copy the full SHA
    727b9ce View commit details
    Browse the repository at this point in the history

  3. Changes required to send icons (as well as not resending notification… 

    …s that change)
    @gfwilliams
    gfwilliams committed Aug 4, 2021
    Copy the full SHA
    531f116 View commit details
    Browse the repository at this point in the history

  4. need to poke DB again for notification selection

    @gfwilliams
    gfwilliams committed Aug 4, 2021
    Copy the full SHA
    df9c84e View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2021

  1. Merge branch 'master' into notification_send_icon

    @gfwilliams
    gfwilliams committed Sep 15, 2021
    Copy the full SHA
    b40168a View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2021

  1. Add onModifyNotification, which Bangle.js plugin handles for 'notify~'

    @gfwilliams
    gfwilliams committed Oct 20, 2021
    Copy the full SHA
    f5f99fa View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2021

  1. Handle message flow control (partial)

    @gfwilliams
    gfwilliams committed Dec 9, 2021
    Copy the full SHA
    8679dfd View commit details
    Browse the repository at this point in the history

  2. misc tweaks

    @gfwilliams
    gfwilliams committed Dec 9, 2021
    Copy the full SHA
    523c223 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2022

  1. Merge branch 'master' into banglejs_and_local_notify

    @gfwilliams
    gfwilliams committed Feb 10, 2022
    Copy the full SHA
    9b51f32 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2022

  1. Merge branch 'master' into banglejs_and_local_notify

    @gfwilliams
    gfwilliams committed Apr 8, 2022
    Copy the full SHA
    428639e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'allow_local_notifications' into banglejs_and_local_notify

    @gfwilliams
    gfwilliams committed Apr 8, 2022
    Copy the full SHA
    e680a9d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'banglejs_and_local_notify' into notification_send_icon 

    # Conflicts:
#	GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
#	app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
#	app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
#	app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
#	app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
    @gfwilliams
    gfwilliams committed Apr 8, 2022
    Copy the full SHA
    b4cb039 View commit details
    Browse the repository at this point in the history