TebbeUbben
05aa369bae
Merge branch 'master' into insight-dev
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
2019-02-09 22:52:01 +01:00
TebbeUbben
6cb3b5fcac
Change Insight driver strings
2019-02-09 22:01:11 +01:00
Milos Kozak
f540c70f22
Merge branch 'dev' into G6
2019-02-08 19:11:38 +01:00
AdrianLxM
9df8273694
Merge pull request #1613 from TebbeUbben/dev-nico
...
Status lights with Insight support
2019-02-02 23:45:52 +01:00
Milos Kozak
5b462c4931
Merge pull request #1600 from tim2000s/dev
...
Upadted AMA Autosens string
2019-02-02 18:07:28 +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
5475d9bceb
Withdraw connection request when deleting pairing
2019-01-25 22:55:15 +01:00
TebbeUbben
53f7cf0dcf
Revert "Improve connection routine"
...
This reverts commit 8116a24
2019-01-25 22:53:35 +01:00
TebbeUbben
8116a24fc6
Improve connection routine
2019-01-25 22:32:22 +01:00
TebbeUbben
85ae946296
Indicate in fragment if cartridge is not inserted
2019-01-19 00:41:29 +01:00
TebbeUbben
2770a49869
Local Insight driver
2019-01-18 22:40:22 +01:00
Tim Street
50f1049674
Updated Use AMA Autosens Features string
...
Updates the naming to remove AMA - line 441.
2019-01-13 21:45:51 +00:00
Milos Kozak
2b9b3b4f16
Eversense support
2018-12-11 21:56:57 +01:00
Nico Schmitz
9e03f0f8ca
Update to current dev branch
2018-12-11 14:51:26 +01:00
Milos Kozak
8610dcc21d
G5 2018 app version support
2018-12-10 19:35:01 +01:00
Milos Kozak
d664136b6e
G6 overview button support
2018-12-01 00:26:04 +01:00
Milos Kozak
946b2bfd12
Initial G6 support
2018-12-01 00:16:15 +01:00
Milos Kozak
b1606d2452
Merge pull request #1551 from triplem/pr_1550
...
Total Basal in NS Profile
2018-11-25 22:40:03 +01:00
Milos Kozak
f600ff045f
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-11-20 14:40:44 +01:00
Milos Kozak
864fe32626
Turkish
2018-11-20 14:40:38 +01:00
Milos Kozak
b6cd214006
Merge pull request #1562 from MilosKozak/fixes
...
Fixes
2018-11-19 19:55:34 +01:00
Milos Kozak
abb1dd956c
Fix sending SMS in Android 8
2018-11-12 19:00:06 +01:00
triplem
eea79c5d0f
fixes PR#1550
2018-11-08 21:14:44 +01:00
triplem
4cd9b19868
REname pump reconnection
2018-11-04 19:29:44 +01:00
AdrianLxM
5465e8f5aa
try to catch bad devicenames
2018-10-19 10:31:57 +02:00
Milos Kozak
c1bbaab8e1
allow UAM only if oref1 sensitivity plugin is selected
2018-10-13 18:07:01 +02:00
Milos Kozak
c68783afd3
maintenance strings cleanup
2018-10-04 23:19:29 +02:00
Milos Kozak
1fa768c146
Afrikaans lang
2018-09-30 23:50:44 +02:00
AdrianLxM
92e5acbc26
Update strings.xml ( #1452 )
2018-09-18 13:31:32 +02:00
Sebastian Lenz
6323f2dd49
fixed typo
2018-09-16 18:32:51 +02:00
Milos Kozak
538824d783
Portuguese language
2018-09-13 20:40:57 +02:00
Milos Kozak
66bc25f2c8
change summary
2018-09-12 00:19:35 +02:00
Milos Kozak
f7269a806d
nsclient allow general preferences
2018-09-11 20:08:59 +02:00
Milos Kozak
e577e8555d
openloop mode min change threshold configurable
2018-09-09 12:15:44 +02:00
Milos Kozak
91695614f4
Merge branch 'andyrozman-virtual_pump_bug_1372' into dev
2018-09-01 22:46:16 +02:00
Milos Kozak
315c83069d
apply bolus description settings in constraints
2018-09-01 22:45:15 +02:00
Milos Kozak
063ead4c17
RS text bolus error codes
2018-08-29 20:14:36 +02:00
Milos Kozak
178c2b90fe
min_5m_carbimpact to AMA settings
2018-08-29 18:17:11 +02:00
Milos Kozak
e1a0aad0b1
update strings
2018-08-25 19:34:48 +02:00
Milos Kozak
ead57748aa
more autosens logging
2018-08-25 19:22:45 +02:00
Milos Kozak
b0f8ab9922
extract key_virtualpump_type
2018-08-23 18:46:06 +02:00
Milos Kozak
243755d1b1
virtualpump: fix string, fix formatter
2018-08-23 18:41:55 +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
73bb574944
add Slovak language to menu
2018-08-21 17:32:31 +02:00
Milos Kozak
32d9a8b4d6
Fix connection handshake for DanaR pumps
2018-08-21 17:25:20 +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
31e050be4a
loop mode in setup wizard
2018-08-14 17:06:09 +02:00
Milos Kozak
0ab5981665
Roumen's Unit tests ( #1325 )
...
* initializer
* aading some tests
* ading some tests
* removed try-catch
but added testingMode boolean for the test to run
* update to latest dev
* formatting
* cleanup tests
* More test classes
* some more
* upd
* more coverage in comm
* 50% class coverage in comm
* Delete crashlytics-build.properties
* remove of crashlytics
* removed unneeded checks
* removet mocking of treatmentsService
* removed treatmentsService mock from newNSTreatmentTest
* more testing classes
* tests of _History_ packets
* tests of _Notify_ packets
* 64 / 65 classes covered
* 100% class coverage in comm
2018-08-10 22:17:44 +02:00