Milos Kozak
c611674b3b
show only valid data
2021-09-16 00:02:27 +02:00
Milos Kozak
56a0c97e96
Merge pull request #634 from Philoul/Fix_DisableLoop
...
Fix Overview LoopDialog (Disable Loop)
2021-09-15 23:54:15 +02:00
Milos Kozak
444915ebf7
fix displaying bg data on range change
2021-09-15 23:19:25 +02:00
Andrei Vereha
cb86438c27
Revert "Revert "avereha/merge dev 2""
2021-09-15 18:38:27 +02:00
Andrei Vereha
7fff6fc564
Revert "avereha/merge dev 2"
2021-09-15 00:12:35 +02:00
Andrei Vereha
efad748939
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/merge-dev-2
2021-09-14 23:55:15 +02:00
Milos Kozak
7690419c6c
always show basal in NSClient mode
2021-09-13 21:05:01 +02:00
Milos Kozak
efd6b28a64
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-09-13 19:06:36 +02:00
Milos Kozak
ba71e0db9b
more Profile validity checks
2021-09-13 19:06:32 +02:00
Andrei Vereha
d4b0935d6b
Merge remote-tracking branch 'upstream/dev' into dash
2021-09-13 18:39:23 +02:00
Philoul
fc83e41148
Avoid disconect pump during suspend
2021-09-10 00:34:17 +02:00
Philoul
4420189310
Merge remote-tracking branch 'Nightscout/dev' into Fix_DisableLoop
2021-09-09 00:03:27 +02:00
Milos Kozak
f505e23d50
New Crowdin updates ( #627 )
...
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* Update source file strings.xml
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Russian)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Russian)
* New translations strings.xml (Slovak)
* Update source file exam.xml
* New translations exam.xml (Romanian)
* New translations exam.xml (Dutch)
* New translations exam.xml (Swedish)
* New translations exam.xml (Slovak)
* New translations exam.xml (Russian)
* New translations exam.xml (Portuguese)
* New translations exam.xml (Polish)
* New translations exam.xml (Norwegian)
* New translations exam.xml (Lithuanian)
* New translations exam.xml (French)
* New translations exam.xml (Korean)
* New translations exam.xml (Italian)
* New translations exam.xml (Hebrew)
* New translations exam.xml (German)
* New translations exam.xml (Czech)
* New translations exam.xml (Spanish)
* New translations exam.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations exam.xml (Slovak)
* New translations exam.xml (Czech)
* New translations exam.xml (Italian)
* New translations exam.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations exam.xml (Russian)
* New translations strings.xml (French)
* New translations strings.xml (Romanian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Swedish)
* New translations strings.xml (Russian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Polish)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Czech)
* New translations strings.xml (Slovak)
* New translations strings.xml (Spanish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Italian)
* New translations strings.xml (German)
* Update source file strings.xml
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Tamil)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Turkish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovenian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Korean)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Irish)
* New translations strings.xml (Greek)
* New translations strings.xml (German)
* New translations strings.xml (Danish)
* New translations strings.xml (Czech)
* New translations strings.xml (Catalan)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (Romanian)
* New translations strings.xml (Croatian)
* Update source file strings.xml
* New translations strings.xml (Hebrew)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
2021-09-08 19:32:52 +02:00
Milos Kozak
d18c05205c
Resolve warnings
2021-09-07 12:08:19 +02:00
Milos Kozak
c9897da78d
Merge pull request #641 from nightscout/openhumans_v2
...
Update Open Humans uploader for new database
2021-09-06 13:54:16 +02:00
Philoul
c00000e079
Simplify a bit more LoopPlugin
2021-08-29 22:24:52 +02:00
Philoul
8770cfa4ad
Merge remote-tracking branch 'Nightscout/dev' into Fix_DisableLoop
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
2021-08-29 17:59:21 +02:00
Milos Kozak
3064fea60d
update exam text
2021-08-28 21:13:30 +02:00
Milos Kozak
5411f4fb3c
key_ns_receive_profile_store default true to fetch NS profiles in setup wizard
2021-08-28 20:58:27 +02:00
Philoul
69839b5395
Add Disconnect Bloc when Loop is suspended or disabled
2021-08-25 09:00:13 +02:00
TebbeUbben
dbf1772397
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
...
Conflicts:
build.gradle
2021-08-20 19:42:59 +02:00
TebbeUbben
3aadb92250
Update Open Humans uploader for new database
2021-08-20 19:37:38 +02:00
Philoul
ee89687653
Fix Basal Sum
...
But sum is only upated when profile is saved
2021-08-20 09:00:51 +02:00
Philoul
0918880415
Allow direct modification of duration of suspend loop or disconnect pump
2021-08-19 22:16:38 +02:00
Philoul
226e968bfd
Clean previous code
2021-08-19 01:03:34 +02:00
Philoul
a28be52faa
Simplify Overview code
2021-08-19 01:01:12 +02:00
Philoul
00c07b91e7
Fix Overview LoopDialog trial
2021-08-17 08:30:10 +02:00
Milos Kozak
4761a1a5ba
kotlin-allopen, fixed tests
2021-08-16 13:47:14 +02:00
Milos Kozak
0af345e340
Make sync variables volatile
2021-08-11 19:55:42 +02:00
Milos Kozak
c5857da42f
StatsActivity fix
2021-08-11 19:01:19 +02:00
Milos Kozak
24fc69c26b
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-08-11 18:10:48 +02:00
Milos Kozak
1c065c75e8
API 30 lints
2021-08-11 18:10:44 +02:00
Milos Kozak
b5ea857ced
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-08-10 21:36:38 +02:00
Milos Kozak
0a66ed307a
HistoryBrowser improvement
2021-08-10 21:36:26 +02:00
Milos Kozak
e8f946ad3f
New Crowdin updates ( #604 )
...
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Romanian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (French)
* New translations strings.xml (Korean)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Irish)
* New translations strings.xml (German)
* New translations strings.xml (Czech)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Spanish)
* Update source file strings.xml
* New translations strings.xml (Czech)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
2021-08-06 23:34:21 +02:00
Milos Kozak
6649386c58
Merge branch 'dev' into gradleupdate
2021-08-06 11:03:26 +02:00
Milos Kozak
0e928bbb9c
compileSdkVersion 30
2021-08-06 00:08:49 +02:00
AdrianLxM
fa27d409ce
refactor build helper
2021-07-31 13:25:20 +02:00
Philoul
d0cde1b07a
Add UserEntries for Alerts (Pump unreachable and Missing BG Readings)
2021-07-14 17:30:09 +02:00
Milos Kozak
b995243947
Dana-i icon
2021-07-12 15:43:02 +02:00
Andrei Vereha
5752369377
Merge remote-tracking branch 'upstream/dev' into avereha/merge
2021-07-11 12:26:41 +02:00
Milos Kozak
581bb0af01
New Crowdin updates ( #588 )
...
* New translations strings.xml (Czech)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Italian)
* New translations strings.xml (Tamil)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Turkish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovenian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Korean)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Spanish)
* New translations strings.xml (Romanian)
* New translations strings.xml (French)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Irish)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Catalan)
* New translations strings.xml (Danish)
* New translations strings.xml (German)
* New translations strings.xml (Greek)
* New translations alert_titles.xml (Korean)
* New translations alert_descriptions.xml (Korean)
* New translations alert_descriptions.xml (Lithuanian)
* New translations strings.xml (Korean)
* New translations objectives.xml (Hebrew)
* New translations strings.xml (Korean)
* New translations strings.xml (Croatian)
* New translations exam.xml (Korean)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Korean)
* New translations strings.xml (Korean)
* New translations exam.xml (Korean)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Russian)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Korean)
* New translations exam.xml (Korean)
* New translations objectives.xml (Korean)
* New translations strings.xml (Korean)
* New translations strings.xml (French)
2021-07-09 21:54:34 +02:00
AdrianLxM
a6fc9fee0f
update jacoco and add global config
2021-07-09 20:02:22 +02:00
Milos Kozak
444d5aeebd
Merge pull request #571 from andyrozman/mdt_new_fix_2
...
Fixes for medtronic driver refactoring
2021-07-01 12:38:51 +02:00
Milos Kozak
272cdbbb00
use package for nsclient broadcast
2021-06-27 12:39:42 +02:00
Andrei Vereha
2133a90ac5
Merge remote-tracking branch 'upstream/dev' into avereha/merge
2021-06-27 11:30:50 +02:00
Andy Rozman
d5a8838cab
- changed/reverted change
2021-06-26 22:00:29 +01:00
Milos Kozak
cf006790b9
make automation profile switch based on last profile switch instead of profile store
2021-06-26 22:57:40 +02:00
Milos Kozak
dc90c6b140
fix switching to virtual pump
2021-06-26 22:52:51 +02:00
Andy Rozman
3288eb2966
Merge branch 'dev' into mdt_new_fix_2
2021-06-26 21:50:00 +01:00
Milos Kozak
62cb1bb506
reduce warnings amount
2021-06-26 19:53:09 +02:00
Andrei Vereha
7b0702b8eb
compile. fix build warnings
2021-06-26 15:58:40 +02:00
Andrei Vereha
1018a41346
Merge remote-tracking branch 'upstream/dev' into avereha/conn
2021-06-26 15:21:40 +02:00
Milos Kozak
7bb03c4c13
Merge pull request #580 from nightscout/diaconn
...
Diaconn
2021-06-24 19:34:22 +02:00
Milos Kozak
33047e478d
2.8.2.2-dev
2021-06-23 22:43:18 +02:00
Milos Kozak
a70f24a68a
fix TherapyEvent upload
2021-06-23 22:33:58 +02:00
Milos Kozak
884ecd9f2b
cleanup
2021-06-23 21:01:42 +02:00
Milos Kozak
e06ec0eba1
getProfile synchronized
2021-06-23 21:01:10 +02:00
Milos Kozak
90baf8e0ea
prevent failed requirement
2021-06-21 21:47:38 +02:00
Milos Kozak
62375cdcfe
New Crowdin updates ( #545 )
...
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Romanian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Turkish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (French)
* New translations strings.xml (Korean)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Irish)
* New translations strings.xml (Greek)
* New translations strings.xml (German)
* New translations strings.xml (Czech)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Spanish)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Russian)
* New translations strings.xml (Czech)
* New translations strings.xml (Italian)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
2021-06-21 07:59:08 +02:00
Andy Rozman
e30c5162ef
Merge branch 'dev' into mdt_new_fix_2
2021-06-20 19:45:03 +01:00
Milos Kozak
0af2cff26f
Merge pull request #557 from Philoul/NewTempFolderForLogExports
...
temp Dir for log export
2021-06-17 22:01:05 +02:00
Milos Kozak
b79d86f0b8
Merge pull request #561 from Philoul/FixDeleteLogs
...
Fix delete logs
2021-06-16 08:22:15 +02:00
Milos Kozak
c3aea16c72
reset cached data on db reset
2021-06-15 14:54:32 +02:00
Milos Kozak
fcf7faa3e0
queue independentConnect fix for DanaR pumps
2021-06-14 15:52:43 +02:00
Philoul
396cc3a1c5
Revert "Add setting"
...
This reverts commit 6fd6283e
2021-06-14 08:58:53 +02:00
Philoul
6fd6283ef6
Add setting
2021-06-11 21:43:53 +02:00
Philoul
c005243dfd
Fix DeleteLogs
2021-06-11 21:39:23 +02:00
Andy Rozman
95326a2894
- storage fix (new key)
2021-06-11 15:57:14 +01:00
Milos Kozak
62005b437a
Improve SMSCommunicator safety
2021-06-10 22:35:50 +02:00
Philoul
539ca3131d
temp Dir for log export
2021-06-10 08:33:15 +02:00
Milos Kozak
8e466be92c
Diaconn support
2021-06-08 23:27:14 +02:00
Milos Kozak
c0dba456d7
fix lst bolus query and smb pocessing
2021-06-02 22:40:30 +02:00
Milos Kozak
74dfe80433
immutable flag for PendingIntent
2021-06-02 16:56:13 +02:00
Milos Kozak
db95670be5
fix loop dialog
2021-06-01 22:34:18 +02:00
Milos Kozak
1d12883f95
fix receiving NOTEs form NS
2021-06-01 20:04:59 +02:00
Milos Kozak
4b017cd0ea
fix sendig logs
2021-06-01 19:48:25 +02:00
Milos Kozak
1e1fac90b3
RS refactor & test fix
2021-05-31 21:35:03 +02:00
Milos Kozak
596012ab10
move logs, eng_mode to AAPS directory
2021-05-31 15:29:42 +02:00
Milos Kozak
67297d60d3
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-05-30 14:52:30 +02:00
Milos Kozak
beb8ba7efc
enable MDT plugin
2021-05-30 14:51:57 +02:00
Milos Kozak
7ed7736b4f
Merge pull request #543 from Philoul/FixCancelExtendedBolus
...
Fix cancel extended bolus (Overview)
2021-05-29 23:47:15 +02:00
Milos Kozak
9d29cafbe6
remove old db code
2021-05-29 23:38:19 +02:00
Andrei Vereha
7ee7cdd83b
Merge remote-tracking branch 'upstream/dev' into avereha/merge-dev
2021-05-28 22:12:21 +02:00
Milos Kozak
91ad9a3ca9
New Crowdin updates ( #541 )
...
* New translations strings.xml (Romanian)
* New translations strings.xml (French)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Turkish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovenian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Korean)
* New translations strings.xml (Croatian)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Irish)
* New translations strings.xml (Greek)
* New translations strings.xml (German)
* New translations strings.xml (Danish)
* New translations strings.xml (Czech)
* New translations strings.xml (Catalan)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Spanish)
* New translations strings.xml (Tamil)
* New translations validator.xml (Lithuanian)
* New translations validator.xml (Korean)
* New translations validator.xml (Greek)
* New translations validator.xml (Chinese Simplified)
* New translations validator.xml (Turkish)
* New translations validator.xml (Swedish)
* New translations validator.xml (Portuguese, Brazilian)
* New translations validator.xml (Polish)
* New translations strings.xml (Romanian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Turkish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Korean)
* New translations strings.xml (Czech)
* New translations strings.xml (Catalan)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Czech)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Irish)
* New translations strings.xml (Greek)
* New translations strings.xml (Danish)
* New translations validator.xml (Afrikaans)
* New translations validator.xml (Spanish)
* New translations strings.xml (Czech)
* New translations strings.xml (Hebrew)
* New translations strings.xml (German)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations exam.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
2021-05-28 16:12:38 +02:00
Milos Kozak
8db5b808ac
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-05-28 16:11:31 +02:00
Milos Kozak
6735d22934
OfflineEvent -> room
2021-05-28 16:06:44 +02:00
Philoul
330728299d
Fix Extended Bolus in Overview
2021-05-28 08:56:58 +02:00
Milos Kozak
66a70fcd22
Merge pull request #531 from andyrozman/meallink-mdt
...
Medtronic driver changes - Kotlin and PumpSync
2021-05-27 23:23:03 +02:00
Philoul
93046d0354
Revert to val for ratio and dev slope Scale
2021-05-27 08:43:45 +02:00
Philoul
ede1468bbb
Modify shift
2021-05-26 22:04:42 +02:00
Philoul
506fbde587
Merge branch 'dev' into FixSensScale
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
2021-05-26 21:50:58 +02:00
Andy Rozman
766b2b4bea
- changes after comments
2021-05-26 20:16:17 +01:00
Andy Rozman
b40f8b79d1
- reverted change to remove check
2021-05-26 16:04:47 +01:00
Milos Kozak
6e19d60796
Scale -> kt
2021-05-26 14:17:49 +02:00
Andy Rozman
029eb55f0e
- changes according to comment in PR
...
- moved files from core to pump-common (which we could without major changes)
- removed DbObjectBase, and removed its deps in files (3)
- changed id for rileylink project (was the same as for pump-common)
2021-05-26 13:14:17 +01:00
Milos Kozak
43e6ba43b6
fix expiring intervals
2021-05-26 09:01:22 +02:00
Philoul
3a24af1a4c
Merge branch 'dev' into FixSensScale
2021-05-25 22:56:00 +02:00
Milos Kozak
84cc4d0c00
fix setting din in profile
2021-05-25 22:10:12 +02:00
Milos Kozak
e170503f82
lint
2021-05-25 21:53:00 +02:00
