Commit graph

1142 commits

Author SHA1 Message Date
Milos Kozak 6200584268 hours to fetch fixed 2017-02-20 09:46:55 +01:00
Milos Kozak 352902438c Merge branch 'nsclient' of https://github.com/MilosKozak/AndroidAPS into nsclient 2017-02-20 08:32:25 +01:00
Milos Kozak d84632a8a4 uploader battery in device status 2017-02-20 08:32:10 +01:00
Milos Kozak 9ea19fff9b detect last received date 2017-02-19 23:41:42 +01:00
Milos Kozak 3b1b732d8f nclient log collection 2017-02-19 20:56:12 +01:00
Milos Kozak c9a6a44e4b adjust upload timing 2017-02-19 20:48:10 +01:00
Milos Kozak d030427b0f adjust devicestatus upload 2017-02-19 20:41:20 +01:00
Milos Kozak 5f4eb1e4c4 pump status tweaking 2017-02-19 19:15:14 +01:00
Milos Kozak de124b8e3e Merge branch 'nsclient' of https://github.com/MilosKozak/AndroidAPS into nsclient 2017-02-19 09:42:28 +01:00
Milos Kozak 9303bd61fd Merge branch 'dev' into nsclient 2017-02-19 09:41:16 +01:00
Milos Kozak a2eb76a8b8 handle if bolus progress is not sent 2017-02-19 00:06:29 +01:00
Milos Kozak e0a9a7ae81 fix carbs logging in driver 2017-02-18 23:12:45 +01:00
AdrianLxM abaafb87eb wear show on status when loop is disabled 2017-02-18 18:52:09 +01:00
AdrianLxM d113d39916 wear setting to show detailed IOB 2017-02-18 18:13:13 +01:00
Milos Kozak 2e15c8b138 add permissions to manifest 2017-02-18 10:41:42 +01:00
Milos Kozak 5d795fbe33 Merge branch 'dev' into nsclient 2017-02-17 22:26:02 +01:00
Milos Kozak 29b4f0063b better handling readonly permission 2017-02-17 22:12:35 +01:00
Milos Kozak f33ccf278b dbupdate/remove, saving queue 2017-02-17 21:24:30 +01:00
Milos Kozak 14e37246c2 nsclient gui and pausing tweaking 2017-02-17 18:14:33 +01:00
Milos Kozak 31364ff07b ignore dbaccess if nsclient not enabled 2017-02-17 16:41:28 +01:00
Milos Kozak 8a374f1b35 Shared preferences cleanup 2017-02-17 16:16:20 +01:00
Milos Kozak 3216ff636a preference keys to strings 2017-02-17 13:43:17 +01:00
Milos Kozak 71112a90e2 internal nsclient 2017-02-17 13:18:36 +01:00
Radoslav Radev 09880f029a Update strings.xml 2017-02-16 16:46:47 +02:00
LadyViktoria 92cd31a0b6 fix key for openapsama_current_basal_safety_multiplier 2017-02-15 14:42:59 +01:00
LadyViktoria 16555347e8 fix key for openapsama_current_basal_safety_multiplier 2017-02-15 13:21:38 +01:00
Milos Kozak 1a3d3eb97c 1.1g 2017-02-14 21:41:39 +01:00
Milos Kozak dda95dc275 allow to remove treatments from GUI 2017-02-14 21:13:13 +01:00
Milos Kozak a75c62be35 show notification when aproaching daily limit 2017-02-14 19:47:45 +01:00
Milos Kozak 2e4aec9916 settings password protected 2017-02-14 19:16:34 +01:00
Milos Kozak 5992413cf9 disable quickwizard with if bg is old 2017-02-14 15:50:24 +01:00
Milos Kozak 8001796f4b virtual pump status upload optional 2017-02-14 15:41:30 +01:00
Milos Kozak e00045155e prefill bg value in careportal dialog 2017-02-14 15:09:22 +01:00
Milos Kozak ac82e2b044 1.1f 2017-02-13 21:06:20 +01:00
Milos Kozak f9ee3c547a translations 2017-02-13 21:05:57 +01:00
Milos Kozak e3edf5cce5 calculate cob 1.5 * DIA to the past 2017-02-13 19:35:01 +01:00
Milos Kozak c6b3fe9883 Merge pull request #178 from AdrianLxM/wear-bolus5
Wear Bolus
2017-02-13 18:13:36 +01:00
Milos Kozak c31795d2e6 adjust devicestatus upload timings 2017-02-13 17:47:58 +01:00
AdrianLxM 05d40e4af0 wear better toasts 2017-02-13 14:18:23 +01:00
AdrianLxM 665f662f3a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into pumpstatus2 2017-02-13 02:18:32 +01:00
AdrianLxM 5ce9d257e8 pump shortStatus String in interface 2017-02-13 02:18:25 +01:00
AdrianLxM e85e651c56 wear full status support and product flavour with/without controls on wear 2017-02-13 01:55:35 +01:00
AdrianLxM 6fcee9ea3f pump shortStatus String in interface 2017-02-13 00:15:02 +01:00
Milos Kozak e003ef8368 Merge pull request #175 from LadyViktoria/dev
use validation lib in cpp - layout fixes & longer snackbar duration
2017-02-12 22:29:20 +01:00
Milos Kozak f6ae267bb5 CS translations 2017-02-12 22:28:42 +01:00
Milos Kozak 1f3aee091e manual invoke of loop in separate thread 2017-02-12 22:02:42 +01:00
viktoria ba254f8829 Merged branch dev into dev 2017-02-12 20:01:25 +01:00
viktoria 0d02f42714 use validation lib in cpp - layout fixes & longer snackbar duration 2017-02-12 19:51:56 +01:00
Milos Kozak 4e3cc65d5d handling pump suspend, show pump actions on overview 2017-02-12 19:51:13 +01:00
AdrianLxM c0b287ba00 wear target statusO 2017-02-12 17:32:53 +01:00
Milos Kozak 351a624b83 small string change 2017-02-12 13:48:03 +01:00
Milos Kozak dc85bc26fc typo 2017-02-12 13:45:08 +01:00
AdrianLxM 5e96124a2d mmol/l fix 2017-02-11 22:27:04 +01:00
AdrianLxM 2e6d754c86 mmol/l fix 2017-02-11 22:26:16 +01:00
AdrianLxM 1f5dd4750a CPP dismiss info when focus is lost 2017-02-11 22:20:29 +01:00
AdrianLxM 6c5028b4be CPP dismiss info when focus is lost 2017-02-11 22:18:28 +01:00
AdrianLxM 104c146b2f Merge pull request #63 from AdrianLxM/patch-16
LadyViktoria validation lib plus safety
2017-02-11 21:12:22 +01:00
AdrianLxM e4c529fa1f reenable safety function 2017-02-11 19:59:20 +01:00
AdrianLxM d9103b6823 wear wizard confirm reformat, connection stability, prime not in menu per default 2017-02-11 19:51:33 +01:00
AdrianLxM 6cb192b876 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into wear-bolus5 2017-02-11 18:09:22 +01:00
AdrianLxM b57253af5e wear add carbs to bolus-wizard confirmation 2017-02-11 17:54:47 +01:00
viktoria 06ee59b42c Merge remote-tracking branch 'refs/remotes/MilosKozak/dev'
Conflicts:
	app/build.gradle
