Milos Kozak
91fecb6cc7
fix NPE
2021-03-16 19:06:05 +01:00
Milos Kozak
9d5d79dcec
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-03-16 19:03:47 +01:00
Milos Kozak
a7d76d4805
fix NPE
2021-03-16 19:03:36 +01:00
Milos Kozak
e2e060b9a9
Merge pull request #414 from Philoul/UpdateTranslator
...
Fix TT Reason in TTDialog and add TT Reason to Translator
2021-03-16 18:17:41 +01:00
Milos Kozak
44d5a04db2
Merge pull request #415 from Philoul/Statistic_string_for_translation
...
Add string to Activity monitor for translation
2021-03-16 18:16:58 +01:00
Philoul
4bd21c2a68
Add string to Activity monitor for translation
2021-03-14 17:07:27 +01:00
Philoul
605ca7def4
Fix TT Reason in TTDialog and add Reason to translator
2021-03-13 17:31:58 +01:00
Milos Kozak
9790f1d558
Merge pull request #409 from nightscout/dependabot/gradle/dev/org.json-json-20210307
...
Bump json from 20201115 to 20210307
2021-03-12 17:28:38 +01:00
dependabot[bot]
f4b2bbfbdf
Bump json from 20201115 to 20210307
...
Bumps [json](https://github.com/douglascrockford/JSON-java ) from 20201115 to 20210307.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases )
- [Commits](https://github.com/douglascrockford/JSON-java/commits )
Signed-off-by: dependabot[bot] <support@github.com>
2021-03-10 07:21:51 +00:00
Milos Kozak
8ec346cd35
specify glucoseUnit, DB++
2021-03-09 22:11:30 +01:00
Milos Kozak
2ef91e6814
Merge pull request #405 from nightscout/careportal
...
Careportal -> Room
2021-03-08 22:27:26 +01:00
Milos Kozak
2ac2a4c2d9
fit TT in Automation
2021-03-08 20:41:42 +01:00
Milos Kozak
c28fb465fb
Merge remote-tracking branch 'ns/dev' into careportal
2021-03-08 20:27:53 +01:00
Milos Kozak
91e323b5f5
New Crowdin updates ( #388 )
...
* New translations exam.xml (Portuguese)
* New translations validator.xml (Slovak)
* New translations alert_descriptions.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations alert_titles.xml (Tamil)
* New translations alert_descriptions.xml (Tamil)
* New translations alert_codes.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations validator.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations exam.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations strings.xml (Tamil)
* New translations objectives.xml (Tamil)
* New translations exceptions.xml (Tamil)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations exam.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Dutch)
* New translations strings.xml (Romanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Korean)
* New translations strings.xml (Italian)
* 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 (French)
* New translations strings.xml (German)
* New translations validator.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 (Portuguese)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Hebrew)
* New translations objectives.xml (Hebrew)
* New translations strings.xml (Czech)
* New translations strings.xml (Italian)
* New translations strings.xml (Portuguese)
* New translations alert_titles.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 (Russian)
* New translations strings.xml (Portuguese)
* New translations exam.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations validator.xml (French)
* New translations alert_descriptions.xml (French)
* New translations alert_titles.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (German)
* New translations strings.xml (French)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Russian)
* New translations strings.xml (Czech)
* New translations strings.xml (Italian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (French)
* New translations alert_descriptions.xml (Swedish)
* New translations alert_titles.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations exam.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 (Swedish)
2021-03-08 20:22:45 +01:00
Milos Kozak
6c072dbe6e
Merge pull request #402 from nightscout/adrian/cleanup-glucosestatus
...
Refactor GlucoseStatusProvider out of GlucoseStatus
2021-03-08 20:20:10 +01:00
Milos Kozak
8db8edc3f6
Careportal -> Room
2021-03-08 20:10:02 +01:00
AdrianLxM
d13d6a7fff
glucose status provider test fix
2021-03-07 22:38:18 +01:00
Milos Kozak
cb29e7a33c
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-03-07 22:04:51 +01:00
AdrianLxM
3cb07c215e
Refactor GlucoseStatusProvider out of GlucoseStatus
2021-03-07 20:22:03 +01:00
Milos Kozak
bcfa449ec8
lints
2021-03-07 19:26:08 +01:00
Milos Kozak
9345276f94
Merge pull request #398 from Tornado-Tim/fix-LGS-constraint
...
Fix Low Glucose Constraint
2021-03-07 18:20:22 +01:00
Milos Kozak
b575c1b34c
Merge pull request #400 from andyrozman/bug138_tbr_for_high_values
...
Bug138 tbr for high values
2021-03-07 18:19:29 +01:00
Milos Kozak
658f565cf2
Notofocation -> kt
2021-03-07 17:46:21 +01:00
Milos Kozak
20cabd00bb
more kotlin conversion
2021-03-07 15:31:05 +01:00
Milos Kozak
563bee2faf
PumpDescription -> kt
2021-03-07 15:19:51 +01:00
Milos Kozak
54ad6caf83
interfaces -> kt
2021-03-07 14:37:05 +01:00
Milos Kozak
fcb4d00ba2
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-03-07 14:22:53 +01:00
Milos Kozak
b9e50885a8
Constraint -> kt
2021-03-07 14:22:50 +01:00
Milos Kozak
2ea423c704
PumpEnactResult -> kt
2021-03-07 13:31:11 +01:00
Milos Kozak
00ee60ff1e
Intervals -> kt
2021-03-07 11:05:33 +01:00
Andy Rozman
4232679c06
- small change (removed unneeded code)
2021-03-07 00:57:13 +00:00
Andy Rozman
2738cf7fce
- TBR was incorrectly interpretted for high TBR values
2021-03-07 00:46:53 +00:00
Milos Kozak
021d70bbe6
Merge pull request #399 from Philoul/Fix_Carbs_Layout
...
Fix Carbs Layout
2021-03-07 00:58:23 +01:00
Milos Kozak
72176edfb9
core -> kt, move tests to core
2021-03-07 00:49:18 +01:00
Milos Kozak
9b78839f5d
typo
2021-03-06 23:18:57 +01:00
Tim Gunn
6ecdd4d7fc
Add appropriate constraint so isLgsAllowed Constraint can be properly checked
2021-03-07 02:53:01 +13:00
Milos Kozak
23c23ea0b8
TrendArrow calculation
2021-03-05 23:08:43 +01:00
Milos Kozak
65770ecbf6
RS pairing improvement
2021-03-05 21:19:53 +01:00
Milos Kozak
04f074caf9
MainApp -> kt, the rest of DatabaseHelperInterface
2021-03-04 19:23:01 +01:00
Milos Kozak
87f348fe5a
Merge pull request #390 from Tornado-Tim/window-perms-setup
...
Add Window Permission into Setup Wizard
2021-03-03 21:57:44 +01:00
Tim Gunn
6688a2696e
add Window Permssion into Setup Wizard
2021-03-04 04:39:35 +13:00
Milos Kozak
b0823bcfb8
Merge pull request #389 from swissalpine/patch-5
...
Fix for AAPS SMB Mode: doesn't work with XDrip anymore - in latest Dev Versions
2021-03-03 14:14:13 +01:00
swissalpine
98e2d9ec86
Update XdripPlugin.kt
2021-03-03 11:06:55 +01:00
swissalpine
68a665bbeb
Fix for issue #380 : AAPS SMB Mode: doesn't work with XDrip anymore - in latest Dev Versions
...
https://github.com/nightscout/AndroidAPS/issues/380
2021-03-03 11:00:48 +01:00
Milos Kozak
17ceb42df8
better message for out of limit
2021-03-03 00:07:02 +01:00
Milos Kozak
94edd017dd
show TBR tab in engineering mode only
2021-03-02 23:32:30 +01:00
Milos Kozak
6eafda561c
exclude dots from profile name
2021-03-02 23:22:15 +01:00
Milos Kozak
efddea0eee
Merge pull request #386 from nightscout/tt
...
TempTarget -> room
2021-03-02 22:41:36 +01:00
Milos Kozak
46fbde9643
add project-dictionary
2021-03-02 00:11:05 +01:00
Milos Kozak
b5dcf27b07
New Crowdin updates ( #378 )
...
* New translations validator.xml (Dutch)
* New translations validator.xml (German)
* New translations alert_descriptions.xml (German)
* New translations alert_titles.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations validator.xml (Romanian)
* New translations alert_descriptions.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations exam.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations validator.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
2021-03-01 23:55:55 +01:00