Commit graph

871 commits

Author SHA1 Message Date
AdrianLxM
a23c76f473
Merge branch 'dev' into smb-wear2 2018-02-14 15:03:45 +01:00
AdrianLxM
c821ef97d8 option to enable wear/SMB notifications 2018-02-14 15:02:04 +01:00
Milos Kozak
31d493d8ae Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-02-13 18:38:55 +01:00
Milos Kozak
3e06b6a4ed
Merge pull request #687 from jotomo/error-announcements
Create NS-anouncements for error dialogs and local alerts.
2018-02-13 18:08:14 +01:00
Milos Kozak
f063fb94d1
Update strings.xml 2018-02-13 18:06:26 +01:00
Johannes Mockenhaupt
f8075927f2
Make new behaviour configurable, default on. 2018-02-13 00:34:24 +01:00
Milos Kozak
6470f7a63e
Update strings.xml 2018-02-12 20:18:44 +01:00
Milos Kozak
5225276259
Update strings.xml 2018-02-12 20:15:47 +01:00
Milos Kozak
da777d9660 HistoryBrowser fill space by bggraph 2018-02-12 19:39:45 +01:00
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
Milos Kozak
359b8401b2
Merge pull request #678 from jamorham/dev
Updates to Insight plugin
2018-02-10 15:13:35 +01:00
Jamorham
046de51496
Insight few small changes 2018-02-10 09:29:23 +00: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
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
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
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
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