Commit graph

12979 commits

Author SHA1 Message Date
Milos Kozak 0022960670
Merge pull request #1059 from triplem/rm_dups
Remove some duplicate code lines
2018-05-29 22:35:39 +02:00
Markus M. May 0fe744c3e6 Remove unnecessary assignment 2018-05-29 21:44:33 +02:00
Markus M. May 41503800e8 Remove some duplicate code lines 2018-05-29 20:57:55 +02:00
AdrianLxM de1196f34b
NSClient as source without advanced filtering 2018-05-29 12:57:07 +02:00
Milos Kozak 7e57c30ecf SW Exit label 2018-05-25 13:00:08 +02:00
Milos Kozak 35c07d1e60 SW scroll to the top on activity create 2018-05-24 00:13:59 +02:00
Milos Kozak d642418e02 resolve NPE 2018-05-23 23:43:41 +02:00
Milos Kozak 683caf78f8 SW configure insulin button 2018-05-23 13:47:16 +02:00
Milos Kozak a7cfcd56e3 SW fix return to 1st page 2018-05-23 13:20:24 +02:00
Milos Kozak fa2c0ab003
Merge pull request #994 from MilosKozak/startupwizard
Startupwizard
2018-05-22 23:07:04 +02:00
Milos Kozak 53bdb0bf09 asking permissions to notifications 2018-05-22 23:06:17 +02:00
Milos Kozak 5d27a28dc9 SW eula 2018-05-22 20:02:38 +02:00
Milos Kozak 250f9f74a0 move askForStoragePermission 2018-05-22 18:59:34 +02:00
Milos Kozak 2626e5bb63 SW android permissions 2018-05-22 17:34:09 +02:00
Roumen Georgiev d927b83281 Merge remote-tracking branch 'origin/dev' into dev 2018-05-21 11:01:07 +03:00
Roumen Georgiev 1d39734b19 clear activity queue 2018-05-21 11:00:48 +03:00
Roumen Georgiev 08ac6c7b31
Merge pull request #22 from MilosKozak/startupwizard
Startupwizard
2018-05-21 10:59:06 +03:00
Milos Kozak 4fa24fb009 SW add more texts 2018-05-20 23:44:09 +02:00
Milos Kozak c723deaf02 SW patient age screen finalization 2018-05-20 22:01:32 +02:00
Milos Kozak b57683eaf5 SW rename package 2018-05-20 21:55:53 +02:00
Andy Rozman e8f860be8b - copied RL code
- copied Medtronic code
- added BLE Scan
- added RL Stats activity
- added RL configuration display
2018-05-20 20:53:55 +01:00
Milos Kozak f24d296836 SW nsclient screen finalizing 2018-05-20 21:36:17 +02:00
AdrianLxM 953128ffe5
UAM without advanced filtering 2018-05-20 19:17:46 +02:00
Milos Kozak 52a4f9af14 SW loop screen update 2018-05-20 16:29:15 +02:00
Milos Kozak d079052944 Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into startupwizard 2018-05-20 16:18:10 +02:00
Milos Kozak de8557a115 SW sensitivity plugin 2018-05-20 16:17:53 +02:00
Milos Kozak 5b9594bdbb SW create elements package 2018-05-20 15:09:32 +02:00
Milos Kozak d0ed4bd717 SWString fix 2018-05-20 15:01:03 +02:00
Milos Kozak bac1be1944
Merge pull request #1050 from boysim/dev
Added and improved dutch translations
2018-05-20 14:46:41 +02:00
Milos Kozak 7714aa9138 Merge branch 'dev' into startupwizard 2018-05-20 14:18:58 +02:00
boysim 5c346f5b79 addedd formattng="false" 2018-05-20 14:18:37 +02:00
Milos Kozak 53cbe05436
Merge pull request #1019 from McHoffi/obj.7-add-info
Obj.7 add info about using SMB/maxIOB
2018-05-20 14:14:11 +02:00
Milos Kozak 8f0bd8e67f
Merge pull request #1047 from PoweRGbg/patch-1
remove wizard from backstack and fix the Exit -> returning to SW
2018-05-20 13:54:54 +02:00
boysim e2bfb224f2 dutch typo fixes 2018-05-20 13:36:28 +02:00
boysim da8acd4a1e dutch typo fixes 2018-05-20 12:55:52 +02:00
Simon Pauwels 25b20f13f1
Merge pull request #50 from MilosKozak/dev
20 mei
2018-05-20 12:20:49 +02:00
Milos Kozak 948e925d12 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-05-20 10:56:37 +02:00
Milos Kozak 06e52bb6ae remove duplicated key 2018-05-20 10:56:32 +02:00
Andy Rozman 4aefea0b28 Add constants file and modified status. 2018-05-17 14:21:35 +01:00
Roumen Georgiev 764e035666
remove wizard from backstack and fix the Exit -> returning to SW 2018-05-16 15:35:17 +03:00
Milos Kozak e91d7e0d11
Merge pull request #1045 from MilosKozak/AdrianLxM-patch-2
Swedish update
2018-05-15 14:27:39 +02:00
Milos Kozak 84cd34f1d3
Merge pull request #1046 from MilosKozak/AdrianLxM-patch-3
polish update
2018-05-15 14:27:23 +02:00
AdrianLxM bf23a8f935
polish update 2018-05-15 14:20:35 +02:00
AdrianLxM bae05b26bb
Update strings.xml
Thanks Marcus
2018-05-15 14:03:14 +02:00
Milos Kozak 66e50f5b62
Merge pull request #1038 from jotomo/upstreaming
[Polish] Dialog/color consistency, translations and other small stuff
2018-05-15 13:09:50 +02:00
Milos Kozak e58149379a
Merge pull request #1043 from jotomo/issue-646
[Bugfix] On bolus cancel request, cancel all boluses. Partially addresses #646.
2018-05-15 10:55:04 +02:00
Milos Kozak e918301f9a
Merge pull request #1042 from jotomo/bleep-bleep-bleep
[Bugfix] Combo: always send out progress updates (SMB or not).
2018-05-15 10:35:45 +02:00
Johannes Mockenhaupt 561c7fb470
Add test. 2018-05-14 00:38:47 +02:00
Johannes Mockenhaupt 25aa6f859f
On bolus cancel request, cancel all boluses. Partially addresses #646. 2018-05-13 23:57:40 +02:00
Johannes Mockenhaupt 29efe11ece
Combo: always send out progress updates (SMB or not).
Without this, showing SMB progress on wear is broken.

(cherry picked from commit 5ebff72)
2018-05-13 23:20:29 +02:00