Commit graph

11039 commits

Author SHA1 Message Date
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
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
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
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
Tim Gunn 6688a2696e
add Window Permssion into Setup Wizard 2021-03-04 04:39:35 +13: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
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
Philoul f226a03c83 Fix Converters.kt
Initialize a first version of Layout with Card and TreamentsUserEntryFragment
2021-03-02 13:31:07 +01:00
Milos Kozak 46fbde9643 add project-dictionary 2021-03-02 00:11:05 +01:00
Milos Kozak b5dcf27b07
New Crowdin updates (#378)
* New translations validator.xml (Dutch)

* New translations validator.xml (German)

* New translations alert_descriptions.xml (German)

* New translations alert_titles.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations validator.xml (Romanian)

* New translations alert_descriptions.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations exam.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations validator.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)
2021-03-01 23:55:55 +01:00
Milos Kozak 56daa82735 bump 2.8.2.1-dev-c 2021-03-01 23:39:34 +01:00
Milos Kozak 69aa6cb496 Merge branch 'tt' of https://github.com/nightscout/AndroidAPS into tt 2021-03-01 23:37:19 +01:00
Milos Kozak 06f35dc522 small fixes 2021-03-01 23:37:14 +01:00
Milos Kozak ae86cfea77 log errors without tags 2021-03-01 23:11:59 +01:00
Milos Kozak 56aaa0a90b
Merge pull request #385 from nightscout/adrian/tt
mocking with argThat
2021-03-01 19:01:16 +01:00
Milos Kozak fdcb65e32c
Merge pull request #383 from nightscout/adrian/wear-events
call confirm wear event
2021-03-01 18:09:30 +01:00
Milos Kozak e5b15a3f11
Merge branch 'tt' into adrian/tt 2021-03-01 17:24:07 +01:00
Milos Kozak 05d5f8217c fix tests 2021-03-01 17:22:12 +01:00
AdrianLxM fc7f63d219 mocking with argThat 2021-03-01 16:28:08 +01:00
Milos Kozak 3b5b945fea TemporaryTarget -> room database 2021-03-01 12:42:42 +01:00
Philoul df995724a7 Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits_Draft
# Conflicts:
#	automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt
2021-03-01 08:34:40 +01:00
Philoul 21784920de Fix witdth of Carbs Layout 2021-02-28 23:20:37 +01:00