Milos Kozak
2463f8fc47
ExtendedBolus, TemporaryBasal -> room, DanaRS working
2021-04-05 22:41:28 +02:00
Philoul
22c1233201
Merge remote-tracking branch 'Nightscout/meallink' into Test_MealLink_VWU_Merge
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
2021-04-04 13:51:53 +02:00
Philoul
be35597da4
Add Pump Sources (only Dana currently has an Entry, but required I think for pump history uploaded in AAPS, or Prime/Fill/ReservoirChange from pump)
2021-04-03 18:51:36 +02:00
Milos Kozak
e26e023ebf
prepare TemporaryBasal
2021-04-01 23:46:21 +02:00
Philoul
bf218e9ff4
Merge remote-tracking branch 'Nightscout/meallink' into meallink_ValueWithUnit
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
2021-03-30 23:05:19 +02:00
Milos Kozak
e9f4f87894
Remove Tratment.class where possible
2021-03-30 19:37:26 +02:00
Philoul
22384ef2e8
Merge branch 'Adrian_ValueWithUnit_Refactor' into meallink_ValueWithUnit
...
# 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/FillDialog.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/dialogs/TreatmentDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/CarbsGenerator.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
# automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt
# automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.kt
# combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
# core/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.java
# core/src/main/java/info/nightscout/androidaps/logging/UserEntryLogger.kt
# database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
# omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/ActiveBolus.java
2021-03-29 13:51:28 +02:00
Milos Kozak
e3ac451f8d
PumpSync interface, VirtualPump, remove pump driver dependency to database
2021-03-29 00:31:40 +02:00
Milos Kozak
df1e2c53db
Bolus, Carbs, BolusCalcResult new way of upload to NS
2021-03-28 13:45:27 +02:00
Philoul
2bd2510bd8
Add Maintenance source
2021-03-27 16:17:38 +01:00
Milos Kozak
7f0fe881b6
DetailedBolusInfo, MealLink UI
2021-03-25 17:48:07 +01:00
Milos Kozak
616871c95c
prepare DetailedBolusInfo
2021-03-22 16:59:09 +01:00
AdrianLxM
7d2e364c77
use UploadQueue through interface
2021-03-19 21:35:09 +01:00
Milos Kozak
c28fb465fb
Merge remote-tracking branch 'ns/dev' into careportal
2021-03-08 20:27:53 +01:00
Milos Kozak
91e323b5f5
New Crowdin updates ( #388 )
...
* New translations exam.xml (Portuguese)
* New translations validator.xml (Slovak)
* New translations alert_descriptions.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations alert_titles.xml (Tamil)
* New translations alert_descriptions.xml (Tamil)
* New translations alert_codes.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations validator.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations exam.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations objectives.xml (Tamil)
* New translations exceptions.xml (Tamil)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations exam.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Dutch)
* New translations strings.xml (Romanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Korean)
* New translations strings.xml (Italian)
* New translations strings.xml (Greek)
* New translations strings.xml (German)
* New translations strings.xml (Czech)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (German)
* New translations validator.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Hebrew)
* New translations objectives.xml (Hebrew)
* New translations strings.xml (Czech)
* New translations strings.xml (Italian)
* New translations strings.xml (Portuguese)
* New translations alert_titles.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations exam.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations validator.xml (French)
* New translations alert_descriptions.xml (French)
* New translations alert_titles.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (German)
* New translations strings.xml (French)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Russian)
* New translations strings.xml (Czech)
* New translations strings.xml (Italian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (French)
* New translations alert_descriptions.xml (Swedish)
* New translations alert_titles.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations exam.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
2021-03-08 20:22:45 +01:00
Milos Kozak
8db8edc3f6
Careportal -> Room
2021-03-08 20:10:02 +01:00
Milos Kozak
658f565cf2
Notofocation -> kt
2021-03-07 17:46:21 +01:00
Milos Kozak
563bee2faf
PumpDescription -> kt
2021-03-07 15:19:51 +01:00
Milos Kozak
2ea423c704
PumpEnactResult -> kt
2021-03-07 13:31:11 +01:00
Milos Kozak
efddea0eee
Merge pull request #386 from nightscout/tt
...
TempTarget -> room
2021-03-02 22:41:36 +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
3b5b945fea
TemporaryTarget -> room database
2021-03-01 12:42:42 +01:00
Milos Kozak
b6cb9edaa3
New Crowdin updates ( #374 )
...
* New translations strings.xml (Afrikaans)
* New translations alert_descriptions.xml (Portuguese)
* New translations alert_titles.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations validator.xml (Russian)
* New translations strings.xml (Russian)
* New translations alert_descriptions.xml (Russian)
* New translations strings.xml (Russian)
2021-02-26 09:23:39 +01:00
Milos Kozak
3fb9e6ce5f
New Crowdin updates ( #372 )
...
* New translations strings.xml (Bulgarian)
* New translations alert_codes.xml (Bulgarian)
* New translations alert_descriptions.xml (Bulgarian)
* New translations alert_titles.xml (Bulgarian)
* New translations exceptions.xml (Bulgarian)
* New translations validator.xml (Catalan)
* New translations strings.xml (Catalan)
* New translations alert_descriptions.xml (Catalan)
* New translations alert_titles.xml (Afrikaans)
* New translations alert_titles.xml (Catalan)
* New translations exceptions.xml (Catalan)
* New translations validator.xml (Czech)
* New translations strings.xml (Czech)
* New translations alert_codes.xml (Czech)
* New translations alert_descriptions.xml (Czech)
* New translations alert_titles.xml (Czech)
* New translations exceptions.xml (Czech)
* New translations exceptions.xml (Afrikaans)
* New translations alert_descriptions.xml (Afrikaans)
* New translations strings.xml (Danish)
* New translations alert_titles.xml (French)
* New translations alert_codes.xml (Romanian)
* New translations alert_descriptions.xml (Romanian)
* New translations alert_titles.xml (Romanian)
* New translations exceptions.xml (Romanian)
* New translations validator.xml (French)
* New translations strings.xml (French)
* New translations alert_codes.xml (French)
* New translations alert_descriptions.xml (French)
* New translations exceptions.xml (French)
* New translations alert_codes.xml (Afrikaans)
* New translations validator.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations alert_codes.xml (Spanish)
* New translations alert_descriptions.xml (Spanish)
* New translations alert_titles.xml (Spanish)
* New translations exceptions.xml (Spanish)
* New translations validator.xml (Afrikaans)
* New translations strings.xml (Afrikaans)
* New translations validator.xml (Danish)
* New translations alert_codes.xml (Danish)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations validator.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations alert_codes.xml (Hebrew)
* New translations alert_descriptions.xml (Hebrew)
* New translations alert_titles.xml (Hebrew)
* New translations exceptions.xml (Hebrew)
* New translations validator.xml (Italian)
* New translations exceptions.xml (Irish)
* New translations alert_descriptions.xml (Danish)
* New translations validator.xml (Greek)
* New translations alert_titles.xml (Danish)
* New translations exceptions.xml (Danish)
* New translations validator.xml (German)
* New translations strings.xml (German)
* New translations alert_codes.xml (German)
* New translations alert_descriptions.xml (German)
* New translations alert_titles.xml (German)
* New translations exceptions.xml (German)
* New translations strings.xml (Greek)
* New translations alert_titles.xml (Irish)
* New translations alert_codes.xml (Greek)
* New translations alert_descriptions.xml (Greek)
* New translations alert_titles.xml (Greek)
* New translations exceptions.xml (Greek)
* New translations validator.xml (Irish)
* New translations strings.xml (Irish)
* New translations alert_codes.xml (Irish)
* New translations alert_descriptions.xml (Irish)
* New translations exceptions.xml (Croatian)
* New translations validator.xml (Hebrew)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Romanian)
* New translations alert_titles.xml (French)
* New translations alert_titles.xml (Spanish)
* New translations alert_descriptions.xml (Spanish)
* New translations alert_codes.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations exceptions.xml (French)
* New translations alert_descriptions.xml (French)
* New translations alert_codes.xml (French)
* New translations strings.xml (French)
* New translations exceptions.xml (Romanian)
* New translations alert_titles.xml (Romanian)
* New translations alert_descriptions.xml (Romanian)
* New translations alert_codes.xml (Romanian)
* New translations exceptions.xml (Spanish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Russian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Italian)
* New translations exceptions.xml (Korean)
* New translations alert_titles.xml (Korean)
* New translations alert_descriptions.xml (Korean)
* New translations alert_codes.xml (Korean)
* New translations strings.xml (Korean)
* New translations exceptions.xml (Italian)
* New translations alert_titles.xml (Italian)
* New translations alert_descriptions.xml (Italian)
* New translations alert_codes.xml (Italian)
* New translations strings.xml (Lithuanian)
* New translations exceptions.xml (Hebrew)
* New translations alert_titles.xml (Hebrew)
* New translations alert_descriptions.xml (Hebrew)
* New translations alert_codes.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations alert_codes.xml (Lithuanian)
* New translations alert_titles.xml (Norwegian)
* New translations alert_descriptions.xml (Portuguese)
* New translations alert_codes.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations exceptions.xml (Polish)
* New translations alert_titles.xml (Polish)
* New translations alert_descriptions.xml (Polish)
* New translations alert_codes.xml (Polish)
* New translations strings.xml (Polish)
* New translations exceptions.xml (Norwegian)
* New translations alert_descriptions.xml (Norwegian)
* New translations alert_descriptions.xml (Lithuanian)
* New translations alert_codes.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations exceptions.xml (Dutch)
* New translations alert_titles.xml (Dutch)
* New translations alert_descriptions.xml (Dutch)
* New translations alert_codes.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations exceptions.xml (Lithuanian)
* New translations alert_titles.xml (Lithuanian)
* New translations exceptions.xml (Portuguese)
* New translations exceptions.xml (Czech)
* New translations alert_titles.xml (Czech)
* New translations alert_descriptions.xml (Czech)
* New translations alert_codes.xml (Czech)
* New translations strings.xml (Czech)
* New translations validator.xml (Czech)
* New translations strings.xml (Catalan)
* New translations exceptions.xml (Bulgarian)
* New translations strings.xml (Danish)
* New translations alert_titles.xml (Bulgarian)
* New translations alert_descriptions.xml (Bulgarian)
* New translations alert_codes.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations exceptions.xml (Afrikaans)
* New translations alert_titles.xml (Afrikaans)
* New translations alert_descriptions.xml (Afrikaans)
* New translations alert_codes.xml (Afrikaans)
* New translations strings.xml (Czech)
* New translations exceptions.xml (Portuguese, Brazilian)
* New translations alert_titles.xml (Portuguese)
* New translations strings.xml (Russian)
* New translations alert_codes.xml (Russian)
* New translations alert_descriptions.xml (Russian)
* New translations strings.xml (Irish)
* New translations exceptions.xml (Greek)
* New translations exceptions.xml (Russian)
* New translations alert_codes.xml (German)
* New translations strings.xml (German)
* New translations alert_descriptions.xml (German)
* New translations alert_titles.xml (Greek)
* New translations alert_titles.xml (German)
* New translations exceptions.xml (German)
* New translations strings.xml (Greek)
* New translations alert_codes.xml (Greek)
* New translations alert_descriptions.xml (Greek)
* New translations alert_titles.xml (Russian)
* New translations alert_titles.xml (Portuguese, Brazilian)
* New translations alert_codes.xml (Chinese Simplified)
* New translations alert_codes.xml (Turkish)
* New translations alert_descriptions.xml (Turkish)
* New translations alert_titles.xml (Turkish)
* New translations exceptions.xml (Turkish)
* New translations strings.xml (Chinese Simplified)
* New translations alert_descriptions.xml (Chinese Simplified)
* New translations alert_titles.xml (Chinese Simplified)
* New translations exceptions.xml (Chinese Simplified)
* New translations strings.xml (Portuguese, Brazilian)
* New translations alert_codes.xml (Portuguese, Brazilian)
* New translations alert_descriptions.xml (Portuguese, Brazilian)
* New translations strings.xml (Turkish)
* New translations exceptions.xml (Swedish)
* New translations strings.xml (Slovak)
* New translations alert_codes.xml (Slovak)
* New translations alert_descriptions.xml (Slovak)
* New translations alert_titles.xml (Slovak)
* New translations exceptions.xml (Slovak)
* New translations alert_titles.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations alert_codes.xml (Swedish)
* New translations alert_descriptions.xml (Swedish)
* New translations validator.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations alert_titles.xml (Italian)
* New translations validator.xml (Italian)
* New translations alert_descriptions.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations validator.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations alert_descriptions.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Turkish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovenian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Korean)
* New translations strings.xml (Romanian)
* New translations strings.xml (Italian)
* New translations strings.xml (Irish)
* New translations strings.xml (Greek)
* New translations strings.xml (German)
* New translations strings.xml (Danish)
* New translations strings.xml (Czech)
* New translations strings.xml (Catalan)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (Croatian)
* New translations validator.xml (Norwegian)
* New translations alert_descriptions.xml (Norwegian)
* New translations alert_titles.xml (Norwegian)
2021-02-25 14:46:25 +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
f402d78d95
rename insight resource files
2021-02-22 20:52:51 +01:00
Milos Kozak
0322dd48ac
insight -> lib
2021-02-21 18:03:26 +01:00
