Commit graph

13455 commits

Author SHA1 Message Date
Bart Sopers 9e0def18c4 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-11-13 17:39:48 +01:00
Bart Sopers e774ad94a5 Fix NPE 2020-11-13 16:32:17 +01:00
Bart Sopers f526c6be38 Prepare Omnipod for upstream merge 2020-11-13 14:52:55 +01:00
Bart Sopers 728b666834 Merge branch 'dev' into omnipod_eros_dev_upstream_merge 2020-11-13 14:50:55 +01:00
Bart Sopers c9aa8b8bba Small cleanup 2020-11-13 14:50:03 +01:00
Bart Sopers 824b89adca Reorder translation 2020-11-13 13:17:39 +01:00
Bart Sopers 93a4f7ec58 Update translation 2020-11-13 13:16:58 +01:00
Bart Sopers f5fac5862d Pod alert improvements: always show notification and always upload to NS 2020-11-13 13:16:19 +01:00
Bart Sopers a6f5bcdfa6 Hide ack alerts button when automatic acknowledgement is enabled 2020-11-13 12:26:20 +01:00
Milos Kozak edd5dd7980 fix Stats 2020-11-12 22:56:03 +01:00
Bart Sopers 103333dee1 Add extra check 2020-11-12 20:29:52 +01:00
Bart Sopers e9944e3b9c Merge branch 'omnipod_eros_dev_automatically_ack_pod_alerts' into omnipod_eros_dev 2020-11-12 20:13:38 +01:00
Bart Sopers d97a30d195 Add check 2020-11-12 20:13:06 +01:00
bartsopers 863f14f60f
Merge pull request #39 from AAPS-Omnipod/omnipod_eros_dev_automatically_ack_pod_alerts
Add option to automatically acknowledge Pod alerts
2020-11-12 20:11:26 +01:00
rICTx-T1D f87193c7fe
Merge pull request #2 from nightscout/dev
head:dev to dev
2020-11-12 20:09:56 +01:00
Bart Sopers 96117bf2da Fix typo in translation 2020-11-12 20:09:17 +01:00
Bart Sopers 41d3447b5f Fix typo and formatting 2020-11-12 19:00:02 +01:00
Bart Sopers 003d507cf8 Add optional to automatically acknowledge Pod alerts and show a notification instead 2020-11-12 18:56:32 +01:00
Bart Sopers 642a7c8e3b Revert "Prepare Omnipod for upstream merge"
This reverts commit 787fa0b305.
2020-11-12 17:29:17 +01:00
Milos Kozak d165e02044 gradle update 2020-11-12 15:45:52 +01:00
Milos Kozak d1009e5321 better handle storage permission on import 2020-11-12 15:27:45 +01:00
Milos Kozak d6bc1ab400 2.7.1-dev 2020-11-12 15:26:26 +01:00
Milos Kozak 4d8793745e
New Crowdin updates (#62)
* New translations strings.xml (Russian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations exam.xml (Polish)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Hebrew)

* New translations exam.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Lithuanian)

* 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 (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Korean)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Italian)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (Polish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Czech)

* New translations strings.xml (French)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Czech)

