Milos Kozak
e26ae1af7d
asking for permissions refactor
2021-01-18 22:47:55 +01:00
Milos Kozak
65a39d91be
refactor import/export to create DaggerAppCompatActivityWithResult
2021-01-18 17:36:18 +01:00
Milos Kozak
23d649a0d8
Merge branch 'dev' into dev
2021-01-10 20:41:36 +01:00
Milos Kozak
e3ee5eeb1a
Merge pull request #214 from nightscout/soft-force-upload-only
...
Rename upload only key and description
2021-01-10 20:26:30 +01:00
AdrianLxM
68be654fd4
Rename upload only key and description
...
This renames the key that people that have disabled it in the past will actively have to re-enable it.
Adds extra warning that it is dangerous to disable it.
2021-01-10 19:56:44 +01:00
Milos Kozak
c5afc6daca
Merge pull request #211 from nightscout/dana/fix-menu-crash-plus-i18n
...
fix menu crash and make graph label translatable
2021-01-10 19:50:25 +01:00
AdrianLxM
301c44627f
fix menu crash and make graph label translatable
2021-01-10 04:10:21 +01:00
parapenT1sta
50dcf7d8bb
Update strings.xml
2021-01-09 21:56:31 +00:00
parapenT1sta
e8be0fbd79
Update strings.xml
2021-01-09 16:48:17 +00:00
Milos Kozak
48084ff7bf
add keys to crash report
2021-01-08 18:55:01 +01:00
xJoe
2b52dbda80
Correction xDrip -> xDrip+
2021-01-08 18:21:36 +01:00
Milos Kozak
c847a5a340
add warning to ns_upload_only
2021-01-08 14:20:18 +01:00
Milos Kozak
5d53029b54
Merge pull request #181 from xJoe/dev
...
Status lights battery
2021-01-07 10:29:09 +01:00
Milos Kozak
2524fc705d
Update app/src/main/res/values/strings.xml
...
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
2021-01-07 10:28:27 +01:00
xJoe
27cd727643
Status lights battery
...
added "pump" as there is also sensor battery as of AAPS 2.8
2021-01-03 18:07:41 +01:00
Milos Kozak
cac28dd01f
trying to fix crowdin
2021-01-03 11:37:31 +01:00
Milos Kozak
bd218a58a2
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-01-03 11:32:47 +01:00
Milos Kozak
e5902b73c7
trying to fix crowdin
2021-01-03 11:32:37 +01:00
xJoe
9e286b789a
Update strings.xml
2021-01-03 10:50:08 +01:00
Milos Kozak
815cbbd21d
Merge pull request #150 from CapnGrumpy/master
...
Update exam.xml
2020-12-29 18:36:53 +01:00
Milos Kozak
a97b6149ca
code cleanup
2020-12-29 18:36:03 +01:00
Matthew Gray
40871717bc
Update exam.xml
...
Consistency in use of I:C and not using 'Topic'.
2020-12-29 13:39:56 +00:00
Milos Kozak
6ed733f8cf
Objectives correction
2020-12-28 22:59:45 +01:00
Milos Kozak
52c6d762f5
Merge branch 'dev' into objectives
2020-12-28 18:40:10 +01:00
Milos Kozak
c8f7dae2c8
Bolus advisor
2020-12-28 16:42:00 +01:00
Philoul
b4710b4936
Merge remote-tracking branch 'Nightscout/dev' into LoopDialog
2020-12-27 13:18:04 +01:00
Philoul
cefdaa471d
Replace Loop Menu by Loop Dialog
2020-12-26 17:40:16 +01:00
Bart Sopers
b783364e81
Fix string resources
2020-12-25 19:36:38 +01:00
Bart Sopers
00b67713b8
Improve string for Omnipod in Setup Wizard
2020-12-25 19:10:02 +01:00
Milos Kozak
3c32583d8c
ProfileHelper layout buttons fix
2020-12-25 14:42:39 +01:00
Milos Kozak
03c59d6e19
SMS: report pump unreachable
2020-12-25 12:06:54 +01:00
Milos Kozak
3be91d83f6
Merge pull request #129 from Philoul/TempTargetButtons
...
TT Dialog Add 5 buttons for quick selection of TempTarget's type
2020-12-23 20:55:34 +01:00
Milos Kozak
46c35880e9
Merge branch 'objectives' into master
2020-12-21 21:48:06 +01:00
Milos Kozak
8042c873a9
position string
2020-12-21 19:40:02 +01:00
Philoul
1d1359dfd4
TT Dialog Add 5 buttons for quick selection of TempTarget
2020-12-20 19:54:54 +01:00
osodebailar
32f37c6b00
change string concetenate with standard coding
2020-12-18 09:05:41 +01:00
Matthew Gray
5dcbd051ff
Merge remote-tracking branch 'origin/master'
2020-12-14 13:23:51 +00:00
Matthew Gray
fa7cab9365
Open topics:
...
1) Typo in Hypo Temp Target - FIXED.
2) Profile switching I:C answer (negate text or expected answer) - FIXED.
3) Douplicated copy in wrongcarbs - FIXED.
4) Possible other strategy in insulin delivery/entry errors. - FIXED.
2020-12-14 13:15:04 +00:00
Milos Kozak
f5f4c655c5
ActionAlarm
2020-12-14 13:52:47 +01:00
Milos Kozak
05c74c0c38
Merge remote-tracking branch 'ns/dev' into pull/84
2020-12-11 22:59:41 +01:00
Milos Kozak
7ed013d44c
Merge branch 'dev' into master
2020-12-11 21:46:00 +01:00
Matthew Gray
d18d17c274
CHO/Bread units changed.
2020-12-07 16:03:45 +00:00
Milos Kozak
26834de458
remove unused resources
2020-12-06 17:32:08 +01:00
Matthew Gray
6ed325f179
Found 1 typo...
2020-12-04 17:44:03 +00:00
Matthew Gray
8c4b2f20a1
Removed question numbers. Added noise and bread units questions.
2020-12-04 17:29:07 +00:00
Milos Kozak
7a96c90ecf
Merge branch 'dev' into bugfix_clone_invalid_profile_causes_fatal_error
2020-11-29 13:29:44 +01:00
Brian Quinion
559a07fa6d
Fix clone local profile to test that profile is valid before adding it (causes a fatal error)
2020-11-29 12:19:03 +00:00
AdrianLxM
124d61577d
about dialog cleanup and dkma
2020-11-28 17:26:03 +01:00
Milos Kozak
3f77496c88
automated copy of configuration AAPS -> NSCLIENT
2020-11-27 16:46:33 +01:00
Matthew Gray
a9cfbde377
RC4 - renumbered CORRECTLY v2.
2020-11-27 15:26:22 +00:00
Matthew Gray
18e914a508
RC4 - renumbered CORRECTLY.
2020-11-27 15:19:38 +00:00
Matthew Gray
80ed590739
RC3 - renumbered.
2020-11-27 15:04:43 +00:00
Brian Quinion
eaba35c024
Add a text filter to the top of preferences
2020-11-24 00:50:09 +00:00
Matthew Gray
865264fc3c
Group RC2.
2020-11-17 14:14:29 +00:00
Philoul
dde45ef737
Rename Patient age string because of Pregnant new type
2020-11-10 21:42:03 +01:00
Milos Kozak
71c605e3e0
fix string
2020-11-08 21:01:46 +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
Matthew Gray
4e914d213b
2nd build fixes.
2020-11-03 13:29:45 +00:00
Matthew Gray
d0037886ba
1st build fixes.
2020-11-03 12:08:32 +00:00
Matthew Gray
c5ee40b393
1st build fixes.
2020-11-03 11:47:25 +00:00
Matthew Gray
159a465ff8
All questions done.
...
Check SpIdentifier.
2020-11-01 14:22:08 +00:00
Matthew Gray
cb71f550b9
more tidying
2020-10-30 15:15:35 +00:00
Matthew Gray
ca343e7b2d
more tidying
2020-10-30 14:51:41 +00:00
Matthew Gray
e23c0a6d4f
Fix ecarbs
2020-10-30 14:31:32 +00:00
Matthew Gray
46094f7cda
Fix isf question again.
2020-10-30 14:25:29 +00:00
Matthew Gray
beb4c6a206
Fix isf question.
2020-10-30 14:21:41 +00:00
Matthew Gray
5b1cf6cd0c
Questions in.
2020-10-30 14:06:50 +00:00
Matthew Gray
b2b59968ca
Can't remember if I did a commit when I stopped work yesterday.
...
Doing one before I start.
2020-10-29 13:49:52 +00:00
Brian Quinion
21b1117655
Add 'pregnant' age option to allow for higher insulin requirements during pregnancy
2020-10-29 12:53:01 +00:00
Milos Kozak
bd15fae39e
bread -> (exchange)
2020-10-28 16:18:47 +01:00
Matthew Gray
584869094f
2nd few changes so I can build this as a test.
2020-10-28 14:05:35 +00:00
Matthew Gray
0f5bfd1b08
1st few changes
2020-10-28 11:37:38 +00:00
Milos Kozak
b4ff088974
Allow configuring pump type in NSClient
2020-10-25 23:10:09 +01:00
Milos Kozak
08b363b6a5
Add Norwegian language
2020-10-25 22:44:17 +01:00
Dominik Dzienia
b2bd2cafec
Allow exporting OTP authenticator secred, for manual provisioning or use in hardware OTP token burning apps
2020-10-22 23:18:52 +02:00
Bart Sopers
6d51224089
Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge
2020-10-21 14:45:44 +02:00
Philoul
85c2c9bb50
Replace dedicated setting by Low Res Skin
...
Just a copy of Classic skin for initialization
2020-10-20 21:17:28 +02:00
Philoul
ee79588449
Add setting for shorten label on very low res
2020-10-19 22:14:28 +02:00
Sam Spycher
16c0c4cfd3
Fix typo in translation string
...
Fixes nightscout/AndroidAPS#38
2020-10-18 20:12:20 +02:00
Philoul
84c2e7e86e
Update of layout for low res screen to avoid line feed in level values
2020-10-17 23:07:40 +02:00
Bart Sopers
f64cc66298
Improve Setup Wizard for Omnipod
2020-10-17 19:47:39 +02:00
Philoul
bd3cba8a1a
First version of Layout and interface
2020-10-17 11:00:38 +02:00
Sam Spycher
b355511f33
Validate durationStep from tbrSettings in Pumptype when setting TBR via SMS
...
Fixes nightscout/AndroidAPS#38
2020-10-16 18:27:04 +02:00
Milos Kozak
cbdee2b81b
Merge pull request #7 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge
...
Latest Omnipod updates + custom queue commands
2020-10-02 09:40:45 +02:00
Bart Sopers
31215ea488
Split Change Pod wizard into Activate Pod wizard and Deactivate Pod wizard
2020-10-01 19:32:56 +02:00
Milos Kozak
05125af9e7
Lyumjev
2020-10-01 18:48:32 +02:00
Bart Sopers
8af6519687
Finish new Change Pod Wizard (and some other small changes)
2020-09-29 20:53:12 +02:00
Bart Sopers
50c3ec702c
Merge branch 'omnipod_eros_dev_upstream_merge' into omnipod_eros_dev
2020-09-24 23:13:46 +02:00
TebbeUbben
b91ee6808f
Update OH information text
2020-09-18 23:29:41 +02:00
Bart Sopers
d21a8ed00e
Merge branch 'omnipod_eros_dev_upstream_merge' into omnipod_eros_dev
2020-09-13 18:47:10 +02:00
Dominik Dzienia
d150730212
Make need for additional PIN at end of security code (after OTP) more obvious
...
* change hint for code checking edit field to indicate need for PIN
* add additional text about how code is constructed from OTP token and PIN
* change PIN preference label - add that it is mandatory
* add "followed by PIN" to text sent via SMS
2020-09-09 11:53:39 +02:00
Milos Kozak
a87a69be38
Merge pull request #2945 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge
...
More Omnipod updates & cleanup
2020-09-08 16:20:24 +02:00
Philoul
9ef85ab563
Typo in String
2020-09-07 22:19:41 +02:00
AdrianLxM
54be27e76a
Merge pull request #2950 from MilosKozak/feature/oh-uploader-2_7
...
Open Humans Uploader for v2.7
2020-09-05 21:31:43 +02:00
Bart Sopers
503fc9dbf9
Allow to continue in Setup Wizard when Omnipod has been selected and a RL connection has been established
2020-09-05 04:26:22 +02:00
Dominik Dzienia
651c3fc426
Add additional prompt for old master password
...
Prompt for old master password (used to encrypt exported preferences) if current master password is different and cannot decrypt file.
2020-09-04 03:55:02 +02:00
Geoffrey Hansen
14deca471a
update copy
2020-09-03 22:06:42 +02:00
Geoffrey Hansen
02f85398d7
cleanup
2020-09-03 21:22:33 +02:00