Commit graph

551 commits

Author SHA1 Message Date
Milos Kozak 3861bece54 extended bolus dialog 2017-05-30 15:07:44 +02:00
Milos Kozak a9b251ce12 Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history 2017-05-26 10:31:46 +02:00
Milos Kozak bb4302c02f Merge branch 'dev' into history 2017-05-26 10:24:48 +02:00
Milos Kozak 0b8499cb7f Merge pull request #251 from AdrianLxM/historytest1
lint disable 'ExtraTranslation'
2017-05-26 10:23:51 +02:00
AdrianLxM 8b81960ceb remove unused strings from russion translation 2017-05-26 10:10:57 +02:00
Milos Kozak 650b792099 mark selected tab in treatments 2017-05-26 10:05:42 +02:00
AdrianLxM cc4419f57a lint ExtraTranslation 2017-05-26 10:00:41 +02:00
AdrianLxM 99b8e48031 lint ExtraTranslation 2017-05-26 09:58:38 +02:00
Milos Kozak 5fb72181ee careportal cage, sage, iage 2017-05-25 20:18:29 +02:00
Milos Kozak 87993c6163 return functionality of faking by extended boluses 2017-05-25 17:26:05 +02:00
fedor apanasenko 4406bb3f06 Update strings.xml 2017-05-25 09:51:08 +03:00
Milos Kozak 86af9eab3d stop extended bolus in actions 2017-05-24 20:37:58 +02:00
Milos Kozak 2ae30fe9b4 temptarget design 2017-05-24 19:42:23 +02:00
Milos Kozak bb9c68fd4d Merge remote-tracking branch 'origin/dev' into history 2017-05-24 19:18:30 +02:00
Milos Kozak f936580734 Russsian language 2017-05-24 18:46:19 +02:00
Milos Kozak 5208f23661 Temptargets under treatments 2017-05-23 23:56:53 +02:00
Milos Kozak 771fbdc303 sync of treatments, tempbasals, extended tested and working 2017-05-23 22:59:06 +02:00
Milos Kozak 8db1bd5ae5 tempbasal ns sync 2017-05-23 20:15:14 +02:00
Milos Kozak 6394421017 boluses working 2017-05-22 22:10:56 +02:00
Milos Kozak 6cd046459a original treatmens plugin removed, temp basals working 2017-05-22 20:58:05 +02:00
Milos Kozak 3330c6a3fd Merge branch 'dev' into history 2017-05-21 16:46:13 +02:00
Milos Kozak 462849af12 russian language entry 2017-05-21 10:06:34 +02:00
Milos Kozak 56d54a6988 italian language 2017-05-20 20:41:23 +02:00
Milos Kozak 8c5ce7290d more work on treatments fragment 2017-05-16 17:48:58 +02:00
Milos Kozak 3ee9bf5ff7 Merge branch 'dev' into history 2017-05-16 15:15:32 +02:00
Milos Kozak 86c975e9d6 Add Italian language 2017-05-16 13:39:24 +02:00
Milos Kozak 45477f96ee Merge pull request #243 from AdrianLxM/xdripstatusline
basal and bolus step in DanaR Fragment
2017-05-16 13:28:39 +02:00
AdrianLxM 572e726678 basal and bolus step in DanaR Fragment 2017-05-16 13:10:02 +02:00
Milos Kozak 6fff6f63a4 bolus dialog redesign 2017-05-16 12:09:32 +02:00
Milos Kozak 4201709e2a finish careportal dialog redesign 2017-05-16 11:47:33 +02:00
Milos Kozak 704ad383e9 careportal layout part1 2017-05-15 21:10:43 +02:00
Milos Kozak 25110cfea4 move database actions from pump to treatments plugin 2017-05-15 18:44:40 +02:00
Milos Kozak c6830baf8f Merge branch 'dev' into history 2017-05-12 16:35:07 +02:00
Milos Kozak abdc1022bf merge bolus & basal into one plugin 2017-05-12 16:27:33 +02:00
AdrianLxM a60afbceb9 typo 2017-05-12 16:08:48 +02:00
AdrianLxM a9e093ad0d some German translations 2017-05-12 16:06:14 +02:00
AdrianLxM c88b8eaa9a make buttons scrollable for small heights 2017-05-12 15:26:16 +02:00
Milos Kozak e005d6bd69 Merge branch 'dev' into history 2017-05-12 13:05:57 +02:00
Milos Kozak df424ea5ff overview buttons 2017-05-12 11:06:33 +02:00
Milos Kozak b782a5b8dc Merge branch 'dev' into history 2017-05-12 00:39:20 +02:00
Milos Kozak a0d31b2118 rename identical functions 2017-05-11 18:54:50 +02:00
Radoslav Radev d58ddf48c6 Update strings.xml 2017-05-11 17:01:49 +03:00
Milos Kozak 7e99ce416a move buttons back to bottom 2017-05-11 10:59:05 +02:00
Milos Kozak 6b9048cd61 Merge pull request #234 from warstar2187/korean
Korean translation update
2017-05-11 09:27:58 +02:00
Milos Kozak 51d52f6b3d Merge branch 'DanaRv2' into history 2017-05-10 21:53:31 +02:00
Milos Kozak 5b25d28f42 Merge branch 'dev' into DanaRv2 2017-05-10 14:05:43 +02:00
AdrianLxM 298d7a7d9c Merge branch 'dev' into xdripstatusline 2017-05-09 23:26:31 +02:00
AdrianLxM 1fa3a2a697 bgi on watch status (optional) 2017-05-09 23:23:37 +02:00
Milos Kozak d313df0d19 removing treatments 2017-05-09 20:47:02 +02:00
Milos Kozak 554fb51a75 profile layout 2017-05-09 19:06:59 +02:00
Milos Kozak 84a6554e07 smaller font size on careportal buttons 2017-05-09 18:36:13 +02:00
Milos Kozak 09fea02ed2 Allow to disable NS upload while client is connected 2017-05-09 16:24:53 +02:00
Milos Kozak b30d79c4cb fix conflicts 2017-05-09 10:46:04 +02:00
Milos Kozak 0048366dcf fix conflict 2017-05-09 10:14:21 +02:00
Milos Kozak 8d3be5e958 colors on danar fragment 2017-05-08 23:19:11 +02:00
AdrianLxM 67f21537ea send status to xDrip 2017-05-06 15:18:19 +02:00
Milos Kozak 05d9f16031 hide label too 2017-05-04 23:22:16 +02:00
Milos Kozak 344144d88a pump status equal size 2017-05-04 21:11:51 +02:00
Milos Kozak aabcee8ea7 fix conflicts 2017-05-04 19:53:45 +02:00
Milos Kozak 352a2a7475 deviations graph 2017-05-04 19:51:58 +02:00
Milos Kozak 070867af28 menu on top 2017-05-04 19:13:56 +02:00
Milos Kozak 289ad394ce Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-05-03 22:30:12 +02:00
Milos Kozak 6d5f2514d0 remove duplicated string 2017-05-03 18:45:29 +02:00
Milos Kozak 573256d7d4 catch missing sms permission 2017-05-03 18:30:18 +02:00
Milos Kozak 602310b70a DanaRv2 1st rev 2017-05-02 17:02:30 +02:00
AdrianLxM 9cef4c5a01 typo insuin->insulin 2017-05-01 18:09:53 +02:00
AdrianLxM 0069f320f8 config builder smallscreen 2017-04-30 21:57:55 +02:00
AdrianLxM 5dc07012d2 overview smallscreen 2017-04-30 21:34:30 +02:00
Milos Kozak 0f1c2bb193 DanaRv2 1st rev 2017-04-30 21:08:00 +02:00
AdrianLxM d8fb53de69 Making dialogs scrollable 2017-04-30 20:54:35 +02:00
Milos Kozak 3279c297dc equal weight 2017-04-30 13:22:16 +02:00
Milos Kozak 2cb6e275c0 allign design of status pills 2017-04-30 13:17:59 +02:00
Milos Kozak 4dd9281276 remove actionbar 2017-04-29 20:16:50 +02:00
Milos Kozak 974e5e0098 pump fragment redesign 2017-04-29 18:11:15 +02:00
Milos Kozak f641d40722 virtual pump layout 2017-04-29 17:48:45 +02:00
Milos Kozak 3552d6aa40 bg value colored 2017-04-27 21:26:53 +02:00
Milos Kozak 5ef034b4fc cob display 2017-04-26 23:45:40 +02:00
warstar2187 dac969b381 Update strings.xml 2017-04-25 10:14:06 +09:00
Milos Kozak 7534f54f19 trend in wizard off by default 2017-04-24 19:24:53 +02:00
Milos Kozak a07a8755b1 IOB graph 2017-04-24 13:17:14 +02:00
Milos Kozak b8a8bed6c5 remove butterknife at all, remove unused code, overview graph optimalization 2017-04-23 13:45:49 +02:00
Milos Kozak 1f2967e866 superbolus must be explicitly enabled 2017-04-22 11:08:57 +02:00
Milos Kozak 3b34e55fda CS translations 2017-04-22 10:21:24 +02:00
Milos Kozak 20f99dffe2 basals rendering redesign 2017-04-22 10:09:54 +02:00
Milos Kozak 55a2df470e insulin activity graph 2017-04-21 18:34:40 +02:00
Milos Kozak 7f122f7497 show dia in insulin plugin 2017-04-21 16:13:53 +02:00
Milos Kozak 90a55966b1 Fast Acting Insulin Prolonged 2017-04-21 15:36:49 +02:00
Milos Kozak 17771434aa upgrade travis & plugin packages 2017-04-21 12:15:08 +02:00
Milos Kozak 25491fbac6 Insulin interface 2017-04-21 11:45:25 +02:00
Milos Kozak 04ae55ac63 exit app after import settings 2017-04-16 13:27:01 +02:00
Milos Kozak 402768cb87 1.33 app start logging optional 2017-04-14 15:33:39 +02:00
Milos Kozak 2413fae0a9 1.32 superbolus & trend contribution in wizard 2017-04-14 14:50:18 +02:00
Milos Kozak 387defbfc7 fix sms pref key 2017-04-09 21:50:05 +02:00
Radoslav Radev 5fe22eac65 Update strings.xml 2017-04-07 13:53:47 +03:00
Milos Kozak c5245ae5fd SMS suspend/resume loop 2017-04-06 21:22:27 +02:00
Milos Kozak a02da220c9 CS translations 2017-04-05 22:04:55 +02:00
Milos Kozak f596050239 loop suspend menu 2017-04-05 21:39:39 +02:00
Milos Kozak d6f31820d9 request battery optimalization whitelisting 2017-03-31 09:21:40 +02:00
Milos Kozak a4f302ee4a show if pump is suspended 2017-03-24 12:05:12 +01:00
Milos Kozak e8edf9eb54 Glimp support 2017-03-21 19:11:39 +01:00