Commit graph

357 commits

Author SHA1 Message Date
PitBeckh 2f72471915 Update strings.xml 2017-01-23 16:24:53 +01:00
Radoslav Radev fbceeec5b0 Update strings.xml 2017-01-23 11:01:42 +02: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 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 2d966c9feb DanaR Stats some improvements 2017-01-20 03:13:41 +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
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 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
AdrianLxM d36a515d45 temp target overview 2017-01-17 21:32:30 +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
Milos Kozak 7c90dfe03c confirm dialog on removing temptarget 2017-01-16 23:54:46 +01:00
Milos Kozak 218190e92f support for removing temp targets from GUI 2017-01-16 23:23:20 +01:00
Milos Kozak eaa16402a7 show running temp target on overview 2017-01-16 20:47:57 +01:00
Milos Kozak 61b1ee781f temp target treatment dialog & sync fix 2017-01-16 16:59:12 +01:00
viktoria e851d15aff DanaR Stats Activity 2017-01-16 13:23:41 +01:00
Milos Kozak 262dae3ab3 Merge pull request #129 from slavidex/patch-26
Update pref_others.xml
2017-01-14 16:37:57 +01:00
Milos Kozak 61a8cad4e8 allow refrest temp targets from NS & fix bugs 2017-01-14 16:36:42 +01:00
Radoslav Radev 8f0a28419d Update pref_others.xml 2017-01-14 15:25:06 +02:00
Radoslav Radev cbd7aa74eb Update strings.xml 2017-01-14 15:21:47 +02:00
Milos Kozak 458bee4538 display temptargets 2017-01-13 23:43:17 +01:00
Milos Kozak 1b53cde2bf plain temptarget plugin 2017-01-13 21:14:04 +01:00
Milos Kozak ea15659050 Merge pull request #122 from AdrianLxM/patch-11
Typo German (Ereignis with one s)
2017-01-10 08:30:29 +01:00
AdrianLxM dfc176d1bd Typo German (Ereignis with one s) 2017-01-10 02:39:16 +01:00
AdrianLxM 856c025e2b typo spanish 2017-01-10 02:37:20 +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 e9b900d74a show predictions in graph 2017-01-08 23:10:27 +01:00
Milos Kozak 68a127d804 make autosens configurable in settings, determinebasaladapter refactoring 2017-01-08 14:21:29 +01:00
Milos Kozak e71b478941 show both deltas on overview 2017-01-08 12:04:42 +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
viktoria f3551dda7f german translation 2017-01-02 16:44:20 +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 4408146f23 disable entering basals in profiles only if pump is not tempbasal capable 2017-01-01 14:34:57 +01:00
Milos Kozak ef2e7b1a62 show basal line only if pump is tempbasal capable 2017-01-01 14:19:35 +01:00
Milos Kozak 38a9c94258 Local Profile 2016-12-31 20:10:36 +01:00
Milos Kozak 6b18336fa2 LocalProfile plugin 2016-12-31 15:06:45 +01:00
Milos Kozak 2e6c168adc TimeListEdit most work done 2016-12-31 13:11:32 +01:00
Milos Kozak e1c2e4c492 TimeListEdit initial work 2016-12-30 16:43:43 +01:00
Milos Kozak b2be49e631 simple profile layout 2016-12-29 22:40:30 +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 0059266791 loop status font size 2016-12-29 14:23:05 +01:00
Milos Kozak 24c5bb9303 Merge branch 'master' into mm640g 2016-12-29 14:01:24 +01:00
Milos Kozak 83f4dbf9ca Merge pull request #103 from AdrianLxM/patch-8
remove mm640g translation again
2016-12-29 13:51:24 +01:00
Milos Kozak c06d25b235 more rearrangements 2016-12-29 00:12:52 +01:00
Milos Kozak f127e7bec1 better allign bg arrows 2016-12-28 23:48:43 +01:00
AdrianLxM 834398b8f0 remove mm640g translation again 2016-12-28 23:31:02 +01:00
AdrianLxM d70c9673d5 average delta 2016-12-28 22:39:40 +01:00
Milos Kozak d2d3e024a2 Merge branch 'ongoingnotif' of https://github.com/AdrianLxM/AndroidAPS 2016-12-28 15:15:24 +01:00
Milos Kozak e2c2f49f6f MM640g bg source 2016-12-28 14:57:11 +01:00
Radoslav Radev 71461e38ca Update strings.xml 2016-12-28 12:17:17 +02:00
warstar2187 804cdba7cf Update strings.xml 2016-12-28 18:22:50 +09:00
AdrianLxM 6ac889cecd ongoing notification integration 2016-12-28 00:03:08 +01:00
AdrianLxM d597be71de ongoing notification 2016-12-27 23:39:16 +01:00
Milos Kozak 405ae28e38 cz translations 2016-12-27 23:39:00 +01:00
Milos Kozak 29327aef01 MDI pump driver 2016-12-27 23:35:50 +01:00
Milos Kozak fdb252b62d show direction next to BG 2016-12-27 20:41:28 +01:00
Milos Kozak cd41bff2bb SMS command BG 2016-12-27 12:17:26 +01:00
Milos Kozak 3bd7568d34 dismiss button not hardcoded 2016-12-24 23:56:47 +01:00
Milos Kozak 052ac47595 Better profile handling 2016-12-24 23:53:17 +01:00
Milos Kozak 2b0c74c56f CZ translations 2016-12-24 14:21:24 +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
AdrianLxM e1dc624a47 fully remove mm640g 2016-12-10 22:58:31 +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 be8003da4b Merge branch 'master' into koreandanar 2016-12-06 23:18:02 +01:00
Milos Kozak 0af894aa56 change info color to green 2016-12-06 22:57:49 +01:00
Milos Kozak abfb832a10 basic notification functionality 2016-12-05 15:20:44 +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
AdrianLxM 1eacf35e47 Merge pull request #25 from AdrianLxM/wear-prepare-final
wear merge current master
2016-11-29 13:17:21 +01:00
Milos Kozak ee408ada79 Merge pull request #80 from warstar2187/master
Fix Insulin Activity and Korean update
2016-11-29 07:44:58 +01:00