2017-02-11 16:06:37 +01:00
Milos Kozak e1341e79bf Merge pull request #161 from warstar2187/master
Fix ExtendedBolusStep
2017-02-11 16:03:31 +01:00
viktoria 56f15a3cf7 Deprecation DataBaseHelper - use Long for .limit 2017-02-11 14:33:22 +01:00
Milos Kozak c5081c378b Merge pull request #169 from LadyViktoria/wip-deprecation-danarStats
Deprecation DanaR Stats
2017-02-11 14:23:45 +01:00
viktoria 0ffddcdefa Deprecation TimeListEdit - add design support libraries 2017-02-11 14:01:37 +01:00
viktoria a4591af392 Deprecation colors 2017-02-11 14:00:44 +01:00
viktoria 1217c22b43 Deprecation DanaR Stats 2017-02-11 13:44:43 +01:00
AdrianLxM 5ea7913a41 wear actionstringhandler use correct actualBG() 2017-02-11 02:58:22 +01:00
AdrianLxM 638b9c263c Merge pull request #61 from MilosKozak/dev
Dev
2017-02-11 02:55:14 +01:00
viktoria 580a296177 use validation lib in cpp - small changes 2017-02-11 00:47:14 +01:00
AdrianLxM 9dae8b4e56 wear don't enact 0carbs/0bolus on wizard result 2017-02-11 00:32:45 +01:00
viktoria 7877235972 Merged branch dev into dev 2017-02-11 00:16:55 +01:00
viktoria 279c67bb70 use validation lib in cpp - add snackbar 2017-02-11 00:16:25 +01:00
Milos Kozak 1e4fa1b93e fix not enacting extended 2017-02-10 21:45:46 +01:00
Milos Kozak 40d166cb7d CS translations 2017-02-10 21:39:51 +01:00
Milos Kozak 2e40c7b605 sms calibrations 2017-02-10 21:20:55 +01:00
LadyViktoria 49e08f3357 use validation lib in cpp - add counter 2017-02-10 18:00:10 +01:00
LadyViktoria e0627bd815 use validation lib in cpp - add a timer 2017-02-10 17:39:09 +01:00
LadyViktoria 48a158b036 use validation lib in cpp - better event handling 2017-02-10 17:29:59 +01:00
Milos Kozak 83667be8cc extract sending intent to a function 2017-02-10 17:25:32 +01:00
Milos Kozak 8db3f258cd xdrip calibration 2017-02-10 16:53:39 +01:00
LadyViktoria 11d0f1aebf better keyboard handling in fragments 2017-02-10 14:24:56 +01:00
warstar2187 9458e0effa Update DanaRKoreanPlugin.java 2017-02-10 20:59:44 +09:00
warstar2187 61f1acdcb0 Update DanaRPlugin.java 2017-02-10 20:59:06 +09:00
AdrianLxM 384e36a1f3 wear remove bolus enaction for testing 2017-02-10 12:52:54 +01:00
LadyViktoria 80de9c0cd8 use validation lib in cpp 2017-02-10 11:34:05 +01:00
LadyViktoria 4857259eda ko translation 2017-02-10 07:59:26 +01:00
AdrianLxM 4220d7712a wear wizard working 2017-02-10 06:07:31 +01:00
AdrianLxM 9785d507a8 wear temp targets working 2017-02-10 02:36:38 +01:00
AdrianLxM 8ece312b6a Merge pull request #60 from MilosKozak/dev
Dev
2017-02-09 23:47:12 +01:00
AdrianLxM aff82642af wear multiple watch situation and disable fillbolus for wider testing 2017-02-09 23:39:23 +01:00
Milos Kozak 715d15b51f CS translations 2017-02-09 22:44:42 +01:00
Milos Kozak 90061c6f25 Show log 2017-02-09 22:29:21 +01:00
AdrianLxM 3ff41af939 wear bolus activity and refactoring 2017-02-09 20:54:41 +01:00
Milos Kozak ed7dd48612 remove TODOs 2017-02-09 20:18:22 +01:00
AdrianLxM dc476a6600 wear menu restructuring and status 2017-02-09 17:40:26 +01:00
Milos Kozak 9d7ac0ce81 1.1e 2017-02-09 17:17:40 +01:00
Milos Kozak 8a2846c516 Merge branch 'dev' into dev 2017-02-09 17:01:05 +01:00
Milos Kozak 9e9637d70b accept temp button visible only if loop selected 2017-02-09 16:51:14 +01:00
Milos Kozak 3aff89acdc fix not attached to activity in bolus progress dialog 2017-02-09 16:45:54 +01:00
Milos Kozak 806cc4a3a7 fix nullpointerexception in reading temp basal status 2017-02-09 16:43:27 +01:00
Milos Kozak a39416d876 fix nullpointerexception in reading temp basal status 2017-02-09 16:39:07 +01:00
Milos Kozak caa109dbfd use SafeParse in DanaRStartsActivity 2017-02-09 16:32:44 +01:00
Milos Kozak b9b08c1528 fix crash when pump status not loaded yet 2017-02-09 16:29:02 +01:00
Milos Kozak 3d3e849d8a fix null pointer exception in persistentnotification 2017-02-09 16:23:28 +01:00
AdrianLxM b8c3fe2933 wear wizard including bg and iob toggles 2017-02-09 16:16:31 +01:00
Milos Kozak 7f123e4208 warn on wrong entered sms phone number 2017-02-09 16:14:09 +01:00
Milos Kozak c015862239 fix crash: not attached to Activity 2017-02-09 16:04:57 +01:00
LadyViktoria 7fc6de17c1 Add prefernces.json changes 2 2017-02-09 10:41:02 +01:00
LadyViktoria 886c1ea359 Add prefernces.json changes 2017-02-09 09:36:51 +01:00
AdrianLxM bf7a96b3e7 bolus progress dialog without activity context 2017-02-09 03:15:13 +01:00
AdrianLxM 74107f58fe wear first fill bolus working 2017-02-09 01:53:28 +01:00
viktoria 0bf51710d1 Merged branch dev into dev 2017-02-08 21:23:47 +01:00
Milos Kozak 698ab31d71 show temp targets only if APS enabled in config 2017-02-08 21:04:26 +01:00
Milos Kozak a43677e4b0 fix pumpcontrol build crash 2017-02-08 20:36:30 +01:00
AdrianLxM d2d0d4b51a wear confirm roundtrip working 2017-02-08 15:15:22 +01:00
AdrianLxM 8e9d73e3a3 wear sending confirmation requests 2017-02-08 11:53:26 +01:00
AdrianLxM 20d32d042f wear bolusprogress cleanup 2017-02-07 12:08:13 +01:00
AdrianLxM e261fa3ec8 wear re-disable fill bolus for virtual pump 2017-02-07 12:02:02 +01:00
AdrianLxM 650111d1b7 wear event for bolus requests to show card early on 2017-02-07 11:09:16 +01:00
AdrianLxM f4b553fe52 Wear added bolusprogress and dismiss when finished 2017-02-07 09:17:19 +01:00
AdrianLxM 8c37809751 Wear cancel bolus via content intent to progress card 2017-02-06 19:35:27 +01:00
AdrianLxM 7ec3ff2a17 Wear bolus progress as card 2017-02-06 16:52:39 +01:00
AdrianLxM 379e3f8ab1 rounding minutesago instead of truncating it 2017-02-05 02:18:13 +01:00
viktoria b0a9d74b49 Merge remote-tracking branch 'refs/remotes/MilosKozak/dev'
Conflicts:
	app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/Autosens.java
	app/src/main/res/values/strings.xml
