Milos Kozak
a2fbab02f9
food -> Room
2021-03-19 18:49:34 +01:00
Philoul
accfc24332
Optimize Actions
2021-03-17 22:45:08 +01:00
Philoul
919a718a81
Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
# core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
2021-03-17 08:55:26 +01:00
Philoul
605ca7def4
Fix TT Reason in TTDialog and add Reason to translator
2021-03-13 17:31:58 +01:00
Philoul
6096825f4c
Formatage xml 1ère version
2021-03-07 03:09:30 +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
17ceb42df8
better message for out of limit
2021-03-03 00:07:02 +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
Milos Kozak
d6e07c45cb
Merge pull request #331 from andyrozman/irish_lang
...
irish langugage
2021-02-25 10:27:54 +01:00
Milos Kozak
bf952cca33
Merge branch 'preference_warning_fix' of https://github.com/osodebailar/AndroidAPS-Nightscout_Fork into osodebailar-preference_warning_fix
2021-02-24 17:19:52 +01:00
Milos Kozak
a0632f7753
automation module
2021-02-22 17:22:30 +01:00
Milos Kozak
42bedb16f5
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-02-21 18:05:26 +01:00
Milos Kozak
0322dd48ac
insight -> lib
2021-02-21 18:03:26 +01:00
Milos Kozak
42b5c94755
Merge pull request #357 from nightscout/combo
...
Combo refactor
2021-02-21 17:16:07 +01:00
Milos Kozak
bd342588e8
do not translate key
2021-02-21 15:28:14 +01:00
Milos Kozak
32873e0730
combo -> new lib
2021-02-21 14:34:31 +01:00
Milos Kozak
2b51525719
Privacy option in StartupWizard
2021-02-21 12:30:45 +01:00
Philoul
bdd5fe383c
Update enum class
...
=> Need help for strings location
2021-02-21 12:03:15 +01:00
Philoul
db23a5e9f7
Update Strings (translatable and key removed)
2021-02-21 10:35:04 +01:00
Philoul
73ebc00085
Fix key
2021-02-20 20:25:52 +01:00
Philoul
14454f6c15
Create keys for uel.log
2021-02-20 13:30:34 +01:00
Milos Kozak
d7ad8eeefc
migrate rest of gradle module files
2021-02-18 23:35:23 +01:00
Milos Kozak
86fb53ce34
SetupWizard update
2021-02-15 13:57:01 +01:00
Andy Rozman
217a17d631
- added irish language back into selection box (was removed some time ago)
2021-02-13 17:43:55 +00:00
Milos Kozak
e374cdfa98
Merge branch 'dev' into newdb
2021-02-11 12:01:12 +01:00
Milos Kozak
6e4effae55
Merge pull request #276 from Philoul/Graph_Scale
...
Secondary graphs : replace Activity by -BGI and align curves scales if same units
2021-02-11 11:48:01 +01:00
Milos Kozak
7b4a30865a
UserEntry logging
2021-02-09 17:57:28 +01:00
Milos Kozak
e16d661183
OverviewFragment -> jetpack
2021-02-04 12:03:34 +01:00
Milos Kozak
ee6cd22d24
MedtronicFragment -> jetpack
2021-02-03 23:02:14 +01:00
Milos Kozak
acf3b23bf7
cleanup
2021-02-01 15:24:48 +01:00
Philoul
71af958fca
Replace Activity by -BGI in secondary graphs
...
Align scales (IOB / Absolute) and (deviation / -BGI) if selected in the same graph
2021-01-30 21:27:22 +01:00
Milos Kozak
aeec33eb9e
FoodFragment -> jetpack
2021-01-25 11:35:36 +01:00
Milos Kozak
21095233dc
HistoryBrowseActivity -> jetpack
2021-01-24 14:44:11 +01:00
Milos Kozak
bcc573202c
CarbsDialog -> jetpack
2021-01-21 17:03:05 +01:00
Milos Kozak
157642649e
ProfileSwitchDialog -> jetpack
2021-01-21 16:38:42 +01:00
Milos Kozak
e26ae1af7d
asking for permissions refactor
2021-01-18 22:47:55 +01:00
Milos Kozak
65a39d91be
refactor import/export to create DaggerAppCompatActivityWithResult
2021-01-18 17:36:18 +01:00
Milos Kozak
23d649a0d8
Merge branch 'dev' into dev
2021-01-10 20:41:36 +01:00
Milos Kozak
e3ee5eeb1a
Merge pull request #214 from nightscout/soft-force-upload-only
...
Rename upload only key and description
2021-01-10 20:26:30 +01:00
AdrianLxM
68be654fd4
Rename upload only key and description
...
This renames the key that people that have disabled it in the past will actively have to re-enable it.
Adds extra warning that it is dangerous to disable it.
2021-01-10 19:56:44 +01:00
Milos Kozak
c5afc6daca
Merge pull request #211 from nightscout/dana/fix-menu-crash-plus-i18n
...
fix menu crash and make graph label translatable
2021-01-10 19:50:25 +01:00
AdrianLxM
301c44627f
fix menu crash and make graph label translatable
2021-01-10 04:10:21 +01:00
parapenT1sta
50dcf7d8bb
Update strings.xml
2021-01-09 21:56:31 +00:00
parapenT1sta
e8be0fbd79
Update strings.xml
2021-01-09 16:48:17 +00:00
Milos Kozak
48084ff7bf
add keys to crash report
2021-01-08 18:55:01 +01:00
xJoe
2b52dbda80
Correction xDrip -> xDrip+
2021-01-08 18:21:36 +01:00
Milos Kozak
c847a5a340
add warning to ns_upload_only
2021-01-08 14:20:18 +01:00
Milos Kozak
2524fc705d
Update app/src/main/res/values/strings.xml
...
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
2021-01-07 10:28:27 +01:00
xJoe
27cd727643
Status lights battery
...
added "pump" as there is also sensor battery as of AAPS 2.8
2021-01-03 18:07:41 +01:00
xJoe
9e286b789a
Update strings.xml
2021-01-03 10:50:08 +01:00
