Andrei Vereha
|
f5c6367495
|
disable dash for now
|
2021-09-25 19:05:49 +02:00 |
|
Andrei Vereha
|
0cd9beb2cf
|
merge with dev
|
2021-09-25 13:55:57 +02:00 |
|
Milos Kozak
|
8d07a697c3
|
EffectiveProfileSwitch sync
|
2021-09-24 14:58:17 +02:00 |
|
Milos Kozak
|
b2c45d0a26
|
remove PowerMock from all modules except wear
|
2021-09-23 17:35:55 +02:00 |
|
Milos Kozak
|
b40428c986
|
Merge pull request #607 from Philoul/NewUelLog
New UserEntries
|
2021-09-22 18:20:06 +02:00 |
|
Milos Kozak
|
a1a5fbaa4f
|
Display EventType properly
|
2021-09-21 22:17:06 +02:00 |
|
Milos Kozak
|
d33f62b23d
|
remove PowerMockRunner where possible
|
2021-09-21 21:57:56 +02:00 |
|
Andrei Vereha
|
2a2cf9fa3c
|
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/merge-dev-6
|
2021-09-21 21:17:53 +02:00 |
|
Milos Kozak
|
d43393e2af
|
unify trend arrow AAPS <-> watch
|
2021-09-21 16:46:12 +02:00 |
|
Milos Kozak
|
ce59c3afd4
|
lints
|
2021-09-21 15:35:59 +02:00 |
|
Milos Kozak
|
9e42f91848
|
finish removing Objective8
|
2021-09-21 15:16:19 +02:00 |
|
Andrei Vereha
|
09675de3f1
|
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dash
|
2021-09-20 18:32:52 +02:00 |
|
Milos Kozak
|
7bb2f446b7
|
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
|
2021-09-20 17:20:22 +02:00 |
|
Milos Kozak
|
374e251801
|
remove @Jvm directives where possible
|
2021-09-20 17:20:09 +02:00 |
|
Milos Kozak
|
71093db68a
|
prevent IndexOutOfBounds
|
2021-09-20 17:17:01 +02:00 |
|
Milos Kozak
|
f2cc8fb5f5
|
Merge pull request #678 from Philoul/Fix/ProfileTotalBasal
Fix total basal in Local Profile Fragment
|
2021-09-20 16:03:00 +02:00 |
|
Milos Kozak
|
72a309a055
|
reset password procedure
|
2021-09-20 14:13:56 +02:00 |
|
Milos Kozak
|
4b6d4d287c
|
Ask for old apssword in SetupWizard
|
2021-09-20 13:04:13 +02:00 |
|
Milos Kozak
|
02b77ae554
|
Remove Objective8 (9)
|
2021-09-20 11:10:47 +02:00 |
|
Milos Kozak
|
b80e2a7648
|
Improve COB handling
|
2021-09-19 09:59:35 +02:00 |
|
Philoul
|
45f576b838
|
Add getEditProfile function to calculate SumLabel
|
2021-09-18 21:54:29 +02:00 |
|
Milos Kozak
|
fb9f5220d3
|
Ignore future events for status lights
|
2021-09-18 18:06:11 +02:00 |
|
Philoul
|
bafc8e951a
|
Merge remote-tracking branch 'Nightscout/dev' into Fix/ProfileTotalBasal
|
2021-09-17 18:10:39 +02:00 |
|
Andrei Vereha
|
e31c77a858
|
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/merge-dev-5
|
2021-09-16 23:38:55 +02:00 |
|
Milos Kozak
|
a448efe09c
|
fix profile editor (ISF limits)
|
2021-09-16 00:18:02 +02:00 |
|
Milos Kozak
|
c611674b3b
|
show only valid data
|
2021-09-16 00:02:27 +02:00 |
|
Milos Kozak
|
56a0c97e96
|
Merge pull request #634 from Philoul/Fix_DisableLoop
Fix Overview LoopDialog (Disable Loop)
|
2021-09-15 23:54:15 +02:00 |
|
Milos Kozak
|
444915ebf7
|
fix displaying bg data on range change
|
2021-09-15 23:19:25 +02:00 |
|
Andrei Vereha
|
cb86438c27
|
Revert "Revert "avereha/merge dev 2""
|
2021-09-15 18:38:27 +02:00 |
|
Andrei Vereha
|
7fff6fc564
|
Revert "avereha/merge dev 2"
|
2021-09-15 00:12:35 +02:00 |
|
Andrei Vereha
|
efad748939
|
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/merge-dev-2
|
2021-09-14 23:55:15 +02:00 |
|
Milos Kozak
|
7690419c6c
|
always show basal in NSClient mode
|
2021-09-13 21:05:01 +02:00 |
|
Milos Kozak
|
ba71e0db9b
|
more Profile validity checks
|
2021-09-13 19:06:32 +02:00 |
|
Andrei Vereha
|
d4b0935d6b
|
Merge remote-tracking branch 'upstream/dev' into dash
|
2021-09-13 18:39:23 +02:00 |
|
Philoul
|
fc83e41148
|
Avoid disconect pump during suspend
|
2021-09-10 00:34:17 +02:00 |
|
Philoul
|
4420189310
|
Merge remote-tracking branch 'Nightscout/dev' into Fix_DisableLoop
|
2021-09-09 00:03:27 +02:00 |
|
Milos Kozak
|
d18c05205c
|
Resolve warnings
|
2021-09-07 12:08:19 +02:00 |
|
Milos Kozak
|
c9897da78d
|
Merge pull request #641 from nightscout/openhumans_v2
Update Open Humans uploader for new database
|
2021-09-06 13:54:16 +02:00 |
|
Philoul
|
c00000e079
|
Simplify a bit more LoopPlugin
|
2021-08-29 22:24:52 +02:00 |
|
Philoul
|
8770cfa4ad
|
Merge remote-tracking branch 'Nightscout/dev' into Fix_DisableLoop
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
|
2021-08-29 17:59:21 +02:00 |
|
Milos Kozak
|
5411f4fb3c
|
key_ns_receive_profile_store default true to fetch NS profiles in setup wizard
|
2021-08-28 20:58:27 +02:00 |
|
Philoul
|
69839b5395
|
Add Disconnect Bloc when Loop is suspended or disabled
|
2021-08-25 09:00:13 +02:00 |
|
TebbeUbben
|
dbf1772397
|
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
Conflicts:
build.gradle
|
2021-08-20 19:42:59 +02:00 |
|
TebbeUbben
|
3aadb92250
|
Update Open Humans uploader for new database
|
2021-08-20 19:37:38 +02:00 |
|
Philoul
|
ee89687653
|
Fix Basal Sum
But sum is only upated when profile is saved
|
2021-08-20 09:00:51 +02:00 |
|
Philoul
|
0918880415
|
Allow direct modification of duration of suspend loop or disconnect pump
|
2021-08-19 22:16:38 +02:00 |
|
Philoul
|
226e968bfd
|
Clean previous code
|
2021-08-19 01:03:34 +02:00 |
|
Philoul
|
a28be52faa
|
Simplify Overview code
|
2021-08-19 01:01:12 +02:00 |
|
Philoul
|
00c07b91e7
|
Fix Overview LoopDialog trial
|
2021-08-17 08:30:10 +02:00 |
|
Milos Kozak
|
4761a1a5ba
|
kotlin-allopen, fixed tests
|
2021-08-16 13:47:14 +02:00 |
|
Milos Kozak
|
0af345e340
|
Make sync variables volatile
|
2021-08-11 19:55:42 +02:00 |
|
Milos Kozak
|
c5857da42f
|
StatsActivity fix
|
2021-08-11 19:01:19 +02:00 |
|
Milos Kozak
|
24fc69c26b
|
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
|
2021-08-11 18:10:48 +02:00 |
|
Milos Kozak
|
1c065c75e8
|
API 30 lints
|
2021-08-11 18:10:44 +02:00 |
|
Milos Kozak
|
b5ea857ced
|
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
|
2021-08-10 21:36:38 +02:00 |
|
Milos Kozak
|
0a66ed307a
|
HistoryBrowser improvement
|
2021-08-10 21:36:26 +02:00 |
|
Milos Kozak
|
6649386c58
|
Merge branch 'dev' into gradleupdate
|
2021-08-06 11:03:26 +02:00 |
|
Milos Kozak
|
0e928bbb9c
|
compileSdkVersion 30
|
2021-08-06 00:08:49 +02:00 |
|
AdrianLxM
|
fa27d409ce
|
refactor build helper
|
2021-07-31 13:25:20 +02:00 |
|
Philoul
|
d0cde1b07a
|
Add UserEntries for Alerts (Pump unreachable and Missing BG Readings)
|
2021-07-14 17:30:09 +02:00 |
|
Milos Kozak
|
b995243947
|
Dana-i icon
|
2021-07-12 15:43:02 +02:00 |
|
Andrei Vereha
|
5752369377
|
Merge remote-tracking branch 'upstream/dev' into avereha/merge
|
2021-07-11 12:26:41 +02:00 |
|
Milos Kozak
|
444d5aeebd
|
Merge pull request #571 from andyrozman/mdt_new_fix_2
Fixes for medtronic driver refactoring
|
2021-07-01 12:38:51 +02:00 |
|
Milos Kozak
|
272cdbbb00
|
use package for nsclient broadcast
|
2021-06-27 12:39:42 +02:00 |
|
Andrei Vereha
|
2133a90ac5
|
Merge remote-tracking branch 'upstream/dev' into avereha/merge
|
2021-06-27 11:30:50 +02:00 |
|
Andy Rozman
|
d5a8838cab
|
- changed/reverted change
|
2021-06-26 22:00:29 +01:00 |
|
Milos Kozak
|
cf006790b9
|
make automation profile switch based on last profile switch instead of profile store
|
2021-06-26 22:57:40 +02:00 |
|
Milos Kozak
|
dc90c6b140
|
fix switching to virtual pump
|
2021-06-26 22:52:51 +02:00 |
|
Andy Rozman
|
3288eb2966
|
Merge branch 'dev' into mdt_new_fix_2
|
2021-06-26 21:50:00 +01:00 |
|
Milos Kozak
|
62cb1bb506
|
reduce warnings amount
|
2021-06-26 19:53:09 +02:00 |
|
Andrei Vereha
|
7b0702b8eb
|
compile. fix build warnings
|
2021-06-26 15:58:40 +02:00 |
|
Andrei Vereha
|
1018a41346
|
Merge remote-tracking branch 'upstream/dev' into avereha/conn
|
2021-06-26 15:21:40 +02:00 |
|
Milos Kozak
|
7bb03c4c13
|
Merge pull request #580 from nightscout/diaconn
Diaconn
|
2021-06-24 19:34:22 +02:00 |
|
Milos Kozak
|
a70f24a68a
|
fix TherapyEvent upload
|
2021-06-23 22:33:58 +02:00 |
|
Milos Kozak
|
884ecd9f2b
|
cleanup
|
2021-06-23 21:01:42 +02:00 |
|
Milos Kozak
|
e06ec0eba1
|
getProfile synchronized
|
2021-06-23 21:01:10 +02:00 |
|
Milos Kozak
|
90baf8e0ea
|
prevent failed requirement
|
2021-06-21 21:47:38 +02:00 |
|
Andy Rozman
|
e30c5162ef
|
Merge branch 'dev' into mdt_new_fix_2
|
2021-06-20 19:45:03 +01:00 |
|
Milos Kozak
|
0af2cff26f
|
Merge pull request #557 from Philoul/NewTempFolderForLogExports
temp Dir for log export
|
2021-06-17 22:01:05 +02:00 |
|
Milos Kozak
|
b79d86f0b8
|
Merge pull request #561 from Philoul/FixDeleteLogs
Fix delete logs
|
2021-06-16 08:22:15 +02:00 |
|
Milos Kozak
|
c3aea16c72
|
reset cached data on db reset
|
2021-06-15 14:54:32 +02:00 |
|
Milos Kozak
|
fcf7faa3e0
|
queue independentConnect fix for DanaR pumps
|
2021-06-14 15:52:43 +02:00 |
|
Philoul
|
c005243dfd
|
Fix DeleteLogs
|
2021-06-11 21:39:23 +02:00 |
|
Andy Rozman
|
95326a2894
|
- storage fix (new key)
|
2021-06-11 15:57:14 +01:00 |
|
Milos Kozak
|
62005b437a
|
Improve SMSCommunicator safety
|
2021-06-10 22:35:50 +02:00 |
|
Philoul
|
539ca3131d
|
temp Dir for log export
|
2021-06-10 08:33:15 +02:00 |
|
Milos Kozak
|
8e466be92c
|
Diaconn support
|
2021-06-08 23:27:14 +02:00 |
|
Milos Kozak
|
c0dba456d7
|
fix lst bolus query and smb pocessing
|
2021-06-02 22:40:30 +02:00 |
|
Milos Kozak
|
74dfe80433
|
immutable flag for PendingIntent
|
2021-06-02 16:56:13 +02:00 |
|
Milos Kozak
|
db95670be5
|
fix loop dialog
|
2021-06-01 22:34:18 +02:00 |
|
Milos Kozak
|
1d12883f95
|
fix receiving NOTEs form NS
|
2021-06-01 20:04:59 +02:00 |
|
Milos Kozak
|
596012ab10
|
move logs, eng_mode to AAPS directory
|
2021-05-31 15:29:42 +02:00 |
|
Milos Kozak
|
67297d60d3
|
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
|
2021-05-30 14:52:30 +02:00 |
|
Milos Kozak
|
beb8ba7efc
|
enable MDT plugin
|
2021-05-30 14:51:57 +02:00 |
|
Milos Kozak
|
7ed7736b4f
|
Merge pull request #543 from Philoul/FixCancelExtendedBolus
Fix cancel extended bolus (Overview)
|
2021-05-29 23:47:15 +02:00 |
|
Milos Kozak
|
9d29cafbe6
|
remove old db code
|
2021-05-29 23:38:19 +02:00 |
|
Andrei Vereha
|
7ee7cdd83b
|
Merge remote-tracking branch 'upstream/dev' into avereha/merge-dev
|
2021-05-28 22:12:21 +02:00 |
|
Milos Kozak
|
8db5b808ac
|
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
|
2021-05-28 16:11:31 +02:00 |
|
Milos Kozak
|
6735d22934
|
OfflineEvent -> room
|
2021-05-28 16:06:44 +02:00 |
|
Philoul
|
330728299d
|
Fix Extended Bolus in Overview
|
2021-05-28 08:56:58 +02:00 |
|