Milos Kozak
|
08880b8032
|
Merge branch 'master' into dev
|
2017-01-26 18:31:31 +01:00 |
|
|
Milos Kozak
|
e78de8b622
|
fix static func
|
2017-01-26 18:27:09 +01:00 |
|
|
Milos Kozak
|
0c289bfb6e
|
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
|
2017-01-26 18:23:47 +01:00 |
|
|
Milos Kozak
|
87ba28136a
|
log new firmware pump
|
2017-01-26 18:23:30 +01:00 |
|
|
Milos Kozak
|
72fc4ec096
|
Merge branch 'master' into dev
|
2017-01-26 17:00:10 +01:00 |
|
|
Milos Kozak
|
750cea7bcf
|
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
|
2017-01-26 16:57:11 +01:00 |
|
|
Milos Kozak
|
5c5468b55b
|
use minimal basal rate from description
|
2017-01-26 16:56:29 +01:00 |
|
|
Milos Kozak
|
837c4573be
|
Merge pull request #146 from Heiner1/dev
Update strings.xml
|
2017-01-26 00:34:52 +01:00 |
|
|
Heiner1
|
5c43c66163
|
Update strings.xml
|
2017-01-25 23:35:31 +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 |
|
|
Milos Kozak
|
1ac071c655
|
Merge pull request #142 from AdrianLxM/patch-13
Remove diff meta info from unresolved merge conflict
|
2017-01-24 08:49:30 +01:00 |
|
|
Milos Kozak
|
107f71722c
|
Merge pull request #141 from LadyViktoria/dev
DanaR Stats small Layout fixes
|
2017-01-24 08:48:57 +01:00 |
|
|
AdrianLxM
|
3a43858948
|
Settings for deltas
|
2017-01-24 02:21:25 +01:00 |
|
|
AdrianLxM
|
0b31062480
|
Remove diff meta info from unresolved merge conflict
Should remove the "unsupported module" error in Android Studio
|
2017-01-24 01:24:05 +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 |
|
|
Milos Kozak
|
5c216e5cec
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-01-23 15:56:55 +01:00 |
|
|
Milos Kozak
|
df0af4da94
|
fix uploading profile
|
2017-01-23 15:56:32 +01:00 |
|
|
Milos Kozak
|
750ac19b41
|
upload data for temp target only if needed
|
2017-01-23 14:47:14 +01:00 |
|
|
Milos Kozak
|
d62105b6c6
|
Merge pull request #139 from slavidex/patch-27
Update strings.xml
|
2017-01-23 12:03:47 +01:00 |
|
|
Radoslav Radev
|
fbceeec5b0
|
Update strings.xml
|
2017-01-23 11:01:42 +02:00 |
|
|
Milos Kozak
|
22f9817f8e
|
upload cpp setting to NS
|
2017-01-23 09:31:14 +01: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
|
c4f8167424
|
Merge pull request #138 from AdrianLxM/adjusttargetsse
Short tab titles
|
2017-01-22 11:35:29 +01:00 |
|
|
Milos Kozak
|
ceaf4f7f78
|
Merge branch 'dev' into adjusttargetsse
|
2017-01-22 11:30:59 +01:00 |
|
|
Milos Kozak
|
14d186752f
|
Merge pull request #137 from ecorman/dev
Update Spanish Translation
|
2017-01-22 10:50:07 +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 |
|
|
AdrianLxM
|
1822f2a6c0
|
Merge pull request #57 from MilosKozak/dev
Dev
|
2017-01-21 00:30:25 +01:00 |
|
|
Milos Kozak
|
ea37d9eaa8
|
Merge pull request #131 from AdrianLxM/tempt-pill
Tempt pill
|
2017-01-21 00:11:07 +01:00 |
|
|
Milos Kozak
|
3194f46902
|
Merge pull request #132 from LadyViktoria/danarstats
DanaR Stats
|
2017-01-20 23:32:55 +01:00 |
|
|
viktoria
|
5a09c3df70
|
DanaR Stats Korean react on touch elsewwhere
|
2017-01-20 22:43:02 +01:00 |
|
|
AdrianLxM
|
377a55c69f
|
DanaR Stats react on touch elsewhere
|
2017-01-20 20:47:31 +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
|
d2acad1942
|
Korean DanaR Stats some improvements
|
2017-01-20 03:19:17 +01:00 |
|
|
viktoria
|
2d966c9feb
|
DanaR Stats some improvements
|
2017-01-20 03:13:41 +01:00 |
|
|
viktoria
|
62853326ed
|
Merged branch dev into danarstats
|
2017-01-20 00:10:56 +01:00 |
|
|
AdrianLxM
|
3f3d519c84
|
Merge branch 'dev' into tempt-pill
|
2017-01-19 21:57:42 +01:00 |
|
|
AdrianLxM
|
992d95744d
|
remove duplicate code
|
2017-01-19 21:53:08 +01:00 |
|