Milos Kozak
d92a7e8ef1
Merge branch 'history' into dev
2018-02-11 23:46:20 +01:00
Milos Kozak
fa2e46fbe5
remove CPP profile
2018-02-11 23:02:21 +01:00
Milos Kozak
943205c782
HardLimits refactor
2018-02-11 22:41:10 +01:00
Milos Kozak
0a69a1ab2f
FR language
2018-02-11 21:00:09 +01:00
Johannes Mockenhaupt
f88894ea02
Clean up some Combo strings.
2018-02-10 19:07:03 +01:00
swissalpine
db07723e8a
Update strings.xml
2018-02-10 17:59:31 +01:00
Milos Kozak
359b8401b2
Merge pull request #678 from jamorham/dev
...
Updates to Insight plugin
2018-02-10 15:13:35 +01:00
AdrianLxM
4587a47840
add links to about
2018-02-10 14:53:43 +01:00
Jamorham
046de51496
Insight few small changes
2018-02-10 09:29:23 +00:00
Johannes Mockenhaupt
89c832b5aa
Use pager sound instead of smoke detector alarm for bolus error.
...
(cherry picked from commit 6767d8b
2018-02-08 22:18:41 +01:00
Johannes Mockenhaupt
1985ed379d
Add mute button to error dialog.
...
So that users needn't hastily close the dialog to stop the sound
and then not being able to read the actual message.
(cherry picked from commit 43755f0
2018-02-08 22:18:38 +01:00
Simon Pauwels
9c95a75ede
Added dutch translations ( #52 )
2018-02-07 23:17:50 +01:00
Johannes Mockenhaupt
483ecadede
Fix dutch translation for Combo's last bolus, minor cleanup.
...
(cherry picked from commit c0cf06a)
2018-02-07 22:53:59 +01:00
Johannes Mockenhaupt
6767d8b767
Use pager sound instead of smoke detector alarm for bolus error.
2018-02-07 20:32:09 +01:00
Johannes Mockenhaupt
43755f071d
Add mute button to error dialog.
...
So that users needn't hastily close the dialog to stop the sound
and then not being able to read the actual message.
2018-02-07 20:32:09 +01:00
Johannes Mockenhaupt
c781601cbb
Commit missing string.
2018-02-06 00:04:24 +01:00
Milos Kozak
f094b5cb64
Merge pull request #658 from bogdangorescu/patch-2
...
RO translation
2018-02-04 18:00:37 +01:00
Bog Dan
8c858d2b2d
RO translation - without translatable="false"
...
Removed translatable="false"
2018-02-04 17:55:59 +02:00
Johannes Mockenhaupt
6b4b044cd6
Remove nested layout for better performance.
2018-02-04 00:36:08 +01:00
Bog Dan
27bf66b501
RO translation
...
Added RO translation
2018-02-04 01:24:18 +02:00
Johannes Mockenhaupt
f6c5b95904
Merge remote-tracking branch 'origin/master' into combo-scripter-v2
...
* origin/master:
Revert "Update strings.xml"
bump 1.58
Update strings.xml
Add issue template.
Enhance insulin plugin test
filter null BT devices
BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.
BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.
ES translations
Dana plugin refactoring
KO language cleanup
Update strings.xml
Update strings.xml
Bg translation
add RO language
CS translations
ButterKnife to Dana fragment
bump 1.57a-dev
Add a unit test for Insulin Plugin
# Conflicts:
# app/build.gradle
# app/src/main/res/values-de/strings.xml
# app/src/main/res/values-nl/strings.xml
# app/src/main/res/values/strings.xml
2018-02-03 16:45:29 +01:00
Johannes Mockenhaupt
f49f3c7e4b
Clean up string resources.
...
(cherry picked from commit 4adcffc)
2018-02-03 16:33:40 +01:00
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
Johannes Mockenhaupt
d336c176fb
Update some descriptions.
2018-01-31 14:07:47 +01:00
Johannes Mockenhaupt
c62ca89931
Fix adding a partial bolus to treatments.
2018-01-31 14:00:59 +01:00
Johannes Mockenhaupt
6981c0fec6
Pump needs rest.
...
(cherry picked from commit 2e88fb9)
2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt
e790c87940
Cleanups and strings.
2018-01-31 00:59:23 +01:00
Milos Kozak
af3b77e646
history browser initial work
2018-01-29 22:48:47 +01:00
Jamorham
ef2189fec6
Insight faux cancel tbr option
2018-01-29 21:31:06 +00:00
Johannes Mockenhaupt
1e22599979
Fix format specifier.
2018-01-29 21:07:22 +01:00
Johannes Mockenhaupt
33ad68d26a
Fix string.
2018-01-29 20:13:53 +01:00
Milos Kozak
b11e301391
ES translations
2018-01-29 20:05:16 +01:00
Johannes Mockenhaupt
216359312a
Minor non-code tweaks.
2018-01-29 20:02:18 +01:00
Johannes Mockenhaupt
2468f23e97
ComboFragment: i18n last bolus.
2018-01-29 20:02:18 +01:00
Johannes Mockenhaupt
3adda9bf6e
Clean up bolus delivery code.
2018-01-29 13:18:49 +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
