caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Commit graph

  • b39fe2ee5e Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev Milos Kozak 2017-12-30 16:25:18 +0100
  • cc50a6fb99 missing inheritance Milos Kozak 2017-12-30 16:25:08 +0100
  • f658da42a7
         Abort bolusing when reading initial state fails. Johannes Mockenhaupt 2017-12-30 15:28:22 +0100
  • 790d5f21e1
         README: Add note on not using ruffy in parallel with AAPS. Johannes Mockenhaupt 2017-12-30 02:12:31 +0100
  • facdc51f6f
         Queue: synchronize creating queue thread to avoid multiple threads. Johannes Mockenhaupt 2017-12-29 16:36:19 +0100
  • c43afd9d28 Merge remote-tracking branch 'origin/dev' into watchfaces Andrew Warrington 2017-12-28 01:03:02 +0100
  • d0f876659e
         Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 Johannes Mockenhaupt 2017-12-28 00:15:05 +0100
  • bd4e51e1f9
         Merge pull request #546 from andrew-warrington/dev AdrianLxM 2017-12-27 23:17:52 +0100
  • 774203605f
         Wear: No guard for RS AdrianLxM 2017-12-27 21:19:57 +0100
  • f970e5e20e
         Minor cleanups. Johannes Mockenhaupt 2017-12-27 21:16:03 +0100
  • 0e61032dec
         Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 Johannes Mockenhaupt 2017-12-27 18:19:51 +0100
  • 3df0e8f9ce Merge branch 'dev' into smb060 Milos Kozak 2017-12-27 18:02:06 +0100
  • 259c7abffd
         Merge pull request #567 from MilosKozak/AdrianLxM-patch-2 Milos Kozak 2017-12-27 16:31:24 +0100
  • b25e403215
         Merge pull request #566 from MilosKozak/rs-create-bond Milos Kozak 2017-12-27 15:01:33 +0100
  • 9387665df9
         wear update AdrianLxM 2017-12-27 14:57:54 +0100
  • ee1236c4e4
         ComboPlugin: assume valid BR unless proven otherwise. Johannes Mockenhaupt 2017-12-27 13:04:10 +0100
  • 75cb44339c
         Merge pull request #32 from jotomo/pump-basal-rate-sanity-and-german-translation Johannes Mockenhaupt 2017-12-27 12:50:40 +0100
  • 3333d7a6b7
         Clean up all the basal rate sanity checks. Johannes Mockenhaupt 2017-12-27 11:36:01 +0100
  • 8089825c4c
         SetBasalProfileCommand: abort if active BR is != 1. Johannes Mockenhaupt 2017-12-27 11:34:22 +0100
  • 728abbe224
         Clean up strings.xml, finish German translation. Johannes Mockenhaupt 2017-12-27 02:25:58 +0100
  • 88b3857fb9
         Clean up pump init. Johannes Mockenhaupt 2017-12-27 00:43:42 +0100
  • 6af28479d6
         Disable loop if unsupported basal rate profile is selected. Fixes #31. Johannes Mockenhaupt 2017-12-27 00:22:34 +0100
  • 79d05488c3
         RS create bond AdrianLxM 2017-12-27 02:24:26 +0100
  • c84ba24c77
         Provide message when setting basal profile fails. Fixes #29. Johannes Mockenhaupt 2017-12-27 01:23:16 +0100
  • 715ffa28d2
         Remove empty Combo prefs. Johannes Mockenhaupt 2017-12-27 01:19:31 +0100
  • 3266cb4944
         Don't show ComboPlugin as constraints plugin. Johannes Mockenhaupt 2017-12-27 01:11:51 +0100
  • 7163162743
         Merge pull request #30 from jotomo/csv2-staging Johannes Mockenhaupt 2017-12-26 11:02:38 +0100
  • 0ab259f61f Merge branch 'dev' into smb060 Milos Kozak 2017-12-26 01:22:49 +0100
  • 72d6c4494b add scrollview Milos Kozak 2017-12-26 01:22:35 +0100
  • 162e73e64d Merge branch 'dev' into smb060 Milos Kozak 2017-12-26 00:35:16 +0100
  • 8fdd16c305 QuickWizard detailed settings Milos Kozak 2017-12-26 00:27:34 +0100
  • a8e0a4dfe8
         Merge remote-tracking branch 'origin/dev' into csv2-staging Johannes Mockenhaupt 2017-12-25 20:52:16 +0100
  • e2f6e6a450
         Merge pull request #547 from MilosKozak/wear-noFakebolusProgressDismiss2 Milos Kozak 2017-12-25 20:44:39 +0100
  • e50c6fc8ed RS BLE modifications AdrianLxM 2017-12-25 20:39:14 +0100
  • ea5629fc86
         Merge remote-tracking branch 'origin/dev' into csv2-staging Johannes Mockenhaupt 2017-12-25 20:29:32 +0100
  • dd58952b42
         Merge pull request #548 from MilosKozak/COB-Wizard-idea Milos Kozak 2017-12-25 19:22:02 +0100
  • b0bf9b5c79 Merge branch 'dev' into smb060 Milos Kozak 2017-12-25 17:01:53 +0100
  • f968ec630c fix non smooth ratio graph Milos Kozak 2017-12-25 17:01:31 +0100
  • d081345da2
         Define lowest non-zero basal rate as minimum basal rate for the Combo. Johannes Mockenhaupt 2017-12-24 13:46:17 +0100
  • ae30046c95 Merge branch 'dev' into smb060 Milos Kozak 2017-12-23 11:18:37 +0100
  • 3ce260dfe9 fix of fix Milos Kozak 2017-12-23 11:18:17 +0100
  • 51de0f16c1 Merge branch 'dev' into smb060 Milos Kozak 2017-12-23 11:07:48 +0100
  • 6e09bfbbe4 fix wrong button type Milos Kozak 2017-12-23 11:07:29 +0100
  • 7380065bd9 Merge branch 'dev' into smb060 Milos Kozak 2017-12-22 21:11:38 +0100
  • 2bb37a4bfc fix doubled percentage when comming from NS Milos Kozak 2017-12-22 21:03:36 +0100
  • 248d3d1697 proper select last used profile Milos Kozak 2017-12-22 20:34:53 +0100
  • 93b954fffe when using profile percentage limit basal rate to minimal value supported by pump Milos Kozak 2017-12-22 20:17:31 +0100
  • 600e2ade1c SingleClickButton Milos Kozak 2017-12-22 19:50:16 +0100
  • 4f46fc27ad
         README-Combo: clean up 'known issues section'. Johannes Mockenhaupt 2017-12-22 16:12:41 +0100
  • 0851581f7f Merge branch 'dev' into smb060 Milos Kozak 2017-12-22 12:03:11 +0100
  • 25667bc79e RS fix crash when pairing is not confirmed on pump Milos Kozak 2017-12-22 11:57:59 +0100
  • 7073688920
         Update ComboPlugin to match updated PumpInterface. Johannes Mockenhaupt 2017-12-22 10:46:54 +0100
  • bd0ae23e30
         Merge branch 'dev' into csv2-staging Johannes Mockenhaupt 2017-12-22 10:39:30 +0100
  • e77e7ffbbd Merge branch 'smb060' of https://gitlab.com/MilosKozak/AndroidAPS into smb060 Milos Kozak 2017-12-22 10:35:33 +0100
  • 99e5a39b33 Merge branch 'dev' into smb060 Milos Kozak 2017-12-22 10:34:45 +0100
  • 5bc6ea04c2 Double -> double Milos Kozak 2017-12-22 03:27:13 +0100
  • 31975396a2 use joda-time Milos Kozak 2017-12-22 02:55:40 +0100
  • 74abdc0271 fix disconnecting pump Milos Kozak 2017-12-22 01:35:52 +0100
  • 6b23ba10bd format output date to be displayed on iDevices correctly Milos Kozak 2017-12-22 00:37:22 +0100
  • a5c4495a5d BolusWizard use 0 for insulin correction if in range Milos Kozak 2017-12-22 00:17:46 +0100
  • 771f9eac1a LocalProfile TimeListEdit min, max Milos Kozak 2017-12-22 00:12:40 +0100
  • 42418d4146
         ComboFragment: make warning/error bold for a better readability. Johannes Mockenhaupt 2017-12-21 22:43:34 +0100
  • 6a3184bc39
         ComboFragment: use history icon for history, not bolus icon. Johannes Mockenhaupt 2017-12-21 11:36:25 +0100
  • 5c7ad1e650
         Merge pull request #553 from MilosKozak/AdrianLxM-patch-1 Milos Kozak 2017-12-21 09:51:41 +0100
  • 176c5f46ff Ensure basal rate shown as a percentage if required according to user preferences. Andrew Warrington 2017-12-21 09:50:16 +0100
  • fb12c0bc96 enable SMB for G5 Milos Kozak 2017-12-21 09:02:49 +0100
  • cb2368f535 Merge branch 'dev' into smb060 Milos Kozak 2017-12-21 08:58:33 +0100
  • 2d2bd6d77a
         remove string with no default translation AdrianLxM 2017-12-21 08:26:55 +0100
  • 2bdda9af43 Rv2,RS fix loading events Milos Kozak 2017-12-21 07:45:56 +0100
  • 5bda1235c3
         Merge pull request #11 from jotomo/combo-scripter-v2 Simon Pauwels 2017-12-20 22:37:43 +0100
  • 5d3b307672 Merge branch 'dev' into smb060 Milos Kozak 2017-12-20 22:37:29 +0100
  • cf9d55747e
         Fix NPE. Johannes Mockenhaupt 2017-12-20 21:14:35 +0100
  • adff0329dd initialize lastCommandTime too after BT reset Milos Kozak 2017-12-20 20:55:14 +0100
  • 0f43e95644 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev Milos Kozak 2017-12-20 20:45:35 +0100
  • 63b0efede3 allow to read status after every command Milos Kozak 2017-12-20 20:45:21 +0100
  • 3b43e4d06a
         Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 Johannes Mockenhaupt 2017-12-20 20:21:12 +0100
  • beb87acc9f
         Merge pull request #552 from MilosKozak/nsoffline Milos Kozak 2017-12-20 20:17:30 +0100
  • c33dd1e7d7 RS enable BT before scanning Milos Kozak 2017-12-20 19:50:44 +0100
  • 4094b0dd61
         Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 Johannes Mockenhaupt 2017-12-20 19:42:13 +0100
  • 70f4b72ff9 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev Milos Kozak 2017-12-20 18:26:52 +0100
  • 096b2e93a3 wait a few sec before disconnection for another command Milos Kozak 2017-12-20 18:26:47 +0100
  • af4816453e
         Add note on supported basal rate ranges. Johannes Mockenhaupt 2017-12-20 18:06:09 +0100
  • 7c04f528cc
         Revert "Handle edge case of setting basal rate in range 0.00 - 0.05." Johannes Mockenhaupt 2017-12-20 18:03:21 +0100
  • 7651107167 Merge branch 'bolus-progress-dialog' into 'smb060' Johannes Mockenhaupt 2017-12-20 16:58:33 +0000
  • c5089d821e Merge branch 'disappearing-predections-checkbox' into 'smb060' Johannes Mockenhaupt 2017-12-20 16:58:12 +0000
  • 2955dd7ec6
         Only show progress dialog for normal boluses, not SMBs. Johannes Mockenhaupt 2017-12-20 17:35:39 +0100
  • 57944fb4b5
         Merge remote-tracking branch 'origin/dev' into smb060 Johannes Mockenhaupt 2017-12-20 17:28:08 +0100
  • 3880c5ff61
         Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 Johannes Mockenhaupt 2017-12-20 16:46:35 +0100
  • 3975ce4cbe
         Merge pull request #551 from jotomo/profile-switch-on-actions-tab Milos Kozak 2017-12-20 16:45:10 +0100
  • 2054e76cde
         Handle edge case of setting basal rate in range 0.00 - 0.05. Johannes Mockenhaupt 2017-12-20 14:34:56 +0100
  • d1085c876e
         Actions tab: show profile switch button for single profile too. Johannes Mockenhaupt 2017-12-20 16:15:55 +0100
  • fd91dfc8a6
         Merge pull request #549 from MilosKozak/nonurgent-oldnsnotif Milos Kozak 2017-12-20 14:59:03 +0100
  • 81ca35515f
         Old NS-Version non-urgent AdrianLxM 2017-12-20 14:34:30 +0100
  • a3db2136e1
         Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 Johannes Mockenhaupt 2017-12-20 13:28:41 +0100
  • eb34345ee2
         Merge pull request #539 from jotomo/queue-bolus-constraints Milos Kozak 2017-12-20 13:25:02 +0100
  • 40edb9ff5c
         Don't update pump basal profile during startup. Johannes Mockenhaupt 2017-12-20 13:01:24 +0100
  • ea1fd8fee8
         Don't declare connection unusable too quickly. Johannes Mockenhaupt 2017-12-20 10:33:03 +0100
  • 0d7e950b73
         Merge pull request #505 from jotomo/sync-to-pump Milos Kozak 2017-12-20 10:49:47 +0100
  • 181338e9e2
         Another NPE check for failure scenarios. Johannes Mockenhaupt 2017-12-20 00:04:14 +0100
  • f4c1f4a3a1
         Make recovering from command failure more robust. Johannes Mockenhaupt 2017-12-19 23:43:08 +0100