Commit graph

270 commits

Author SHA1 Message Date
AdrianLxM
6378d0a6bf
Merge branch 'dev' into 221-fix 2019-04-07 18:16:42 +02:00
AdrianLxM
430738d706 2.2.1 2019-04-07 17:18:27 +02:00
Milos Kozak
fbd9e3e501 Firebase integration 2019-04-04 17:15:45 +02:00
Milos Kozak
f1f1be160b put back constraint layout library 2019-03-30 16:03:08 +01:00
Milos Kozak
cabdb1d2fb Merge branch 'dev' into automation 2019-03-30 15:47:23 +01:00
Milos Kozak
361ffa91c8 revert changes and disable test 2019-03-30 11:11:44 +01:00
Milos Kozak
7f7e2eeb46 2.2.1-dev 2019-03-29 08:33:26 +01:00
AdrianLxM
97430a00b1
2.2 2019-03-28 22:47:13 +01:00
Nico Schmitz
fc7e65c4d1 Update to recent upstream/dev 2019-03-22 23:08:13 +01:00
Nico Schmitz
91e4b01f10 Display actions and merge recent upstream/dev
- Add ActionListAdapter
- Add ChooseActionDialog
- Merge upstream/dev branch
2019-03-19 19:08:46 +01:00
Andy Rozman
f7c4db35b5 Merge branch 'dev' into wear_upgrade 2019-03-12 22:46:38 +00:00
Andy Rozman
be9039d8b0 Minor changes 2019-03-12 22:41:52 +00:00
Milos Kozak
e8a41b01b7 bump 2.1.3-dev 2019-03-07 11:07:48 +01:00
Andy Rozman
6e500c1e75 On both sides changed BIND_LISTENER in manifest and added a lot of logging, some might be commented out.
On AAPS side:
- added some capabilites
- fully refactored SendToDataLayerThread (copied from xdrip)
- updated code
- all tasks are now executed on Executor (and not by itself) - main problem that some data was not sent

