Milos Kozak
ea7ccfc8f8
Merge pull request #2398 from dv1/combov2-fixes-001
...
comboctl-main: Use the standard bolus' total amount as its immediate amount
2023-02-09 21:01:04 +01:00
Carlos Rafael Giani
82bdb4df9a
comboctl-main: Use the standard bolus' total amount as its immediate amount
...
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
2023-02-09 18:50:27 +01:00
Milos Kozak
40e14ba0e3
Merge remote-tracking branch 'origin/dev' into ns15
2023-02-09 17:14:51 +01:00
Milos Kozak
6598d6c00f
revert targetSdkVersion to 28
2023-02-09 17:14:01 +01:00
Milos Kozak
d7fd4d08b0
Merge pull request #2394 from nightscout/dependabot/gradle/dev/androidx.browser-browser-1.5.0
...
chore(deps): bump androidx.browser:browser from 1.4.0 to 1.5.0
2023-02-09 14:04:45 +01:00
Milos Kozak
b72508c2f4
Merge pull request #2395 from nightscout/dependabot/gradle/dev/work_version-2.8.0
...
chore(deps): bump work_version from 2.7.1 to 2.8.0
2023-02-09 14:04:21 +01:00
Milos Kozak
35445ce645
Merge pull request #2396 from nightscout/dependabot/gradle/dev/androidx.appcompat-appcompat-1.6.1
...
chore(deps): bump androidx.appcompat:appcompat from 1.6.0 to 1.6.1
2023-02-09 14:02:48 +01:00
dependabot[bot]
ecbc351b02
chore(deps): bump androidx.appcompat:appcompat from 1.6.0 to 1.6.1
...
Bumps androidx.appcompat:appcompat from 1.6.0 to 1.6.1.
---
updated-dependencies:
- dependency-name: androidx.appcompat:appcompat
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-09 08:01:41 +00:00
dependabot[bot]
7992ad0214
chore(deps): bump work_version from 2.7.1 to 2.8.0
...
Bumps `work_version` from 2.7.1 to 2.8.0.
Updates `androidx.work:work-runtime-ktx` from 2.7.1 to 2.8.0
Updates `androidx.work:work-testing` from 2.7.1 to 2.8.0
---
updated-dependencies:
- dependency-name: androidx.work:work-runtime-ktx
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: androidx.work:work-testing
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-09 08:01:32 +00:00
dependabot[bot]
f68ba670c7
chore(deps): bump androidx.browser:browser from 1.4.0 to 1.5.0
...
Bumps androidx.browser:browser from 1.4.0 to 1.5.0.
---
updated-dependencies:
- dependency-name: androidx.browser:browser
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-09 08:01:23 +00:00
Milos Kozak
e62bb19b49
fix database cleanup
2023-02-08 18:08:07 +01:00
Milos Kozak
0f4dd15a27
Merge branch 'dev' into ns15
2023-02-07 15:22:53 +01:00
Milos Kozak
1da267f05c
test targetsdk 33
2023-02-07 15:22:33 +01:00
Milos Kozak
5ebf498794
New Crowdin updates ( #2381 )
...
* New translations strings.xml (French)
* New translations strings.xml (Turkish)
* New translations exam.xml (French)
* New translations exam.xml (Turkish)
* New translations exam.xml (French)
* New translations strings.xml (Slovak)
* New translations exam.xml (Slovak)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations exam.xml (Norwegian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations exam.xml (Russian)
2023-02-07 13:44:42 +01:00
Milos Kozak
aaf19b15ce
Merge pull request #2384 from nightscout/dependabot/gradle/dev/com.android.tools.build-gradle-7.4.1
...
chore(deps): bump com.android.tools.build:gradle from 7.4.0 to 7.4.1
2023-02-07 13:42:07 +01:00
dependabot[bot]
92701fa98b
chore(deps): bump com.android.tools.build:gradle from 7.4.0 to 7.4.1
...
Bumps com.android.tools.build:gradle from 7.4.0 to 7.4.1.
---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-07 12:18:51 +00:00
Milos Kozak
90e0f48ddc
G7 support
2023-02-07 10:51:07 +01:00
Milos Kozak
d346e2e459
Openhumans: fix plugin type
2023-02-04 19:35:04 +01:00
Milos Kozak
65123fe527
Combov2: prevent NPE
2023-02-04 19:26:04 +01:00
Milos Kozak
66c85597f7
Xdrip: fix interface
2023-02-04 18:50:57 +01:00
Milos Kozak
6c536d7eee
Merge pull request #2388 from nightscout/xdrip
...
New xDrip sync
2023-02-04 18:45:37 +01:00
Milos Kozak
9c8a4ad3c1
Merge branch 'dev' into xdrip
2023-02-04 11:01:15 +01:00
Milos Kozak
b5d03ff897
Merge branch 'ns15' into xdrip
2023-02-04 11:01:10 +01:00
Milos Kozak
5f1cdc8e3d
Merge pull request #2386 from nightscout/dependabot/gradle/dev/kotlin_version-1.8.10
...
chore(deps): bump kotlin_version from 1.8.0 to 1.8.10
2023-02-04 10:27:49 +01:00
dependabot[bot]
7b59ce78a8
chore(deps): bump kotlin_version from 1.8.0 to 1.8.10
...
Bumps `kotlin_version` from 1.8.0 to 1.8.10.
Updates `org.jetbrains.kotlin:kotlin-gradle-plugin` from 1.8.0 to 1.8.10
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.8.10/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.0...v1.8.10 )
Updates `org.jetbrains.kotlin:kotlin-allopen` from 1.8.0 to 1.8.10
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.8.10/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.0...v1.8.10 )
Updates `org.jetbrains.kotlin:kotlin-serialization` from 1.8.0 to 1.8.10
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.8.10/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.0...v1.8.10 )
Updates `org.jetbrains.kotlin.android` from 1.8.0 to 1.8.10
Updates `org.jetbrains.kotlin:kotlin-stdlib-jdk8` from 1.8.0 to 1.8.10
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.8.10/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.0...v1.8.10 )
Updates `org.jetbrains.kotlin:kotlin-reflect` from 1.8.0 to 1.8.10
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.8.10/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.0...v1.8.10 )
---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-allopen
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-serialization
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin.android
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk8
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-reflect
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-03 08:15:38 +00:00
Milos Kozak
cba67a5dee
fix tests
2023-02-02 11:53:47 +01:00
Milos Kozak
c93e228410
Merge branch 'dev' into xdrip
2023-02-01 16:53:39 +01:00
Milos Kozak
1dd7365200
Merge branch 'dev' into ns15
2023-02-01 15:18:28 +01:00
Milos Kozak
ba58fb5ff7
AAPSClient: provide info about charging state
2023-02-01 15:18:06 +01:00
Milos Kozak
bfabe464c0
Merge branch 'dev' into ns15
2023-02-01 14:29:16 +01:00
Milos Kozak
e2d91f6203
NSCv3: improve loading
2023-02-01 14:05:56 +01:00
Milos Kozak
50c1234630
Tidepool: cleanup, send data older than 3h
2023-02-01 07:49:23 +01:00
Milos Kozak
8c0eefac23
Merge branch 'ns15' of https://github.com/nightscout/AndroidAPS into ns15
2023-01-31 16:04:05 +01:00
Milos Kozak
29c5b4030f
Merge branch 'ns15' of https://github.com/nightscout/AndroidAPS into ns15
2023-01-31 14:55:29 +01:00
Milos Kozak
e23f8ba528
Merge branch 'dev' into ns15
2023-01-31 14:55:20 +01:00
Milos Kozak
78295cf827
NSCv3: HTTP logging
2023-01-31 14:54:04 +01:00
Milos Kozak
413d958c87
do not catch Worker exceptions
2023-01-31 12:58:46 +01:00
Milos Kozak
23e60084d0
improve logging
2023-01-31 12:53:32 +01:00
Milos Kozak
f6670091ec
New Crowdin updates ( #2344 )
...
* New translations strings.xml (Serbian (Latin))
* Update source file strings.xml
* Update source file strings.xml
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations exam.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (German)
* New translations strings.xml (Romanian)
* New translations strings.xml (French)
* New translations strings.xml (Spanish)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Catalan)
* New translations strings.xml (Czech)
* New translations strings.xml (Danish)
* New translations strings.xml (German)
* New translations strings.xml (Greek)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hungarian)
* New translations strings.xml (Italian)
* New translations strings.xml (Korean)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Polish)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Russian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Swedish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Croatian)
* New translations strings.xml (Spanish)
* New translations strings.xml (German)
* New translations strings.xml (Russian)
* Update source file strings.xml
* Update source file strings.xml
* New translations strings.xml (Spanish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Lithuanian)
* New translations protection.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations exam.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 exam.xml (Lithuanian)
* New translations exam.xml (Lithuanian)
* New translations exam.xml (Lithuanian)
* New translations exam.xml (Lithuanian)
* New translations exam.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations exam.xml (Lithuanian)
* New translations exam.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations objectives.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations exam.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations protection.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations exam.xml (Lithuanian)
* New translations exam.xml (Lithuanian)
* New translations exam.xml (Lithuanian)
* New translations strings.xml (French)
* New translations strings.xml (Czech)
* New translations strings.xml (French)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations exam.xml (Turkish)
* New translations objectives.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations objectives.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations objectives.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations protection.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations exam.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Romanian)
* New translations strings.xml (French)
* New translations strings.xml (Spanish)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Catalan)
* New translations strings.xml (Czech)
* New translations strings.xml (Danish)
* New translations strings.xml (German)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Italian)
* New translations strings.xml (Korean)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Polish)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Russian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Swedish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Romanian)
* New translations strings.xml (French)
* New translations strings.xml (Spanish)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Catalan)
* New translations strings.xml (Czech)
* New translations strings.xml (Danish)
* New translations strings.xml (German)
* New translations strings.xml (Greek)
* New translations strings.xml (Irish)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hungarian)
* New translations strings.xml (Italian)
* New translations strings.xml (Japanese)
* New translations strings.xml (Korean)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Polish)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Russian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Swedish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Croatian)
* New translations strings.xml (Serbian (Latin))
* New translations exam.xml (Romanian)
* New translations exam.xml (French)
* New translations exam.xml (Spanish)
* New translations exam.xml (Afrikaans)
* New translations exam.xml (Bulgarian)
* New translations exam.xml (Catalan)
* New translations exam.xml (Czech)
* New translations exam.xml (Danish)
* New translations exam.xml (German)
* New translations exam.xml (Greek)
* New translations exam.xml (Hebrew)
* New translations exam.xml (Italian)
* New translations exam.xml (Korean)
* New translations exam.xml (Lithuanian)
* New translations exam.xml (Dutch)
* New translations exam.xml (Norwegian)
* New translations exam.xml (Polish)
* New translations exam.xml (Portuguese)
* New translations exam.xml (Russian)
* New translations exam.xml (Slovak)
* New translations exam.xml (Swedish)
* New translations exam.xml (Turkish)
* New translations exam.xml (Chinese Simplified)
* New translations exam.xml (Portuguese, Brazilian)
* New translations exam.xml (Croatian)
* New translations strings.xml (French)
* New translations strings.xml (Spanish)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Polish)
* New translations strings.xml (Russian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Turkish)
* Update source file strings.xml
* Update source file exam.xml
* Update source file strings.xml
* Update source file strings.xml
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations exam.xml (German)
* Update source file strings.xml
* New translations strings.xml (Czech)
* New translations strings.xml (French)
* New translations strings.xml (Spanish)
* New translations strings.xml (German)
* New translations strings.xml (Russian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Turkish)
* New translations exam.xml (German)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations exam.xml (Spanish)
* New translations exam.xml (Czech)
* New translations exam.xml (Polish)
* New translations objectives.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
* New translations strings.xml (Polish)
2023-01-30 22:13:24 +01:00
Milos Kozak
cacf62f20c
Merge pull request #2377 from dv1/check-for-suspend-before-tbr-and-bolus
...
WIP: combov2: Check if pump is suspended before setting TBR and delivering…
2023-01-30 18:40:14 +01:00
Milos Kozak
1bf884311d
Do not translate key
2023-01-30 12:36:17 +01:00
Milos Kozak
8a2d786ef5
Merge pull request #2380 from nightscout/dependabot/gradle/dev/org.jlleitschuh.gradle.ktlint-11.1.0
...
chore(deps): bump org.jlleitschuh.gradle.ktlint from 11.0.0 to 11.1.0
2023-01-30 11:19:07 +01:00
dependabot[bot]
f6ad8d0dc8
chore(deps): bump org.jlleitschuh.gradle.ktlint from 11.0.0 to 11.1.0
...
Bumps org.jlleitschuh.gradle.ktlint from 11.0.0 to 11.1.0.
---
updated-dependencies:
- dependency-name: org.jlleitschuh.gradle.ktlint
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-01-30 08:02:13 +00:00
Milos Kozak
0ef9155dbe
Merge pull request #2379 from markvader/about_strings
...
Group "About Screen" strings in UI strings file inc. one from combo strings file
2023-01-30 08:22:01 +01:00
Milos Kozak
faaf7e225b
Merge pull request #2376 from emmatovar27/dev
...
Changes from the community to some of the questions on objective 3.
2023-01-30 08:17:57 +01:00
Mark Breen
1c8f8a2459
Group "About Screen" strings in UI strings file inc one from combo strings
2023-01-30 01:36:25 +00:00
emmatovar27
b0a1277616
--Changes from the Community to some of the questions on objectives 3.
2023-01-29 17:19:29 -08:00
Milos Kozak
56d5acf90d
Merge remote-tracking branch 'origin/dev' into ns15
2023-01-29 22:55:00 +01:00
Milos Kozak
38ee906db9
Merge pull request #2341 from nightscout/dependabot/gradle/dev/androidx.appcompat-appcompat-1.6.0
...
chore(deps): bump appcompat from 1.5.1 to 1.6.0
2023-01-29 22:54:39 +01:00
Milos Kozak
b735f930ba
Merge pull request #2340 from nightscout/dependabot/gradle/dev/room_version-2.5.0
...
chore(deps): bump room_version from 2.4.3 to 2.5.0
2023-01-29 22:54:19 +01:00
