caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
12129 commits 1 branch 20 tags 140 MiB
Commit graph

1381 commits

Author SHA1 Message Date
Milos Kozak 6ed9024769 fix text 2021-10-16 20:19:51 +02:00
Milos Kozak 98681c4c0f missing backslash 2021-10-16 19:41:16 +02:00
Milos Kozak c9ecb51093 Full sync message 2021-10-16 19:11:41 +02:00
Milos Kozak dabf4bf33c Application expired check 2021-10-16 13:02:31 +02:00
Milos Kozak 65a14c8eca Merge branch 'AddActionCP' into dev 2021-10-09 10:10:58 +02:00
Milos Kozak 53ce835c5b Rename Local profile to Profile 2021-10-09 09:17:44 +02:00
Philoul ec627ae48c Add Careportal actions (Note, Exercise, Question and Announcement) 2021-10-09 01:51:43 +02:00
Philoul 9a1de97564 Add shortname for NSClient BG plugin 2021-10-03 21:48:02 +02:00
Milos Kozak 8d07a697c3 EffectiveProfileSwitch sync 2021-09-24 14:58:17 +02:00
Milos Kozak ba71e0db9b more Profile validity checks 2021-09-13 19:06:32 +02:00
TebbeUbben dbf1772397 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 
 Conflicts:
	build.gradle
 2021-08-20 19:42:59 +02:00
TebbeUbben 3aadb92250 Update Open Humans uploader for new database 2021-08-20 19:37:38 +02:00
Milos Kozak c5857da42f StatsActivity fix 2021-08-11 19:01:19 +02:00
Milos Kozak 62005b437a Improve SMSCommunicator safety 2021-06-10 22:35:50 +02:00
Milos Kozak 9d29cafbe6 remove old db code 2021-05-29 23:38:19 +02:00
Milos Kozak 6735d22934 OfflineEvent -> room 2021-05-28 16:06:44 +02:00
Milos Kozak a0c7e0352d typo 2021-05-17 23:03:52 +02:00
Milos Kozak 0f2f5cd1fa Profile sync, removed NSProfile 2021-05-04 21:07:47 +02:00
Milos Kozak c75d4e8e4e eliminate old NS sync style 2021-05-03 12:49:11 +02:00
Milos Kozak e48d317d55 ProfileSwitch NS sync 2021-04-30 17:21:24 +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 3d9ef71045 Merge branch 'meallink' into meallink_ValueWithUnit 
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
 2021-03-31 22:18:50 +02:00
Milos Kozak a5ea0d9027 DeviceStatus 2021-03-31 21:54:49 +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 df1e2c53db Bolus, Carbs, BolusCalcResult new way of upload to NS 2021-03-28 13:45:27 +02:00
Milos Kozak c9c02458d6 TT & GV new way of upload to NS 2021-03-27 23:14:51 +01:00
Milos Kozak 4edf51d6ea remove nsUpload call for TemporaryTargets 2021-03-26 16:23:47 +01:00
Milos Kozak 7f0fe881b6 DetailedBolusInfo, MealLink UI 2021-03-25 17:48:07 +01:00
Philoul d3a9947cb4 Integrate Source for SMS, NS and Bolus Record (Simplify list of actions) 2021-03-23 15:42:55 +01:00
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