Commit graph

1033 commits

Author SHA1 Message Date
Milos Kozak 4e3cc65d5d handling pump suspend, show pump actions on overview 2017-02-12 19:51:13 +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
Milos Kozak d32a823071 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-02-12 13:43:29 +01:00
Milos Kozak e5e5eca37f Merge pull request #172 from AdrianLxM/patch-16
Validation for CPP
2017-02-12 11:23:34 +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 e4c529fa1f reenable safety function 2017-02-11 19:59:20 +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 8ede0c1d08 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-02-11 16:04:45 +01:00
Milos Kozak e1341e79bf Merge pull request #161 from warstar2187/master
Fix ExtendedBolusStep
2017-02-11 16:03:31 +01:00
Milos Kozak 65ae422512 Merge remote-tracking branch 'warstar/master' into dev 2017-02-11 15:54:01 +01:00
Milos Kozak a11e33f81a Merge pull request #171 from LadyViktoria/wip-deprecationDatabaseHelper
Deprecation DataBaseHelper - use Long for .limit
2017-02-11 14:35:00 +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
Milos Kozak f1e1a1bc00 Merge pull request #170 from LadyViktoria/wip-deprecation-color
Deprecation colors
2017-02-11 14:23:19 +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
Milos Kozak 5c063640ec Merge pull request #166 from LadyViktoria/CleanUpDevBranch
cleanup branch
2017-02-11 10:47:35 +01:00
viktoria c6c6bc4f40 delete .idea 2017-02-11 01:51:15 +01:00
viktoria 5915503ac5 delete wear.iml 2017-02-11 01:50:51 +01:00
viktoria 3176f33a9e fix gitignore 2017-02-11 01:50:25 +01:00
viktoria 580a296177 use validation lib in cpp - small changes 2017-02-11 00:47:14 +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
LadyViktoria 80de9c0cd8 use validation lib in cpp 2017-02-10 11:34:05 +01:00
Milos Kozak 6f6e3385c5 Merge pull request #157 from LadyViktoria/dev
ko translation
2017-02-10 08:26:43 +01:00
LadyViktoria 4857259eda ko translation 2017-02-10 07:59:26 +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
Milos Kozak ed7dd48612 remove TODOs 2017-02-09 20:18:22 +01:00
Milos Kozak 9d7ac0ce81 1.1e 2017-02-09 17:17:40 +01:00
Milos Kozak a6871f6b4a Merge pull request #145 from LadyViktoria/dev
Add prefernces.json to advanced settings
2017-02-09 17:13:28 +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