On Wear side:
- added capabilities and refactored code in ListenerService (by looking at xdrip code)
2019-03-06 23:38:18 +00:00
Milos Kozak
6c19e91abc bump 2.1.2 2019-03-05 21:26:30 +01:00
Milos Kozak
5cf9516012 fix gradle files 2019-03-05 20:44:51 +01:00
AdrianLxM
f28d763ada
version bump 2.1.1 2019-03-02 22:25:13 +01:00
Milos Kozak
668a45b1ad bump 2.1 2019-03-02 15:56:11 +01:00
Milos Kozak
5938c5659b Pumpcontrol icon 2019-03-02 14:37:53 +01:00
Milos Kozak
9f66e0b96e Fabric update 2019-02-19 18:03:18 +01:00
Milos Kozak
1e37ce5ba7 bump 2.1-dev 2019-02-19 17:10:33 +01:00
TebbeUbben
0f2ac24fc2 Remove insight tag from build version 2019-01-31 17:34:15 +01:00
TebbeUbben
b5daa8f297 Change build version 2019-01-19 13:52:23 +01:00
TebbeUbben
2770a49869 Local Insight driver 2019-01-18 22:40:22 +01:00
Milos Kozak
8d9cc0cea6
version "2.0" 2018-11-02 23:22:37 +01:00
Milos Kozak
d921182055 2.0i-dev 2018-10-06 22:12:06 +02:00
Milos Kozak
23a91b3838 2.0h-dev 2018-09-25 17:56:16 +02:00
Nico Schmitz
c60aae8630 Work on implementation for automation plugin.
- Use butterknife
- Import weekdays selector
- Implement layout for trigger connection and trigger time
- Implement view holders
- Implement adapters
- Implement dummy code for quick testings
- Refactor code
2018-09-25 00:00:09 +02:00
Milos Kozak
0552a3f1ed 2.0g-dev 2018-09-09 12:24:03 +02:00
Milos Kozak
980e4998e2 send HEAD to fabric 2018-08-27 20:19:30 +02:00
Milos Kozak
2e03c3a298 2.0f-dev 2018-08-25 19:23:17 +02:00
Milos Kozak
9610ef54da 2.0e-dev 2018-08-20 15:14:04 +02:00
Milos Kozak
74f2866fb5 2.0d-dev 2018-08-17 15:22:30 +02:00
Milos Kozak
fff2e84608 remove g5uploader flavor 2018-08-07 21:45:35 +02:00
Milos Kozak
fcf47ecc03 NSClient2 flavor 2018-08-07 21:07:43 +02:00
Milos Kozak
ddff05da75
Merge pull request #1262 from triplem/logshipper
Logshipper
2018-08-02 14:40:54 +02:00
Milos Kozak
c0a3eb67ba check for new version on github 2018-08-01 23:03:01 +02:00
Markus M. May
3306e14ca1 Merge branch 'dev' into logshipper 2018-08-01 20:42:05 +02:00
Milos Kozak
5fc2535bcd 2.0c-dev 2018-07-31 22:08:35 +02:00
Markus M. May
883bbf46e1 use fragment insteaad of activity, move pref im/export to maintenance plugin 2018-07-30 22:56:00 +02:00
Milos Kozak
6f29bd6a9a bump 2.0b-dev 2018-07-24 00:46:42 +02:00
Milos Kozak
2e1d473243 bump 2.0a-dev 2018-07-22 10:01:59 +02:00
TebbeUbben
da9d586326 Also set round icon if available 2018-06-14 19:43:16 +02:00
TebbeUbben
f77e903721 Revert "Use icon for all build configurations"
This reverts commit e194e0d
2018-06-14 19:39:00 +02:00
TebbeUbben
e194e0dc48 Use icon for all build configurations 2018-06-13 20:26:46 +02:00
TebbeUbben
9e0dc9bfe5 New launcher icon 2018-06-13 20:23:40 +02:00
Milos Kozak
7714aa9138 Merge branch 'dev' into startupwizard 2018-05-20 14:18:58 +02:00
Johannes Mockenhaupt
d0492462a4
Add time to build version. 2018-05-13 12:32:45 +02:00
AdrianLxM
714eca483e
revert gradle to dev 2018-05-04 20:16:12 +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
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
8419f8d0e9 update socket.io to 1.0.0 2018-05-02 18:49:40 +02:00
AdrianLxM
e70791dc2f
gradle rc2 2018-05-01 18:07:08 +02:00
AdrianLxM
faa09f8505 2.0 rc1 2018-04-28 19:49:55 +02:00
Milos Kozak
883da922e5 1.60e-dev 2018-04-20 22:14:54 +02:00
Milos Kozak
b554d641a7 setupwizard template 2018-04-20 17:27:31 +02:00
Milos Kozak
83421c7266 show tests in travis 2018-04-11 16:23:35 +02:00
Milos Kozak
ca01fcc270 1.60d-dev 2018-04-07 09:35:21 +02:00
Markus M. May
79094a92f9 Provide newer support libraries, compile with 27 and target 25 2018-04-04 22:46:44 +02:00
Markus M. May
3e792ebfe3 Downgrade supportLibVersion 2018-04-04 21:53:37 +02:00
Markus M. May
b7840fb5b5 Revert compileSdkVersion as well 2018-04-04 21:44:23 +02:00
Markus M. May
c3bec7e7a6 Revert targetSdkVersion 2018-04-04 21:38:47 +02:00
Markus M. May
9006721873 Version bump butterknife plugin 2018-04-02 22:43:20 +02:00
Milos Kozak
c06b89e8e4 targetSdkVersion 27 2018-04-02 12:03:41 +02:00
Markus M. May
0bf84d4fa2 Break build on linting 2018-04-01 20:53:53 +02:00
Markus M. May
297c288e6a Disable abortOnError on linting 2018-04-01 20:49:02 +02:00
Markus M. May
5ef062c22f inital gradle update 2018-04-01 20:49:02 +02:00
Milos Kozak
c57d14aa05 MainAppTest 2018-03-31 15:00:32 +02:00
Milos Kozak
bcb733e42c Plugins refactor 2018-03-31 00:36:03 +02:00
Milos Kozak
5c5b8ee2f0 DetailedBolusInfo test & fix 2018-03-26 13:25:53 +02:00
Milos Kozak
482d4f4454 1.60b-dev 2018-03-26 11:07:50 +02:00
Milos Kozak
22d617cbc0 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-23 20:53:44 +01:00
Milos Kozak
4502ed6807 1.60a-dev 2018-03-23 20:53:25 +01:00
Milos Kozak
51ca4cc8c6 show failed tests at the end of travis log 2018-03-21 07:41:03 +01:00
Milos Kozak
326229ebbb limitClosedLoop & remove openloop flavor 2018-03-19 17:06:22 +01:00
Milos Kozak
f7621c4cc5 Profile tests 2018-03-18 15:02:21 +01:00
Milos Kozak
7961a9f00a ver 1.60-dev 2018-03-18 10:36:38 +01:00
Milos Kozak
d25855295d travis 2nd try 2018-03-13 23:48:14 +01:00
Markus M. May
b10f8f2fe1 Add environment variable to handle testCoverage 2018-03-13 19:24:08 +01:00
Johannes Mockenhaupt
bf2e567f9c
Moar buttons. 2018-02-18 11:06:36 +01:00
Milos Kozak
d92a7e8ef1 Merge branch 'history' into dev 2018-02-11 23:46:20 +01:00
Milos Kozak
94a6794504
Merge pull request #661 from MilosKozak/move-rhino-lib
move rhino to external lib
2018-02-04 21:51:04 +01:00
Milos Kozak
1471d2bcd5
Merge pull request #639 from triplem/cleanup_libs
Remove jniLibs, download on build
2018-02-04 18:18:39 +01:00
AdrianLxM
316c3da46c
use default repo for rhino 2018-02-04 08:24:12 +01:00
AdrianLxM
1bac0e573d move rhino to external lib 2018-02-04 07:27:02 +01:00
Milos Kozak
411add616b
Merge pull request #632 from jamorham/dev
Add Insight Pump Plugin
2018-02-02 09:21:57 +01:00
Markus M. May
b7ec90ca07 Remove java file object 2018-02-01 21:25:37 +01:00
Markus M. May
6d8c0770c3 Rework copying of libs 2018-02-01 21:11:28 +01:00
Markus M. May
629b626306 Download jniLibs as dependency, delete on clean (in gradle) 2018-02-01 20:09:29 +01:00
Milos Kozak
f3769521a5 bump 1.59-dev 2018-02-01 10:25:28 +01:00
Milos Kozak
2157022735 bump 1.58 2018-01-31 23:21:02 +01:00
Milos Kozak
af3b77e646 history browser initial work 2018-01-29 22:48:47 +01:00
Milos Kozak
1eba5b79b8 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-01-29 13:28:36 +01:00
Jamorham
2c9cd89ff3
Add unit test 2018-01-26 22:44:12 +00:00
Johannes Mockenhaupt
3100447167
Disable release build checks until wear lib upgrade (#620). 2018-01-26 15:57:26 +01:00
Milos Kozak
8d792a24db bump 1.57a-dev 2018-01-25 11:21:27 +01:00
Milos Kozak
bd5c7c396f sdk27 & butterknife 2018-01-24 21:54:24 +01:00