Milos Kozak
|
fcb4d00ba2
|
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
|
2021-03-07 14:22:53 +01:00 |
|
|
Milos Kozak
|
b9e50885a8
|
Constraint -> kt
|
2021-03-07 14:22:50 +01:00 |
|
|
Milos Kozak
|
2ea423c704
|
PumpEnactResult -> kt
|
2021-03-07 13:31:11 +01:00 |
|
|
Milos Kozak
|
00ee60ff1e
|
Intervals -> kt
|
2021-03-07 11:05:33 +01:00 |
|
|
Philoul
|
46cc4d9e85
|
Careportal Remove Duration ValueWithUnit if empty
|
2021-03-07 10:52:42 +01:00 |
|
|
Philoul
|
c259aa345c
|
Csv format (not xml) modified to Excel default
remove unnecessary " and use ; as separator
|
2021-03-07 10:43:33 +01:00 |
|
|
Andrei Vereha
|
bef32e70c1
|
Merge pull request #18 from 0pen-dash/eap-aka
EAP AKA session establishment
|
2021-03-07 10:22:42 +01:00 |
|
|
Philoul
|
6096825f4c
|
Formatage xml 1ère version
|
2021-03-07 03:09:30 +01:00 |
|
|
Andy Rozman
|
4232679c06
|
- small change (removed unneeded code)
|
2021-03-07 00:57:13 +00:00 |
|
|
Andy Rozman
|
2738cf7fce
|
- TBR was incorrectly interpretted for high TBR values
|
2021-03-07 00:46:53 +00:00 |
|
|
Milos Kozak
|
021d70bbe6
|
Merge pull request #399 from Philoul/Fix_Carbs_Layout
Fix Carbs Layout
|
2021-03-07 00:58:23 +01:00 |
|
|
Milos Kozak
|
72176edfb9
|
core -> kt, move tests to core
|
2021-03-07 00:49:18 +01:00 |
|
|
Milos Kozak
|
9b78839f5d
|
typo
|
2021-03-06 23:18:57 +01:00 |
|
|
Philoul
|
cf83d20e13
|
Merge branch 'User_Entry_ValueWithUnits' into UE_ExportXML
# Conflicts:
# core/src/main/java/info/nightscout/androidaps/utils/extensions/UserEntryExt.kt
# database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
|
2021-03-06 22:31:39 +01:00 |
|
|
Philoul
|
523a9f2800
|
Add detailed information for Careportal entries
|
2021-03-06 19:45:13 +01:00 |
|
|
Philoul
|
5d827d123e
|
8 ColorGroup added for UI + Fix Carbs in WizardDialog
|
2021-03-06 17:42:41 +01:00 |
|
|
Andrei Vereha
|
4fa16bc6cf
|
Merge pull request #20 from 0pen-dash/maintenance/when-formatting
don't align when in columns according to kotlin styleguide
|
2021-03-06 16:56:23 +01:00 |
|
|
Philoul
|
177bf214fd
|
xml export initialization
|
2021-03-06 16:14:44 +01:00 |
|
|
Tim Gunn
|
6ecdd4d7fc
|
Add appropriate constraint so isLgsAllowed Constraint can be properly checked
|
2021-03-07 02:53:01 +13:00 |
|
|
AdrianLxM
|
81b34f8680
|
don't align when in columns according to kotlin styleguide
|
2021-03-06 14:16:23 +01:00 |
|
|
Milos Kozak
|
fd19c6bf8e
|
Dana-i BLE5 support
|
2021-03-05 23:20:14 +01:00 |
|
|
Milos Kozak
|
23c23ea0b8
|
TrendArrow calculation
|
2021-03-05 23:08:43 +01:00 |
|
|
Milos Kozak
|
65770ecbf6
|
RS pairing improvement
|
2021-03-05 21:19:53 +01:00 |
|
|
AdrianLxM
|
65b0c5ccda
|
discord badge
|
2021-03-05 00:53:30 +01:00 |
|
|
Philoul
|
c065672179
|
Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
|
2021-03-04 23:19:08 +01:00 |
|
|
Milos Kozak
|
04f074caf9
|
MainApp -> kt, the rest of DatabaseHelperInterface
|
2021-03-04 19:23:01 +01:00 |
|
|
Philoul
|
db4268f408
|
UserEntry text format and colors.xml
ValueWithUnit Bold
Note standard grey color
Action Colored (table in UserEntryExt.kt)
|
2021-03-04 14:52:30 +01:00 |
|
|
Philoul
|
37777d7d82
|
Convert Long duration to min (TT from NS)
|
2021-03-04 00:22:40 +01:00 |
|
|
Philoul
|
e89aaf4d11
|
Merge Dev, Fix new uel.log in NSClientPlugin
|
2021-03-03 23:53:15 +01:00 |
|
|
Philoul
|
4ce59b929a
|
Merge remote-tracking branch 'Nightscout/dev' into User_Entry_VWU
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
|
2021-03-03 22:49:31 +01:00 |
|
|
Milos Kozak
|
87f348fe5a
|
Merge pull request #390 from Tornado-Tim/window-perms-setup
Add Window Permission into Setup Wizard
|
2021-03-03 21:57:44 +01:00 |
|
|
Philoul
|
db1b3b7328
|
Add EventTime if changed (Carbs, TT, CP, PS)
|
2021-03-03 21:16:37 +01:00 |
|
|
Andrei Vereha
|
c2627176cf
|
dash BleIO: s/let/also
|
2021-03-03 17:07:18 +01:00 |
|
|
Andrei Vereha
|
7976df596e
|
dash eap-aka: use named parameters
|
2021-03-03 17:02:59 +01:00 |
|
|
Andrei Vereha
|
c3d7cf9483
|
dash LTK exchange: s/var/val
|
2021-03-03 17:02:12 +01:00 |
|
|
Tim Gunn
|
6688a2696e
|
add Window Permssion into Setup Wizard
|
2021-03-04 04:39:35 +13:00 |
|
|
Andrei Vereha
|
7c0e2af053
|
dash: rename EAP AKA to SessionEstablisher
|
2021-03-03 14:24:23 +01:00 |
|
|
Andrei Vereha
|
b2797fa57f
|
dash: undo ktLint
|
2021-03-03 14:22:09 +01:00 |
|
|
Andrei Vereha
|
da84c35b31
|
format: CTRL+Alt+L
|
2021-03-03 14:18:20 +01:00 |
|
|
Milos Kozak
|
b0823bcfb8
|
Merge pull request #389 from swissalpine/patch-5
Fix for AAPS SMB Mode: doesn't work with XDrip anymore - in latest Dev Versions
|
2021-03-03 14:14:13 +01:00 |
|
|
Andrei Vereha
|
154e74fc22
|
dash ble: fix detekt issues
|
2021-03-03 14:10:33 +01:00 |
|
|
swissalpine
|
98e2d9ec86
|
Update XdripPlugin.kt
|
2021-03-03 11:06:55 +01:00 |
|
|
swissalpine
|
68a665bbeb
|
Fix for issue #380: AAPS SMB Mode: doesn't work with XDrip anymore - in latest Dev Versions
https://github.com/nightscout/AndroidAPS/issues/380
|
2021-03-03 11:00:48 +01:00 |
|
|
Philoul
|
a556df86c5
|
uel log, put name in value with unit
|
2021-03-03 08:53:48 +01:00 |
|
|
Philoul
|
e0610a8341
|
Fix 0 value not hidden and add separator for VWU
|
2021-03-03 00:31:28 +01:00 |
|
|
Milos Kozak
|
17ceb42df8
|
better message for out of limit
|
2021-03-03 00:07:02 +01:00 |
|
|
Milos Kozak
|
94edd017dd
|
show TBR tab in engineering mode only
|
2021-03-02 23:32:30 +01:00 |
|
|
Milos Kozak
|
6eafda561c
|
exclude dots from profile name
|
2021-03-02 23:22:15 +01:00 |
|
|
Philoul
|
efa9e18f83
|
Constructor for formated Strings with param, add notes, convert to AAPS units in fragment
|
2021-03-02 22:43:18 +01:00 |
|
|
Milos Kozak
|
efddea0eee
|
Merge pull request #386 from nightscout/tt
TempTarget -> room
|
2021-03-02 22:41:36 +01:00 |
|