Milos Kozak
|
6312b81e10
|
Merge branch 'smb060' into dev
|
2018-02-02 10:51:13 +01:00 |
|
Cukrovka
|
af5dc7cc7b
|
Update strings.xml
Oprava diakritiky.
|
2018-02-02 09:36:03 +01:00 |
|
Milos Kozak
|
411add616b
|
Merge pull request #632 from jamorham/dev
Add Insight Pump Plugin
|
2018-02-02 09:21:57 +01:00 |
|
AdrianLxM
|
aca422dfb6
|
remove duplicates
|
2018-02-01 23:55:08 +01:00 |
|
Milos Kozak
|
90b0e6d84a
|
Merge branch 'dev' into smb060
|
2018-02-01 23:02:00 +01:00 |
|
AdrianLxM
|
cea99a968f
|
small fixes
|
2018-02-01 22:09:57 +01:00 |
|
AdrianLxM
|
2e44734b61
|
Merge branch 'dev' into spanishmerge
|
2018-02-01 22:07:06 +01:00 |
|
AdrianLxM
|
276784c799
|
Merge branch 'patch-1' of https://github.com/CaroGo/AndroidAPS into dev180127
|
2018-02-01 22:02:27 +01:00 |
|
Milos Kozak
|
463031bd31
|
FR language
|
2018-02-01 20:17:42 +01:00 |
|
Jamorham
|
73ea3628b2
|
Extracted insight strings
|
2018-02-01 10:33:54 +00:00 |
|
Milos Kozak
|
e779dbf221
|
fix merge conflict
|
2018-02-01 10:29:00 +01:00 |
|
CaroGo
|
815247dabb
|
Update strings.xml
I did a few changes...
|
2018-01-31 16:51:00 +01:00 |
|
Jamorham
|
ef2189fec6
|
Insight faux cancel tbr option
|
2018-01-29 21:31:06 +00:00 |
|
Milos Kozak
|
b11e301391
|
ES translations
|
2018-01-29 20:05:16 +01:00 |
|
Milos Kozak
|
af31c29134
|
Merge branch 'dev' into smb060
|
2018-01-29 12:01:02 +01:00 |
|
Johannes Mockenhaupt
|
449dbd79f7
|
Rename TBR to 'temp basal'
|
2018-01-29 03:14:10 +01:00 |
|
Johannes Mockenhaupt
|
0655e4e676
|
SMB: clean up APSResult.toSpanned a bit.
(cherry picked from commit 10d7c79)
|
2018-01-29 03:13:57 +01:00 |
|
Milos Kozak
|
f54452515b
|
KO language cleanup
|
2018-01-28 23:29:33 +01:00 |
|
warstar2187
|
c297ce88bb
|
Update strings.xml
|
2018-01-28 11:01:56 +09:00 |
|
warstar2187
|
76d606fddf
|
Update strings.xml
|
2018-01-28 10:51:09 +09:00 |
|
Radoslav Radev
|
d4fe03ac30
|
Bg translation
|
2018-01-27 16:12:51 +02:00 |
|
Milos Kozak
|
296d5059d6
|
SMB options in preferences
|
2018-01-27 14:47:04 +01:00 |
|
Milos Kozak
|
4af8e14417
|
Merge branch 'dev' into smb060
|
2018-01-27 13:47:41 +01:00 |
|
Milos Kozak
|
ce3c888246
|
add RO language
|
2018-01-27 13:40:19 +01:00 |
|
Jamorham
|
3150e7d00f
|
Add double rounding helper
|
2018-01-26 22:26:29 +00:00 |
|
Milos Kozak
|
b2d9ad8986
|
Merge branch 'dev' into smb060
|
2018-01-26 22:49:25 +01:00 |
|
Milos Kozak
|
d634ee7d4b
|
CS translations
|
2018-01-26 22:10:27 +01:00 |
|
Jamorham
|
2f7dc11b9f
|
Update Insight fragment layouts
|
2018-01-26 16:46:09 +00:00 |
|
Milos Kozak
|
98e850b1b3
|
Merge branch 'dev' into smb060
|
2018-01-26 11:54:09 +01:00 |
|
Jamorham
|
69da0cf57a
|
Always connected option
|
2018-01-25 23:21:42 +00:00 |
|
Johannes Mockenhaupt
|
0067eb75d5
|
Fix format specifiers in Spanish translation, add MainApp.gs(id, args).
|
2018-01-25 20:28:21 +01:00 |
|
Jamorham
|
54e2f7a712
|
Current work in progress
|
2018-01-25 17:30:16 +00:00 |
|
Milos Kozak
|
ca01168474
|
Merge pull request #611 from MilosKozak/min_unreachable
minimum of 30 min for unreachable alert
|
2018-01-25 11:24:09 +01:00 |
|
Johannes Mockenhaupt
|
0f98c49876
|
Fix namespace errors.
|
2018-01-24 16:54:29 +01:00 |
|
Johannes Mockenhaupt
|
2a4f1950b3
|
Add missing ids to other overview layouts.
|
2018-01-24 16:53:40 +01:00 |
|
Jamorham
|
7a4bc3b694
|
Initial bits for Insight Pump
|
2018-01-24 14:18:31 +00:00 |
|
Johannes Mockenhaupt
|
3a02f01374
|
Overview: make checkbox labels toggle state as well.
|
2018-01-24 14:10:17 +01:00 |
|
Milos Kozak
|
52e4496add
|
Careportal DB browser
|
2018-01-22 21:49:01 +01:00 |
|
Milos Kozak
|
f5a2c5bcd2
|
cancel extending bolus on pump disconnection
|
2018-01-21 23:38:24 +01:00 |
|
AdrianLxM
|
3962808626
|
minimum of 30 min for unreachable alert
|
2018-01-21 19:05:04 +01:00 |
|
Milos Kozak
|
fa48720f0e
|
Merge branch 'dev' into smb060
|
2018-01-21 15:58:54 +01:00 |
|
Milos Kozak
|
eedc38fbcf
|
synchronized access to basal_v
|
2018-01-21 15:56:07 +01:00 |
|
Milos Kozak
|
e5ede788ba
|
Merge branch 'dev' into smb060
|
2018-01-21 13:38:21 +01:00 |
|
Milos Kozak
|
060895b33f
|
better handling of wrong profiles
|
2018-01-21 13:37:38 +01:00 |
|
Johannes Mockenhaupt
|
8109900e9b
|
Overview: move checkboxes before label.
(cherry picked from commit 4825e16)
|
2018-01-19 20:13:53 +01:00 |
|
Milos Kozak
|
91a6c7a96c
|
Merge branch 'dev' into smb060
|
2018-01-15 12:46:50 +01:00 |
|
Johannes Mockenhaupt
|
be8534db51
|
Add strings for the Combo pump, including some renames.
Some virtualpump_* strings have been renamed to pump_* since they're
now used for multiple pumps.
|
2018-01-11 21:47:30 +01:00 |
|
Simon Pauwels
|
2df19b85a5
|
typo and added dutch translations
|
2018-01-09 21:16:37 +01:00 |
|
Milos Kozak
|
fbb120673f
|
Merge branch 'dev' into smb060
|
2018-01-07 15:32:14 +01:00 |
|
Milos Kozak
|
1ff99c4814
|
prefill profile switch JSON from local store if not exists
|
2018-01-07 15:29:50 +01:00 |
|