Milos Kozak
47ec03efec
Merge commit 'd827c10161c621664f5041b3ee586b8fe76a7707' into dev
2019-08-28 15:38:27 +02:00
Milos Kozak
0a77fb9bcb
implement percentage in wizard, refactoring to kotlin
2019-08-23 16:31:30 +02:00
Milos Kozak
9d6654eecf
fix SingleFragmentActivity
2019-08-08 21:16:15 +02:00
Milos Kozak
6802c0ea85
fix activities
2019-08-08 18:39:56 +02:00
Milos Kozak
9226a561db
remove butterknife from HistoryBrowseActivity
2019-08-07 16:58:57 +02:00
Milos Kozak
4831eb9193
Merge branch 'dev' into batteryopt
2019-08-03 23:17:02 +02:00
Milos Kozak
81eeb66538
SDK checking cleanup 2
2019-08-03 20:00:56 +02:00
Milos Kozak
b572d110d8
remove splash on other activities
2019-08-02 17:15:57 +02:00
Paulus
d827c10161
CR #1903 initial commit
2019-08-01 00:47:57 +02:00
Milos Kozak
48316dbd4c
fix calculation, conditional rendering
2019-07-26 20:30:58 +02:00
Milos Kozak
09270f36bf
Merge branch 'dev' into automation
2019-07-25 16:17:16 +02:00
Milos Kozak
51bc5d3618
Merge branch 'dev' into medtronic_andy_merge
2019-07-25 13:40:37 +02:00
Milos Kozak
e02681ac31
Merge branch 'dev' into automation
2019-07-23 13:13:26 +02:00
Milos Kozak
d25f6f07b0
migrate to kotlin, remove butterknife, code claeanup
2019-07-18 23:49:59 +02:00
Milos Kozak
c4ba821dc1
Merge branch 'dev' into automation
2019-07-14 20:00:42 +02:00
Milos Kozak
8c2c2b21ea
Merge branch 'dev' into medtronic_andy_merge
2019-07-14 19:50:07 +02:00
Milos Kozak
72ff3e1e7f
Merge branch 'dev' into IA-in-BG-graph
2019-07-14 19:44:01 +02:00
Paulus
106d30394c
Included insulin activity on both primary and secondary graphs
2019-07-13 18:28:16 +02:00
Andy Rozman
992f69daaa
medtronic-0.12.0-SNAPSHOT
...
- Merge branch 'dev' into medtronic_andy
2019-07-05 14:18:28 +01:00
Milos Kozak
c0345ce56c
Merge branch 'dev' into automation
2019-07-04 23:37:36 +01:00
Milos Kozak
323c282b9f
Tidepool in engineering mode only
2019-06-30 15:38:30 +02:00
Tebbe Ubben
5af80ceb02
Support for new Dexcom app
2019-06-19 01:38:55 +02:00
Milos Kozak
243e6c5801
pump manufacters etc
2019-06-09 14:02:33 +02:00
Milos Kozak
10584d9b00
RxBus
2019-06-07 12:46:08 +02:00
Milos Kozak
01006b32ce
remove explicit enable checkbox, test login
2019-06-07 09:13:29 +02:00
Milos Kozak
e32801ca6b
preferences, button
2019-06-04 07:38:17 +02:00
Milos Kozak
9a76f3386d
androidx transition
2019-05-16 13:57:37 +02:00
Andy Rozman
b5da57e20f
Merge branch 'dev' into medtronic_andy
2019-05-03 21:35:18 +01:00
Milos Kozak
3ab2a142d1
Merge remote-tracking branch 'origin/dev' into automation
2019-05-02 22:27:54 +02:00
Milos Kozak
4336b47431
NPE fixes from Firebase
2019-04-29 11:36:30 +02:00
Andy Rozman
c7f6eb79f0
- fixes for Bolus problems
2019-04-12 21:20:09 +01:00
Andy Rozman
7392eaeb58
- gradle fixes
...
- remove formatting changes
- moved plugins/general/overview/Dialogs/ to plugins/general/overview/dialogs/
- fixing treatment changes that are received from NS, and extending copying of data to ignore pumpId
2019-04-10 16:24:16 +01:00
Nico Schmitz
fc7e65c4d1
Update to recent upstream/dev
2019-03-22 23:08:13 +01:00
Nico Schmitz
91e4b01f10
Display actions and merge recent upstream/dev
...
- Add ActionListAdapter
- Add ChooseActionDialog
- Merge upstream/dev branch
2019-03-19 19:08:46 +01:00
Andy Rozman
011aaf5336
Moved medtronic to correct package
2019-03-02 20:39:14 +00:00
Andy Rozman
f7395c7a2c
Changes after merge, compilable, but medtronic is still in old structure.
2019-03-02 20:24:53 +00:00
Andy Rozman
289902633e
Merge branch 'dev' into medtronic_andy
2019-03-02 18:20:37 +00:00
Milos Kozak
d9a9c933bc
package refactor
2019-02-28 23:16:50 +01:00
Milos Kozak
395faa7dc9
pumps package refactor
2019-02-26 20:38:27 +01:00
Milos Kozak
b0dd2f464b
Insight driver (Sight remote) removal
2019-02-25 19:33:01 +01:00
Andy Rozman
5aa5d9f749
Merge branch 'dev' into medtronic_andy
2019-02-16 20:50:36 +00:00
Nico Schmitz
9e03f0f8ca
Update to current dev branch
2018-12-11 14:51:26 +01:00
Andy Rozman
75d3f3b4bc
Merge branch 'dev' into medtronic_andy (2.0i - 24.10.2018)
2018-10-24 12:18:20 +01:00
Andy Rozman
ca536ee97e
[0.3.1]
...
- removed code that sends wakeup on every command
- added checking if device is present
- fixed reading data when no data present (PostProcessingUI)
- work done on showing hardware in configuration (added RileyLinkSelectPreference)
- fixing configuration (in wizard)
2018-10-20 13:24:36 +01:00
Milos Kozak
3eee5b13c7
LocationService
2018-09-19 15:26:58 +02:00
Milos Kozak
924bc97e3b
remove static ConfigBuilderPlugin.commandQueue
2018-09-17 19:29:01 +02:00
Milos Kozak
bc19973ce0
remove static ConfigBuilderPlugin.activePump
2018-09-17 17:43:42 +02:00
Andy Rozman
da75ed643d
Merge branch 'dev' into medtronic_andy and some minor changes to make it compilable
2018-09-14 18:14:45 +01:00
Milos Kozak
f7269a806d
nsclient allow general preferences
2018-09-11 20:08:59 +02:00
Nico Schmitz
5386c7db4a
Update to upstream/dev and resolve conflicts
2018-08-19 14:37:42 +02:00