Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

6

600SeriesAndroidUploader
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Incidents

Snippets Groups Projects

06139e97

Commit 06139e97 authored 8 years ago by Lennart Goedhart

Downloads
- Plain Diff

Merge branch 'feature/PR105' of https://github.com/pazaan/640gAndroidUploader...

Merge branch 'feature/PR105' of https://github.com/pazaan/640gAndroidUploader into pazaan/develop-basal-rates

parents 43423ddc c3103400

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

app/build.gradle 7 additions, 1 deletion

app/build.gradle
app/src/main/AndroidManifest.xml 5 additions, 0 deletions

app/src/main/AndroidManifest.xml
app/src/main/java/info/nightscout/android/model/medtronicNg/PumpStatusEvent.java 4 additions, 0 deletions

...nightscout/android/model/medtronicNg/PumpStatusEvent.java
app/src/main/java/info/nightscout/android/upload/nightscout/NightScoutUpload.java 169 additions, 0 deletions

...ightscout/android/upload/nightscout/NightScoutUpload.java
app/src/main/java/info/nightscout/android/upload/nightscout/NightscoutApi.java 0 additions, 1 deletion

...o/nightscout/android/upload/nightscout/NightscoutApi.java
app/src/main/java/info/nightscout/android/upload/nightscout/NightscoutUploadIntentService.java 18 additions, 235 deletions

...roid/upload/nightscout/NightscoutUploadIntentService.java
app/src/main/java/info/nightscout/android/upload/nightscout/serializer/EntriesSerializer.java 29 additions, 0 deletions

...droid/upload/nightscout/serializer/EntriesSerializer.java
app/src/main/java/info/nightscout/api/BolusEndpoints.java 76 additions, 0 deletions

app/src/main/java/info/nightscout/api/BolusEndpoints.java
app/src/main/java/info/nightscout/api/DeviceEndpoints.java 97 additions, 0 deletions

app/src/main/java/info/nightscout/api/DeviceEndpoints.java
app/src/main/java/info/nightscout/api/GlucoseEndpoints.java 89 additions, 0 deletions

app/src/main/java/info/nightscout/api/GlucoseEndpoints.java
app/src/main/java/info/nightscout/api/UploadApi.java 78 additions, 0 deletions

app/src/main/java/info/nightscout/api/UploadApi.java
app/src/main/res/values/strings.xml 7 additions, 2 deletions

app/src/main/res/values/strings.xml

with 579 additions and 239 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment