Milos Kozak
|
2e40c7b605
|
sms calibrations
|
2017-02-10 21:20:55 +01:00 |
|
|
LadyViktoria
|
48a158b036
|
use validation lib in cpp - better event handling
|
2017-02-10 17:29:59 +01:00 |
|
|
Milos Kozak
|
8db3f258cd
|
xdrip calibration
|
2017-02-10 16:53:39 +01:00 |
|
|
LadyViktoria
|
80de9c0cd8
|
use validation lib in cpp
|
2017-02-10 11:34:05 +01:00 |
|
|
LadyViktoria
|
4857259eda
|
ko translation
|
2017-02-10 07:59:26 +01:00 |
|
|
AdrianLxM
|
8ece312b6a
|
Merge pull request #60 from MilosKozak/dev
Dev
|
2017-02-09 23:47:12 +01:00 |
|
|
Milos Kozak
|
715d15b51f
|
CS translations
|
2017-02-09 22:44:42 +01:00 |
|
|
Milos Kozak
|
90061c6f25
|
Show log
|
2017-02-09 22:29:21 +01:00 |
|
|
Milos Kozak
|
ed7dd48612
|
remove TODOs
|
2017-02-09 20:18:22 +01:00 |
|
|
Milos Kozak
|
8a2846c516
|
Merge branch 'dev' into dev
|
2017-02-09 17:01:05 +01:00 |
|
|
Milos Kozak
|
7f123e4208
|
warn on wrong entered sms phone number
|
2017-02-09 16:14:09 +01:00 |
|
|
LadyViktoria
|
7fc6de17c1
|
Add prefernces.json changes 2
|
2017-02-09 10:41:02 +01:00 |
|
|
LadyViktoria
|
886c1ea359
|
Add prefernces.json changes
|
2017-02-09 09:36:51 +01:00 |
|
|
AdrianLxM
|
bf7a96b3e7
|
bolus progress dialog without activity context
|
2017-02-09 03:15:13 +01:00 |
|
|
AdrianLxM
|
650111d1b7
|
wear event for bolus requests to show card early on
|
2017-02-07 11:09:16 +01:00 |
|
|
viktoria
|
b0a9d74b49
|
Merge remote-tracking branch 'refs/remotes/MilosKozak/dev'
Conflicts:
app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/Autosens.java
app/src/main/res/values/strings.xml
|
2017-02-02 19:00:17 +01:00 |
|
|
AdrianLxM
|
bd75015a58
|
Correct error for tempbasals
|
2017-02-01 14:38:55 +01:00 |
|
|
LadyViktoria
|
1f3b425c44
|
Remove careportal_temptarget string
|
2017-01-31 20:28:32 +01:00 |
|
|
Milos Kozak
|
762b561abb
|
CS translations
|
2017-01-29 21:15:05 +01:00 |
|
|
Milos Kozak
|
d6a22be184
|
remove absorption rate from everywhere
|
2017-01-29 20:19:02 +01:00 |
|
|
viktoria
|
75ff6867bc
|
Add prefernces.json make settings work with validator lib
|
2017-01-29 13:00:52 +01:00 |
|
|
Milos Kozak
|
3f90ad6a5c
|
sync profile to pump
|
2017-01-28 23:45:14 +01:00 |
|
|
viktoria
|
c64d45b758
|
Merged MilosKozak/dev into dev
Conflicts:
app/src/main/res/values/strings.xml
|
2017-01-28 22:35:54 +01:00 |
|
|
Milos Kozak
|
b9b9e21dcb
|
fix merge conflicts
|
2017-01-28 21:37:51 +01:00 |
|
|
Milos Kozak
|
538e8fd2fa
|
better detect & display old pump firmware
|
2017-01-28 20:48:32 +01:00 |
|
|
LadyViktoria
|
4d4630ca1a
|
Add prefernces.json rename some Strings to match OpenAPS docs
|
2017-01-27 09:56:32 +01:00 |
|
|
LadyViktoria
|
f510b0a8cc
|
Add prefernces.json errer message translations
attention the characters are limited.
maybe its caused by old libs
com.android.support:appcompat-v7:23.4.0
'com.android.support:support-v4:23.4.0
|
2017-01-27 09:52:16 +01:00 |
|
|
LadyViktoria
|
1d2f98abf4
|
Add prefernces.json remove openapsama_skip_neutral_temps
|
2017-01-26 15:32:44 +01:00 |
|
|
LadyViktoria
|
4702a87d8e
|
Add prefernces.json add safety limits
|
2017-01-26 12:07:25 +01:00 |
|
|
viktoria
|
2f8b2a382d
|
Merged branch dev into dev
|
2017-01-26 00:39:28 +01:00 |
|
|
viktoria
|
74cfa08b81
|
Change some Prefernces names to match names in OpenAPS docs
|
2017-01-26 00:35:46 +01:00 |
|
|
Heiner1
|
5c43c66163
|
Update strings.xml
|
2017-01-25 23:35:31 +01:00 |
|
|
viktoria
|
88d6178a1b
|
Add prefernces.json small fix
|
2017-01-25 22:20:56 +01:00 |
|
|
viktoria
|
9d2b645d8c
|
Add prefernces.json default values
|
2017-01-25 22:11:17 +01:00 |
|
|
viktoria
|
fd6432f808
|
Add prefernces.json put hyperlink and warning there
|
2017-01-25 20:41:33 +01:00 |
|
|
viktoria
|
8e095fefaf
|
Add prefernces.json layout changes
|
2017-01-25 20:20:39 +01:00 |
|
|
viktoria
|
0838ede6a3
|
Add prefernces.json change secondary text color to white
|
2017-01-25 20:19:53 +01:00 |
|
|
LadyViktoria
|
b898fc044e
|
Add prefernces.json to advanced settings
|
2017-01-25 15:18:01 +01:00 |
|
|
Milos Kozak
|
044547b594
|
Merge pull request #143 from AdrianLxM/deltasx
Settings for deltas
|
2017-01-24 10:59:10 +01:00 |
|
|
AdrianLxM
|
950b638e50
|
Advanced Settings
|
2017-01-24 10:28:42 +01:00 |
|
|
AdrianLxM
|
3a43858948
|
Settings for deltas
|
2017-01-24 02:21:25 +01:00 |
|
|
viktoria
|
bd588af1ba
|
DanaR Stats small Layout fixes
|
2017-01-23 21:52:24 +01:00 |
|
|
Milos Kozak
|
da2739f7b7
|
Merge pull request #140 from PitBeckh/patch-1
Update strings.xml
|
2017-01-23 20:23:30 +01:00 |
|
|
PitBeckh
|
dc12ef3fec
|
Update strings.xml
|
2017-01-23 16:26:59 +01:00 |
|
|
PitBeckh
|
2f72471915
|
Update strings.xml
|
2017-01-23 16:24:53 +01:00 |
|
|
Radoslav Radev
|
fbceeec5b0
|
Update strings.xml
|
2017-01-23 11:01:42 +02:00 |
|
|
Radoslav Radev
|
106bfe4f1c
|
Update strings.xml
|
2017-01-23 07:14:12 +02:00 |
|
|
Radoslav Radev
|
2d02449a87
|
Update strings.xml
|
2017-01-22 21:44:49 +02:00 |
|
|
PitBeckh
|
d995910384
|
Update strings.xml
|
2017-01-22 20:34:54 +01:00 |
|
|
Milos Kozak
|
ceaf4f7f78
|
Merge branch 'dev' into adjusttargetsse
|
2017-01-22 11:30:59 +01:00 |
|
|
ecorman
|
24b86a0b99
|
Update: Perfil->Objetivo
|
2017-01-22 00:07:10 +01:00 |
|
|
AdrianLxM
|
f418152059
|
sorten tab titles active
|
2017-01-21 23:48:05 +01:00 |
|
|
ecorman
|
3a2549d0b6
|
Update Spanish Translation
|
2017-01-21 23:08:23 +01:00 |
|
|
AdrianLxM
|
ea78dd5bc1
|
Shorten tabs first
|
2017-01-21 19:44:58 +01:00 |
|
|
Milos Kozak
|
404a4de916
|
Merge pull request #136 from AdrianLxM/adjusttargetsse
Preference Switches for Autosens
|
2017-01-21 11:22:34 +01:00 |
|
|
Milos Kozak
|
53f9b30b3e
|
temp target display update
|
2017-01-21 11:22:03 +01:00 |
|
|
AdrianLxM
|
50b7e619fc
|
Preference switches for Autosens
|
2017-01-21 01:35:15 +01:00 |
|
|
Milos Kozak
|
ea37d9eaa8
|
Merge pull request #131 from AdrianLxM/tempt-pill
Tempt pill
|
2017-01-21 00:11:07 +01:00 |
|
|
viktoria
|
33bb7d80a6
|
DanaR Stats small fixes and move Listeners
|
2017-01-20 16:45:01 +01:00 |
|
|
viktoria
|
722976f6b0
|
DanaR Stats beautify layout and add some listeners
|
2017-01-20 14:51:16 +01:00 |
|
|
viktoria
|
2d966c9feb
|
DanaR Stats some improvements
|
2017-01-20 03:13:41 +01:00 |
|
|
AdrianLxM
|
88a1dcde51
|
remove empty language translation
|
2017-01-19 21:32:09 +01:00 |
|
|
AdrianLxM
|
0c11f78ed3
|
cleanup after merge
|
2017-01-19 21:15:08 +01:00 |
|
|
LadyViktoria
|
1597f74bd0
|
Merge branch 'dev' into danarstats
|
2017-01-19 20:52:01 +01:00 |
|
|
AdrianLxM
|
6c3a07cc62
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into MilosKozak-dev
|
2017-01-19 20:47:53 +01:00 |
|
|
Milos Kozak
|
2754e23c08
|
CS translations
|
2017-01-19 19:52:14 +01:00 |
|
|
Milos Kozak
|
c701b5d125
|
waiting for pump message
|
2017-01-19 19:21:25 +01:00 |
|
|
Milos Kozak
|
f8feaf565b
|
show how is value hard limited
|
2017-01-19 18:40:08 +01:00 |
|
|
viktoria
|
b70e895b95
|
DanaR Stats fixes
|
2017-01-18 04:31:47 +01:00 |
|
|
viktoria
|
9ba24b4ffd
|
DanaR Stats Beautify
|
2017-01-18 03:08:19 +01:00 |
|
|
viktoria
|
678fbedcbf
|
Merge branch 'dev'
Conflicts:
app/src/main/res/values/strings.xml
|
2017-01-18 03:03:58 +01:00 |
|
|
AdrianLxM
|
d36a515d45
|
temp target overview
|
2017-01-17 21:32:30 +01:00 |
|
|
Milos Kozak
|
0e21b67a42
|
fix merge conflicts
|
2017-01-17 18:00:44 +01:00 |
|
|
Milos Kozak
|
432c937a46
|
Merge branch 'dev' into AMA
|
2017-01-17 17:49:21 +01:00 |
|
|
Milos Kozak
|
08c078466a
|
Merge pull request #127 from MilosKozak/temptarget
Temptarget
|
2017-01-17 17:47:14 +01:00 |
|
|
Milos Kozak
|
7c90dfe03c
|
confirm dialog on removing temptarget
|
2017-01-16 23:54:46 +01:00 |
|
|
Milos Kozak
|
218190e92f
|
support for removing temp targets from GUI
|
2017-01-16 23:23:20 +01:00 |
|
|
Milos Kozak
|
eaa16402a7
|
show running temp target on overview
|
2017-01-16 20:47:57 +01:00 |
|
|
Milos Kozak
|
61b1ee781f
|
temp target treatment dialog & sync fix
|
2017-01-16 16:59:12 +01:00 |
|
|
viktoria
|
e851d15aff
|
DanaR Stats Activity
|
2017-01-16 13:23:41 +01:00 |
|
|
Milos Kozak
|
262dae3ab3
|
Merge pull request #129 from slavidex/patch-26
Update pref_others.xml
|
2017-01-14 16:37:57 +01:00 |
|
|
Milos Kozak
|
61a8cad4e8
|
allow refrest temp targets from NS & fix bugs
|
2017-01-14 16:36:42 +01:00 |
|
|
Radoslav Radev
|
8f0a28419d
|
Update pref_others.xml
|
2017-01-14 15:25:06 +02:00 |
|
|
Radoslav Radev
|
cbd7aa74eb
|
Update strings.xml
|
2017-01-14 15:21:47 +02:00 |
|
|
Milos Kozak
|
458bee4538
|
display temptargets
|
2017-01-13 23:43:17 +01:00 |
|
|
Milos Kozak
|
1b53cde2bf
|
plain temptarget plugin
|
2017-01-13 21:14:04 +01:00 |
|
|
Milos Kozak
|
ea15659050
|
Merge pull request #122 from AdrianLxM/patch-11
Typo German (Ereignis with one s)
|
2017-01-10 08:30:29 +01:00 |
|
|
AdrianLxM
|
dfc176d1bd
|
Typo German (Ereignis with one s)
|
2017-01-10 02:39:16 +01:00 |
|
|
AdrianLxM
|
856c025e2b
|
typo spanish
|
2017-01-10 02:37:20 +01:00 |
|
|
Milos Kozak
|
74afdb6874
|
Merge branch 'dev' into AMA
|
2017-01-09 17:34:49 +01:00 |
|
|
Milos Kozak
|
26a76217bf
|
Greek language
|
2017-01-09 17:23:56 +01:00 |
|
|
Milos Kozak
|
e9b900d74a
|
show predictions in graph
|
2017-01-08 23:10:27 +01:00 |
|
|
Milos Kozak
|
68a127d804
|
make autosens configurable in settings, determinebasaladapter refactoring
|
2017-01-08 14:21:29 +01:00 |
|
|
Milos Kozak
|
e71b478941
|
show both deltas on overview
|
2017-01-08 12:04:42 +01:00 |
|
|
Milos Kozak
|
6621c2f610
|
log script debug in fragment
|
2017-01-08 00:27:13 +01:00 |
|
|
Milos Kozak
|
9c93d3ad7d
|
log autosens input data in fragment
|
2017-01-08 00:07:18 +01:00 |
|
|
Milos Kozak
|
25a3b678e9
|
most new AMA code added
|
2017-01-06 22:42:37 +01:00 |
|
|
Milos Kozak
|
3dfac49b82
|
duplicate MA -> AMA
|
2017-01-03 21:15:40 +01:00 |
|
|
viktoria
|
f3551dda7f
|
german translation
|
2017-01-02 16:44:20 +01:00 |
|
|
Milos Kozak
|
952a2342a8
|
Merge pull request #104 from MilosKozak/mm640g
MM640g bg source
|
2017-01-02 13:58:56 +01:00 |
|
|
Milos Kozak
|
4408146f23
|
disable entering basals in profiles only if pump is not tempbasal capable
|
2017-01-01 14:34:57 +01:00 |
|
|
Milos Kozak
|
ef2e7b1a62
|
show basal line only if pump is tempbasal capable
|
2017-01-01 14:19:35 +01:00 |
|
|
Milos Kozak
|
38a9c94258
|
Local Profile
|
2016-12-31 20:10:36 +01:00 |
|
|
Milos Kozak
|
6b18336fa2
|
LocalProfile plugin
|
2016-12-31 15:06:45 +01:00 |
|
|
Milos Kozak
|
2e6c168adc
|
TimeListEdit most work done
|
2016-12-31 13:11:32 +01:00 |
|
|
Milos Kozak
|
e1c2e4c492
|
TimeListEdit initial work
|
2016-12-30 16:43:43 +01:00 |
|
|
Milos Kozak
|
b2be49e631
|
simple profile layout
|
2016-12-29 22:40:30 +01:00 |
|
|
Milos Kozak
|
1e99c00626
|
allow sms string to be translated separately
|
2016-12-29 16:22:40 +01:00 |
|
|
Milos Kozak
|
8e46a55e48
|
allow better translation of min ago
|
2016-12-29 16:06:00 +01:00 |
|
|
Milos Kozak
|
0059266791
|
loop status font size
|
2016-12-29 14:23:05 +01:00 |
|
|
Milos Kozak
|
24c5bb9303
|
Merge branch 'master' into mm640g
|
2016-12-29 14:01:24 +01:00 |
|
|
Milos Kozak
|
83f4dbf9ca
|
Merge pull request #103 from AdrianLxM/patch-8
remove mm640g translation again
|
2016-12-29 13:51:24 +01:00 |
|
|
Milos Kozak
|
c06d25b235
|
more rearrangements
|
2016-12-29 00:12:52 +01:00 |
|
|
Milos Kozak
|
f127e7bec1
|
better allign bg arrows
|
2016-12-28 23:48:43 +01:00 |
|
|
AdrianLxM
|
834398b8f0
|
remove mm640g translation again
|
2016-12-28 23:31:02 +01:00 |
|
|
AdrianLxM
|
d70c9673d5
|
average delta
|
2016-12-28 22:39:40 +01:00 |
|
|
Milos Kozak
|
d2d3e024a2
|
Merge branch 'ongoingnotif' of https://github.com/AdrianLxM/AndroidAPS
|
2016-12-28 15:15:24 +01:00 |
|
|
Milos Kozak
|
e2c2f49f6f
|
MM640g bg source
|
2016-12-28 14:57:11 +01:00 |
|
|
Radoslav Radev
|
71461e38ca
|
Update strings.xml
|
2016-12-28 12:17:17 +02:00 |
|
|
warstar2187
|
804cdba7cf
|
Update strings.xml
|
2016-12-28 18:22:50 +09:00 |
|
|
AdrianLxM
|
6ac889cecd
|
ongoing notification integration
|
2016-12-28 00:03:08 +01:00 |
|
|
AdrianLxM
|
d597be71de
|
ongoing notification
|
2016-12-27 23:39:16 +01:00 |
|
|
Milos Kozak
|
405ae28e38
|
cz translations
|
2016-12-27 23:39:00 +01:00 |
|
|
Milos Kozak
|
29327aef01
|
MDI pump driver
|
2016-12-27 23:35:50 +01:00 |
|
|
Milos Kozak
|
fdb252b62d
|
show direction next to BG
|
2016-12-27 20:41:28 +01:00 |
|
|
Milos Kozak
|
cd41bff2bb
|
SMS command BG
|
2016-12-27 12:17:26 +01:00 |
|
|
Milos Kozak
|
3bd7568d34
|
dismiss button not hardcoded
|
2016-12-24 23:56:47 +01:00 |
|
|
Milos Kozak
|
052ac47595
|
Better profile handling
|
2016-12-24 23:53:17 +01:00 |
|
|
Milos Kozak
|
2b0c74c56f
|
CZ translations
|
2016-12-24 14:21:24 +01:00 |
|
|
Milos Kozak
|
7719e2ac63
|
use notifications for profile update
|
2016-12-22 12:17:38 +01:00 |
|
|
Milos Kozak
|
cb4330ddcd
|
notify when pump settings is wrong
|
2016-12-13 22:10:13 +01:00 |
|
|
AdrianLxM
|
e1dc624a47
|
fully remove mm640g
|
2016-12-10 22:58:31 +01:00 |
|
|
Milos Kozak
|
6ba532d178
|
notify about setting basal profile
|
2016-12-09 16:04:07 +01:00 |
|
|
Milos Kozak
|
4103e4bf4a
|
allow set profile to pump from simpleprofile plugin
|
2016-12-09 12:40:15 +01:00 |
|
|
Milos Kozak
|
be8003da4b
|
Merge branch 'master' into koreandanar
|
2016-12-06 23:18:02 +01:00 |
|
|
Milos Kozak
|
0af894aa56
|
change info color to green
|
2016-12-06 22:57:49 +01:00 |
|
|
Milos Kozak
|
abfb832a10
|
basic notification functionality
|
2016-12-05 15:20:44 +01:00 |
|
|
Milos Kozak
|
4b389c2cad
|
dana drivers switching working
|
2016-12-03 17:42:08 +01:00 |
|
|
Milos Kozak
|
db2fd55f7c
|
copy files for Korean DanaR
|
2016-11-29 20:52:40 +01:00 |
|
|
Milos Kozak
|
97a22344e3
|
CZ translations
|
2016-11-29 19:07:09 +01:00 |
|
|
Milos Kozak
|
36d5f1dc29
|
proper danar errors detection
|
2016-11-29 18:28:36 +01:00 |
|
|
AdrianLxM
|
896503918c
|
wear extract strings
|
2016-11-29 15:01:00 +01:00 |
|
|
AdrianLxM
|
1eacf35e47
|
Merge pull request #25 from AdrianLxM/wear-prepare-final
wear merge current master
|
2016-11-29 13:17:21 +01:00 |
|
|
Milos Kozak
|
ee408ada79
|
Merge pull request #80 from warstar2187/master
Fix Insulin Activity and Korean update
|
2016-11-29 07:44:58 +01:00 |
|
|
Milos Kozak
|
2912d1cce1
|
Merge pull request #79 from AdrianLxM/viktoria-permissions
Viktoria permissions
|
2016-11-28 19:02:28 +01:00 |
|
|
LadyViktoria
|
39be1bb4c7
|
Android 6+ Permissions #6
|
2016-11-25 13:35:34 +01:00 |
|
|
LadyViktoria
|
1967602c70
|
Android 6+ Permissions #3
|
2016-11-25 13:32:07 +01:00 |
|
|
AdrianLxM
|
12e78656b7
|
wear settings
|
2016-11-24 16:23:31 +01:00 |
|
|
AdrianLxM
|
c633904e8c
|
wear fragment and reset button
|
2016-11-24 16:23:31 +01:00 |
|
|
ecorman
|
da861a7108
|
Note basal start / end to see note in Xdrip+ with data
|
2016-11-23 23:59:11 +01:00 |
|
|
Radoslav Radev
|
8b5ee91c95
|
Update strings.xml
|
2016-11-17 22:40:51 +02:00 |
|
|
Radoslav Radev
|
56c83aac2f
|
bg translation
1
|
2016-11-17 22:12:19 +02:00 |
|
|
AdrianLxM
|
513b2966c9
|
CPP cleanup and i18n
|
2016-11-14 18:19:17 +01:00 |
|
|
AdrianLxM
|
74ea6c4011
|
CPP working
|
2016-11-14 18:19:17 +01:00 |
|
|
AdrianLxM
|
c2d1fdb39e
|
CPP edit base basal gui - without function yet
|
2016-11-14 18:19:17 +01:00 |
|
|
AdrianLxM
|
dba81ede2a
|
calculation for isf and ic. Tooltips.
|
2016-11-14 18:19:17 +01:00 |
|
|
AdrianLxM
|
3fe7c7a0fa
|
CPP shiftfix and base profile view
|
2016-11-14 18:19:17 +01:00 |
|
|
AdrianLxM
|
2c5b20a721
|
CPP html-ify and send to pump button
|
2016-11-14 18:19:17 +01:00 |
|
|
AdrianLxM
|
a57a864c24
|
CPP icons
|
2016-11-14 18:19:17 +01:00 |
|
|
AdrianLxM
|
4dbb20b8c5
|
CPP small redesign
|
2016-11-14 18:19:17 +01:00 |
|
|
AdrianLxM
|
f815f7fce6
|
CPP ic and isf data
|
2016-11-14 18:19:17 +01:00 |
|
|
AdrianLxM
|
8c93925865
|
CPP simple representation string
|
2016-11-14 18:19:17 +01:00 |
|
|
AdrianLxM
|
364b3d6710
|
CPP percentage and shift working on hard coded basal rate
|
2016-11-14 18:19:17 +01:00 |
|
|
AdrianLxM
|
be556cf388
|
CPP copy simple profile
|
2016-11-14 18:19:17 +01:00 |
|
|
AdrianLxM
|
d94136bc95
|
overview dymanic height
|
2016-11-12 20:39:11 +01:00 |
|
|
warstar2187
|
2365dbac86
|
Update strings.xml
|
2016-11-13 01:54:28 +09:00 |
|
|
Milos Kozak
|
0b56b7554c
|
Merge pull request #64 from AdrianLxM/fill-presets2
Fill presets
|
2016-11-12 10:41:54 +01:00 |
|
|
Milos Kozak
|
dce6acba54
|
Merge pull request #65 from AdrianLxM/german-update
German update
|
2016-11-12 10:28:01 +01:00 |
|
|
AdrianLxM
|
2fef497ce9
|
German updates 02
|
2016-11-11 17:59:23 +01:00 |
|
|
AdrianLxM
|
75889c24b3
|
German updates 01
|
2016-11-11 17:59:10 +01:00 |
|
|
AdrianLxM
|
1568f77229
|
fill preset buttons
|
2016-11-11 16:24:00 +01:00 |
|
|
warstar2187
|
2d54a068ad
|
Update strings.xml
|
2016-11-11 23:07:32 +09:00 |
|
|
Milos Kozak
|
c034f77b71
|
fix merge conflict 2
|
2016-11-11 13:09:50 +01:00 |
|
|
Milos Kozak
|
a341fa4343
|
fix merge conflict
|
2016-11-11 13:09:11 +01:00 |
|
|
AdrianLxM
|
a6d5d68938
|
fill action
|
2016-11-11 00:56:15 +01:00 |
|
|
Milos Kozak
|
e8d169f078
|
allow automated actions only whem pump is initialized
|
2016-11-10 23:33:12 +01:00 |
|
|
AdrianLxM
|
7b4b4f7cfc
|
Overview profile redesign
|
2016-11-10 23:20:23 +01:00 |
|
|
AdrianLxM
|
4ee87d1cca
|
basal profile on overview
|
2016-11-10 21:03:26 +01:00 |
|
|
AdrianLxM
|
a6ae92bb2f
|
Receive profile updates on uploadOnly when NS-Profiles are used
|
2016-11-10 18:53:01 +01:00 |
|
|
AdrianLxM
|
c900d6611c
|
Warn on "refresh treatments from NS" button in upload only mode.
|
2016-11-10 18:52:42 +01:00 |
|
|
AdrianLxM
|
f85f04d33f
|
NS upload only
|
2016-11-10 18:33:50 +01:00 |
|
|
Milos Kozak
|
21f732b378
|
report app start/restart to NS
|
2016-11-10 16:42:59 +01:00 |
|
|
Milos Kozak
|
8d360f837d
|
Merge pull request #57 from warstar2187/master
kr translation update
|
2016-11-10 10:02:01 +01:00 |
|
|
AdrianLxM
|
341d7222e5
|
Strings for reset DB
|
2016-11-08 22:36:47 +01:00 |
|
|
warstar2187
|
1f35018148
|
Update strings.xml
|
2016-11-08 20:04:19 +09:00 |
|
|
AdrianLxM
|
ede982c8c5
|
Update danar_history_item.xml
|
2016-11-08 06:08:12 +01:00 |
|
|
Milos Kozak
|
6263b98683
|
Merge pull request #39 from warstar2187/master
Update strings.xml
|
2016-11-07 09:13:21 +01:00 |
|
|
Milos Kozak
|
45ffc18d25
|
move set temp and set extended buttons to actions
|
2016-11-05 20:12:58 +01:00 |
|
|
Milos Kozak
|
3ac9811d9a
|
Actions page & offline profile switch
|
2016-11-05 15:46:11 +01:00 |
|
|
Radoslav Radev
|
b9d4a5fc0a
|
Update strings.xml
|
2016-11-03 07:47:24 +02:00 |
|
|
Milos Kozak
|
57b032065f
|
Merge pull request #45 from AdrianLxM/disableLoopLabel
Disable loop label
|
2016-11-02 22:20:48 +01:00 |
|
|
AdrianLxM
|
b7f4dd3366
|
borders again on loopmode label
|
2016-11-02 18:27:46 +01:00 |
|
|
AdrianLxM
|
b1f3bb17bb
|
Show in Overview when loop is disabled
|
2016-11-02 18:04:14 +01:00 |
|
|
AdrianLxM
|
80e8ac465a
|
Update German translation
|
2016-11-02 14:33:41 +01:00 |
|
|
AdrianLxM
|
b265be3536
|
Some updates on German translation
|
2016-11-02 14:17:16 +01:00 |
|
|
warstar2187
|
46fd0c87dd
|
Update strings.xml
|
2016-10-27 08:16:19 +09:00 |
|
|
warstar2187
|
e4e2ea3aac
|
Update strings.xml
|
2016-10-27 02:53:23 +09:00 |
|
|
warstar2187
|
a49afea27c
|
Update strings.xml
|
2016-10-26 15:57:21 +09:00 |
|
|
warstar2187
|
58591514f7
|
Update strings.xml
|
2016-10-26 15:34:26 +09:00 |
|
|
warstar2187
|
02c231a236
|
Update strings.xml
|
2016-10-26 12:36:15 +09:00 |
|
|
warstar2187
|
f39b009ca3
|
Update strings.xml
|
2016-10-26 10:10:33 +09:00 |
|
|
warstar2187
|
70249c7e3e
|
Update strings.xml
|
2016-10-26 09:49:46 +09:00 |
|
|
Milos Kozak
|
4c3d67535c
|
Korean language template
|
2016-10-25 23:38:44 +02:00 |
|
|
Milos Kozak
|
861c24fc45
|
distinguish between meal and correction bulus
|
2016-10-25 23:33:02 +02:00 |
|
|
AdrianLxM
|
d2906e8fd4
|
overview_quickwizardentry translated but does not exist
|
2016-10-21 22:18:17 +02:00 |
|
|
Milos Kozak
|
6f8d828ec2
|
QuickWizard
|
2016-10-20 23:50:31 +02:00 |
|
|
Milos Kozak
|
5ec339e987
|
fix BolusProgessDialog size on Android 6
|
2016-10-11 23:49:26 +02:00 |
|
|
Milos Kozak
|
4378c9af14
|
more SMS commands
|
2016-09-16 14:08:26 +02:00 |
|
|
Milos Kozak
|
57db26443e
|
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
|
2016-09-13 22:40:55 +02:00 |
|
|
Milos Kozak
|
ecb685f7f6
|
hard limits on openaps params
|
2016-09-13 22:15:17 +02:00 |
|
|
ecorman
|
83c4214710
|
Reduce width, + sign was not visible
|
2016-09-12 00:34:31 +02:00 |
|
|
ecorman
|
52525b69f4
|
Updated Translation
|
2016-09-12 00:33:14 +02:00 |
|
|
ecorman
|
0221a14f7c
|
Updated translation
|
2016-09-12 00:07:50 +02:00 |
|
|
Milos Kozak
|
05831c75a6
|
SMS LOOP commands
|
2016-09-10 15:33:00 +02:00 |
|
|
Radoslav Radev
|
9c82350c1e
|
Update strings.xml
|
2016-09-10 10:37:33 +03:00 |
|
|
Milos Kozak
|
bdeb7d6061
|
Merge pull request #30 from slavidex/patch-11
too long
|
2016-09-09 13:08:37 +02:00 |
|
|
Radoslav Radev
|
829beb5c8f
|
too long
|
2016-09-09 07:54:16 +03:00 |
|
|
ecorman
|
e5c1c1df4d
|
Improve Spanish Translation
|
2016-09-08 23:19:07 +02:00 |
|
|
ecorman
|
fcdd07a182
|
Reduce size to better fit screen
|
2016-09-08 23:18:15 +02:00 |
|
|
ecorman
|
dd032b19e0
|
Spanish translation update strings.xml
|
2016-09-07 23:40:37 +02:00 |
|
|
ecorman
|
b3857f7794
|
Spanish translation
|
2016-09-07 23:39:06 +02:00 |
|
|
Milos Kozak
|
3fb84636db
|
fix objectives import/export
|
2016-08-13 11:30:43 +02:00 |
|
|
Milos Kozak
|
40aada0eb4
|
ajdust some danar pump comm params
|
2016-08-12 20:22:44 +02:00 |
|
|
Milos Kozak
|
ebee1cdeca
|
scrollview in careportal dialog
|
2016-08-11 15:36:59 +02:00 |
|
|
Milos Kozak
|
4da0f345cf
|
fix wizard gui
|
2016-08-11 09:54:03 +02:00 |
|
|
Radoslav Radev
|
9bbc1e97a5
|
BG translation
|
2016-08-11 07:45:35 +03:00 |
|
|
Milos Kozak
|
d023e4ae32
|
move targets from fragment to plugin
|
2016-08-10 23:27:26 +02:00 |
|
|
Milos Kozak
|
d2b01dcc32
|
fix BG lang
|
2016-08-10 18:25:49 +02:00 |
|
|
Radoslav Radev
|
098aa22da6
|
BG translation
fix
|
2016-08-10 16:44:13 +03:00 |
|
|
Milos Kozak
|
acbd028465
|
bolus progress in virtual pump
|
2016-08-10 14:50:53 +02:00 |
|
|
Milos Kozak
|
49d6690450
|
OpenAPS MA target value
|
2016-08-09 15:40:12 +02:00 |
|
|
Milos Kozak
|
267e0220c0
|
overview scroll, determinebasal fix
|
2016-08-08 14:47:24 +02:00 |
|
|
Milos Kozak
|
88698576a2
|
plusminis edit shows toast when hit limit
|
2016-08-08 10:08:30 +02:00 |
|
|
Milos Kozak
|
ff2e9a82bc
|
fix some crashes
|
2016-08-07 13:07:13 +02:00 |
|
|
Milos Kozak
|
b711648bee
|
plugins refactoring
|
2016-08-05 23:54:03 +02:00 |
|
|
Milos Kozak
|
7cc0fb593d
|
IOB display & upload fix
|
2016-08-05 00:32:48 +02:00 |
|
|
Milos Kozak
|
b42644de39
|
objectives finalization, some todos
|
2016-08-04 23:38:43 +02:00 |
|
|
Milos Kozak
|
a7d3dca752
|
Bolusing dialog
|
2016-08-04 09:17:26 +02:00 |
|
|
Milos Kozak
|
c20026c15a
|
lowsuspend cleanup
|
2016-08-03 14:40:47 +02:00 |
|
|
Milos Kozak
|
6b75dd3dc9
|
error.mp3
|
2016-08-02 18:39:56 +02:00 |
|
|
Milos Kozak
|
dbb0a6a659
|
danar fragment update, danar pump password, toast with sound
|
2016-08-02 18:39:14 +02:00 |
|
|
Milos Kozak
|
e94fe1f647
|
danar history translation support
|
2016-07-28 13:40:32 +02:00 |
|
|
Milos Kozak
|
a9218c20d5
|
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
|
2016-07-27 17:50:04 +02:00 |
|
|
Milos Kozak
|
61e8ffeebd
|
DanaR history loader
|
2016-07-27 17:49:56 +02:00 |
|
|
Ulrich Kopp
|
4e2d97d42d
|
DE translation
|
2016-07-24 17:36:54 +02:00 |
|
|
Milos Kozak
|
978770d70a
|
icon
|
2016-07-21 15:11:17 +02:00 |
|
|
Milos Kozak
|
7d568f2c24
|
cz translation
|
2016-07-20 23:19:49 +02:00 |
|
|
Milos Kozak
|
fd91348eba
|
fix bg translation
|
2016-07-20 23:14:19 +02:00 |
|
|
Radoslav Radev
|
9007d25e7e
|
translation bg
|
2016-07-20 22:37:22 +03:00 |
|
|
Milos Kozak
|
788289c757
|
remove alert mp3
|
2016-07-19 11:40:22 +02:00 |
|