2017-02-02 19:00:17 +01:00
AdrianLxM bd75015a58 Correct error for tempbasals 2017-02-01 14:38:55 +01:00
LadyViktoria 1f3b425c44 Remove careportal_temptarget string 2017-01-31 20:28:32 +01:00
Milos Kozak 78fb6f934e measure execution time of every part 2017-01-31 09:52:33 +01:00
Milos Kozak 1b2500dc6c calculate only needed data in AMA 2017-01-31 09:40:05 +01:00
Milos Kozak 9722130299 move all treatments db actions to DatabaseHelper 2017-01-30 20:00:46 +01:00
Milos Kozak 8d0c1dcacf do not calculate autosens for MA 2017-01-30 15:19:50 +01:00
Milos Kozak 90924e607f 1.1d 2017-01-30 14:36:04 +01:00
Milos Kozak d98c6b125e Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-01-30 14:31:15 +01:00
Milos Kozak 607ac8b897 AMA execution time 2017-01-30 14:30:46 +01:00
AdrianLxM dce0c378b9 round durations 2017-01-30 05:02:49 +01:00
AdrianLxM 9f74b0083b Add minutesrunning in determine-basal Adapter 2017-01-30 04:25:03 +01:00
AdrianLxM 3d6be15306 update determine-basal.js to current Oref0 dev 2017-01-30 04:23:18 +01:00
Milos Kozak 179511a833 fix conflicts 2017-01-29 22:41:01 +01:00
Milos Kozak 907de4da7b execution profiler 2017-01-29 22:37:25 +01:00
Milos Kozak 762b561abb CS translations 2017-01-29 21:15:05 +01:00
Milos Kozak d6a22be184 remove absorption rate from everywhere 2017-01-29 20:19:02 +01:00
Milos Kozak 4e14865054 remove unneeded carbs_hr from AMA 2017-01-29 19:29:26 +01:00
Milos Kozak 331598b7fa display danar profile preferences only if selected 2017-01-29 19:22:49 +01:00
Milos Kozak e608bf4095 fix profile test in keep alive & korean driver switching 2017-01-29 19:17:28 +01:00
Milos Kozak 3a17ed19c4 prevent null pointer exception 2017-01-29 18:48:42 +01:00
viktoria 75ff6867bc Add prefernces.json make settings work with validator lib 2017-01-29 13:00:52 +01:00
viktoria 7d68b50a56 Add prefernces.json validator lib 2017-01-29 13:00:21 +01:00
Milos Kozak ed29302547 status outdated first 2017-01-29 11:24:11 +01:00
Milos Kozak c48e147a68 remove forgotten code 2017-01-29 11:21:15 +01:00
Milos Kozak 55f99ee28e connect when outdated basal 2017-01-29 11:11:07 +01:00
Milos Kozak 3f90ad6a5c sync profile to pump 2017-01-28 23:45:14 +01:00
viktoria c64d45b758 Merged MilosKozak/dev into dev
Conflicts:
	app/src/main/res/values/strings.xml
