Roumen Georgiev
|
bfd61a65a0
|
fix for screens adding up
|
2018-05-09 15:44:40 +03:00 |
|
Roumen Georgiev
|
41d736e176
|
updated to latest from Milos
|
2018-05-09 15:06:34 +03:00 |
|
Roumen Georgiev
|
a7bbf93599
|
Merge pull request #19 from MilosKozak/startupwizard
Startupwizard
|
2018-05-09 14:49:17 +03:00 |
|
Roumen Georgiev
|
0e8f0669c5
|
Update SWDefinition.java
|
2018-05-09 14:48:35 +03:00 |
|
Milos Kozak
|
bacb3fb337
|
SW pump screen
|
2018-05-09 13:38:17 +02:00 |
|
Roumen Georgiev
|
1f2f2f54fc
|
added SWCheckbox item
|
2018-05-09 14:15:53 +03:00 |
|
Milos Kozak
|
ed43eddc83
|
SWInfotext
|
2018-05-09 11:55:21 +02:00 |
|
Milos Kozak
|
61a7d69a65
|
Merge branch 'dev' into startupwizard
|
2018-05-09 11:41:05 +02:00 |
|
Milos Kozak
|
dbc5e3689a
|
Merge pull request #1028 from andyrozman/translation_irish
Translation - Irish (Gaeilge)
|
2018-05-09 11:20:52 +02:00 |
|
Andy Rozman
|
bacc79970a
|
Added formated=false to some translations.
|
2018-05-09 10:19:27 +01:00 |
|
Milos Kozak
|
8c2d0d80ee
|
Merge pull request #1017 from MilosKozak/notification-height
Tests required: Notification height
|
2018-05-09 10:16:29 +02:00 |
|
Roumen Georgiev
|
d5a3177c35
|
trying pump followup screen -NOT WORKING
|
2018-05-09 11:06:52 +03:00 |
|
McHoffi
|
77522d0770
|
Update strings.xml
|
2018-05-09 09:45:53 +02:00 |
|
Milos Kozak
|
0c848b25f6
|
Merge branch 'dev' into translation_irish
|
2018-05-09 09:25:11 +02:00 |
|
Milos Kozak
|
e29a590cad
|
Merge pull request #1020 from MilosKozak/dia-refactor
default DIA
|
2018-05-08 23:43:54 +02:00 |
|
Milos Kozak
|
62a83bc197
|
Merge pull request #1010 from MilosKozak/sv-update
swedish update
|
2018-05-08 23:32:10 +02:00 |
|
Milos Kozak
|
3f568c2724
|
Merge pull request #1030 from triplem/wifi_connection
Add isConnected, enable NSClient only, if really connected to internet
|
2018-05-08 23:30:51 +02:00 |
|
Milos Kozak
|
faba0d9ff6
|
Merge pull request #1023 from MilosKozak/polish-translation
Polish translation
|
2018-05-08 23:27:14 +02:00 |
|
Milos Kozak
|
8c042b4bc8
|
Merge pull request #1029 from RadoslavR/patch-58
bg translation again
|
2018-05-08 23:18:52 +02:00 |
|
Johannes Mockenhaupt
|
39905f8e60
|
Darker UAM, ZT prediction colors.
They now have the same level of 'brightness'.
|
2018-05-08 21:26:52 +02:00 |
|
Markus M. May
|
86a91baad7
|
Fix translation
|
2018-05-08 20:56:02 +02:00 |
|
Roumen Georgiev
|
85d4ef4419
|
trying pump followup screen
|
2018-05-08 17:09:37 +03:00 |
|
Roumen Georgiev
|
e357c7fd1b
|
adding pump selection
|
2018-05-08 15:14:36 +03:00 |
|
Johannes Mockenhaupt
|
ce6e53e9c6
|
Wear wizard: add TT config option.
|
2018-05-08 13:28:01 +02:00 |
|
Markus M. May
|
b0d8d547d8
|
Add isConnected, enable NSClient only, if really connected to internet
|
2018-05-07 20:43:13 +02:00 |
|
Radoslav Radev
|
0164da23a4
|
Update strings.xml
|
2018-05-07 21:34:55 +03:00 |
|
Markus M. May
|
5314c24099
|
Additional translations
|
2018-05-07 20:25:30 +02:00 |
|
Andy Rozman
|
3baf907267
|
Initial irish translation
|
2018-05-07 16:45:38 +01:00 |
|
AdrianLxM
|
c6dac2789c
|
one more polish update
|
2018-05-07 10:30:07 +02:00 |
|
AdrianLxM
|
af2c27236b
|
polish update
|
2018-05-07 10:24:06 +02:00 |
|
Johannes Mockenhaupt
|
785c402848
|
LP: Don't notify about invalid values during editing.
|
2018-05-07 02:11:59 +02:00 |
|
boysim
|
2ae6369362
|
added dutch translations
|
2018-05-06 22:52:04 +02:00 |
|
AdrianLxM
|
3385a23bdb
|
Merge pull request #1004 from pedroll/aaps20_rc3
Spanish translation
|
2018-05-06 20:25:17 +02:00 |
|
pedroll
|
0d2a0798f7
|
Spanish translation 2
|
2018-05-06 20:04:12 +02:00 |
|
pedroll
|
7b73c59ee5
|
Spanish translation 2
|
2018-05-06 20:04:12 +02:00 |
|
AdrianLxM
|
cdc8e45f32
|
Merge pull request #1015 from jotomo/lemming-treatment
Fix finding BG in graph for treatments before the first displayed BG.
|
2018-05-06 19:51:01 +02:00 |
|
AdrianLxM
|
f3967e07d2
|
polish in gerenal strings.xml
|
2018-05-06 19:44:58 +02:00 |
|
AdrianLxM
|
858c75095b
|
polish arrays.xml
|
2018-05-06 19:32:43 +02:00 |
|
AdrianLxM
|
b89ac3049c
|
polish fix strings
|
2018-05-06 19:30:35 +02:00 |
|
AdrianLxM
|
7b0acd1c4a
|
polish remove translatable=false
|
2018-05-06 19:29:00 +02:00 |
|
AdrianLxM
|
270f60ac1c
|
polish first - thanks Tomasz K.
|
2018-05-06 19:25:10 +02:00 |
|
McHoffi
|
9d367c1fa1
|
Update ObjectivesFragment.java
|
2018-05-06 18:18:34 +02:00 |
|
McHoffi
|
06948ca0f4
|
Update strings.xml
|
2018-05-06 18:16:42 +02:00 |
|
Radoslav Radev
|
b08332e340
|
bg translation
|
2018-05-06 14:49:10 +03:00 |
|
AdrianLxM
|
f0351834ff
|
default DIA
|
2018-05-06 12:49:03 +02:00 |
|
McHoffi
|
36d6edf0db
|
Update strings.xml
|
2018-05-06 12:16:51 +02:00 |
|
Johannes Mockenhaupt
|
56cbac3b4d
|
Leftover MainApp.gs rewrite.
|
2018-05-06 11:49:16 +02:00 |
|
Johannes Mockenhaupt
|
ef70c1f244
|
MainApp.sResources.getColor -> MainApp.gc.
|
2018-05-06 11:47:15 +02:00 |
|
Johannes Mockenhaupt
|
b9c649bd68
|
Uso blue/orange for carbs/insulin in confirmation dialogs.
Aligns with the graph's use of using blueish colors insulin and
orange for carbs stuff.
|
2018-05-06 11:46:09 +02:00 |
|
AdrianLxM
|
1ac41323e6
|
fix notification last line cutoff
|
2018-05-05 21:55:49 +02:00 |
|
AdrianLxM
|
116222858e
|
update lastApproachingDailyLimit
|
2018-05-05 21:12:09 +02:00 |
|
AdrianLxM
|
d99fafe375
|
restrict aproaching daily limit to once every 30 minutes RS
|
2018-05-05 21:10:15 +02:00 |
|
AdrianLxM
|
5458df0907
|
restrict aproaching daily limit to once every 30 minutes Rv2
|
2018-05-05 21:08:17 +02:00 |
|
AdrianLxM
|
c2315b7bea
|
restrict aproaching daily limit to once every 30 minutes R-Korean
|
2018-05-05 21:03:35 +02:00 |
|
AdrianLxM
|
b43eff8e55
|
restrict aproaching daily limit to once every 30 minutes R
|
2018-05-05 21:02:31 +02:00 |
|
AdrianLxM
|
70b2b1502f
|
restrict wrong password notification to once every 30 seconds
|
2018-05-05 20:59:11 +02:00 |
|
AdrianLxM
|
c8c7e12056
|
Wrong password notification
|
2018-05-05 20:54:10 +02:00 |
|
AdrianLxM
|
246c8922df
|
Korean wrong password notification
|
2018-05-05 20:51:46 +02:00 |
|
Johannes Mockenhaupt
|
1e0b7d331a
|
Fix finding BG in graph for treatments before the first displayed BG.
(cherry picked from commit 8bdafe3)
|
2018-05-05 19:13:38 +02:00 |
|
AdrianLxM
|
260e259fb0
|
Update strings.xml
|
2018-05-05 15:17:03 +02:00 |
|
AdrianLxM
|
d574c70471
|
Merge pull request #1011 from Heiner1/dev-strings
Dev strings
|
2018-05-05 10:12:20 +02:00 |
|
swissalpine
|
fb04250c90
|
Elliminat syntax error
|
2018-05-05 10:00:30 +02:00 |
|
Heiner1
|
3a0c34e7b6
|
Update strings.xml
|
2018-05-05 09:45:10 +02:00 |
|
AdrianLxM
|
499edd7c05
|
swedish update
|
2018-05-05 09:20:29 +02:00 |
|
Radoslav Radev
|
9aeb2b6ede
|
Update strings.xml
|
2018-05-04 23:51:08 +03:00 |
|
Markus M. May
|
e07aecd62d
|
Further translations
|
2018-05-04 22:02:32 +02:00 |
|
Johannes Mockenhaupt
|
d15ada5cd9
|
Combo: Fix visual glitch in fragment.
|
2018-05-04 21:27:54 +02:00 |
|
AdrianLxM
|
1646420c47
|
base basal -> Basal Base (was Base Temporal)
|
2018-05-04 20:17:55 +02:00 |
|
AdrianLxM
|
714eca483e
|
revert gradle to dev
|
2018-05-04 20:16:12 +02:00 |
|
pedroll
|
5ff86e9c34
|
Spanish translation
|
2018-05-04 19:54:21 +02:00 |
|
AdrianLxM
|
7190bccf20
|
release candidate 3
|
2018-05-04 19:24:05 +02:00 |
|
AdrianLxM
|
93c3a3d624
|
Merge branch 'dev' into aaps20_rc3
|
2018-05-04 19:21:39 +02:00 |
|
AdrianLxM
|
f511b9ed39
|
Merge pull request #1000 from MilosKozak/bolusprogress-dismiss
IDEA: dismiss bolus progress dialog when Queue is empty
|
2018-05-04 19:03:11 +02:00 |
|
Milos Kozak
|
57973d4d3a
|
Merge pull request #1001 from jotomo/carbs-gen-refactor
Extract and deduplicate eCarbs generation
|
2018-05-04 16:10:23 +02:00 |
|
Milos Kozak
|
61e6404bbe
|
Merge pull request #995 from MilosKozak/wear-wizard
Wear eCarbs
|
2018-05-04 14:33:55 +02:00 |
|
Johannes Mockenhaupt
|
35a6bbb6a7
|
Set CareportalEvent.MEALBOLUS for eCarbs.
|
2018-05-04 14:22:43 +02:00 |
|
Johannes Mockenhaupt
|
43cc3c4908
|
Extract CarbsGenerator class.
|
2018-05-04 14:18:55 +02:00 |
|
Milos Kozak
|
963f1e1abf
|
Merge branch 'dev' into startupwizard
|
2018-05-04 13:26:40 +02:00 |
|
swissalpine
|
10b67a0c11
|
Update GraphData.java
|
2018-05-04 12:31:11 +02:00 |
|
swissalpine
|
7312bf061a
|
Update colors.xml
|
2018-05-04 12:30:28 +02:00 |
|
AdrianLxM
|
5c8e99b191
|
dismiss bolus progress dialog when Queue is empty
|
2018-05-04 12:24:37 +02:00 |
|
Milos Kozak
|
91f3db782d
|
SWButton rename option to text
|
2018-05-04 10:20:22 +02:00 |
|
Milos Kozak
|
55661ca7a0
|
SWButton
|
2018-05-04 10:17:50 +02:00 |
|
swissalpine
|
010a2f3fd8
|
Make deviation bars transparent
|
2018-05-04 10:04:45 +02:00 |
|
Milos Kozak
|
88d964f135
|
SW reuse save, cleanup
|
2018-05-04 09:35:57 +02:00 |
|
AdrianLxM
|
c34cc73b1e
|
fix wear wizard
|
2018-05-03 23:08:16 +02:00 |
|
Radoslav Radev
|
52411f7afe
|
half of the Bulgarian translation
|
2018-05-03 23:34:50 +03:00 |
|
AdrianLxM
|
8d6997f519
|
ecarb ignore 0 carbs
|
2018-05-03 22:08:54 +02:00 |
|
AdrianLxM
|
fb75346bcd
|
ecarb make settings consistent
|
2018-05-03 22:08:50 +02:00 |
|
AdrianLxM
|
61f07da1a2
|
ecarb doECarb
|
2018-05-03 22:08:43 +02:00 |
|
AdrianLxM
|
c69a541b75
|
ecarb ash first response
|
2018-05-03 22:08:27 +02:00 |
|
Milos Kozak
|
4539756455
|
Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into startupwizard
|
2018-05-03 22:02:12 +02:00 |
|
Milos Kozak
|
dea5ff0080
|
styles cleanup
|
2018-05-03 22:01:59 +02:00 |
|
Milos Kozak
|
d1958a3e2d
|
Merge branch 'dev' into startupwizard
|
2018-05-03 21:31:55 +02:00 |
|
Milos Kozak
|
02590ddd72
|
SW remove unneeded code
|
2018-05-03 21:29:34 +02:00 |
|
McHoffi
|
39e9448c67
|
Typo fix
|
2018-05-03 21:20:54 +02:00 |
|
Milos Kozak
|
cc532b9107
|
SWRadioButton cleanup
|
2018-05-03 20:13:27 +02:00 |
|
Milos Kozak
|
94db444acb
|
SW validator, language, cleanup
|
2018-05-03 20:06:13 +02:00 |
|
Milos Kozak
|
36265ab1c6
|
SWPlugin
|
2018-05-03 18:41:47 +02:00 |
|
AdrianLxM
|
43dc7d1846
|
wear cathegorize preferences
|
2018-05-03 17:49:31 +02:00 |
|
AdrianLxM
|
62a38ed537
|
wearwizard fix NPE when CobInfo not available - missing part
|
2018-05-03 17:49:22 +02:00 |
|
AdrianLxM
|
b37b892eea
|
wearwizard fix NPE when CobInfo not available
|
2018-05-03 17:49:17 +02:00 |
|
AdrianLxM
|
fe0f2e3ce6
|
wearwizard settings on phone
|
2018-05-03 17:49:13 +02:00 |
|
AdrianLxM
|
c394c045c9
|
wearwizard reduced watch settings
|
2018-05-03 17:49:09 +02:00 |
|
AdrianLxM
|
bdfce784c0
|
wearwizard ensure watch apk is up to date
|
2018-05-03 17:49:05 +02:00 |
|
AdrianLxM
|
ec106726a7
|
wearwizard trend
|
2018-05-03 17:49:01 +02:00 |
|
AdrianLxM
|
24dd4e1710
|
wearwizard cob
|
2018-05-03 17:48:54 +02:00 |
|
Roumen Georgiev
|
515590cdf6
|
other screens
|
2018-05-03 17:04:56 +03:00 |
|
Roumen Georgiev
|
425ba77200
|
other screens
|
2018-05-03 16:59:23 +03:00 |
|
AdrianLxM
|
012593a480
|
Update NotificationStore.java
|
2018-05-03 12:18:48 +02:00 |
|
Roumen Georgiev
|
083730f476
|
WIP: BGSOURCE screen
|
2018-05-03 09:02:16 +03:00 |
|
Milos Kozak
|
e5ed63a46f
|
fix name on future profile switches
|
2018-05-03 00:13:49 +02:00 |
|
Milos Kozak
|
a35c925930
|
Merge pull request #983 from jotomo/issue-939
WIP: Fix bolus progress dialog not closing with onPause/onResume cycle
|
2018-05-02 23:20:29 +02:00 |
|
Johannes Mockenhaupt
|
396268d9c8
|
Send invalid boluses (prime boluses) to watch.
|
2018-05-02 22:49:31 +02:00 |
|
Johannes Mockenhaupt
|
599c87f794
|
Combo: better error message when initialization fails.
|
2018-05-02 22:48:57 +02:00 |
|
Milos Kozak
|
a64bfe7a39
|
Merge pull request #977 from MilosKozak/persistent-text
show bg missing not no profile
|
2018-05-02 22:38:07 +02:00 |
|
Milos Kozak
|
f9bbb72831
|
Merge pull request #979 from MilosKozak/lp-ps-always
LP: Allow ProfileSwitch before pump is connected.
|
2018-05-02 22:37:23 +02:00 |
|
Johannes Mockenhaupt
|
79458a1c73
|
Ignore harmless errors (un)subscribing to the message bus.
|
2018-05-02 22:36:52 +02:00 |
|
Milos Kozak
|
28430cc757
|
fix cob calculation
|
2018-05-02 22:35:51 +02:00 |
|
Milos Kozak
|
e2f28e0ae4
|
fix rounding on bolus delivery
|
2018-05-02 22:20:27 +02:00 |
|
Markus M. May
|
07c47a4ba7
|
Start de translation
|
2018-05-02 21:45:16 +02:00 |
|
AdrianLxM
|
a3421316ac
|
Allow ProfileSwitch before pump is connected.
https://github.com/MilosKozak/AndroidAPS/issues/969
|
2018-05-02 21:38:45 +02:00 |
|
Johannes Mockenhaupt
|
3b19db14fd
|
Clean up.
|
2018-05-02 21:25:04 +02:00 |
|
Johannes Mockenhaupt
|
22e90743aa
|
Fix #939.
|
2018-05-02 21:24:06 +02:00 |
|
AdrianLxM
|
eb594c1867
|
show bg missing not no profile
|
2018-05-02 21:09:04 +02:00 |
|
AdrianLxM
|
f1736f048e
|
Update strings.xml
|
2018-05-02 20:20:13 +02:00 |
|
Milos Kozak
|
8419f8d0e9
|
update socket.io to 1.0.0
|
2018-05-02 18:49:40 +02:00 |
|
Milos Kozak
|
a36b1b2a10
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2018-05-02 18:39:47 +02:00 |
|
Milos Kozak
|
4cc952900d
|
show progress reason from iobcobthread
|
2018-05-02 18:39:37 +02:00 |
|
Milos Kozak
|
5671b99f30
|
Merge pull request #974 from MilosKozak/swedish-update
Swedis Update strings.xml
|
2018-05-02 18:02:51 +02:00 |
|
CaroGo
|
a768c03462
|
Update strings.xml
|
2018-05-02 17:43:17 +02:00 |
|
Milos Kozak
|
a4ff9d29e2
|
Merge branch 'dev' into swedish-update
|
2018-05-02 17:10:01 +02:00 |
|
Milos Kozak
|
e42d5f1204
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2018-05-02 17:05:32 +02:00 |
|
Milos Kozak
|
42164489c8
|
cs translations
|
2018-05-02 17:05:20 +02:00 |
|
AdrianLxM
|
f52451085c
|
remove translation of language names
|
2018-05-02 16:41:56 +02:00 |
|
AdrianLxM
|
fb61f3cde2
|
Update strings.xml
|
2018-05-02 16:39:28 +02:00 |
|
Johannes Mockenhaupt
|
c51635dba4
|
Watch: colored preds.
|
2018-05-02 16:01:40 +02:00 |
|
Milos Kozak
|
efff5d4e10
|
Merge pull request #966 from jotomo/greener-grass
Brighter green for "treatment active" for better readability.
|
2018-05-02 15:05:27 +02:00 |
|
Milos Kozak
|
e562d0f437
|
Merge pull request #957 from triplem/charging_merged
Charging merged
|
2018-05-02 15:04:00 +02:00 |
|
Johannes Mockenhaupt
|
32323d673b
|
Brighter green for "treatment active" for better readability.
|
2018-05-02 15:01:49 +02:00 |
|
AdrianLxM
|
926ee535d5
|
use MainApp.gs instead of context 2
|
2018-05-02 14:28:16 +02:00 |
|
AdrianLxM
|
d289c5c7d7
|
use MainApp.gs instead of context
|
2018-05-02 14:27:23 +02:00 |
|
AdrianLxM
|
3f3959f785
|
use MainApp.gs instead of getString from Activity/Dialog 2
|
2018-05-02 14:21:53 +02:00 |
|
AdrianLxM
|
611d761a41
|
use MainApp.gs instead of getString from Activity/Dialog
|
2018-05-02 14:16:40 +02:00 |
|
AdrianLxM
|
4a22fd355d
|
Merge remote-tracking branch 'milosremote/dev' into use-gs
|
2018-05-02 14:11:45 +02:00 |
|
AdrianLxM
|
5aa3a88c7f
|
remove direct access to sResources 9
|
2018-05-02 13:59:27 +02:00 |
|
AdrianLxM
|
166f2843df
|
remove direct access to sResources 8
|
2018-05-02 13:58:52 +02:00 |
|
AdrianLxM
|
de4643d16f
|
remove direct access to sResources 8
|
2018-05-02 13:57:28 +02:00 |
|
AdrianLxM
|
74d0c71712
|
remove direct access to sResources 7
|
2018-05-02 13:51:24 +02:00 |
|
AdrianLxM
|
545d1d1586
|
remove direct access to sResources 6
|
2018-05-02 13:50:31 +02:00 |
|