Commit graph

10423 commits

Author SHA1 Message Date
AdrianLxM 7b4b4f7cfc Overview profile redesign 2016-11-10 23:20:23 +01:00
AdrianLxM 4ee87d1cca basal profile on overview 2016-11-10 21:03:26 +01:00
AdrianLxM 80e875b821 Merge pull request #11 from MilosKozak/master
update from milos master
2016-11-10 21:02:43 +01:00
Milos Kozak 585d3fbb2c Merge pull request #59 from AdrianLxM/uploadOnly2
Upload only2
2016-11-10 19:39:45 +01:00
AdrianLxM a6ae92bb2f Receive profile updates on uploadOnly when NS-Profiles are used 2016-11-10 18:53:01 +01:00
AdrianLxM c900d6611c Warn on "refresh treatments from NS" button in upload only mode. 2016-11-10 18:52:42 +01:00
AdrianLxM f85f04d33f NS upload only 2016-11-10 18:33:50 +01:00
AdrianLxM 37813861ec Merge pull request #10 from MilosKozak/master
update to milos master
2016-11-10 17:59:39 +01:00
Milos Kozak 21f732b378 report app start/restart to NS 2016-11-10 16:42:59 +01:00
Milos Kozak a5778b4916 Merge pull request #58 from AdrianLxM/loadmorehightemps
Load more "extended bolus" high temps
2016-11-10 13:54:11 +01:00
AdrianLxM 5088b84417 Receive profile updates on uploadOnly when NS-Profiles are used 2016-11-10 13:50:13 +01:00
Milos Kozak 156f42da5f always report active profile 2016-11-10 13:15:23 +01:00
Milos Kozak 770f44118b Merge pull request #56 from AdrianLxM/hapticFeedback
Haptic feedback
2016-11-10 10:02:26 +01:00
Milos Kozak 8d360f837d Merge pull request #57 from warstar2187/master
kr translation update
2016-11-10 10:02:01 +01:00
AdrianLxM 3ee1cf5023 haptic feedback for loop pill on overview 2016-11-10 00:02:51 +01:00
AdrianLxM 3a84abb4f1 Merge pull request #9 from MilosKozak/master
update to Milos master
2016-11-09 12:41:11 +01:00
Milos Kozak 8707b42526 Merge pull request #54 from AdrianLxM/confirm_reset_db
Confirm reset db
2016-11-08 23:02:03 +01:00
AdrianLxM aaba503cd0 Fix crash due to not found theme 2016-11-08 22:57:56 +01:00
Milos Kozak bad7e5d7c4 gradle fix 2016-11-08 22:55:08 +01:00
AdrianLxM 341d7222e5 Strings for reset DB 2016-11-08 22:36:47 +01:00
AdrianLxM 218ccc803b Ask before resetting DB 2016-11-08 22:35:57 +01:00
AdrianLxM d3582dab36 Merge pull request #8 from MilosKozak/master
Update to milos master
2016-11-08 22:34:07 +01:00
Milos Kozak a2d4f22bd7 added git HEAD and version to pump status and logs 2016-11-08 19:10:25 +01:00
Milos Kozak 94a7033e0c always upload current basal rate 2016-11-08 17:55:39 +01:00
Milos Kozak a4a9efd812 TAB_VIEW_PADDING_DIPS = 9 2016-11-08 14:24:02 +01:00
warstar2187 1f35018148 Update strings.xml 2016-11-08 20:04:19 +09:00
warstar2187 9ae3d88f9c Update DanaRPlugin.java 2016-11-08 19:59:54 +09:00
Milos Kozak 4a4dc04865 fix iob reporting to NS 2016-11-08 10:29:24 +01:00
Milos Kozak b0c4f0f655 Merge pull request #53 from AdrianLxM/TDD-History
Tdd history
2016-11-08 07:17:33 +01:00
AdrianLxM ff66edf064 Add TDD to DanaR daily view
... also don't show the time for the day. It is always 00:00 anyways.
2016-11-08 06:11:50 +01:00
AdrianLxM ede982c8c5 Update danar_history_item.xml 2016-11-08 06:08:12 +01:00
AdrianLxM 69355c5609 Merge pull request #7 from MilosKozak/master
Update to Milos master
2016-11-08 06:01:58 +01:00
Milos Kozak a5d68395c8 Merge pull request #52 from AdrianLxM/activityContrib
Activity contrib
2016-11-07 16:03:55 +01:00
AdrianLxM 93accc0d9f Add in basalIOB.activity 2016-11-07 15:18:48 +01:00
AdrianLxM 8bdc86f359 Calculate activityContrib for TempBasal 2016-11-07 15:17:16 +01:00
AdrianLxM 82443bc8ab Merge pull request #6 from MilosKozak/master
Update to Milos master
2016-11-07 15:14:44 +01:00
Milos Kozak 48388496f5 Merge pull request #51 from AdrianLxM/patch-8
Add base basal rate to Overview when temp is running
2016-11-07 10:19:44 +01:00
AdrianLxM 2e6a37dcbd Add base basal rate to Overview when temp is running
Now that there is more space with less buttons, it should fit ;)
2016-11-07 10:18:16 +01:00
Milos Kozak d67ae5df78 version bump 1.0.20 2016-11-07 10:16:13 +01:00
Milos Kozak 925b5612fc Merge pull request #49 from AdrianLxM/disableLoopLongpress
Disable loop on Longpress on Loop-Status in Overview
2016-11-07 10:14:14 +01:00
Milos Kozak 3533ec16ba Merge pull request #50 from AdrianLxM/patch-7
fix for net IOB
2016-11-07 09:36:16 +01:00
Milos Kozak 6263b98683 Merge pull request #39 from warstar2187/master
Update strings.xml
2016-11-07 09:13:21 +01:00
AdrianLxM e948a6f955 fix for net IOB 2016-11-07 07:55:41 +01:00
AdrianLxM 686593986c Update PreferencesActivity.java 2016-11-07 01:02:08 +01:00
AdrianLxM c851aefc8e Update MainActivity.java 2016-11-07 01:01:33 +01:00
AdrianLxM 68be6179f8 Update EventRefreshGui.java 2016-11-07 01:00:50 +01:00
AdrianLxM be39a35d68 Update ConfigBuilderFragment.java 2016-11-07 00:59:47 +01:00
AdrianLxM c93322f2da Overview Loopdisable on longclick 1 2016-11-07 00:58:44 +01:00
AdrianLxM 0aa4fbba45 Merge pull request #5 from MilosKozak/master
update to milos master
2016-11-07 00:55:01 +01:00
Milos Kozak f84777bf00 Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-11-06 12:10:55 +01:00