Commit graph

2958 commits

Author SHA1 Message Date
Tim Gunn
f0bdafc1d6
Merge branch 'update-oref' of github.com:Tornado-Tim/AndroidAPS into AS0ref 2020-04-06 18:46:58 +12:00
Tim Gunn
a87681a31a
fix variable 2020-04-06 18:45:47 +12:00
Milos Kozak
2995999989 Merge remote-tracking branch 'origin/dev' into dagger3 2020-04-06 00:19:12 +02:00
Dominik Dzienia
f1770c093b Introduced Patient name, refactored SMS OTP and Prefs Export to use it 2020-04-05 21:35:19 +02:00
Milos Kozak
856ef12f16 New translations objectives.xml (Dutch) 2020-04-05 18:33:39 +02:00
Tim Gunn
91e36e01ba
Merge branch 'update-oref' of github.com:Tornado-Tim/AndroidAPS into AS0ref 2020-04-05 23:04:49 +12:00
Tim Gunn
6d064fb56c
fix preference screen to conform to norms 2020-04-05 23:03:19 +12:00
Tim Gunn
63fb50a2e6
Update oref1 text. 2020-04-05 22:35:49 +12:00
Tim Gunn
785b4540c9
Remove oref0 2020-04-05 22:33:20 +12:00
Andy Rozman
88554ee376 Merge branch 'dev' into omnipod_eros_dev 2020-04-04 20:25:09 +01:00
Tim Gunn
acab0b87be
Merge branch 'dagger3' of github.com:MilosKozak/AndroidAPS into update-oref 2020-04-05 00:45:47 +13:00
Milos Kozak
013018ac7b Merge remote-tracking branch 'origin/dagger3' into rs 2020-04-02 22:06:17 +02:00
Milos Kozak
dbc199d00c Merge branch 'dagger3' of https://github.com/MilosKozak/AndroidAPS into dagger3 2020-04-02 18:48:49 +02:00
Milos Kozak
615b025600 Merge branch 'pull/2542' into dagger3 2020-04-02 18:48:37 +02:00
Milos Kozak
64ee80b48b
Merge pull request #2545 from dlvoy/dagger3-encprefs
Preferences Encryption
2020-04-01 23:31:29 +02:00
Milos Kozak
e05f9f2a87 Merge remote-tracking branch 'origin/dev' into dagger3 2020-04-01 21:33:04 +02:00
Milos Kozak
447c05f05f
New Crowdin translations (#2543)
* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations objectives.xml (Bulgarian)

* New translations strings.xml (Portuguese, Brazilian)
2020-04-01 18:13:48 +02:00
Dominik Dzienia
1c97f8a720 Preferences Encryption:
- encrypted JSON format support
 - using master password & password prompt
- refactored alerts
2020-04-01 13:59:10 +02:00
Roumen Georgiev
b95f882956 initial work 2020-03-30 15:53:12 +03:00
Milos Kozak
a85ec262d3 Display Dana model 2020-03-28 22:40:56 +01:00
Milos Kozak
502eb59089 Merge remote-tracking branch 'origin/dagger3' into rs 2020-03-27 21:49:20 +01:00
Milos Kozak
c477649276 Fix wear preferences, expand single preference by default 2020-03-27 21:32:47 +01:00
Milos Kozak
459ba955ad Merge branch 'dev' into dagger3 2020-03-27 20:30:39 +01:00
Milos Kozak
7e61c5bc61
New Crowdin translations (#2530)
* New translations objectives.xml (French)

* New translations objectives.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Czech)
2020-03-27 20:29:36 +01:00
Milos Kozak
5ce8b998d9 RS v3 encryption 2020-03-26 20:25:20 +01:00
Tim Gunn
d8ccaadc03
Merge branch 'dagger3' of github.com:MilosKozak/AndroidAPS into update-oref 2020-03-26 12:17:08 +13:00
Dominik Dzienia
c58c62d4bc Tost shown when password is set now show when password is not set at end (cancel) or unset 2020-03-25 14:47:28 +01:00
Tim Gunn
e1d8691af2
Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into update-oref 2020-03-25 13:30:12 +13:00
Dominik Dzienia
6e9ccc593f Support for master password and storing password as hashes (HMAC) instead of plaintext,
additional crypto utils with tests (partialy for in-progress pref export encryption),
changed PasswordCheck to more common UI and to use lambdas (will need given password in lambda callback for prefs enc)
2020-03-25 01:21:20 +01:00
Milos Kozak
0e9f643241 Merge branch 'biometric' into dagger3 2020-03-22 19:59:35 +01:00
Milos Kozak
235d241736 Merge branch 'dev' into dagger3 2020-03-21 18:32:23 +01:00
Milos Kozak
34434ffc62
Merge pull request #2452 from StephenBrown2/add_mdt_nimh
Add NiMH battery option for Medtronic pumps
2020-03-21 15:34:54 +01:00
Milos Kozak
71de506b79 New translations strings.xml (Portuguese) 2020-03-20 17:40:34 +01:00
Milos Kozak
a12762f034 Move OTP settings to preferences 2020-03-20 17:31:30 +01:00
Milos Kozak
4d88786fb6 Force TOTP 2020-03-20 16:22:38 +01:00
Milos Kozak
5d32bfec95 Merge branch 'dagger3' into TOTP 2020-03-20 15:58:17 +01:00
Milos Kozak
e27ddc1772 Merge branch 'dev' into dagger3 2020-03-17 18:47:43 +01:00
Milos Kozak
854d81e8a8
New Crowdin translations (#2488)
* New translations strings.xml (French)

* New translations insight_alert_codes.xml (Finnish)

* New translations exam.xml (Finnish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Polish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Japanese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (German)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Greek)

* New translations strings.xml (Croatian)

* New translations strings.xml (Finnish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (German)

* New translations exam.xml (Lithuanian)

* New translations strings.xml (Czech)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)

* New translations exam.xml (Czech)

* New translations strings.xml (Czech)

* New translations exam.xml (Czech)

* New translations strings.xml (Russian)

* New translations strings.xml (French)

* New translations strings.xml (German)

* New translations strings.xml (French)

* New translations objectives.xml (Greek)

* New translations objectives.xml (Afrikaans)

* New translations objectives.xml (Bulgarian)

* New translations objectives.xml (Chinese Simplified)

* New translations objectives.xml (Croatian)

* New translations objectives.xml (Czech)

* New translations objectives.xml (Dutch)

* New translations objectives.xml (Finnish)

* New translations objectives.xml (French)

* New translations objectives.xml (German)

* New translations objectives.xml (Hebrew)

* New translations objectives.xml (Irish)

* New translations objectives.xml (Japanese)

* New translations objectives.xml (Korean)

* New translations objectives.xml (Lithuanian)

* New translations objectives.xml (Polish)

* New translations objectives.xml (Portuguese)

* New translations objectives.xml (Portuguese, Brazilian)

* New translations objectives.xml (Romanian)

* New translations objectives.xml (Russian)

* New translations objectives.xml (Slovak)

* New translations objectives.xml (Slovenian)

* New translations objectives.xml (Spanish)

* New translations objectives.xml (Swedish)

* New translations objectives.xml (Italian)

* New translations objectives.xml (Turkish)

* New translations objectives.xml (Italian)

* New translations objectives.xml (German)

* New translations objectives.xml (Portuguese)

* New translations objectives.xml (Portuguese, Brazilian)

* New translations objectives.xml (Czech)

* New translations objectives.xml (Slovak)

* New translations objectives.xml (Russian)
2020-03-17 16:32:41 +01:00
Milos Kozak
d6997f8190 Objectives text change 2020-03-15 12:07:09 +01:00
Milos Kozak
99aec40534 Merge branch 'dev' into dagger3 2020-03-10 22:39:26 +01:00
Brian Quinion
b1097880f4 Add carbs required to overview. Add notification with option to ignore carbs suggestions for 5, 15 or 30min 2020-03-10 18:46:14 +00:00
Milos Kozak
8d111cb819 Merge branch 'dev' into dagger3 2020-03-10 19:20:22 +01:00
Brian Quinion
063d3685e1 Show carb suggestions from OpenAPS 2020-03-10 11:30:13 +00:00
TebbeUbben
7d9c1f8af9 Use "Display time-sensitive notifications" for Insight alerts 2020-03-09 23:07:55 +01:00
Andy Rozman
f482250b70 Merge branch 'omnipod_eros_dev' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros_dev 2020-03-07 19:51:25 +00:00
Andy Rozman
44cc3f6119 - problem with settings 2020-03-07 19:50:51 +00:00
Milos Kozak
2467c0bba7 scrollable buttons in landscape mode 2020-03-07 20:50:49 +01:00
Milos Kozak
14bda9cf71 hide overview_accepttempbutton by default 2020-03-07 20:37:08 +01:00
Milos Kozak
a3ee216b21
New Crowdin translations (#2485)
* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (French)

* New translations strings.xml (Italian)

* New translations objectives.xml (Italian)

* New translations strings.xml (Italian)

* New translations insight_alert_titles.xml (Italian)

* New translations insight_exceptions.xml (Italian)

* New translations strings.xml (Italian)
2020-03-07 17:34:39 +01:00
Milos Kozak
7412f67528
New Crowdin translations (#2464)
* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (French)

* New translations strings.xml (Italian)

* New translations strings.xml (Irish)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations insight_alert_titles.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations objectives.xml (Italian)

* New translations strings.xml (Italian)

* New translations objectives.xml (Italian)

* New translations strings.xml (Italian)

* New translations exam.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)
2020-03-06 11:35:03 +01:00