* New translations strings.xml (Italian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Polish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Russian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (French)

* New translations strings.xml (Hebrew)

* New translations strings.xml (German)
2020-11-12 14:48:01 +01:00
Milos Kozak 66e4e2992e
Merge pull request #14 from rICTx-T1D/rICTx-T1D_watchface01
New styled watchface with multiple colored styles for round and rect watches
2020-11-12 14:31:33 +01:00
Milos Kozak 4986ddef46
Merge pull request #65 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge
Latest Omnipod updates
2020-11-12 11:25:21 +01:00
Bart Sopers 15fed588ca Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-11-11 21:36:03 +01:00
Bart Sopers a425d710a3 Rename translation key 2020-11-11 21:35:45 +01:00
Bart Sopers 5e8cb2e1ed Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-11-11 21:09:33 +01:00
bartsopers c809b4ea6f
Merge pull request #37 from AAPS-Omnipod/omnipod_eros_dev_remove_duplicate_verification
Remove delivery status verification in favor of nonce verification
2020-11-11 21:03:09 +01:00
Bart Sopers a72ec5a0df Don't add duplicate failure for TBR 2020-11-11 21:01:42 +01:00
Bart Sopers 5ab24e99dd Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_remove_duplicate_verification 2020-11-11 20:31:28 +01:00
Bart Sopers cdf059a0ba Revert hiding disconnect buttons in overview for Omnipod 2020-11-11 20:31:05 +01:00
Bart Sopers 310af0eb63 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_remove_duplicate_verification 2020-11-11 20:13:47 +01:00
Bart Sopers c16fc3a946 Show disconnected icon in overview for Omnipod when Pod is suspended and hide disconnect buttons in overview for Omnipod 2020-11-11 20:12:57 +01:00
Bart Sopers 85086bceed Remove delivery status verification in favor of nonce verification 2020-11-11 19:50:06 +01:00
Milos Kozak 2098dda5bb
Merge pull request #64 from Philoul/PatientAgeString
Patient age string Rename
2020-11-10 23:24:59 +01:00
Philoul dde45ef737 Rename Patient age string because of Pregnant new type 2020-11-10 21:42:03 +01:00
Bart Sopers a875a9c437 Show deactivate button instead of retry button in case of Pod faults in activation wizard 2020-11-10 20:15:48 +01:00
Bart Sopers 9eda130df2 Small Omnipod pairing bug fix 2020-11-10 20:10:52 +01:00
Milos Kozak d94eaffa63
New Crowdin updates (#61)
* New translations exam.xml (Romanian)

* New translations exam.xml (French)

* New translations exam.xml (Korean)

* New translations exam.xml (Russian)

* New translations exam.xml (Portuguese)

* New translations exam.xml (Polish)

* New translations exam.xml (Norwegian)

* New translations exam.xml (Dutch)

* New translations exam.xml (Lithuanian)

* New translations exam.xml (Greek)

* New translations exam.xml (Czech)

* New translations exam.xml (Spanish)

* New translations exam.xml (Slovak)

* New translations exam.xml (Swedish)

* New translations exam.xml (Portuguese, Brazilian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations exam.xml (Hebrew)

* New translations objectives.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Czech)

* New translations strings.xml (French)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Russian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Hebrew)

* New translations insight_exceptions.xml (Hebrew)

* New translations insight_alert_descriptions.xml (Hebrew)

* New translations insight_alert_titles.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Lithuanian)

* New translations exam.xml (German)

* New translations insight_alert_codes.xml (Hebrew)

* 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 (Swedish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (French)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Czech)

* New translations strings.xml (Russian)

* New translations exam.xml (Czech)

* New translations exam.xml (Russian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (Polish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Hebrew)

* New translations exam.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations exam.xml (Norwegian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Hebrew)
2020-11-09 13:33:55 +01:00
Milos Kozak 71c605e3e0 fix string 2020-11-08 21:01:46 +01:00
Milos Kozak e223cd5de3 fix string 2020-11-08 18:11:08 +01:00
Milos Kozak 207a1a522b Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2020-11-08 18:01:37 +01:00
Milos Kozak e9d0cb3d5c
Merge pull request #55 from twain47/pregnancy_age
Add 'pregnant' age option to allow for higher insulin requirements during pregnancy
2020-11-08 18:01:01 +01:00
Milos Kozak 6b629a1dda
Merge pull request #41 from Philoul/Action_CarePortalInfo
Level informations added in Action>Careportal
2020-11-08 17:47:14 +01:00
Brian Quinion e89eb67236 Update hard limits based on looping in pregnancy group feedback 2020-11-08 16:31:10 +00:00
Brian Quinion aa53ac11f2 Move PREGNANT to a correct key/value pair 2020-11-08 00:45:49 +00:00
Milos Kozak c8ce281f9c
Merge pull request #57 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge
Add translation for Omnipod exception
2020-11-07 20:08:42 +01:00
Milos Kozak 1b0483d476 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2020-11-07 16:58:00 +01:00
Milos Kozak 7a41ef5eed RS: better handle error state 2020-11-07 12:30:39 +01:00