Commit graph

883 commits

Author SHA1 Message Date
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
Milos Kozak
144292576a
Merge branch 'dev' into watchfaces-steampunk 2018-01-05 11:36:48 +01:00
AdrianLxM
95bca1a92d actual bg in objective 1 2018-01-04 18:53:38 +01:00
Milos Kozak
d7200d1e8e warn if wrong profile is detected 2018-01-04 11:06:57 +01:00
Milos Kozak
ff5d42522c Merge branch 'dev' into smb060 2018-01-03 20:31:36 +01:00
AdrianLxM
c8fa729d8d
update German 2018-01-01 15:45:01 +01:00
swissalpine
62da90011a
Revised German Translation 2018-01-01 15:10:38 +01:00
Milos Kozak
d27d1b1821 Objectives update 2017-12-31 12:24:51 +01:00
Milos Kozak
0ab259f61f Merge branch 'dev' into smb060 2017-12-26 01:22:49 +01:00
Milos Kozak
72d6c4494b add scrollview 2017-12-26 01:22:35 +01:00
Milos Kozak
162e73e64d Merge branch 'dev' into smb060 2017-12-26 00:35:16 +01:00
Milos Kozak
8fdd16c305 QuickWizard detailed settings 2017-12-26 00:27:34 +01:00
Milos Kozak
ae30046c95 Merge branch 'dev' into smb060 2017-12-23 11:18:37 +01:00
Milos Kozak
3ce260dfe9 fix of fix 2017-12-23 11:18:17 +01:00
Milos Kozak
51de0f16c1 Merge branch 'dev' into smb060 2017-12-23 11:07:48 +01:00
Milos Kozak
6e09bfbbe4 fix wrong button type 2017-12-23 11:07:29 +01:00
Milos Kozak
7380065bd9 Merge branch 'dev' into smb060 2017-12-22 21:11:38 +01:00
Milos Kozak
93b954fffe when using profile percentage limit basal rate to minimal value supported by pump 2017-12-22 20:17:31 +01:00
Milos Kozak
600e2ade1c SingleClickButton 2017-12-22 19:50:16 +01:00
Milos Kozak
99e5a39b33 Merge branch 'dev' into smb060 2017-12-22 10:34:45 +01:00
AdrianLxM
2d2bd6d77a
remove string with no default translation 2017-12-21 08:26:55 +01:00
Milos Kozak
5d3b307672 Merge branch 'dev' into smb060 2017-12-20 22:37:29 +01:00
Milos Kozak
beb87acc9f
Merge pull request #552 from MilosKozak/nsoffline
Nsoffline
2017-12-20 20:17:30 +01:00
Johannes Mockenhaupt
57944fb4b5
Merge remote-tracking branch 'origin/dev' into smb060
* origin/dev:
  Actions tab: show profile switch button for single profile too.
  Old NS-Version non-urgent
  Add SP to imports
  refactor cancelAlarm back to KeepAliveReceiver
  push next alert on read status
  G5 upload to xdrip
  fake Esel new file
  fake Esel
  Apply bolus constraint before applying.
  Rv2,RS: always load last 45 min
  remove wear-overview notifications as replaced by system notifications
  Remove missed reference to pref in NSProfilePlugin.
  Remove 'sync to profile' pref.

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
2017-12-20 17:28:08 +01:00
Milos Kozak
0d7e950b73
Merge pull request #505 from jotomo/sync-to-pump
Remove sync to pump pref, always sync
2017-12-20 10:49:47 +01:00
Milos Kozak
8cb4921bab BG viewer 2017-12-15 01:03:31 +01:00
Milos Kozak
5f60e7cf2b G5 upload to xdrip 2017-12-14 21:49:11 +01:00
Milos Kozak
b1c4f28eb7 OpenAPS 0.6.0 1st part 2017-12-11 18:45:04 +01:00
Milos Kozak
696dd4c592 Merge branch 'dev' into smb 2017-12-07 23:54:37 +01:00
Milos Kozak
dc3c853aca Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-07 18:48:18 +01:00
Milos Kozak
9d7e2f1bec RS report unsupported firmware 2017-12-07 18:48:05 +01:00
AdrianLxM
525adddc5e
Merge pull request #527 from osodebailar/dev
Dev
2017-12-06 10:18:43 +01:00
AdrianLxM
50cbff6fa4 untranslatable strings 2017-12-05 22:08:14 +01:00
Milos Kozak
a293f86978 Merge branch 'dev' into smb 2017-12-05 17:36:44 +01:00
Milos Kozak
188762519c greek language 2017-12-05 17:03:40 +01:00
Johannes Mockenhaupt
23874ebbd6
Remove 'sync to profile' pref.
(cherry picked from commit 01c52e7)
2017-12-05 10:00:31 +01:00
Milos Kozak
d4d194f7f0 Merge branch 'dev' into smb 2017-12-04 23:30:24 +01:00
AdrianLxM
aefb0d62df
Merge pull request #522 from MilosKozak/dev
Dev
2017-12-04 17:53:36 +01:00
Milos Kozak
9e0241aebc fix translations 2017-12-03 19:12:07 +01:00
AdrianLxM
07c1084287
Merge branch 'watchfaces' into dev 2017-12-02 21:45:39 +01:00
AdrianLxM
98777579c8 delta granularity and NPE fix 2017-12-01 20:32:26 +01:00
Milos Kozak
622ac15c50 Merge branch 'dev' into smb, fix compile, add queue features 2017-12-01 18:13:05 +01:00
AdrianLxM
090127012c
Merge branch 'dev' into btwatchdog-pr 2017-12-01 14:03:44 +01:00
AdrianLxM
09dac632f9 bluetooth watchdog 2017-12-01 13:57:53 +01:00
Andreas
29d9d20605
Update strings.xml
Add german text for local alerts
2017-12-01 08:03:33 +01:00
Andreas
e07c5fb50d
Update strings.xml
Change "Temp basal" to "Temp Basal"
2017-11-30 15:04:40 +01:00
Milos Kozak
04742c60cd G5 fix time value 2017-11-29 23:00:41 +01:00
Milos Kozak
7fc9efde40 G5 offline/uploader 2017-11-29 16:07:26 +01:00
Milos Kozak
d1aec1ff18 Localalerts settings by adrian 2017-11-28 21:48:46 +01:00
Milos Kozak
a13661400f DanaRv2 queue & pump autodection 2017-11-22 22:09:58 +01:00
Milos Kozak
dfd0218a6a Merge branch 'dev' into queue 2017-11-22 19:44:16 +01:00
Milos Kozak
a9f1acf7a7
Merge pull request #502 from jotomo/combo-extractions
Combo extractions
2017-11-22 19:36:59 +01:00
Johannes Mockenhaupt
1e4070e862
Fix typo in fragment name. 2017-11-22 11:34:23 +01:00
Milos Kozak
f134163a76 Merge branch 'dev' into queue 2017-11-21 22:31:56 +01:00
Milos Kozak
a6bf18244a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-11-21 22:31:22 +01:00
Milos Kozak
ca44ae9a0b fix RU translation 2017-11-21 22:31:02 +01:00
Milos Kozak
3ab235f829 refactor pump interface out of ConfigBuilder, remove handlers 2017-11-20 23:39:12 +01:00
Milos Kozak
d8d8b150b6 Merge branch 'dev2' into queue 2017-11-20 17:34:03 +01:00
Milos Kozak
973b9d50c1 Merge branch 'dev' into dev2 2017-11-20 17:28:15 +01:00
Milos Kozak
25aa5094a4 alarm for failed bolus 2017-11-11 22:32:00 +01:00
Milos Kozak
a5227fc773 add bolus sound 2017-11-11 16:20:34 +01:00
Milos Kozak
86b11edd58 RS connection and status reading 2017-11-11 14:05:29 +01:00
Milos Kozak
8bae1a18e4 CommandQueue 2017-11-08 22:22:51 +01:00
Milos Kozak
5ad564e0e3 CS translation 2017-11-03 10:13:23 +01:00
Milos Kozak
a1c6704ae9 Merge branch 'dev2' into smb 2017-11-01 20:50:14 +01:00
Milos Kozak
f67bd291cd Merge branch 'dev' into dev2 2017-11-01 20:44:24 +01:00
Milos Kozak
60699eddbb preferences update 2017-11-01 20:43:59 +01:00