Milos Kozak
|
1153c33200
|
tempbasal & extendedbolus 3way sync
|
2017-06-08 18:15:17 +02:00 |
|
Milos Kozak
|
4d30ba9cdb
|
treatments PumpHistory and NS mark
|
2017-06-07 19:43:19 +02:00 |
|
Milos Kozak
|
17f59df597
|
gui tweaking, pump battery event
|
2017-06-06 08:21:11 +02:00 |
|
Milos Kozak
|
7c7638a7a1
|
extract color resources
|
2017-06-05 15:34:22 +02:00 |
|
Milos Kozak
|
e0a6db22a2
|
run rendering calculations on background
|
2017-06-05 15:16:07 +02:00 |
|
Milos Kozak
|
1702ce7702
|
adjusting nsclient mode
|
2017-06-04 00:46:44 +02:00 |
|
Milos Kozak
|
b40cf99201
|
gui tweaking
|
2017-06-03 22:43:35 +02:00 |
|
Milos Kozak
|
d365fcd6a4
|
fix bugs & design tweaking
|
2017-06-02 23:25:11 +02:00 |
|
Milos Kozak
|
f267c85377
|
it compiles now with profiles
|
2017-06-02 10:25:49 +02:00 |
|
Milos Kozak
|
b3d18b2537
|
disable bolus when pump is suspended
|
2017-05-30 18:23:07 +02:00 |
|
Milos Kozak
|
f5f7d28cc1
|
temp basal dialog design
|
2017-05-30 18:10:05 +02:00 |
|
Milos Kozak
|
3861bece54
|
extended bolus dialog
|
2017-05-30 15:07:44 +02:00 |
|
Milos Kozak
|
a9b251ce12
|
Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history
|
2017-05-26 10:31:46 +02:00 |
|
Milos Kozak
|
bb4302c02f
|
Merge branch 'dev' into history
|
2017-05-26 10:24:48 +02:00 |
|
Milos Kozak
|
0b8499cb7f
|
Merge pull request #251 from AdrianLxM/historytest1
lint disable 'ExtraTranslation'
|
2017-05-26 10:23:51 +02:00 |
|
AdrianLxM
|
8b81960ceb
|
remove unused strings from russion translation
|
2017-05-26 10:10:57 +02:00 |
|
Milos Kozak
|
650b792099
|
mark selected tab in treatments
|
2017-05-26 10:05:42 +02:00 |
|
AdrianLxM
|
cc4419f57a
|
lint ExtraTranslation
|
2017-05-26 10:00:41 +02:00 |
|
AdrianLxM
|
99b8e48031
|
lint ExtraTranslation
|
2017-05-26 09:58:38 +02:00 |
|
Milos Kozak
|
5fb72181ee
|
careportal cage, sage, iage
|
2017-05-25 20:18:29 +02:00 |
|
Milos Kozak
|
87993c6163
|
return functionality of faking by extended boluses
|
2017-05-25 17:26:05 +02:00 |
|
fedor apanasenko
|
4406bb3f06
|
Update strings.xml
|
2017-05-25 09:51:08 +03:00 |
|
Milos Kozak
|
86af9eab3d
|
stop extended bolus in actions
|
2017-05-24 20:37:58 +02:00 |
|
Milos Kozak
|
2ae30fe9b4
|
temptarget design
|
2017-05-24 19:42:23 +02:00 |
|
Milos Kozak
|
bb9c68fd4d
|
Merge remote-tracking branch 'origin/dev' into history
|
2017-05-24 19:18:30 +02:00 |
|
Milos Kozak
|
f936580734
|
Russsian language
|
2017-05-24 18:46:19 +02:00 |
|
Milos Kozak
|
5208f23661
|
Temptargets under treatments
|
2017-05-23 23:56:53 +02:00 |
|
Milos Kozak
|
771fbdc303
|
sync of treatments, tempbasals, extended tested and working
|
2017-05-23 22:59:06 +02:00 |
|
Milos Kozak
|
8db1bd5ae5
|
tempbasal ns sync
|
2017-05-23 20:15:14 +02:00 |
|
Milos Kozak
|
6394421017
|
boluses working
|
2017-05-22 22:10:56 +02:00 |
|
Milos Kozak
|
6cd046459a
|
original treatmens plugin removed, temp basals working
|
2017-05-22 20:58:05 +02:00 |
|
Milos Kozak
|
3330c6a3fd
|
Merge branch 'dev' into history
|
2017-05-21 16:46:13 +02:00 |
|
Milos Kozak
|
462849af12
|
russian language entry
|
2017-05-21 10:06:34 +02:00 |
|
Milos Kozak
|
56d54a6988
|
italian language
|
2017-05-20 20:41:23 +02:00 |
|
Milos Kozak
|
8c5ce7290d
|
more work on treatments fragment
|
2017-05-16 17:48:58 +02:00 |
|
Milos Kozak
|
3ee9bf5ff7
|
Merge branch 'dev' into history
|
2017-05-16 15:15:32 +02:00 |
|
Milos Kozak
|
86c975e9d6
|
Add Italian language
|
2017-05-16 13:39:24 +02:00 |
|
Milos Kozak
|
45477f96ee
|
Merge pull request #243 from AdrianLxM/xdripstatusline
basal and bolus step in DanaR Fragment
|
2017-05-16 13:28:39 +02:00 |
|
AdrianLxM
|
572e726678
|
basal and bolus step in DanaR Fragment
|
2017-05-16 13:10:02 +02:00 |
|
Milos Kozak
|
6fff6f63a4
|
bolus dialog redesign
|
2017-05-16 12:09:32 +02:00 |
|
Milos Kozak
|
4201709e2a
|
finish careportal dialog redesign
|
2017-05-16 11:47:33 +02:00 |
|
Milos Kozak
|
704ad383e9
|
careportal layout part1
|
2017-05-15 21:10:43 +02:00 |
|
Milos Kozak
|
25110cfea4
|
move database actions from pump to treatments plugin
|
2017-05-15 18:44:40 +02:00 |
|
Milos Kozak
|
c6830baf8f
|
Merge branch 'dev' into history
|
2017-05-12 16:35:07 +02:00 |
|
Milos Kozak
|
abdc1022bf
|
merge bolus & basal into one plugin
|
2017-05-12 16:27:33 +02:00 |
|
AdrianLxM
|
a60afbceb9
|
typo
|
2017-05-12 16:08:48 +02:00 |
|
AdrianLxM
|
a9e093ad0d
|
some German translations
|
2017-05-12 16:06:14 +02:00 |
|
AdrianLxM
|
c88b8eaa9a
|
make buttons scrollable for small heights
|
2017-05-12 15:26:16 +02:00 |
|
Milos Kozak
|
e005d6bd69
|
Merge branch 'dev' into history
|
2017-05-12 13:05:57 +02:00 |
|
Milos Kozak
|
df424ea5ff
|
overview buttons
|
2017-05-12 11:06:33 +02:00 |
|
Milos Kozak
|
b782a5b8dc
|
Merge branch 'dev' into history
|
2017-05-12 00:39:20 +02:00 |
|
Milos Kozak
|
a0d31b2118
|
rename identical functions
|
2017-05-11 18:54:50 +02:00 |
|
Radoslav Radev
|
d58ddf48c6
|
Update strings.xml
|
2017-05-11 17:01:49 +03:00 |
|
Milos Kozak
|
7e99ce416a
|
move buttons back to bottom
|
2017-05-11 10:59:05 +02:00 |
|
Milos Kozak
|
6b9048cd61
|
Merge pull request #234 from warstar2187/korean
Korean translation update
|
2017-05-11 09:27:58 +02:00 |
|
Milos Kozak
|
51d52f6b3d
|
Merge branch 'DanaRv2' into history
|
2017-05-10 21:53:31 +02:00 |
|
Milos Kozak
|
5b25d28f42
|
Merge branch 'dev' into DanaRv2
|
2017-05-10 14:05:43 +02:00 |
|
AdrianLxM
|
298d7a7d9c
|
Merge branch 'dev' into xdripstatusline
|
2017-05-09 23:26:31 +02:00 |
|
AdrianLxM
|
1fa3a2a697
|
bgi on watch status (optional)
|
2017-05-09 23:23:37 +02:00 |
|
Milos Kozak
|
d313df0d19
|
removing treatments
|
2017-05-09 20:47:02 +02:00 |
|
Milos Kozak
|
554fb51a75
|
profile layout
|
2017-05-09 19:06:59 +02:00 |
|
Milos Kozak
|
84a6554e07
|
smaller font size on careportal buttons
|
2017-05-09 18:36:13 +02:00 |
|
Milos Kozak
|
09fea02ed2
|
Allow to disable NS upload while client is connected
|
2017-05-09 16:24:53 +02:00 |
|
Milos Kozak
|
b30d79c4cb
|
fix conflicts
|
2017-05-09 10:46:04 +02:00 |
|
Milos Kozak
|
0048366dcf
|
fix conflict
|
2017-05-09 10:14:21 +02:00 |
|
Milos Kozak
|
8d3be5e958
|
colors on danar fragment
|
2017-05-08 23:19:11 +02:00 |
|
AdrianLxM
|
67f21537ea
|
send status to xDrip
|
2017-05-06 15:18:19 +02:00 |
|
Milos Kozak
|
05d9f16031
|
hide label too
|
2017-05-04 23:22:16 +02:00 |
|
Milos Kozak
|
344144d88a
|
pump status equal size
|
2017-05-04 21:11:51 +02:00 |
|
Milos Kozak
|
aabcee8ea7
|
fix conflicts
|
2017-05-04 19:53:45 +02:00 |
|
Milos Kozak
|
352a2a7475
|
deviations graph
|
2017-05-04 19:51:58 +02:00 |
|
Milos Kozak
|
070867af28
|
menu on top
|
2017-05-04 19:13:56 +02:00 |
|
Milos Kozak
|
289ad394ce
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-05-03 22:30:12 +02:00 |
|
Milos Kozak
|
6d5f2514d0
|
remove duplicated string
|
2017-05-03 18:45:29 +02:00 |
|
Milos Kozak
|
573256d7d4
|
catch missing sms permission
|
2017-05-03 18:30:18 +02:00 |
|
Milos Kozak
|
602310b70a
|
DanaRv2 1st rev
|
2017-05-02 17:02:30 +02:00 |
|
AdrianLxM
|
9cef4c5a01
|
typo insuin->insulin
|
2017-05-01 18:09:53 +02:00 |
|
AdrianLxM
|
0069f320f8
|
config builder smallscreen
|
2017-04-30 21:57:55 +02:00 |
|
AdrianLxM
|
5dc07012d2
|
overview smallscreen
|
2017-04-30 21:34:30 +02:00 |
|
Milos Kozak
|
0f1c2bb193
|
DanaRv2 1st rev
|
2017-04-30 21:08:00 +02:00 |
|
AdrianLxM
|
d8fb53de69
|
Making dialogs scrollable
|
2017-04-30 20:54:35 +02:00 |
|
Milos Kozak
|
3279c297dc
|
equal weight
|
2017-04-30 13:22:16 +02:00 |
|
Milos Kozak
|
2cb6e275c0
|
allign design of status pills
|
2017-04-30 13:17:59 +02:00 |
|
Milos Kozak
|
4dd9281276
|
remove actionbar
|
2017-04-29 20:16:50 +02:00 |
|
Milos Kozak
|
974e5e0098
|
pump fragment redesign
|
2017-04-29 18:11:15 +02:00 |
|
Milos Kozak
|
f641d40722
|
virtual pump layout
|
2017-04-29 17:48:45 +02:00 |
|
Milos Kozak
|
3552d6aa40
|
bg value colored
|
2017-04-27 21:26:53 +02:00 |
|
Milos Kozak
|
5ef034b4fc
|
cob display
|
2017-04-26 23:45:40 +02:00 |
|
warstar2187
|
dac969b381
|
Update strings.xml
|
2017-04-25 10:14:06 +09:00 |
|
Milos Kozak
|
7534f54f19
|
trend in wizard off by default
|
2017-04-24 19:24:53 +02:00 |
|
Milos Kozak
|
a07a8755b1
|
IOB graph
|
2017-04-24 13:17:14 +02:00 |
|
Milos Kozak
|
b8a8bed6c5
|
remove butterknife at all, remove unused code, overview graph optimalization
|
2017-04-23 13:45:49 +02:00 |
|
Milos Kozak
|
1f2967e866
|
superbolus must be explicitly enabled
|
2017-04-22 11:08:57 +02:00 |
|
Milos Kozak
|
3b34e55fda
|
CS translations
|
2017-04-22 10:21:24 +02:00 |
|
Milos Kozak
|
20f99dffe2
|
basals rendering redesign
|
2017-04-22 10:09:54 +02:00 |
|
Milos Kozak
|
55a2df470e
|
insulin activity graph
|
2017-04-21 18:34:40 +02:00 |
|
Milos Kozak
|
7f122f7497
|
show dia in insulin plugin
|
2017-04-21 16:13:53 +02:00 |
|
Milos Kozak
|
90a55966b1
|
Fast Acting Insulin Prolonged
|
2017-04-21 15:36:49 +02:00 |
|
Milos Kozak
|
17771434aa
|
upgrade travis & plugin packages
|
2017-04-21 12:15:08 +02:00 |
|
Milos Kozak
|
25491fbac6
|
Insulin interface
|
2017-04-21 11:45:25 +02:00 |
|
Milos Kozak
|
04ae55ac63
|
exit app after import settings
|
2017-04-16 13:27:01 +02:00 |
|
Milos Kozak
|
402768cb87
|
1.33 app start logging optional
|
2017-04-14 15:33:39 +02:00 |
|
Milos Kozak
|
2413fae0a9
|
1.32 superbolus & trend contribution in wizard
|
2017-04-14 14:50:18 +02:00 |
|
Milos Kozak
|
387defbfc7
|
fix sms pref key
|
2017-04-09 21:50:05 +02:00 |
|
Radoslav Radev
|
5fe22eac65
|
Update strings.xml
|
2017-04-07 13:53:47 +03:00 |
|
Milos Kozak
|
c5245ae5fd
|
SMS suspend/resume loop
|
2017-04-06 21:22:27 +02:00 |
|
Milos Kozak
|
a02da220c9
|
CS translations
|
2017-04-05 22:04:55 +02:00 |
|
Milos Kozak
|
f596050239
|
loop suspend menu
|
2017-04-05 21:39:39 +02:00 |
|
Milos Kozak
|
d6f31820d9
|
request battery optimalization whitelisting
|
2017-03-31 09:21:40 +02:00 |
|
Milos Kozak
|
a4f302ee4a
|
show if pump is suspended
|
2017-03-24 12:05:12 +01:00 |
|
Milos Kozak
|
e8edf9eb54
|
Glimp support
|
2017-03-21 19:11:39 +01:00 |
|
warstar2187
|
242428e2cb
|
Update strings.xml
|
2017-03-09 04:20:40 +09:00 |
|
Radoslav Radev
|
3b129dc7f6
|
Update strings.xml
|
2017-03-05 15:58:37 +02:00 |
|
Radoslav Radev
|
a0f2e4f663
|
Update strings.xml
|
2017-03-05 15:42:01 +02:00 |
|
Radoslav Radev
|
54f376330a
|
Update strings.xml
|
2017-03-05 15:28:20 +02:00 |
|
Milos Kozak
|
de9dbf9243
|
CS translations
|
2017-03-04 20:55:13 +01:00 |
|
Milos Kozak
|
e25fb9845d
|
hide unneeded labels in nsclient mode
|
2017-02-23 23:32:26 +01:00 |
|
Milos Kozak
|
b0c828c93e
|
nsclient build variant
|
2017-02-23 20:00:33 +01:00 |
|
Milos Kozak
|
15d6de4701
|
age from product flavor to prefs
|
2017-02-22 20:29:41 +01:00 |
|
Milos Kozak
|
87ad140eb5
|
SMS logging and resource refactor
|
2017-02-22 14:11:05 +01:00 |
|
Milos Kozak
|
34ed92f8aa
|
fix displaying delta when not available
|
2017-02-21 10:00:08 +01:00 |
|
AdrianLxM
|
98edfc57e0
|
dismiss bolus progress via events
|
2017-02-20 14:49:38 +01:00 |
|
AdrianLxM
|
686e16de8d
|
scrollview match parent in width
|
2017-02-20 13:31:47 +01:00 |
|
AdrianLxM
|
1f464bdae0
|
Merge remote-tracking branch 'milosremote/dev' into adridev
|
2017-02-20 13:11:35 +01:00 |
|
AdrianLxM
|
18e2dcffcf
|
make things scrollable
|
2017-02-20 13:10:07 +01:00 |
|
Milos Kozak
|
6200584268
|
hours to fetch fixed
|
2017-02-20 09:46:55 +01:00 |
|
Milos Kozak
|
5f4eb1e4c4
|
pump status tweaking
|
2017-02-19 19:15:14 +01:00 |
|
Milos Kozak
|
9303bd61fd
|
Merge branch 'dev' into nsclient
|
2017-02-19 09:41:16 +01:00 |
|
AdrianLxM
|
d113d39916
|
wear setting to show detailed IOB
|
2017-02-18 18:13:13 +01:00 |
|
Milos Kozak
|
5d795fbe33
|
Merge branch 'dev' into nsclient
|
2017-02-17 22:26:02 +01:00 |
|
Milos Kozak
|
29b4f0063b
|
better handling readonly permission
|
2017-02-17 22:12:35 +01:00 |
|
Milos Kozak
|
14e37246c2
|
nsclient gui and pausing tweaking
|
2017-02-17 18:14:33 +01:00 |
|
Milos Kozak
|
31364ff07b
|
ignore dbaccess if nsclient not enabled
|
2017-02-17 16:41:28 +01:00 |
|
Milos Kozak
|
8a374f1b35
|
Shared preferences cleanup
|
2017-02-17 16:16:20 +01:00 |
|
Milos Kozak
|
3216ff636a
|
preference keys to strings
|
2017-02-17 13:43:17 +01:00 |
|
Milos Kozak
|
71112a90e2
|
internal nsclient
|
2017-02-17 13:18:36 +01:00 |
|
Radoslav Radev
|
09880f029a
|
Update strings.xml
|
2017-02-16 16:46:47 +02:00 |
|
Milos Kozak
|
dda95dc275
|
allow to remove treatments from GUI
|
2017-02-14 21:13:13 +01:00 |
|
Milos Kozak
|
a75c62be35
|
show notification when aproaching daily limit
|
2017-02-14 19:47:45 +01:00 |
|
Milos Kozak
|
2e4aec9916
|
settings password protected
|
2017-02-14 19:16:34 +01:00 |
|
Milos Kozak
|
8001796f4b
|
virtual pump status upload optional
|
2017-02-14 15:41:30 +01:00 |
|
Milos Kozak
|
e00045155e
|
prefill bg value in careportal dialog
|
2017-02-14 15:09:22 +01:00 |
|
Milos Kozak
|
f9ee3c547a
|
translations
|
2017-02-13 21:05:57 +01:00 |
|
Milos Kozak
|
c6b3fe9883
|
Merge pull request #178 from AdrianLxM/wear-bolus5
Wear Bolus
|
2017-02-13 18:13:36 +01:00 |
|
Milos Kozak
|
e003ef8368
|
Merge pull request #175 from LadyViktoria/dev
use validation lib in cpp - layout fixes & longer snackbar duration
|
2017-02-12 22:29:20 +01:00 |
|
Milos Kozak
|
f6ae267bb5
|
CS translations
|
2017-02-12 22:28:42 +01:00 |
|
Milos Kozak
|
1f3aee091e
|
manual invoke of loop in separate thread
|
2017-02-12 22:02:42 +01:00 |
|
viktoria
|
ba254f8829
|
Merged branch dev into dev
|
2017-02-12 20:01:25 +01:00 |
|
viktoria
|
0d02f42714
|
use validation lib in cpp - layout fixes & longer snackbar duration
|
2017-02-12 19:51:56 +01:00 |
|
Milos Kozak
|
4e3cc65d5d
|
handling pump suspend, show pump actions on overview
|
2017-02-12 19:51:13 +01:00 |
|
Milos Kozak
|
351a624b83
|
small string change
|
2017-02-12 13:48:03 +01:00 |
|
Milos Kozak
|
dc85bc26fc
|
typo
|
2017-02-12 13:45:08 +01:00 |
|
AdrianLxM
|
5e96124a2d
|
mmol/l fix
|
2017-02-11 22:27:04 +01:00 |
|
AdrianLxM
|
2e6d754c86
|
mmol/l fix
|
2017-02-11 22:26:16 +01:00 |
|
AdrianLxM
|
1f5dd4750a
|
CPP dismiss info when focus is lost
|
2017-02-11 22:20:29 +01:00 |
|
AdrianLxM
|
6c5028b4be
|
CPP dismiss info when focus is lost
|
2017-02-11 22:18:28 +01:00 |
|
AdrianLxM
|
104c146b2f
|
Merge pull request #63 from AdrianLxM/patch-16
LadyViktoria validation lib plus safety
|
2017-02-11 21:12:22 +01:00 |
|
AdrianLxM
|
638b9c263c
|
Merge pull request #61 from MilosKozak/dev
Dev
|
2017-02-11 02:55:14 +01:00 |
|
viktoria
|
7877235972
|
Merged branch dev into dev
|
2017-02-11 00:16:55 +01:00 |
|
viktoria
|
279c67bb70
|
use validation lib in cpp - add snackbar
|
2017-02-11 00:16:25 +01:00 |
|
Milos Kozak
|
40d166cb7d
|
CS translations
|
2017-02-10 21:39:51 +01:00 |
|
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 |
|