Commit graph

11881 commits

Author SHA1 Message Date
Andrei Vereha
3255ecda6d
Merge pull request #120 from 0pen-dash/avereha/merge-dev-3
avereha/merge dev 3
2021-09-15 18:40:52 +02:00
Andrei Vereha
b0f80d5c62 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/merge-dev-3 2021-09-15 18:39:28 +02:00
Andrei Vereha
7af3685933
Merge pull request #119 from 0pen-dash/revert-118-revert-117-avereha/merge-dev-2
Revert "Revert "avereha/merge dev 2""
2021-09-15 18:38:54 +02:00
Andrei Vereha
cb86438c27
Revert "Revert "avereha/merge dev 2"" 2021-09-15 18:38:27 +02:00
Milos Kozak
3d32d5ec43
Merge pull request #672 from Philoul/fix/targetoutofhardlimit
Fix ProfileSealed Target out of Hardlimit
2021-09-15 12:11:01 +02:00
Andrei Vereha
b8eefa842d
Merge pull request #118 from 0pen-dash/revert-117-avereha/merge-dev-2
Revert "avereha/merge dev 2"
2021-09-15 00:13:06 +02:00
Andrei Vereha
7fff6fc564
Revert "avereha/merge dev 2" 2021-09-15 00:12:35 +02:00
Andrei Vereha
aea88ffddf
Merge pull request #117 from 0pen-dash/avereha/merge-dev-2
avereha/merge dev 2
2021-09-14 23:59:33 +02:00
Andrei Vereha
efad748939 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/merge-dev-2 2021-09-14 23:55:15 +02:00
Philoul
d9c066a859 Fix ProfileSealed Target out of Hardlimit 2021-09-14 21:47:13 +02:00
Andrei Vereha
829f5fec6a
Merge pull request #116 from 0pen-dash/avereha/unconfirmed
bugfix: ALARM_ILLEGAL_PUMP_STATE
2021-09-14 20:19:15 +02:00
Andrei Vereha
40a56d11ee bufix for ALARM_ILLEGAL_PUMP_STATE 2021-09-14 20:01:21 +02:00
Milos Kozak
7690419c6c always show basal in NSClient mode 2021-09-13 21:05:01 +02:00
Milos Kozak
0b764a2881 fix SP crash on start 2021-09-13 19:28:45 +02:00
Milos Kozak
efd6b28a64 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-09-13 19:06:36 +02:00
Milos Kozak
ba71e0db9b more Profile validity checks 2021-09-13 19:06:32 +02:00
Andrei Vereha
d4b0935d6b Merge remote-tracking branch 'upstream/dev' into dash 2021-09-13 18:39:23 +02:00
Milos Kozak
1bb0e07db7
Merge pull request #670 from Philoul/fix/automation
Fix Automation rule regression (new)
2021-09-13 11:49:01 +02:00
Philoul
c49dbe655a Fix Automation rule
Action not displayed with JSONArray, it works with a JSONObject...
2021-09-12 15:56:34 +02:00
Andrei Vereha
3432dcf85f
Merge pull request #113 from vanelsberg/FixPodExpires
Pod expiry datetime drifting until next refresh or connection (issue#92)
2021-09-12 13:36:24 +02:00
Andrei Vereha
1b1722cbb3
Merge pull request #112 from vanelsberg/tvelsberg-fixes3
Minimum fill amount = 80U
2021-09-12 13:35:55 +02:00
Andrei Vereha
7b660ba2eb
Merge pull request #111 from vanelsberg/issuetemplate-dash-testing
Add issue template for DASH testing
2021-09-12 13:35:42 +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
2cbfad42fe
Merge pull request #666 from nightscout/revert-665-dev
Revert "NullPointerException while processing Bolus entries"
2021-09-08 19:19:14 +02:00
Milos Kozak
07e4440fee
Revert "NullPointerException while processing Bolus entries" 2021-09-08 19:19:02 +02:00
Milos Kozak
ddbeb31d49
Merge pull request #665 from rdziadosz/dev
NullPointerException while processing Bolus entries
2021-09-08 13:53:41 +02:00
Radoslaw Dziadosz
738495ddda NullPointerException while processing Bolus entries 2021-09-08 01:04:42 +02:00
Milos Kozak
5760d3e85b Update Crowdin configuration file 2021-09-07 22:45:53 +02:00
Milos Kozak
d18c05205c Resolve warnings 2021-09-07 12:08:19 +02:00
Milos Kozak
2034774b39
Merge pull request #647 from nightscout/dependabot/gradle/dev/kotlin_version-1.5.30
Bump kotlin_version from 1.5.21 to 1.5.30
2021-09-06 17:06:14 +02:00
Milos Kozak
9aaddf12d9
Merge pull request #659 from nightscout/dependabot/gradle/dev/com.android.tools.build-gradle-7.0.2
Bump gradle from 7.0.0 to 7.0.2
2021-09-06 17:04:46 +02:00
Milos Kozak
c9897da78d
Merge pull request #641 from nightscout/openhumans_v2
Update Open Humans uploader for new database
2021-09-06 13:54:16 +02:00
Milos Kozak
679a63f757 fix build 2021-09-06 13:50:58 +02:00
Milos Kozak
84343c39a4 fix tests 2021-09-06 11:27:27 +02:00
Milos Kozak
379ed6dca6
Merge pull request #663 from Philoul/Fix_Automation_regression
Fix Automation regression (Add missing return)
2021-09-06 10:27:59 +02:00
Philoul
2fafa78f56 Fix Automation regression (Add missing return) 2021-09-04 23:59:45 +02:00
Theo van Elsberg
9e4c1abd12 Pod expiry datetime drifting until next refresh or connection (issue#92) 2021-09-04 00:17:41 +02:00
Milos Kozak
ba4a8f3a1d
Merge pull request #660 from rdziadosz/dev
Xstream permission
2021-09-03 13:47:23 +02:00
Radoslaw
991b1257d1 xstream permission 2021-09-03 00:01:45 +02:00
dependabot[bot]
59e02e8a8b
Bump gradle from 7.0.0 to 7.0.2
Bumps gradle from 7.0.0 to 7.0.2.

---
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>
2021-09-02 08:13:55 +00:00
Theo van Elsberg
922a84805d Add issue template for DASH testing 2021-09-01 22:18:32 +02:00
Theo van Elsberg
318bdaca6c Minimum fill amount = 80U 2021-09-01 20:33:41 +02:00
Milos Kozak
4d5b699cc4 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-08-28 21:13:54 +02:00
Milos Kozak
3064fea60d update exam text 2021-08-28 21:13:30 +02:00
Milos Kozak
89e16fa0f5
Merge pull request #648 from nightscout/dependabot/gradle/dev/org.mockito-mockito-core-3.12.4
Bump mockito-core from 3.12.1 to 3.12.4
2021-08-28 21:09:17 +02:00
Milos Kozak
5411f4fb3c key_ns_receive_profile_store default true to fetch NS profiles in setup wizard 2021-08-28 20:58:27 +02:00
Milos Kozak
1b87522a4b Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-08-28 19:13:20 +02:00
dependabot[bot]
e4db86facc
Bump mockito-core from 3.12.1 to 3.12.4
Bumps [mockito-core](https://github.com/mockito/mockito) from 3.12.1 to 3.12.4.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.12.1...v3.12.4)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-26 08:05:33 +00:00
dependabot[bot]
1eb12401b0
Bump kotlin_version from 1.5.21 to 1.5.30
Bumps `kotlin_version` from 1.5.21 to 1.5.30.

Updates `kotlin-gradle-plugin` from 1.5.21 to 1.5.30
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.30/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.21...v1.5.30)

Updates `kotlin-allopen` from 1.5.21 to 1.5.30
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.30/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.21...v1.5.30)

Updates `kotlin-stdlib-jdk7` from 1.5.21 to 1.5.30
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.30/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.21...v1.5.30)

Updates `kotlin-reflect` from 1.5.21 to 1.5.30
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.30/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.21...v1.5.30)

---
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-stdlib-jdk7
  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>
2021-08-25 08:11:11 +00:00
Milos Kozak
2ec6e625e7
Merge pull request #636 from nightscout/dependabot/gradle/dev/byteBuddyVersion-1.11.13
Bump byteBuddyVersion from 1.11.5 to 1.11.13
2021-08-24 12:03:36 +02:00