Find a file
Philoul 654ca35dd1 Merge branch 'UserEntryImprovement' into AdrianVWU_Update
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.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/LoopDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.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/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
#	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/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsUserEntryFragment.kt
#	app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
#	core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/ClassicPrefsFormat.kt
#	core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
#	core/src/main/java/info/nightscout/androidaps/utils/extensions/UserEntryExt.kt
#	database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
2021-03-28 17:04:52 +02:00
.github Update issue templates 2021-03-17 10:26:43 +01:00
.idea idea: value with unit as sealed class 2021-03-25 02:24:26 +01:00
app Merge branch 'UserEntryImprovement' into AdrianVWU_Update 2021-03-28 17:04:52 +02:00
automation Add UserEntry for Automation rules (PS, TT, Loop) 2021-03-27 12:05:07 +01:00
combo make new ValueWithUnit translatable 2021-03-25 03:23:28 +01:00
core Merge branch 'UserEntryImprovement' into AdrianVWU_Update 2021-03-28 17:04:52 +02:00
dana Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_DevMerge 2021-03-09 21:50:17 +01:00
danar Notofocation -> kt 2021-03-07 17:46:21 +01:00
danars specify glucoseUnit, DB++ 2021-03-09 22:11:30 +01:00
database Merge branch 'UserEntryImprovement' into AdrianVWU_Update 2021-03-28 17:04:52 +02:00
gource gource example 2018-07-28 13:27:54 +02:00
gradle gradle-6.8.2 2021-03-21 20:00:55 +01:00
icons Merge pull request #145 from Philoul/Insight_Icon 2021-01-22 22:41:22 +01:00
insight Add Maintenance source 2021-03-27 16:17:38 +01:00
logo LINT: xml 2019-04-08 17:03:18 +02:00
medtronic remove test file 2021-03-25 03:25:57 +01:00
omnipod-common New Crowdin updates (#388) 2021-03-08 20:22:45 +01:00
omnipod-dash New Crowdin updates (#388) 2021-03-08 20:22:45 +01:00
omnipod-eros make new ValueWithUnit translatable 2021-03-25 03:23:28 +01:00
rileylink - change log 2021-03-20 13:57:16 +00:00
wear Bump json from 20201115 to 20210307 2021-03-10 07:21:51 +00:00
.gitignore add project-dictionary 2021-03-02 00:11:05 +01:00
.travis.yml build-tools-29.0.2 2020-07-28 23:56:22 +02:00
build.gradle update gradle 2021-03-19 23:36:57 +01:00
codecov.yml Create codecov.yml 2020-09-16 09:03:59 +02:00
CONTRIBUTING.md Point contributing docs to crowdin urls 2020-12-29 18:27:30 -08:00
crowdin.yml rename insight resource files 2021-02-22 20:52:51 +01:00
demo_keystore.jks Demo keystore 2019-05-01 16:56:06 +02:00
gradle.properties gradle tweaking 2020-05-04 21:03:30 +02:00
gradlew inital gradle update 2018-04-01 20:49:02 +02:00
gradlew.bat inital gradle update 2018-04-01 20:49:02 +02:00
ISSUE_TEMPLATE.md update issue template 2020-09-23 15:49:08 +02:00
LICENSE.txt Create LICENSE.txt 2016-12-15 22:14:53 +01:00
README.md discord badge 2021-03-05 00:53:30 +01:00
revoking_leaked_apks.md Improve documentation 2019-05-01 17:00:56 +02:00
runtests.bat libs update 2020-10-19 21:51:13 +02:00
settings.gradle Merge pull request #364 from bartsopers/dash 2021-02-22 17:33:13 +01:00
Steampunk_graphics_source_link.md move steampunk md to main dir 2018-01-03 14:00:57 +01:00

AndroidAPS

Support Server

Build status Crowdin Documentation Status codecov dev: codecov

BTC 3KawK8aQe48478s6fxJ8Ms6VTWkwjgr9f2