102 commits

Author	SHA1	Message	Date
Andrei Vereha	0cd9beb2cf	merge with dev	2021-09-25 13:55:57 +02:00
Milos Kozak	b2c45d0a26	remove PowerMock from all modules except wear	2021-09-23 17:35:55 +02:00
Milos Kozak	d33f62b23d	remove PowerMockRunner where possible	2021-09-21 21:57:56 +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	374e251801	remove @Jvm directives where possible	2021-09-20 17:20:09 +02:00
Milos Kozak	77e3c73608	Fix Omnipod bolus progress text	2021-09-20 10:31:46 +02:00
Andrei Vereha	d4b0935d6b	Merge remote-tracking branch 'upstream/dev' into dash	2021-09-13 18:39:23 +02:00
Milos Kozak	f505e23d50	New Crowdin updates (#627) ... * New translations strings.xml (French) * New translations strings.xml (French) * New translations strings.xml (French) * Update source file strings.xml * New translations strings.xml (Hebrew) * New translations strings.xml (Hebrew) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (Russian) * New translations strings.xml (Italian) * New translations strings.xml (Hebrew) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Czech) * New translations strings.xml (Czech) * 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) * New translations strings.xml (Russian) * New translations strings.xml (Slovak) * Update source file exam.xml * New translations exam.xml (Romanian) * New translations exam.xml (Dutch) * New translations exam.xml (Swedish) * New translations exam.xml (Slovak) * New translations exam.xml (Russian) * New translations exam.xml (Portuguese) * New translations exam.xml (Polish) * New translations exam.xml (Norwegian) * New translations exam.xml (Lithuanian) * New translations exam.xml (French) * New translations exam.xml (Korean) * New translations exam.xml (Italian) * New translations exam.xml (Hebrew) * New translations exam.xml (German) * New translations exam.xml (Czech) * New translations exam.xml (Spanish) * New translations exam.xml (Hebrew) * New translations strings.xml (Hebrew) * New translations exam.xml (Slovak) * New translations exam.xml (Czech) * New translations exam.xml (Italian) * New translations exam.xml (Norwegian) * New translations strings.xml (Norwegian) * New translations exam.xml (Russian) * New translations strings.xml (French) * New translations strings.xml (Romanian) * New translations strings.xml (Portuguese) * New translations strings.xml (Swedish) * New translations strings.xml (Russian) * New translations strings.xml (Dutch) * New translations strings.xml (Lithuanian) * New translations strings.xml (Polish) * New translations strings.xml (Bulgarian) * New translations strings.xml (Czech) * New translations strings.xml (Slovak) * New translations strings.xml (Spanish) * New translations strings.xml (Norwegian) * New translations strings.xml (Hebrew) * New translations strings.xml (Italian) * New translations strings.xml (German) * Update source file strings.xml * New translations strings.xml (Lithuanian) * New translations strings.xml (Tamil) * 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 (Italian) * New translations strings.xml (Hebrew) * 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 (Romanian) * New translations strings.xml (Croatian) * Update source file strings.xml * New translations strings.xml (Hebrew) * New translations strings.xml (Czech) * New translations strings.xml (German)	2021-09-08 19:32:52 +02:00
Milos Kozak	e8f946ad3f	New Crowdin updates (#604) ... * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (Romanian) * New translations strings.xml (Dutch) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Swedish) * 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 (Lithuanian) * New translations strings.xml (French) * New translations strings.xml (Korean) * New translations strings.xml (Italian) * New translations strings.xml (Hebrew) * New translations strings.xml (Irish) * New translations strings.xml (German) * New translations strings.xml (Czech) * New translations strings.xml (Bulgarian) * New translations strings.xml (Spanish) * Update source file strings.xml * New translations strings.xml (Czech) * New translations strings.xml (Hebrew) * 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 (Italian) * New translations strings.xml (Slovak) * New translations strings.xml (Slovak) * New translations strings.xml (Slovak) * New translations strings.xml (Hebrew) * New translations strings.xml (Hebrew) * New translations strings.xml (Hebrew) * New translations strings.xml (Slovak) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Norwegian) * New translations strings.xml (Norwegian) * New translations strings.xml (Norwegian)	2021-08-06 23:34:21 +02:00
Andrei Vereha	5752369377	Merge remote-tracking branch 'upstream/dev' into avereha/merge	2021-07-11 12:26:41 +02:00
Milos Kozak	581bb0af01	New Crowdin updates (#588) ... * New translations strings.xml (Czech) * New translations strings.xml (Lithuanian) * New translations strings.xml (Lithuanian) * New translations strings.xml (Italian) * New translations strings.xml (Tamil) * 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 (Lithuanian) * New translations strings.xml (Korean) * New translations strings.xml (Hebrew) * New translations strings.xml (Spanish) * New translations strings.xml (Romanian) * New translations strings.xml (French) * New translations strings.xml (Afrikaans) * New translations strings.xml (Irish) * New translations strings.xml (Bulgarian) * New translations strings.xml (Catalan) * New translations strings.xml (Danish) * New translations strings.xml (German) * New translations strings.xml (Greek) * New translations alert_titles.xml (Korean) * New translations alert_descriptions.xml (Korean) * New translations alert_descriptions.xml (Lithuanian) * New translations strings.xml (Korean) * New translations objectives.xml (Hebrew) * New translations strings.xml (Korean) * New translations strings.xml (Croatian) * New translations exam.xml (Korean) * New translations strings.xml (Lithuanian) * New translations strings.xml (Lithuanian) * New translations strings.xml (Lithuanian) * New translations strings.xml (Lithuanian) * New translations strings.xml (Lithuanian) * New translations strings.xml (Lithuanian) * New translations strings.xml (Lithuanian) * New translations strings.xml (Korean) * New translations strings.xml (Korean) * New translations exam.xml (Korean) * New translations strings.xml (Italian) * New translations strings.xml (Italian) * New translations strings.xml (Russian) * New translations strings.xml (French) * New translations strings.xml (French) * New translations strings.xml (Korean) * New translations exam.xml (Korean) * New translations objectives.xml (Korean) * New translations strings.xml (Korean) * New translations strings.xml (French)	2021-07-09 21:54:34 +02:00
AdrianLxM	a6fc9fee0f	update jacoco and add global config	2021-07-09 20:02:22 +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	8c8bd6360c	Merge pull request #567 from nightscout/travis ... gradle update	2021-06-22 19:02:32 +02:00
Milos Kozak	62375cdcfe	New Crowdin updates (#545) ... * New translations strings.xml (Hebrew) * New translations strings.xml (Hebrew) * New translations strings.xml (French) * New translations strings.xml (French) * New translations strings.xml (French) * New translations strings.xml (Romanian) * New translations strings.xml (Dutch) * 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 (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 (Lithuanian) * New translations strings.xml (French) * New translations strings.xml (Korean) * New translations strings.xml (Italian) * New translations strings.xml (Hebrew) * New translations strings.xml (Irish) * 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 (Czech) * New translations strings.xml (Czech) * New translations strings.xml (Slovak) * New translations strings.xml (Slovak) * New translations strings.xml (Slovak) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Norwegian) * New translations strings.xml (Norwegian) * New translations strings.xml (Norwegian) * New translations strings.xml (Norwegian) * New translations strings.xml (Norwegian) * 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 (Italian) * New translations strings.xml (Italian) * New translations strings.xml (Hebrew) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (French) * New translations strings.xml (French) * New translations strings.xml (Russian) * New translations strings.xml (Czech) * New translations strings.xml (Italian) * 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 (French)	2021-06-21 07:59:08 +02:00
Milos Kozak	740c009471	gradle:7.1.0-alpha02	2021-06-16 08:23:55 +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	91ad9a3ca9	New Crowdin updates (#541) ... * New translations strings.xml (Romanian) * New translations strings.xml (French) * 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 (Croatian) * New translations strings.xml (Italian) * New translations strings.xml (Hebrew) * 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 (Tamil) * New translations validator.xml (Lithuanian) * New translations validator.xml (Korean) * New translations validator.xml (Greek) * New translations validator.xml (Chinese Simplified) * New translations validator.xml (Turkish) * New translations validator.xml (Swedish) * New translations validator.xml (Portuguese, Brazilian) * New translations validator.xml (Polish) * New translations strings.xml (Romanian) * New translations strings.xml (Portuguese) * New translations strings.xml (Polish) * New translations strings.xml (Norwegian) * 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 (Korean) * New translations strings.xml (Czech) * New translations strings.xml (Catalan) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Afrikaans) * New translations strings.xml (Spanish) * New translations strings.xml (French) * New translations strings.xml (French) * New translations strings.xml (Czech) * New translations strings.xml (Italian) * New translations strings.xml (Italian) * New translations strings.xml (Hebrew) * New translations strings.xml (Hebrew) * New translations strings.xml (Hebrew) * New translations strings.xml (Irish) * New translations strings.xml (Greek) * New translations strings.xml (Danish) * New translations validator.xml (Afrikaans) * New translations validator.xml (Spanish) * New translations strings.xml (Czech) * New translations strings.xml (Hebrew) * New translations strings.xml (German) * New translations strings.xml (French) * New translations strings.xml (French) * New translations strings.xml (French) * New translations strings.xml (French) * New translations exam.xml (French) * New translations strings.xml (French) * New translations strings.xml (French) * New translations strings.xml (French)	2021-05-28 16:12:38 +02:00
Milos Kozak	66a70fcd22	Merge pull request #531 from andyrozman/meallink-mdt ... Medtronic driver changes - Kotlin and PumpSync	2021-05-27 23:23:03 +02:00
Andy Rozman	029eb55f0e	- changes according to comment in PR ... - moved files from core to pump-common (which we could without major changes) - removed DbObjectBase, and removed its deps in files (3) - changed id for rileylink project (was the same as for pump-common)	2021-05-26 13:14:17 +01:00
Milos Kozak	ea940ea165	remove redundant carbTime	2021-05-22 21:24:49 +02:00
Milos Kozak	79833dbdf1	New Crowdin updates (#490) ... * New translations strings.xml (Hebrew) * New translations exam.xml (Lithuanian) * New translations strings.xml (Slovak) * New translations strings.xml (Swedish) * New translations objectives.xml (Hebrew) * New translations objectives.xml (Hebrew) * New translations strings.xml (Hebrew) * New translations exam.xml (Hebrew) * New translations strings.xml (Hebrew) * New translations alert_descriptions.xml (Hebrew) * New translations strings.xml (Dutch) * New translations strings.xml (French) * New translations strings.xml (French) * New translations strings.xml (Hebrew) * New translations exam.xml (Hebrew) * New translations strings.xml (Hebrew) * New translations exam.xml (Hebrew) * New translations strings.xml (Hebrew) * New translations strings.xml (French) * New translations objectives.xml (French) * New translations strings.xml (Romanian) * New translations strings.xml (Polish) * New translations strings.xml (Slovak) * New translations strings.xml (Slovak) * New translations strings.xml (Slovak) * New translations strings.xml (Slovak) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * 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 (Polish) * New translations strings.xml (Dutch) * New translations strings.xml (Lithuanian) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (Norwegian) * New translations strings.xml (Polish) * New translations strings.xml (Norwegian) * New translations strings.xml (Norwegian) * New translations strings.xml (Norwegian) * New translations strings.xml (Norwegian) * New translations strings.xml (Polish) * New translations strings.xml (Slovak) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Swedish) * New translations strings.xml (Swedish) * New translations strings.xml (Swedish) * New translations strings.xml (Swedish) * New translations strings.xml (Turkish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Lithuanian) * New translations strings.xml (Lithuanian) * New translations strings.xml (Czech) * New translations strings.xml (Czech) * New translations strings.xml (Czech) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Afrikaans) * New translations strings.xml (Czech) * New translations strings.xml (French) * New translations strings.xml (Romanian) * New translations strings.xml (Romanian) * New translations strings.xml (Romanian) * New translations strings.xml (French) * New translations strings.xml (French) * New translations strings.xml (French) * New translations strings.xml (French) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Afrikaans) * New translations strings.xml (Czech) * New translations strings.xml (Korean) * New translations strings.xml (Korean) * 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 strings.xml (Hebrew) * New translations strings.xml (Hebrew) * New translations strings.xml (Hebrew) * New translations strings.xml (Hebrew) * New translations strings.xml (Irish) * New translations strings.xml (Greek) * New translations strings.xml (Greek) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Slovak) * New translations strings.xml (Slovak) * New translations strings.xml (Slovak)	2021-05-18 18:31:01 +02:00
Andrei Vereha	e3f7608de7	Merge remote-tracking branch 'upstream/dev2_dana_combo_only' into avereha/dev2-merge	2021-05-01 20:11:48 +02:00
Milos Kozak	37e3c4532a	Profiles -> room (no NS sync yet)	2021-04-29 20:42:45 +02:00
Milos Kozak	cada2919d1	prepare Profile interface	2021-04-19 18:44:17 +02:00
Milos Kozak	481ba32b3b	Merge remote-tracking branch 'ns/dev' into dev2_dana_combo_only	2021-04-15 18:38:32 +02:00
Milos Kozak	6b16e93427	New Crowdin updates (#479) ... * New translations exam.xml (Czech) * New translations exam.xml (Portuguese) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Turkish) * New translations strings.xml (Russian) * New translations strings.xml (Portuguese) * New translations strings.xml (Dutch) * New translations objectives.xml (Portuguese) * New translations strings.xml (Polish) * New translations strings.xml (Swedish) * New translations strings.xml (Lithuanian) * New translations strings.xml (Romanian) * New translations exam.xml (Dutch) * New translations strings.xml (Korean) * New translations strings.xml (Slovak) * New translations strings.xml (Hebrew) * New translations objectives.xml (Hebrew) * New translations strings.xml (Spanish) * New translations strings.xml (Norwegian) * New translations exam.xml (Hebrew) * New translations strings.xml (French) * New translations strings.xml (German) * New translations strings.xml (Greek) * New translations strings.xml (Irish) * New translations strings.xml (Italian) * New translations strings.xml (Czech) * New translations strings.xml (Bulgarian) * New translations strings.xml (Afrikaans) * New translations strings.xml (Portuguese) * New translations strings.xml (Hebrew) * New translations strings.xml (Portuguese) * New translations strings.xml (Portuguese) * New translations alert_titles.xml (Portuguese) * New translations exceptions.xml (Portuguese) * New translations strings.xml (Romanian) * New translations strings.xml (Korean) * 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 (Bulgarian) * New translations strings.xml (Afrikaans) * New translations strings.xml (Spanish) * New translations strings.xml (French) * New translations strings.xml (Dutch) * New translations strings.xml (Portuguese) * New translations strings.xml (Lithuanian) * New translations strings.xml (Polish) * New translations validator.xml (Dutch) * New translations strings.xml (Portuguese) * New translations strings.xml (Croatian) * New translations strings.xml (Tamil) * 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 (Russian) * New translations strings.xml (Italian) * New translations strings.xml (Hebrew) * New translations strings.xml (German) * New translations strings.xml (Czech) * New translations strings.xml (French) * New translations strings.xml (Norwegian) * New translations strings.xml (Romanian) * New translations strings.xml (Czech) * New translations strings.xml (French) * New translations strings.xml (Slovak) * New translations strings.xml (Catalan) * New translations strings.xml (Slovak) * New translations strings.xml (Norwegian) * New translations strings.xml (Norwegian) * New translations strings.xml (Portuguese) * New translations strings.xml (Catalan) * New translations strings.xml (Swedish) * New translations strings.xml (Slovak) * New translations strings.xml (Russian) * New translations validator.xml (Portuguese) * New translations strings.xml (Croatian) * New translations strings.xml (Tamil) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Turkish) * New translations strings.xml (Portuguese) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Swedish) * New translations strings.xml (Portuguese) * New translations strings.xml (Slovenian) * New translations strings.xml (Danish) * New translations strings.xml (Russian) * New translations strings.xml (Portuguese) * New translations strings.xml (Polish) * New translations strings.xml (Dutch) * New translations strings.xml (Lithuanian) * New translations strings.xml (Korean) * New translations strings.xml (Italian) * New translations strings.xml (Hebrew) * New translations strings.xml (Irish) * New translations strings.xml (Greek) * New translations strings.xml (German) * New translations strings.xml (Bulgarian) * New translations strings.xml (Afrikaans) * New translations strings.xml (Spanish) * New translations strings.xml (French) * New translations strings.xml (Romanian)	2021-04-15 18:18:10 +02:00
Milos Kozak	24164eee98	PumpInterface rename	2021-04-14 19:36:13 +02:00
Milos Kozak	c04993ddad	rename interfaces, cleanup	2021-04-14 00:45:30 +02:00
Milos Kozak	8ce5a881d3	_now() -> now()	2021-04-11 17:58:50 +02:00
Milos Kozak	998eba8b9f	DateUtil -> kt, static funcs removed	2021-04-11 17:47:55 +02:00
Milos Kozak	4eef2507fb	fix tests	2021-04-10 12:19:31 +02:00
Milos Kozak	d27b7a6139	Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink	2021-04-05 23:13:17 +02:00
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
Robrub	6cf621d90a	Update strings.xml ... Minor change : Omnipod needs 80U to be primed and not 85U. I've tested this many times with an insulin pen.	2021-04-03 11:38:15 +02:00
Milos Kozak	e26e023ebf	prepare TemporaryBasal	2021-04-01 23:46:21 +02:00
Bart Sopers	fe9c5d00a7	WIP on implementing OmnipodDashPumpPlugin + some autoformatting	2021-03-31 11:18:58 +02:00
Philoul	6c8b4dfab0	Merge branch 'meallink' into meallink_ValueWithUnit ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt	2021-03-29 22:39:12 +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	0a61585836	core.pump.common cleanup	2021-03-29 10:45:48 +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
Milos Kozak	7f0fe881b6	DetailedBolusInfo, MealLink UI	2021-03-25 17:48:07 +01:00
AdrianLxM	d9aced595b	make new ValueWithUnit translatable	2021-03-25 03:23:28 +01:00
Milos Kozak	616871c95c	prepare DetailedBolusInfo	2021-03-22 16:59:09 +01:00
Milos Kozak	02afb58a14	fix of fix	2021-03-16 21:18:44 +01:00
Milos Kozak	91fecb6cc7	fix NPE	2021-03-16 19:06:05 +01:00