Commit 1d0413e
committed
Squashed commit of the following:
commit a11b593
Author: Ivan Valkou <[email protected]>
Date: Thu Dec 26 15:49:31 2019 +0300
Show last MB event in settings
commit 8773d77
Author: Ivan Valkou <[email protected]>
Date: Wed Dec 25 17:34:33 2019 +0300
Microbolus.Event
commit 519609c
Merge: 626630e 62952ae
Author: Ivan Valkou <[email protected]>
Date: Mon Dec 23 19:30:11 2019 +0300
Merge branch 'dev-ivan' into microboluses
# Conflicts:
# Loop.xcconfig
# Loop/Views/MicrobolusView.swift
# LoopCore/Microbolus.swift
commit 62952ae
Author: Ivan Valkou <[email protected]>
Date: Mon Dec 23 19:28:15 2019 +0300
Set default partial application rate to 0.3
commit 310ffac
Author: Ivan Valkou <[email protected]>
Date: Mon Dec 23 19:13:17 2019 +0300
add 'Not Limited' option to max sizes of MB
commit 626630e
Author: Ivan Valkou <[email protected]>
Date: Mon Dec 23 13:53:43 2019 +0300
The view is divided into small parts.
commit 1ff5463
Author: Ivan Valkou <[email protected]>
Date: Mon Dec 23 13:53:43 2019 +0300
The view is divided into small parts.
commit 3f688b1
Author: Ivan Valkou <[email protected]>
Date: Mon Dec 23 13:23:53 2019 +0300
MicrobolusView refactored
commit 1a991ec
Merge: 74ef344 a098d6a
Author: Ivan Valkou <[email protected]>
Date: Mon Dec 23 13:26:18 2019 +0300
Merge branch 'dev' of https://github.com/LoopKit/Loop into dev-ivan
commit db44386
Author: Ivan Valkou <[email protected]>
Date: Mon Dec 23 13:23:53 2019 +0300
MicrobolusView refactored
commit 491458d
Merge: 2abf5db a098d6a
Author: Ivan Valkou <[email protected]>
Date: Mon Dec 23 12:55:02 2019 +0300
Merge branch 'dev' of https://github.com/LoopKit/Loop into microboluses
commit 2abf5db
Author: Ivan Valkou <[email protected]>
Date: Sun Dec 22 12:41:30 2019 +0300
Clear marketing version
commit b7d2c43
Author: Ivan Valkou <[email protected]>
Date: Sun Dec 22 12:35:13 2019 +0300
Clear signing
commit 74ef344
Author: Ivan Valkou <[email protected]>
Date: Sat Dec 21 17:02:26 2019 +0300
bump version
commit 56bcbb5
Author: Ivan Valkou <[email protected]>
Date: Sat Dec 21 16:59:50 2019 +0300
Partial bolus application UI setting
commit 641f83f
Author: Ivan Valkou <[email protected]>
Date: Sat Dec 21 15:55:03 2019 +0300
partialApplication parameter (default 0.5)
commit a40bfa6
Author: Ivan Valkou <[email protected]>
Date: Sat Dec 21 16:59:50 2019 +0300
Partial bolus application UI setting
commit e79049b
Author: Ivan Valkou <[email protected]>
Date: Sat Dec 21 15:55:03 2019 +0300
partialApplication parameter (default 0.5)
commit f238db4
Author: Ivan Valkou <[email protected]>
Date: Sat Dec 21 15:29:47 2019 +0300
Override `hasFinished` check
commit 7a24458
Merge: 09a082d 650ffd4
Author: Ivan Valkou <[email protected]>
Date: Sat Dec 21 15:42:12 2019 +0300
Merge branch 'dev' of https://github.com/LoopKit/Loop into dev-ivan
# Conflicts:
# Loop.xcconfig
commit f13327a
Author: Ivan Valkou <[email protected]>
Date: Sat Dec 21 15:39:39 2019 +0300
Revert CURRENT_PROJECT_VERSION
commit 275923f
Merge: 07d63e1 650ffd4
Author: Ivan Valkou <[email protected]>
Date: Sat Dec 21 15:38:15 2019 +0300
Merge branch 'dev' of https://github.com/LoopKit/Loop into microboluses
commit 07d63e1
Author: Ivan Valkou <[email protected]>
Date: Sat Dec 21 15:29:47 2019 +0300
Override `hasFinished` check
commit c9b97dd
Author: Ivan Valkou <[email protected]>
Date: Fri Dec 20 13:07:03 2019 +0300
Cleenup unused code
commit 9888b57
Author: Ivan Valkou <[email protected]>
Date: Fri Dec 20 12:59:18 2019 +0300
Remove Settings.bundle
commit 03a7f86
Author: Ivan Valkou <[email protected]>
Date: Fri Dec 20 12:57:49 2019 +0300
Remove NightscoutAPIClient
commit 86bff4e
Author: Ivan Valkou <[email protected]>
Date: Fri Dec 20 12:50:15 2019 +0300
Revert "Current time line on charts (LoopKit#6)"
This reverts commit 10f581e.
commit 09a082d
Author: Ivan Valkou <[email protected]>
Date: Wed Dec 18 20:32:51 2019 +0300
Disabled pickers fixed
commit d4841ed
Author: Ivan Valkou <[email protected]>
Date: Wed Dec 18 18:39:49 2019 +0300
bump version
commit 8498438
Author: Ivan Valkou <[email protected]>
Date: Wed Dec 18 18:31:33 2019 +0300
adaptiveRateNonlinear switch in settings
commit d36f713
Author: Ivan Valkou <[email protected]>
Date: Wed Dec 18 17:51:17 2019 +0300
Fix binding and update UI
commit bbb0538
Author: Ivan Valkou <[email protected]>
Date: Tue Dec 17 16:25:40 2019 +0300
busines logic and UI
commit 31974cb
Author: Ivan Valkou <[email protected]>
Date: Sat Dec 14 18:33:32 2019 +0300
model and view
commit 0d28665
Author: Ivan Valkou <[email protected]>
Date: Sat Dec 7 15:04:51 2019 +0300
bump version
commit 61308c8
Author: Ivan Valkou <[email protected]>
Date: Sat Dec 7 14:00:55 2019 +0300
Remove UIApplication.protectedDataDidBecomeAvailableNotification
commit 82243de
Author: Ivan Valkou <[email protected]>
Date: Sat Dec 7 13:55:49 2019 +0300
Cancel MB if already bolusing
commit 7fa7357
Author: Ivan Valkou <[email protected]>
Date: Sat Nov 30 17:16:50 2019 +0300
Microbolus refactoring
commit f464c52
Author: Ivan Valkou <[email protected]>
Date: Sat Nov 30 16:20:53 2019 +0300
NS Client updated
commit c2e028f
Author: Ivan Valkou <[email protected]>
Date: Sat Nov 30 15:54:02 2019 +0300
Do not open bolus screen after carbs changed
commit 381d957
Author: Ivan Valkou <[email protected]>
Date: Sat Nov 30 15:45:50 2019 +0300
Limit MB if current glucose below target
commit dc8b19e
Author: Ivan Valkou <[email protected]>
Date: Sat Nov 30 15:30:06 2019 +0300
update version
commit 8d42217
Merge: 16edb41 d2d9487
Author: Ivan Valkou <[email protected]>
Date: Sat Nov 30 15:18:07 2019 +0300
Merge branch 'LoopKit-dev' into dev-ivan
# Conflicts:
# Cartfile.resolved
commit d2d9487
Merge: a24eeb5 ac31e0b
Author: Ivan Valkou <[email protected]>
Date: Sat Nov 30 15:16:26 2019 +0300
Merge branch 'dev' of https://github.com/LoopKit/Loop into LoopKit-dev
commit 16edb41
Author: Ivan Valkou <[email protected]>
Date: Sat Nov 23 17:10:31 2019 +0300
Bolus recommendation notice cancels a microbolus
commit bc10d13
Merge: 8cddb00 22543b8
Author: Ivan Valkou <[email protected]>
Date: Sat Nov 23 16:01:04 2019 +0300
Merge branch 'empty-settings-fix' into dev-ivan
# Conflicts:
# Cartfile.resolved
commit 22543b8
Author: Ivan Valkou <[email protected]>
Date: Sat Nov 23 16:00:02 2019 +0300
Fixed loss of settings after reboot.
commit 8cddb00
Merge: 10f581e e1bcfd4
Author: Ivan Valkou <[email protected]>
Date: Sat Nov 23 15:36:48 2019 +0300
Merge branch 'current-time-lines' into dev-ivan
# Conflicts:
# Cartfile.resolved
commit e1bcfd4
Author: Ivan <[email protected]>
Date: Sat Nov 23 14:57:05 2019 +0300
Current time line on charts (LoopKit#6)
commit a24eeb5
Merge: 430d9ab 49412b6
Author: Ivan Valkou <[email protected]>
Date: Sat Nov 23 15:29:38 2019 +0300
Merge branch 'dev' of https://github.com/LoopKit/Loop into LoopKit-dev
# Conflicts:
# Cartfile.resolved
commit b0869d0
Merge: 430d9ab 49412b6
Author: Ivan Valkou <[email protected]>
Date: Sat Nov 23 15:28:48 2019 +0300
Merge branch 'dev' of https://github.com/LoopKit/Loop into LoopKit-dev
# Conflicts:
# Cartfile.resolved
commit 10f581e
Author: Ivan <[email protected]>
Date: Sat Nov 23 14:57:05 2019 +0300
Current time line on charts (LoopKit#6)
commit 0c25618
Author: Ivan Valkou <[email protected]>
Date: Fri Nov 15 14:37:22 2019 +0300
Revert "revert notification names"
This reverts commit ad62a80.
commit f4b6aaa
Author: Ivan Valkou <[email protected]>
Date: Fri Nov 15 14:16:25 2019 +0300
update cartfile
commit 959fe30
Author: Ivan Valkou <[email protected]>
Date: Wed Nov 13 17:26:27 2019 +0300
MB with COB and without COB work independently
commit ad62a80
Author: Ivan Valkou <[email protected]>
Date: Tue Nov 12 11:31:21 2019 +0300
revert notification names
commit c9ee230
Merge: 0194ea2 430d9ab
Author: Ivan Valkou <[email protected]>
Date: Tue Nov 12 11:23:57 2019 +0300
Merge branch 'dev' into dev-ivan
# Conflicts:
# Cartfile.resolved
commit 0194ea2
Author: Ivan Valkou <[email protected]>
Date: Tue Nov 12 11:22:48 2019 +0300
Cartfile.resolved
commit 430d9ab
Author: Pete Schwamb <[email protected]>
Date: Thu Nov 7 00:26:24 2019 -0600
Notification names changed in LoopKit (LoopKit#1165)
* Notification names changed in LoopKit
* Bump carthage revs
commit abed78f
Author: David Thornley <[email protected]>
Date: Mon Nov 11 11:26:27 2019 +0100
Add ability to define a lower limit before performing the bolus (LoopKit#4)
* Log what is being recommended.
* Fix typos
* Add a user configurable minimum bolus limit to allow the user to prevent the delivering of very small 0.05 unit boluses
* Update message and the display format of the values for minimum units to deliver
commit 2a2b02e
Author: Ivan Valkou <[email protected]>
Date: Sat Nov 9 15:01:21 2019 +0300
Fix texts
commit 1fb94ef
Author: Ivan Valkou <[email protected]>
Date: Thu Nov 7 19:50:39 2019 +0300
Safe Mode refactored
commit 06021b8
Author: Ivan Valkou <[email protected]>
Date: Thu Nov 7 16:16:32 2019 +0300
nonlinear-carb-model
commit e755e1c
Author: Ivan Valkou <[email protected]>
Date: Wed Nov 6 22:47:13 2019 +0300
Revert "Carb Absorption Model UI"
This reverts commit 1a94f7f.
commit 1a94f7f
Author: Ivan Valkou <[email protected]>
Date: Wed Nov 6 20:56:34 2019 +0300
Carb Absorption Model UI
commit ca202c8
Author: Ivan Valkou <[email protected]>
Date: Sun Nov 3 01:31:10 2019 +0300
Microboluses Safe Mode
commit f646063
Author: Ivan Valkou <[email protected]>
Date: Sat Nov 2 13:20:46 2019 +0300
Add 15 min control clucose chek
commit 785a909
Author: Ivan Valkou <[email protected]>
Date: Sat Nov 2 11:05:20 2019 +0300
Fix MB without COM
commit 7ee1917
Author: Ivan Valkou <[email protected]>
Date: Fri Nov 1 21:41:17 2019 +0300
Bump version
commit a4ebeb1
Author: Ivan <[email protected]>
Date: Fri Nov 1 21:37:48 2019 +0300
Microbolus screen (LoopKit#3)
* draft UI
* New Microboluses Screen
commit 9fdd8c2
Author: Ivan Valkou <[email protected]>
Date: Thu Oct 31 11:56:03 2019 +0300
build version changed
commit 5e158aa
Author: Ivan Valkou <[email protected]>
Date: Wed Oct 30 17:59:49 2019 +0300
disable Microboluses if closed loop disabled
commit 13db3d2
Author: Ivan Valkou <[email protected]>
Date: Tue Oct 29 21:18:09 2019 +0300
misprint fixed
commit 2d843b6
Author: Ivan Valkou <[email protected]>
Date: Mon Oct 28 18:07:45 2019 +0300
little refactor
commit f7047f3
Author: Ivan Valkou <[email protected]>
Date: Mon Oct 28 16:51:35 2019 +0300
fix 0 bolus bug
commit 3d17aa2
Author: Ivan Valkou <[email protected]>
Date: Mon Oct 28 12:11:35 2019 +0300
spikeapp scheme supported
commit c621ec1
Author: Ivan Valkou <[email protected]>
Date: Sun Oct 27 16:47:27 2019 +0300
Fix version & skip bolus screen on Watch
commit b7b1374
Merge: 5f9df78 91a834f
Author: Ivan Valkou <[email protected]>
Date: Sun Oct 27 15:10:18 2019 +0300
Merge branch 'dev' into dev-ivan
commit 91a834f
Merge: fa494fe 3aa8e6e
Author: Ivan Valkou <[email protected]>
Date: Sun Oct 27 15:09:21 2019 +0300
Merge branch 'LoopKit-dev' into dev
commit 3aa8e6e
Merge: fa494fe 9407f8c
Author: Ivan Valkou <[email protected]>
Date: Sun Oct 27 15:08:56 2019 +0300
Merge branch 'dev' of https://github.com/LoopKit/Loop into LoopKit-dev
# Conflicts:
# Cartfile.resolved
commit 5f9df78
Author: Ivan Valkou <[email protected]>
Date: Fri Oct 25 16:40:06 2019 +0300
rewrite loop()
commit 82fc9b6
Author: Ivan Valkou <[email protected]>
Date: Fri Oct 25 11:47:19 2019 +0300
Max Microbolus Size title
commit 2deafd3
Author: Ivan Valkou <[email protected]>
Date: Thu Oct 24 22:14:06 2019 +0300
Microbolus refactoring
commit 4205e97
Author: Ivan Valkou <[email protected]>
Date: Thu Oct 24 19:48:19 2019 +0300
do not show bolus screen if microboluses is enabled
commit e40731e
Author: Ivan Valkou <[email protected]>
Date: Thu Oct 24 18:58:03 2019 +0300
Fix explanation of MB
commit c3f0cb8
Author: Ivan Valkou <[email protected]>
Date: Thu Oct 24 18:51:38 2019 +0300
Microboluses in settings
commit 56f151f
Author: Ivan Valkou <[email protected]>
Date: Thu Oct 24 13:37:58 2019 +0300
Micro Boluses!
commit 6190e2d
Author: Ivan Valkou <[email protected]>
Date: Wed Oct 23 20:07:12 2019 +0300
NSAllowsArbitraryLoads
commit d349c8f
Author: Ivan Valkou <[email protected]>
Date: Wed Oct 23 16:38:16 2019 +0300
Cartfile update
commit 43e4d8c
Author: Ivan Valkou <[email protected]>
Date: Wed Oct 23 16:36:03 2019 +0300
NightscoutAPIClient added
commit fa494fe
Author: Pete Schwamb <[email protected]>
Date: Sun Oct 13 11:00:22 2019 -0500
Remote overrides (LoopKit#1131)
* Allow overrides to be enabled via APNs
* Update to NS sent notifications
* Cleanup prints
* Query override history for NS upload
* Bump submodule revs
* Handle indefinite duration override treatment uploads
* Use separate representation for indefinite duration treatments
* Bump cartfile rev
* Send any override changes when uploading loop status
* Bump carthage revisions
* Bump carthage revision
* Fix typo, and log device token
* Carthage dependency revisions
commit d653500
Author: Pete Schwamb <[email protected]>
Date: Sun Oct 13 09:28:16 2019 -0500
New strategy for asset overrides. Fixes popup warnings (LoopKit#1145)
* New strategy for asset overrides. Fixes popup warnings
* Add DefaultAssets.xcassets back to WatchApp target
commit af99248
Author: Pete Schwamb <[email protected]>
Date: Sun Oct 13 08:58:10 2019 -0500
Fix issue with PumpManager ble update coming in right after cgm update arrives (LoopKit#1096)
commit 255a7de
Author: katie disimone <[email protected]>
Date: Sun Oct 13 06:53:42 2019 -0700
display - for HUD CGM when value is >15 min old (LoopKit#1140)
commit 2c948ec
Author: katie disimone <[email protected]>
Date: Sun Oct 13 06:42:28 2019 -0700
hide the saved API secret by default in NS services display (LoopKit#1142)1 parent b272b92 commit 1d0413e
File tree
14 files changed
+862
-34
lines changed- Common/Models
- Loop.xcodeproj
- LoopCore
- Loop
- Managers
- View Controllers
- Views
- ru.lproj
- WatchApp Extension/Controllers
14 files changed
+862
-34
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| 34 | + | |
34 | 35 | | |
35 | 36 | | |
36 | 37 | | |
| |||
68 | 69 | | |
69 | 70 | | |
70 | 71 | | |
| 72 | + | |
71 | 73 | | |
72 | 74 | | |
73 | 75 | | |
| |||
100 | 102 | | |
101 | 103 | | |
102 | 104 | | |
| 105 | + | |
103 | 106 | | |
104 | 107 | | |
105 | 108 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
27 | 31 | | |
28 | 32 | | |
29 | 33 | | |
| |||
240 | 244 | | |
241 | 245 | | |
242 | 246 | | |
243 | | - | |
244 | 247 | | |
245 | 248 | | |
246 | 249 | | |
| |||
571 | 574 | | |
572 | 575 | | |
573 | 576 | | |
| 577 | + | |
| 578 | + | |
| 579 | + | |
574 | 580 | | |
575 | 581 | | |
576 | 582 | | |
| |||
1526 | 1532 | | |
1527 | 1533 | | |
1528 | 1534 | | |
| 1535 | + | |
1529 | 1536 | | |
1530 | 1537 | | |
1531 | 1538 | | |
| |||
1613 | 1620 | | |
1614 | 1621 | | |
1615 | 1622 | | |
| 1623 | + | |
1616 | 1624 | | |
1617 | 1625 | | |
1618 | 1626 | | |
| |||
1632 | 1640 | | |
1633 | 1641 | | |
1634 | 1642 | | |
| 1643 | + | |
1635 | 1644 | | |
1636 | 1645 | | |
1637 | 1646 | | |
| |||
2648 | 2657 | | |
2649 | 2658 | | |
2650 | 2659 | | |
| 2660 | + | |
2651 | 2661 | | |
2652 | 2662 | | |
2653 | 2663 | | |
| |||
2708 | 2718 | | |
2709 | 2719 | | |
2710 | 2720 | | |
| 2721 | + | |
2711 | 2722 | | |
2712 | 2723 | | |
2713 | 2724 | | |
| |||
2796 | 2807 | | |
2797 | 2808 | | |
2798 | 2809 | | |
| 2810 | + | |
2799 | 2811 | | |
2800 | 2812 | | |
2801 | 2813 | | |
| |||
2848 | 2860 | | |
2849 | 2861 | | |
2850 | 2862 | | |
| 2863 | + | |
2851 | 2864 | | |
2852 | 2865 | | |
2853 | 2866 | | |
| |||
2882 | 2895 | | |
2883 | 2896 | | |
2884 | 2897 | | |
2885 | | - | |
2886 | 2898 | | |
2887 | 2899 | | |
2888 | 2900 | | |
| |||
3542 | 3554 | | |
3543 | 3555 | | |
3544 | 3556 | | |
| 3557 | + | |
3545 | 3558 | | |
3546 | 3559 | | |
3547 | 3560 | | |
| |||
3561 | 3574 | | |
3562 | 3575 | | |
3563 | 3576 | | |
| 3577 | + | |
3564 | 3578 | | |
3565 | 3579 | | |
3566 | 3580 | | |
| |||
3588 | 3602 | | |
3589 | 3603 | | |
3590 | 3604 | | |
| 3605 | + | |
3591 | 3606 | | |
3592 | 3607 | | |
3593 | 3608 | | |
| |||
3610 | 3625 | | |
3611 | 3626 | | |
3612 | 3627 | | |
| 3628 | + | |
3613 | 3629 | | |
3614 | 3630 | | |
3615 | 3631 | | |
| |||
3631 | 3647 | | |
3632 | 3648 | | |
3633 | 3649 | | |
| 3650 | + | |
3634 | 3651 | | |
3635 | 3652 | | |
3636 | 3653 | | |
| |||
3652 | 3669 | | |
3653 | 3670 | | |
3654 | 3671 | | |
| 3672 | + | |
3655 | 3673 | | |
3656 | 3674 | | |
3657 | 3675 | | |
| |||
3924 | 3942 | | |
3925 | 3943 | | |
3926 | 3944 | | |
| 3945 | + | |
3927 | 3946 | | |
3928 | 3947 | | |
3929 | 3948 | | |
| |||
3946 | 3965 | | |
3947 | 3966 | | |
3948 | 3967 | | |
| 3968 | + | |
3949 | 3969 | | |
3950 | 3970 | | |
3951 | 3971 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
672 | 672 | | |
673 | 673 | | |
674 | 674 | | |
| 675 | + | |
| 676 | + | |
| 677 | + | |
| 678 | + | |
| 679 | + | |
| 680 | + | |
| 681 | + | |
| 682 | + | |
| 683 | + | |
675 | 684 | | |
676 | 685 | | |
677 | 686 | | |
| |||
0 commit comments