Commit graph

6088 commits

Author SHA1 Message Date
Milos Kozak b61780cb5f
Merge pull request #1536 from Tornado-Tim/set-basal-oref-update
Bring set-basal up to date with oref 0.7.0
2018-11-03 21:43:43 +01:00
Milos Kozak fd2893e934
Merge pull request #1525 from MilosKozak/dev2_1
[WIP] 2.1 code
2018-11-03 21:25:34 +01:00
Tim Gunn 864b760933 Bring set-basal up to date with oref 0.7.0 2018-11-03 21:03:46 +13:00
Milos Kozak c7ab2ae476
Merge pull request #1535 from MilosKozak/AdrianLxM-patch-2
update wiki
2018-11-03 01:13:28 +01:00
AdrianLxM b45bbcd030
update wiki 2018-11-03 01:12:05 +01:00
Milos Kozak 4f0f947edd
Merge pull request #1534 from MilosKozak/aaps20_release
AndroidAPS 2.0 release
2018-11-03 00:19:47 +01:00
Milos Kozak fa2f52b560 fix test for master branch 2018-11-03 00:04:31 +01:00
Milos Kozak c0baecc951
Merge branch 'master' into aaps20_release 2018-11-02 23:48:31 +01:00
Milos Kozak fda934c3cb
limit logging for 2.0 2018-11-02 23:24:57 +01:00
Milos Kozak 8d9cc0cea6
version "2.0" 2018-11-02 23:22:37 +01:00
Milos Kozak 718cc7d78b
Merge pull request #1530 from MilosKozak/l10n_dev
New Crowdin translations
2018-11-02 19:04:28 +01:00
Milos Kozak 5a5d89563f Fix BolusProgressDialog 2018-11-02 19:04:16 +01:00
Milos Kozak 0a545dc92b
Merge pull request #1532 from MilosKozak/dev
Dev
2018-11-02 10:40:11 +01:00
Milos Kozak 1a335debc0 New translations strings.xml (Czech) 2018-11-02 09:21:57 +01:00
Milos Kozak 8d4c5d4087
Merge pull request #1529 from MilosKozak/l10n_dev
New Crowdin translations
2018-11-02 09:20:51 +01:00
Milos Kozak 2344f5f68b New translations strings.xml (Turkish) 2018-11-01 19:51:22 +01:00
Milos Kozak 1e920d195d Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-11-01 07:59:01 +01:00
Milos Kozak 23a58c2fc1 == -> equals 2018-11-01 07:54:29 +01:00
Milos Kozak c3a7da7f9b
Merge pull request #1528 from PoweRGbg/unitTestsv2
v2 tests
2018-10-31 14:17:09 +01:00
Roumen Georgiev 685b9e007a v2 tests 2018-10-31 11:55:06 +02:00
Milos Kozak b73cbacbf5 fix NPE 2018-10-31 08:05:57 +01:00
Milos Kozak ca27843dd7 fix NPE 2018-10-31 08:02:16 +01:00
Milos Kozak ad3794d32f fix NPE 2018-10-31 07:59:04 +01:00
Milos Kozak 62aa49dd5b fix loading BGs <39 #2 2018-10-30 21:25:34 +01:00
Milos Kozak 871b9b6b3d fix loading BGs <39 2018-10-30 21:24:53 +01:00
Milos Kozak b3a4950497
Merge pull request #1527 from blocklist/patch-17
Update build.gradle
2018-10-29 10:01:20 +01:00
Milos Kozak ad6566b133
Merge pull request #1526 from MilosKozak/AdrianLxM-patch-1
Get device name before setting up the callback
2018-10-29 09:59:44 +01:00
blocklist 3f6a521b1f
Update build.gradle
google() needs to be loaded before others.
Otherwise, you got the error-message:
> Could not find aapt2-proto.jar (com.android.tools.build:aapt2-proto:0.3.1).
> Searched in the following locations:
> https://jcenter.bintray.com/com/android/tools/build/aapt2-proto/0.3.1/aapt2-proto-0.3.1.jar
2018-10-29 08:32:13 +01:00
AdrianLxM 667cbe0b12
Get device name before setting up the callback
In case the callback is very quick, the name might not have been set yet?
2018-10-28 20:35:37 +01:00
Milos Kozak a4e8ace6c4
New translations strings.xml (Russian) (#1523) 2018-10-28 13:30:59 +01:00
Milos Kozak d54651e916 cache midnight time calculation 2018-10-28 12:21:35 +01:00
Milos Kozak 00349527e1 calculate IobCobThread execution time 2018-10-28 11:47:12 +01:00
Milos Kozak 05dcb58f0a check for future timestamp while loading history (RS,Rv2) 2018-10-28 11:24:59 +01:00
Milos Kozak 512ceceeb8
New Crowdin translations (#1513) 2018-10-26 07:59:33 +02:00
Milos Kozak a918addc12
Merge pull request #1517 from andyrozman/dev
Added Notification types needed for Medtronic
2018-10-24 21:51:47 +02:00
triplem 43fcfaf5d6 solve #1449 2018-10-24 20:46:22 +02:00
Andy Rozman 07eef5adae
Added Notification types needed for Medtronic
Added Notification types needed for Medtronic (reserving this two numbers)
2018-10-24 12:45:54 +01:00
Milos Kozak 91610e40e5
Merge pull request #1512 from MilosKozak/RS-npefix
try to catch bad devicenames
2018-10-22 21:39:31 +02:00
Milos Kozak b6809c9d45 fix compiler warning 2018-10-22 21:27:15 +02:00
Milos Kozak 947c786dc3
New Crowdin translations (#1507)
* New translations strings.xml (Czech)

* New translations strings.xml (Russian)

* New translations strings.xml (French)
2018-10-21 22:27:47 +02:00
AdrianLxM 5465e8f5aa try to catch bad devicenames 2018-10-19 10:31:57 +02:00
Milos Kozak 786a91f7e1
Merge pull request #1508 from jotomo/fabric-attributes
Fabric: don't report disabled plugins.
2018-10-17 22:33:59 +02:00
Johannes Mockenhaupt eaf849e625
Fabric: don't report disabled plugins.
Effectively reverts 91cbe1dd63.
2018-10-17 15:54:33 +02:00
Milos Kozak 54b3e60f48
New Crowdin translations (#1506) 2018-10-15 18:10:58 +02:00
Milos Kozak 80b4f1d3cc
New Crowdin translations (#1504) 2018-10-14 23:33:29 +02:00
Milos Kozak fee3b33d81
Merge pull request #1499 from jotomo/upstream-1482+1489
Combo: allow records created by the combo to be merged with existing records.
2018-10-14 23:33:08 +02:00
Milos Kozak 6ae98e5177 add comment 2018-10-14 22:55:21 +02:00
Milos Kozak 295ed6dba3
Merge pull request #1505 from MilosKozak/swedish-numberformat-fix
replace swedish minus sign with default minus sign
2018-10-14 21:41:08 +02:00
AdrianLxM f9fa82f1ef
replace swedish minus sign with default minus sign 2018-10-14 20:47:00 +02:00
Johannes Mockenhaupt c326e7a483
Overview: don't block the UI waiting for IobCob thread. 2018-10-14 16:24:07 +02:00