2017-01-28 22:35:54 +01:00
Milos Kozak b9b9e21dcb fix merge conflicts 2017-01-28 21:37:51 +01:00
Milos Kozak 926a26a724 the same for korean danar 2017-01-28 21:17:27 +01:00
Milos Kozak 538e8fd2fa better detect & display old pump firmware 2017-01-28 20:48:32 +01:00
AdrianLxM 4ced11819c fix autosens
bgi's most of the time where 0 or got truncated to full integers.

Example from tonight: autosens result factor from 1.0 before and 1.09 after this.
2017-01-28 01:20:36 +01:00
LadyViktoria 4d4630ca1a Add prefernces.json rename some Strings to match OpenAPS docs 2017-01-27 09:56:32 +01:00
LadyViktoria f510b0a8cc Add prefernces.json errer message translations
attention the characters are limited.
maybe its caused by old libs
com.android.support:appcompat-v7:23.4.0
'com.android.support:support-v4:23.4.0
2017-01-27 09:52:16 +01:00
LadyViktoria 24e6f42ac2 Merged branch dev into dev 2017-01-27 09:11:45 +01:00
Milos Kozak 1e8defb884 Merge pull request #144 from AdrianLxM/deltasx
remove round-basal.js
2017-01-26 22:43:57 +01:00
viktoria 3fcf52aa02 Merged MilosKozak/dev into dev 2017-01-26 18:39:30 +01:00
Milos Kozak 08880b8032 Merge branch 'master' into dev 2017-01-26 18:31:31 +01:00
Milos Kozak e78de8b622 fix static func 2017-01-26 18:27:09 +01:00
Milos Kozak 0c289bfb6e Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2017-01-26 18:23:47 +01:00
Milos Kozak 87ba28136a log new firmware pump 2017-01-26 18:23:30 +01:00
Milos Kozak 72fc4ec096 Merge branch 'master' into dev 2017-01-26 17:00:10 +01:00
Milos Kozak 750cea7bcf Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2017-01-26 16:57:11 +01:00
Milos Kozak 5c5468b55b use minimal basal rate from description 2017-01-26 16:56:29 +01:00
LadyViktoria 1d2f98abf4 Add prefernces.json remove openapsama_skip_neutral_temps 2017-01-26 15:32:44 +01:00
LadyViktoria 0ddc26ce89 Add prefernces.json small import fixes 2017-01-26 12:10:50 +01:00
LadyViktoria 4702a87d8e Add prefernces.json add safety limits 2017-01-26 12:07:25 +01:00
viktoria 2f8b2a382d Merged branch dev into dev 2017-01-26 00:39:28 +01:00
viktoria 74cfa08b81 Change some Prefernces names to match names in OpenAPS docs 2017-01-26 00:35:46 +01:00
Heiner1 5c43c66163 Update strings.xml 2017-01-25 23:35:31 +01:00
viktoria 88d6178a1b Add prefernces.json small fix 2017-01-25 22:20:56 +01:00
viktoria 9d2b645d8c Add prefernces.json default values 2017-01-25 22:11:17 +01:00
viktoria fd6432f808 Add prefernces.json put hyperlink and warning there 2017-01-25 20:41:33 +01:00
viktoria 8e095fefaf Add prefernces.json layout changes 2017-01-25 20:20:39 +01:00
viktoria 0838ede6a3 Add prefernces.json change secondary text color to white 2017-01-25 20:19:53 +01:00
viktoria c01488e7a9 Add prefernces.json switch to SafeParse 2017-01-25 20:19:00 +01:00
LadyViktoria 2a0968eba9 Add prefences.Json show summary 2017-01-25 20:17:16 +01:00
AdrianLxM b588211658 prevent nullpointer exception when BG <39 2017-01-25 15:37:05 +01:00
LadyViktoria b898fc044e Add prefernces.json to advanced settings 2017-01-25 15:18:01 +01:00
AdrianLxM 1328c32bb8 remove duplicate setTempBasal function declaration 2017-01-25 13:18:54 +01:00
AdrianLxM 9ef4f4d9ad cleanup unused round-basal.js 2017-01-25 11:34:09 +01:00
AdrianLxM 805f23fe59 directly pass round-basal to V8 2017-01-25 10:02:35 +01:00
AdrianLxM 53c63f0f48 simplify round-basal.js 2017-01-25 09:43:54 +01:00
Milos Kozak 044547b594 Merge pull request #143 from AdrianLxM/deltasx
Settings for deltas
2017-01-24 10:59:10 +01:00
AdrianLxM 950b638e50 Advanced Settings 2017-01-24 10:28:42 +01:00
AdrianLxM 3a43858948 Settings for deltas 2017-01-24 02:21:25 +01:00
viktoria bd588af1ba DanaR Stats small Layout fixes 2017-01-23 21:52:24 +01:00
Milos Kozak da2739f7b7 Merge pull request #140 from PitBeckh/patch-1
Update strings.xml
2017-01-23 20:23:30 +01:00
PitBeckh dc12ef3fec Update strings.xml 2017-01-23 16:26:59 +01:00
PitBeckh 2f72471915 Update strings.xml 2017-01-23 16:24:53 +01:00
Milos Kozak 5c216e5cec Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-01-23 15:56:55 +01:00
Milos Kozak df0af4da94 fix uploading profile 2017-01-23 15:56:32 +01:00
Milos Kozak 750ac19b41 upload data for temp target only if needed 2017-01-23 14:47:14 +01:00
Milos Kozak d62105b6c6 Merge pull request #139 from slavidex/patch-27
Update strings.xml
2017-01-23 12:03:47 +01:00
Radoslav Radev fbceeec5b0 Update strings.xml 2017-01-23 11:01:42 +02:00
Milos Kozak 22f9817f8e upload cpp setting to NS 2017-01-23 09:31:14 +01:00
Radoslav Radev 106bfe4f1c Update strings.xml 2017-01-23 07:14:12 +02:00
Radoslav Radev 2d02449a87 Update strings.xml 2017-01-22 21:44:49 +02:00
PitBeckh d995910384 Update strings.xml 2017-01-22 20:34:54 +01:00
Milos Kozak ceaf4f7f78 Merge branch 'dev' into adjusttargetsse 2017-01-22 11:30:59 +01:00
ecorman 24b86a0b99 Update: Perfil->Objetivo 2017-01-22 00:07:10 +01:00
AdrianLxM f418152059 sorten tab titles active 2017-01-21 23:48:05 +01:00
ecorman 3a2549d0b6 Update Spanish Translation 2017-01-21 23:08:23 +01:00
AdrianLxM ea78dd5bc1 Shorten tabs first 2017-01-21 19:44:58 +01:00
Milos Kozak 404a4de916 Merge pull request #136 from AdrianLxM/adjusttargetsse
Preference Switches for Autosens
2017-01-21 11:22:34 +01:00
Milos Kozak 53f9b30b3e temp target display update 2017-01-21 11:22:03 +01:00
AdrianLxM 50b7e619fc Preference switches for Autosens 2017-01-21 01:35:15 +01:00
Milos Kozak ea37d9eaa8 Merge pull request #131 from AdrianLxM/tempt-pill
Tempt pill
2017-01-21 00:11:07 +01:00
viktoria 5a09c3df70 DanaR Stats Korean react on touch elsewwhere 2017-01-20 22:43:02 +01:00
AdrianLxM 377a55c69f DanaR Stats react on touch elsewhere 2017-01-20 20:47:31 +01:00
viktoria 33bb7d80a6 DanaR Stats small fixes and move Listeners 2017-01-20 16:45:01 +01:00
viktoria 722976f6b0 DanaR Stats beautify layout and add some listeners 2017-01-20 14:51:16 +01:00
viktoria d2acad1942 Korean DanaR Stats some improvements 2017-01-20 03:19:17 +01:00
viktoria 2d966c9feb DanaR Stats some improvements 2017-01-20 03:13:41 +01:00
viktoria 62853326ed Merged branch dev into danarstats 2017-01-20 00:10:56 +01:00
AdrianLxM 3f3d519c84 Merge branch 'dev' into tempt-pill 2017-01-19 21:57:42 +01:00
AdrianLxM 992d95744d remove duplicate code 2017-01-19 21:53:08 +01:00
AdrianLxM 88a1dcde51 remove empty language translation 2017-01-19 21:32:09 +01:00
AdrianLxM 0c11f78ed3 cleanup after merge 2017-01-19 21:15:08 +01:00
LadyViktoria 1597f74bd0 Merge branch 'dev' into danarstats 2017-01-19 20:52:01 +01:00
AdrianLxM 6c3a07cc62 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into MilosKozak-dev 2017-01-19 20:47:53 +01:00
viktoria 6120add315 Add very Hard Limits to constants 2017-01-19 20:36:19 +01:00
Milos Kozak 2754e23c08 CS translations 2017-01-19 19:52:14 +01:00
Milos Kozak 98a95fb16e 1.1c 2017-01-19 19:22:04 +01:00
Milos Kozak c701b5d125 waiting for pump message 2017-01-19 19:21:25 +01:00
Milos Kozak f8feaf565b show how is value hard limited 2017-01-19 18:40:08 +01:00
Milos Kozak 649cab63fc allow some diff on profile check 2017-01-19 18:07:16 +01:00
Milos Kozak e808bcedee remove logging 2017-01-19 15:17:43 +01:00
Milos Kozak 75b53cfc0d iob calc fix 2017-01-19 14:35:16 +01:00
Milos Kozak 07c9a21ff9 autosens log 2017-01-19 13:54:56 +01:00
Milos Kozak e8dcf73c83 remove carbsAbsorbed from debug 2017-01-18 21:45:27 +01:00
Milos Kozak 452edd5771 1.1b 2017-01-18 21:41:10 +01:00
Milos Kozak 8586ed5adb show autosens result 2017-01-18 21:40:43 +01:00
AdrianLxM 480b832efe temptarget zero-duration cleanup 2017-01-18 16:49:48 +01:00
AdrianLxM b79743588d temptarget sort and allow for zero-duration to cancel predated ones 2017-01-18 15:52:20 +01:00
Milos Kozak ba370b3cf3 ver 1.1a 2017-01-18 08:05:46 +01:00
viktoria b70e895b95 DanaR Stats fixes 2017-01-18 04:31:47 +01:00
viktoria 9ba24b4ffd DanaR Stats Beautify 2017-01-18 03:08:19 +01:00
viktoria 678fbedcbf Merge branch 'dev'
Conflicts:
	app/src/main/res/values/strings.xml
2017-01-18 03:03:58 +01:00
Milos Kozak 9f4cc28c0f allow removing temp target records with null _id 2017-01-17 23:43:50 +01:00
AdrianLxM d36a515d45 temp target overview 2017-01-17 21:32:30 +01:00
Milos Kozak f9ed2ed4b4 temp targets to AMA 2017-01-17 18:56:08 +01:00
Milos Kozak 0e21b67a42 fix merge conflicts 2017-01-17 18:00:44 +01:00
Milos Kozak 432c937a46 Merge branch 'dev' into AMA 2017-01-17 17:49:21 +01:00
Milos Kozak 08c078466a Merge pull request #127 from MilosKozak/temptarget
Temptarget
2017-01-17 17:47:14 +01:00