Commit graph

603 commits

Author SHA1 Message Date
Milos Kozak
d9a9c933bc package refactor 2019-02-28 23:16:50 +01:00
Milos Kozak
395faa7dc9 pumps package refactor 2019-02-26 20:38:27 +01:00
TebbeUbben
cc189d360f Merge remote-tracking branch 'nico/dev-wip' into dev-nico 2019-02-02 16:58:21 +01:00
TebbeUbben
d1f7086651 Merge branch 'master' into insight-dev
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
2019-01-31 13:08:33 +01:00
TebbeUbben
2770a49869 Local Insight driver 2019-01-18 22:40:22 +01:00
Nico Schmitz
9e03f0f8ca Update to current dev branch 2018-12-11 14:51:26 +01:00
triplem
eea79c5d0f fixes PR#1550 2018-11-08 21:14:44 +01:00
Sebastian Lenz
6323f2dd49 fixed typo 2018-09-16 18:32:51 +02:00
Milos Kozak
69544f67b5 nsclient arrow layout update 2018-09-11 19:50:35 +02:00
Milos Kozak
8a92bed479 tratments layout improvement 2018-09-11 19:29:51 +02:00
Milos Kozak
f5e7d28aa6 fix WizardInfoDialog 2nd 2018-09-01 23:34:35 +02:00
Milos Kozak
2c5837a235 Merge branch 'virtual_pump_Bug863' of https://github.com/andyrozman/AndroidAPS into andyrozman-virtual_pump_Bug863 2018-08-23 17:53:28 +02:00
Milos Kozak
653a98fd5b better layout for nsclient mode 2018-08-21 23:19:04 +02:00
Milos Kozak
414c3416dd WizardInfoDialog 2018-08-20 19:32:18 +02:00
Nico Schmitz
5386c7db4a Update to upstream/dev and resolve conflicts 2018-08-19 14:37:42 +02:00
Milos Kozak
4bfd851bf6
Merge pull request #1297 from MilosKozak/overview-flexbox
overview flexbox
2018-08-04 09:02:19 +02:00
AdrianLxM
77a3972f6a overview flexbox 2018-08-03 16:07:15 +02:00
Milos Kozak
70e2b64adf rename Time -> Time offset in eCarbs dialog 2018-08-03 13:04:58 +02:00
Milos Kozak
a01d9924eb
Merge branch 'dev' into sens 2018-08-02 15:22:45 +02:00
Milos Kozak
3bcd656c14 Maintenance plugin cleanup 2018-08-02 15:19:13 +02:00
Markus M. May
8f5869d806 Add sens data to small height overview as well 2018-08-01 20:48:36 +02:00
Markus M. May
38ac294a3c Add sens data to overview for normal overview 2018-08-01 20:40:34 +02:00
Milos Kozak
c6bc15e311
Merge branch 'dev' into virtual_pump_Bug863 2018-08-01 11:57:48 +02:00
Markus M. May
9f90d31f35 Merge latest dev changes 2018-07-30 19:39:38 +02:00
Milos Kozak
073b522b93 user defined level of logging 2018-07-30 17:04:43 +02:00
Milos Kozak
75bb38ba1f move activities to new package 2018-07-29 00:08:28 +02:00
Markus M. May
f70909d6c6 Refactore logshipper to maintenance, move funcs from menu to plugin 2018-07-28 22:45:40 +02:00
Markus M. May
c34104b906 move log shipment to own plugin 2018-07-25 22:00:58 +02:00
Milos Kozak
7e2d3fd8be historybrowser, rendering optimizations 2018-07-24 00:46:08 +02:00
Milos Kozak
782e7939bc history browser: remove seek bar until gets implemented 2018-07-17 23:00:45 +02:00
Milos Kozak
917ddf0cbe CS translations 2018-07-02 15:04:09 +02:00
Nico Schmitz
2ce38702e2
Merge branch 'dev' into dev-wip 2018-07-01 22:44:11 +02:00
Milos Kozak
cf8bf419e2
Merge pull request #1147 from TebbeUbben/cb-fix
Config builder cleanup
2018-06-24 17:29:29 +02:00
TebbeUbben
2b5631e1e7 Config builder cleanup 2018-06-24 15:13:06 +02:00
Milos Kozak
a3fafa521b nsclient for phones layout 2018-06-23 22:17:54 +02:00
Milos Kozak
a4b3b7b2e9 Clean AndroidAPS started button 2018-06-23 20:28:20 +02:00
Milos Kozak
586665e19f nsclient table mode improvements 2018-06-23 18:24:04 +02:00
Johannes Mockenhaupt
41ce9677df
Remove duplicate string. 2018-06-21 09:57:35 +02:00
Johannes Mockenhaupt
6002c747e6
Treatments tab: add button (if applicable) to delete future treatments. 2018-06-21 00:38:22 +02:00
Nico Schmitz
f46a81a7be Add overview_statuslights to overview_fragment_smallheight.xml 2018-06-17 21:02:42 +02:00
Nico Schmitz
87d7fed75b Remove margin of status light layout 2018-06-16 14:03:45 +02:00
Nico Schmitz
aa4f506961 Update to current upstream/dev branch 2018-06-16 02:51:33 +02:00
Tebbe Ubben
1e4c7178f4
Merge branch 'dev' into dev 2018-06-15 21:10:33 +02:00
Nico Schmitz
1604b53327 Fix bugs, refactor code and add preferences 2018-06-14 20:49:58 +02:00
Nico Schmitz
18c6bdd4ef Improve layout xml 2018-06-13 21:35:21 +02:00
Nico Schmitz
217583d601 Use getBatteryLevel() for BAT status. Refactor code and layout. 2018-06-13 19:58:52 +02:00
Nico Schmitz
f28fca668f Integrate info fields from swissalpine/dev-work 2018-06-13 00:07:13 +02:00
Nico Schmitz
5ba6f02b93 Remove reservoir TextView 2018-06-12 23:31:46 +02:00
Nico Schmitz
4ebc149783 Add changes of schmitzn/reservoir-view 2018-06-12 23:28:11 +02:00
Milos Kozak
d051e081e2 Merge branch 'dev' into rsoption 2018-06-12 21:59:20 +02:00