Commit graph

203 commits

Author SHA1 Message Date
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 538e8fd2fa better detect & display old pump firmware 2017-01-28 20:48:32 +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 1d2f98abf4 Add prefernces.json remove openapsama_skip_neutral_temps 2017-01-26 15:32:44 +01:00
viktoria 74cfa08b81 Change some Prefernces names to match names in OpenAPS docs 2017-01-26 00:35:46 +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
LadyViktoria b898fc044e Add prefernces.json to advanced settings 2017-01-25 15:18:01 +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
AdrianLxM f418152059 sorten tab titles active 2017-01-21 23:48:05 +01:00
AdrianLxM ea78dd5bc1 Shorten tabs first 2017-01-21 19:44:58 +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 2d966c9feb DanaR Stats some improvements 2017-01-20 03:13:41 +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
Milos Kozak 2754e23c08 CS translations 2017-01-19 19:52:14 +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
viktoria 9ba24b4ffd DanaR Stats Beautify 2017-01-18 03:08:19 +01:00
Milos Kozak 0e21b67a42 fix merge conflicts 2017-01-17 18:00:44 +01:00
Milos Kozak 7c90dfe03c confirm dialog on removing temptarget 2017-01-16 23:54:46 +01:00
Milos Kozak 61b1ee781f temp target treatment dialog & sync fix 2017-01-16 16:59:12 +01:00
Milos Kozak 61a8cad4e8 allow refrest temp targets from NS & fix bugs 2017-01-14 16:36:42 +01:00
Milos Kozak 1b53cde2bf plain temptarget plugin 2017-01-13 21:14:04 +01:00
Milos Kozak 74afdb6874 Merge branch 'dev' into AMA 2017-01-09 17:34:49 +01:00
Milos Kozak 26a76217bf Greek language 2017-01-09 17:23:56 +01:00
Milos Kozak 68a127d804 make autosens configurable in settings, determinebasaladapter refactoring 2017-01-08 14:21:29 +01:00
Milos Kozak 6621c2f610 log script debug in fragment 2017-01-08 00:27:13 +01:00
Milos Kozak 9c93d3ad7d log autosens input data in fragment 2017-01-08 00:07:18 +01:00
Milos Kozak 25a3b678e9 most new AMA code added 2017-01-06 22:42:37 +01:00
Milos Kozak 3dfac49b82 duplicate MA -> AMA 2017-01-03 21:15:40 +01:00
Milos Kozak 952a2342a8 Merge pull request #104 from MilosKozak/mm640g
MM640g bg source
2017-01-02 13:58:56 +01:00
Milos Kozak 6b18336fa2 LocalProfile plugin 2016-12-31 15:06:45 +01:00
Milos Kozak 1e99c00626 allow sms string to be translated separately 2016-12-29 16:22:40 +01:00
Milos Kozak 8e46a55e48 allow better translation of min ago 2016-12-29 16:06:00 +01:00
Milos Kozak 24c5bb9303 Merge branch 'master' into mm640g 2016-12-29 14:01:24 +01:00
Milos Kozak e2c2f49f6f MM640g bg source 2016-12-28 14:57:11 +01:00
AdrianLxM 6ac889cecd ongoing notification integration 2016-12-28 00:03:08 +01:00
Milos Kozak 29327aef01 MDI pump driver 2016-12-27 23:35:50 +01:00
Milos Kozak cd41bff2bb SMS command BG 2016-12-27 12:17:26 +01:00
Milos Kozak 052ac47595 Better profile handling 2016-12-24 23:53:17 +01:00
Milos Kozak 7719e2ac63 use notifications for profile update 2016-12-22 12:17:38 +01:00
Milos Kozak cb4330ddcd notify when pump settings is wrong 2016-12-13 22:10:13 +01:00
Milos Kozak 6ba532d178 notify about setting basal profile 2016-12-09 16:04:07 +01:00
Milos Kozak 4103e4bf4a allow set profile to pump from simpleprofile plugin 2016-12-09 12:40:15 +01:00
Milos Kozak 4b389c2cad dana drivers switching working 2016-12-03 17:42:08 +01:00
Milos Kozak db2fd55f7c copy files for Korean DanaR 2016-11-29 20:52:40 +01:00
Milos Kozak 97a22344e3 CZ translations 2016-11-29 19:07:09 +01:00
Milos Kozak 36d5f1dc29 proper danar errors detection 2016-11-29 18:28:36 +01:00
AdrianLxM 896503918c wear extract strings 2016-11-29 15:01:00 +01:00
Milos Kozak 2912d1cce1 Merge pull request #79 from AdrianLxM/viktoria-permissions
Viktoria permissions
2016-11-28 19:02:28 +01:00
LadyViktoria 39be1bb4c7 Android 6+ Permissions #6 2016-11-25 13:35:34 +01:00
LadyViktoria 1967602c70 Android 6+ Permissions #3 2016-11-25 13:32:07 +01:00
ecorman da861a7108 Note basal start / end to see note in Xdrip+ with data 2016-11-23 23:59:11 +01:00
AdrianLxM 513b2966c9 CPP cleanup and i18n 2016-11-14 18:19:17 +01:00
Milos Kozak 0b56b7554c Merge pull request #64 from AdrianLxM/fill-presets2
Fill presets
2016-11-12 10:41:54 +01:00
AdrianLxM 1568f77229 fill preset buttons 2016-11-11 16:24:00 +01:00
Milos Kozak c034f77b71 fix merge conflict 2 2016-11-11 13:09:50 +01:00
Milos Kozak a341fa4343 fix merge conflict 2016-11-11 13:09:11 +01:00
AdrianLxM a6d5d68938 fill action 2016-11-11 00:56:15 +01:00
Milos Kozak e8d169f078 allow automated actions only whem pump is initialized 2016-11-10 23:33:12 +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
Milos Kozak 21f732b378 report app start/restart to NS 2016-11-10 16:42:59 +01:00
AdrianLxM 341d7222e5 Strings for reset DB 2016-11-08 22:36:47 +01:00
Milos Kozak 3ac9811d9a Actions page & offline profile switch 2016-11-05 15:46:11 +01:00
AdrianLxM b1f3bb17bb Show in Overview when loop is disabled 2016-11-02 18:04:14 +01:00
Milos Kozak 4c3d67535c Korean language template 2016-10-25 23:38:44 +02:00
Milos Kozak 861c24fc45 distinguish between meal and correction bulus 2016-10-25 23:33:02 +02:00
Milos Kozak 6f8d828ec2 QuickWizard 2016-10-20 23:50:31 +02:00
Milos Kozak 4378c9af14 more SMS commands 2016-09-16 14:08:26 +02:00
Milos Kozak ecb685f7f6 hard limits on openaps params 2016-09-13 22:15:17 +02:00
Milos Kozak 05831c75a6 SMS LOOP commands 2016-09-10 15:33:00 +02:00
ecorman dd032b19e0 Spanish translation update strings.xml 2016-09-07 23:40:37 +02:00
Milos Kozak 40aada0eb4 ajdust some danar pump comm params 2016-08-12 20:22:44 +02:00
Milos Kozak 4da0f345cf fix wizard gui 2016-08-11 09:54:03 +02:00
Milos Kozak acbd028465 bolus progress in virtual pump 2016-08-10 14:50:53 +02:00
Milos Kozak 49d6690450 OpenAPS MA target value 2016-08-09 15:40:12 +02:00
Milos Kozak 88698576a2 plusminis edit shows toast when hit limit 2016-08-08 10:08:30 +02:00
Milos Kozak b711648bee plugins refactoring 2016-08-05 23:54:03 +02:00
Milos Kozak b42644de39 objectives finalization, some todos 2016-08-04 23:38:43 +02:00
Milos Kozak a7d3dca752 Bolusing dialog 2016-08-04 09:17:26 +02:00
Milos Kozak c20026c15a lowsuspend cleanup 2016-08-03 14:40:47 +02:00
Milos Kozak dbb0a6a659 danar fragment update, danar pump password, toast with sound 2016-08-02 18:39:14 +02:00
Milos Kozak e94fe1f647 danar history translation support 2016-07-28 13:40:32 +02:00
Milos Kozak 61e8ffeebd DanaR history loader 2016-07-27 17:49:56 +02:00
Milos Kozak a1a64873fd DanaR driver as a service 2016-07-18 12:02:33 +02:00
Milos Kozak 7f661b7fa6 danar profile dia&car configurable in preferences 2016-07-15 20:56:07 +02:00
Milos Kozak c5d40b3a6c careportal eventtypes translations 2016-07-15 19:45:03 +02:00
Milos Kozak 90fee59e8a sms communicator: remote bolus, status 2016-07-14 23:29:21 +02:00
Milos Kozak 4a8ecb3a79 better display pump results 2016-07-13 18:57:23 +02:00