Commit graph

12748 commits

Author SHA1 Message Date
Milos Kozak 65b85c6c71 New translations strings.xml (Spanish) 2019-07-14 20:33:39 +02:00
Milos Kozak d31281d032 New translations strings.xml (Swedish) 2019-07-14 20:27:47 +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 6244f11013 New translations strings.xml (Portuguese, Brazilian) 2019-07-14 19:44:18 +02:00
Milos Kozak 72ff3e1e7f
Merge branch 'dev' into IA-in-BG-graph 2019-07-14 19:44:01 +02:00
Milos Kozak 7eb649068a
Update build.gradle 2019-07-14 18:42:48 +01:00
Milos Kozak f5640eec92
Merge pull request #1870 from MilosKozak/tidepool
Tidepool
2019-07-14 19:40:25 +02:00
Milos Kozak 1a32f6a92d New translations strings.xml (German) 2019-07-14 19:22:45 +02:00
Milos Kozak 9d15ea608e static version in OpenDatasetMessage 2019-07-14 17:13:07 +01:00
Johannes Mockenhaupt 9ee6194ce3
Use OKDialog, ErrorHelper in place of MessageDialog. 2019-07-14 17:18:53 +02:00
Milos Kozak d7a28bf713 Session test 2019-07-14 16:11:27 +01:00
Johannes Mockenhaupt 240c83e83a
Proper exception logging. 2019-07-14 16:59:00 +02:00
Milos Kozak 4fd3b53a6e New translations strings.xml (Spanish) 2019-07-14 16:33:16 +02:00
Milos Kozak beb4e004bf better null checks 2019-07-14 15:01:12 +01:00
Milos Kozak 7496a746d0 New translations strings.xml (Czech) 2019-07-14 14:12:53 +02:00
Milos Kozak 6d2e159edb
retrofit version 2019-07-14 12:27:21 +01:00
Milos Kozak 6e6d21438b
Merge pull request #1871 from jotomo/tidepool-prefs-category
Fix Tidepool prefs header not showing
2019-07-14 13:22:54 +02:00
Johannes Mockenhaupt 0e37228a07
Tidepool: remove category summary (is never displayed). 2019-07-14 11:54:03 +02:00
Johannes Mockenhaupt 35cc095f8b
Tidepool: fix prefs category/header. 2019-07-14 11:52:51 +02:00
Milos Kozak 5fc52123af New translations strings.xml (Slovak) 2019-07-14 10:22:42 +02:00
Milos Kozak 8686560ec8 reset version 2019-07-13 23:14:52 +02:00
Andy Rozman 400a336137 - Removed test 2019-07-13 20:29:20 +01:00
Milos Kozak 0710a03479 jetpack 2019-07-13 21:27:26 +02:00
Andy Rozman 2c07bc4c3b - Removed test 2019-07-13 19:55:14 +01:00
Andy Rozman 094d81c5ce - Fixed wrong UTest 2019-07-13 19:52:31 +01:00
Andy Rozman 92b9643b43 Merge branch 'medtronic_andy_merge' of https://github.com/andyrozman/AndroidAPS into medtronic_andy_merge 2019-07-13 19:22:07 +01:00
Andy Rozman 675dcc1b5b Fixes:
- removed unneeded classes and xml
- some fixes: MedtronicUtil, using different method to determine if pump driver is selected
2019-07-13 19:15:44 +01:00
Paulus 106d30394c Included insulin activity on both primary and secondary graphs 2019-07-13 18:28:16 +02:00
Paulus 2a4e9e2cc6 Changed scale factor so IA is always displayed at same scale (even if only selected option) 2019-07-13 17:54:27 +02:00
Paulus d528e800f6 Fixed code so IA is also correctly displayed in ssecondary if it is the only selected option. 2019-07-13 17:46:57 +02:00
Milos Kozak 968bccaacc Merge branch 'dev' into tidepool 2019-07-13 17:45:34 +02:00
Paulus 96d20d835f Modified string resources, included IA on both primary and secondary graph 2019-07-13 17:03:04 +02:00
Milos Kozak 4f903cd53d
Merge branch 'dev' into medtronic_andy_merge 2019-07-13 16:17:12 +02:00
Milos Kozak adf1a0da66 libraries update 2019-07-13 16:16:43 +02:00
Andy Rozman 8c8fba5522 - Added separate method for TreatmentService.createOrUpdate for Medtronic (createOrUpdateMedtronic)
- MedtronicUtil added method to detect if pump is Medtronic (reads ConfigBuilder.getActivePump().deviceID)
- TreatementService call from NS checks pump type and calls correct method
- TreatmentPlugin checks pumptype and calls correct createOrUpdate method
2019-07-13 14:28:24 +01:00
Andy Rozman 0b1ef81d40 Updated files that had only formating changes and removed lcoal files. 2019-07-13 12:26:42 +01:00
Paulus d7cb84e693 Fixed handling of null profile 2019-07-13 10:26:15 +02:00
Milos Kozak 1eed348fe0 Merge branch 'dev' into automation 2019-07-13 10:11:14 +02:00
Milos Kozak 606122bae0 fix kotlin warnings 2019-07-13 10:09:57 +02:00
Milos Kozak 4dd4408273 gradle update 2019-07-13 10:01:01 +02:00
Andy Rozman 39c3f5ddfe Added engineering mode for Medtronic driver. 2019-07-12 19:31:43 +01:00
Andy Rozman a5a36332f3 Prepared for PR 2019-07-12 19:29:36 +01:00
Andy Rozman 264bbdee20 Merge branch 'dev' into medtronic_andy 2019-07-12 18:54:15 +01:00
Paulus fc1dd360b3 split menu for 1st & secondary graphs 2019-07-11 21:17:41 +02:00
Milos Kozak f5c22a33ff icons 2019-07-11 18:56:50 +01:00
Milos Kozak 777896855d
Merge pull request #1864 from jotomo/ruffyscripter-unparsable-menu-reset
Bugfix, Combo: recovery after encountering an unknown menu
2019-07-11 18:54:34 +01:00
Milos Kozak 4df1127a8c jetpack compliance, code cleanup, extracted resources 2019-07-11 18:18:05 +01:00
Milos Kozak a356e5cbc7 New translations strings.xml (Polish) 2019-07-11 07:51:58 +01:00
Paulus 4ff9206dad #1851 included code from fra-orolo, now using color identifier for activity and line is optional in graph 2019-07-09 11:42:40 +02:00