3501 commits

Author	SHA1	Message	Date
Markus M. May	07c47a4ba7	Start de translation	2018-05-02 21:45:16 +02:00
AdrianLxM	f1736f048e	Update strings.xml	2018-05-02 20:20:13 +02:00
Milos Kozak	5671b99f30	Merge pull request #974 from MilosKozak/swedish-update ... Swedis Update strings.xml	2018-05-02 18:02:51 +02:00
CaroGo	a768c03462	Update strings.xml	2018-05-02 17:43:17 +02:00
Milos Kozak	a4ff9d29e2	Merge branch 'dev' into swedish-update	2018-05-02 17:10:01 +02:00
Milos Kozak	42164489c8	cs translations	2018-05-02 17:05:20 +02:00
AdrianLxM	f52451085c	remove translation of language names	2018-05-02 16:41:56 +02:00
AdrianLxM	fb61f3cde2	Update strings.xml	2018-05-02 16:39:28 +02:00
Milos Kozak	efff5d4e10	Merge pull request #966 from jotomo/greener-grass ... Brighter green for "treatment active" for better readability.	2018-05-02 15:05:27 +02:00
Johannes Mockenhaupt	32323d673b	Brighter green for "treatment active" for better readability.	2018-05-02 15:01:49 +02:00
Andy Rozman	4b121ae892	- copied roundtrip2 project into here (for easier use), some of it might be reused ... - added PumpCommon - added PumpMedtronic	2018-05-01 22:44:53 +01:00
Markus M. May	12d80e96ef	Merge latest dev version	2018-05-01 21:56:33 +02:00
soko78	183f2cd6b3	Update strings.xml ... line 177 & 178 changed "temoräres ziel" into "temporäres ziel"	2018-05-01 20:30:53 +02:00
Johannes Mockenhaupt	5ef7506e5f	Clean up prediction colors.	2018-05-01 19:16:28 +02:00
Winfried Kuiper	d68f74bb68	Update strings.xml	2018-04-30 23:09:35 +02:00
Markus M. May	099cb6c4e4	add battery charging state	2018-04-29 22:49:43 +02:00
Roumen Georgiev	a0463742fa	WIP: language set and validation	2018-04-27 17:04:08 +03:00
Roumen Georgiev	bb38d7644b	move onClick in SWRadioButton	2018-04-27 13:30:45 +03:00
AdrianLxM	ee0c811e0d	Merge pull request #912 from jotomo/display-cob ... Add IobCobCalculatorPlugin.getCobInfo().	2018-04-26 23:52:52 +02:00
Roumen Georgiev	11dc20faca	code cleanup	2018-04-26 16:59:56 +03:00
Roumen Georgiev	d75de2f645	show "NEXT" only when isValid() == true	2018-04-26 15:18:01 +03:00
osodebailar	5a74087632	Change iob and cob color for a better uniform look. ... Insulin , iob etc. always in different blue colors, Cob in orange (ocher) like color	2018-04-25 16:51:49 +02:00
Roumen Georgiev	dc91e3a544	currentScreen not updating - fixed & center fields	2018-04-25 17:02:10 +03:00
Roumen Georgiev	8333fe8975	get radiobutton values from arrays.xml & no header	2018-04-25 16:45:15 +03:00
Roumen Georgiev	7fb1b32188	moved show() method to SWItem classes	2018-04-25 15:29:20 +03:00
Roumen Georgiev	dda7ca3f95	radio group is generated dynamically	2018-04-25 11:03:33 +03:00
Johannes Mockenhaupt	f4bafc6260	Add IobCobCalculatorPlugin.getCobInfo().	2018-04-24 23:09:07 +02:00
Milos Kozak	c490499d03	preferences cleanup	2018-04-24 00:11:52 +02:00
Roumen Georgiev	eef4423109	basic navigation works	2018-04-23 17:03:22 +03:00
Roumen Georgiev	76685c3cff	WIP: initial work	2018-04-23 15:58:27 +03:00
Andreas Eggen	511b9c6819	Merge branch 'dev' of git://github.com/MilosKozak/AndroidAps into dev	2018-04-23 08:26:48 +02:00
Milos Kozak	545b4a51ee	Merge pull request #914 from jotomo/overview-extended-bolus-display ... Overview: hide ext. bolus line if none running; spacings, alignments.	2018-04-22 23:13:10 +02:00
Johannes Mockenhaupt	896f919f37	Disable roaming (pref) when wifi-only is enabled.	2018-04-22 21:43:31 +02:00
Johannes Mockenhaupt	47770e9c6c	Overview: hide ext. bolus line if none running; spacings, alignments.	2018-04-22 21:31:53 +02:00
osodebailar	e97b35a030	Change headertext label size from large to medium	2018-04-22 19:48:56 +02:00
Milos Kozak	6851adbfd3	NSClient connection settings	2018-04-22 18:24:06 +02:00
TebbeUbben	7c971197c7	Swapped pump started and paused strings inadvertently	2018-04-21 23:29:23 +02:00
Tebbe Ubben	f4e02a4862	Merge branch 'dev' into dev	2018-04-21 23:22:02 +02:00
TebbeUbben	fd776a2a0e	Add 0%-TBR to history when pump has been started or stopped	2018-04-21 23:20:33 +02:00
Milos Kozak	c4db1c5e2d	move quickwizard preferences under overview	2018-04-21 21:58:07 +02:00
Milos Kozak	1f55078aa3	extract strings from overview preferences	2018-04-21 21:37:50 +02:00
Milos Kozak	cab592efb5	overview preferences cleanup	2018-04-21 21:31:42 +02:00
Milos Kozak	fe762248a5	nsclient preferences cleanup	2018-04-21 21:14:09 +02:00
Milos Kozak	ea59458383	nsclient preferences cleanup	2018-04-21 20:46:55 +02:00
Milos Kozak	c40aaed52f	allow to show dev slope in dev	2018-04-21 12:09:09 +02:00
Milos Kozak	c0250dd62c	show calculation cob progress on graph	2018-04-21 10:50:55 +02:00
Milos Kozak	c27ceb0a72	better bolus error handling for Dana pumps	2018-04-21 00:02:15 +02:00
Milos Kozak	b554d641a7	setupwizard template	2018-04-20 17:27:31 +02:00
Milos Kozak	41b5636c13	clear autosens cache on new preferences change	2018-04-20 12:44:19 +02:00
AdrianLxM	11b88c7947	Merge remote-tracking branch 'milosremote/dev' into cob-rework	2018-04-19 20:22:14 +02:00
AdrianLxM	ed24a129ae	unify Default in settings xml and constants	2018-04-19 19:32:50 +02:00
AdrianLxM	00c05c0e23	totalMinCarbsImpact depending on sensitivty plugin	2018-04-19 12:57:13 +02:00
AdrianLxM	e8406320e0	COB settings	2018-04-19 11:48:00 +02:00
AdrianLxM	2cf438a064	Merge remote-tracking branch 'jotomoremote/carbs-gen-pr' into carbsgen0418	2018-04-18 16:00:00 +02:00
Johannes Mockenhaupt	5d1c6cd118	Move "show notes ..." pref into Buttons submenu.	2018-04-17 21:03:16 +02:00
AdrianLxM	00a0bf2f1a	local profile icons	2018-04-17 20:41:43 +02:00
AdrianLxM	eb2f628f1f	unify names of same icon with different resolution	2018-04-17 20:41:33 +02:00
Alessya	05a1b35ccb	Rename Icon files	2018-04-17 20:41:21 +02:00
Alessya	8dd589c5fe	New icons added for local profile screen	2018-04-17 20:41:07 +02:00
Alessya	91b58446ca	Rename Icon files	2018-04-17 15:59:00 +03:00
Alessya	b2fb14e57a	New icons added for local profile screen	2018-04-17 15:57:54 +03:00
Johannes Mockenhaupt	c7c90ea919	Proper fix.	2018-04-16 10:11:48 +02:00
Johannes Mockenhaupt	58aa4f1323	Unbreak wizard xml, small fixes.	2018-04-15 19:29:23 +02:00
Johannes Mockenhaupt	447bd9b6a3	Alignments. ... (cherry picked from commit a63c388)	2018-04-15 00:28:08 +02:00
Johannes Mockenhaupt	9b80221752	Set inputType for notes fields. ... (cherry picked from commit af0807d)	2018-04-14 10:43:48 +02:00
Johannes Mockenhaupt	f420491611	NewCarbsDialog: cleanups.	2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt	bf7e9e4bf3	NewInsulinDialog: add notes field, use relative time, align style.	2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt	719d3d459b	NumberPicker: apply signed, decimal constraints for keyboard usage.	2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt	efcc02775b	FillDialog: add missed validation, notes field, align style.	2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt	bf02edd871	Make visibility of notes field a preference.	2018-04-12 21:43:55 +02:00
Johannes Mockenhaupt	05e07cf943	Align style of labels, i18n.	2018-04-12 21:32:47 +02:00
Johannes Mockenhaupt	4acf0c713a	Merge remote-tracking branch 'origin/dev' into carbs-gen-pr ... * origin/dev: Adding notes to carbs and to wizard on overview	2018-04-12 21:23:30 +02:00
Johannes Mockenhaupt	a075d87da1	Remove help dialog. ... (cherry picked from commit b1ef8e1)	2018-04-12 20:59:24 +02:00
Johannes Mockenhaupt	9b3b228aad	Color active/scheduled bolus/carbs and TT entries in treatment tab.	2018-04-11 13:05:54 +02:00
Johannes Mockenhaupt	d2491ca429	NewCarbsDialog: add duration, help.	2018-04-11 13:05:54 +02:00
Markus M. May	99c8bbc6c2	Adding notes to carbs and to wizard on overview	2018-04-09 22:10:08 +02:00
AdrianLxM	d1d46849ee	Merge pull request #832 from MilosKozak/lp-edit ... LocalProfile reset/save button	2018-04-09 14:08:22 +02:00
Milos Kozak	9b91b4ab93	Merge branch 'dev' into automatic-careportal-events	2018-04-08 23:53:04 +02:00
TebbeUbben	851cec7240	Renamed alerts.xml to insight_alerts.xml	2018-04-08 20:27:23 +02:00
Milos Kozak	d9279eed2a	split MaxIOB for SMB	2018-04-08 20:17:15 +02:00
TebbeUbben	b488e30459	Use uploadError for pump alarms	2018-04-08 18:46:29 +02:00
TebbeUbben	56b2799785	Added insight_real_tbr_cancel option again	2018-04-08 18:32:11 +02:00
TebbeUbben	f8d4dbf6a1	Add pump alerts as notes	2018-04-08 17:22:53 +02:00
AdrianLxM	5c6e598cd6	Merge branch 'dev' into lp-edit	2018-04-08 16:14:43 +02:00
Milos Kozak	78ffae6e47	Merge pull request #849 from jotomo/combo-cleanup ... Combo cleanup	2018-04-06 21:14:50 +02:00
Milos Kozak	35decd0e53	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-04-06 21:12:14 +02:00
Milos Kozak	c94d01f22b	better time synchronization for danarv2	2018-04-06 18:30:36 +02:00
Johannes Mockenhaupt	623a5e3da1	Combo: remove unused strings, minor code cleanups.	2018-04-06 11:42:33 +02:00
Johannes Mockenhaupt	344d9c1f49	Combo: remove 'read history' button. ... History and basal rate profile are permanently checked and updated. This functionality would only be needed if driver was fundamentally broken.	2018-04-06 11:35:35 +02:00
Johannes Mockenhaupt	db4439f1cc	Combo: remove half-backed alerts dialog.	2018-04-06 11:35:34 +02:00
Johannes Mockenhaupt	e937a777ba	Combo: remove superseeded TDD button and dialog.	2018-04-06 11:35:34 +02:00
swissalpine	afebf30bc0	Add string loopdisconnectedfor	2018-04-05 21:55:07 +02:00
AdrianLxM	009f5dfa38	reset -> strings.xml	2018-04-03 18:37:34 +02:00
AdrianLxM	933b1acd7e	lp save button	2018-04-03 18:33:13 +02:00
AdrianLxM	75a91997b7	lp reset	2018-04-03 14:34:15 +02:00
Milos Kozak	e9c7bdc7f4	add necessity of profile switch to objectives	2018-03-31 22:30:42 +02:00
Milos Kozak	a91aeec144	fix nsclient layout	2018-03-31 20:32:47 +02:00
Milos Kozak	bcb733e42c	Plugins refactor	2018-03-31 00:36:03 +02:00
Milos Kozak	259b5fa818	Merge pull request #809 from MilosKozak/tdds-again-merged ... Tdds again merged	2018-03-28 17:35:23 +02:00
Milos Kozak	fc2da20743	fix conflict	2018-03-28 10:25:58 +02:00
Milos Kozak	e9b499314d	PUMP SMS command, connect to pump before reporting SMS STATUS	2018-03-28 10:22:10 +02:00
Milos Kozak	8e6953cc92	activate button on NSProfile fragment	2018-03-26 09:25:57 +02:00
AdrianLxM	a5d0ec45cc	Merge remote-tracking branch 'milosremote/dev' into tdds-again-merged	2018-03-26 08:39:24 +02:00
Milos Kozak	afe3d68a10	display SMB reasons	2018-03-25 23:56:52 +02:00
Milos Kozak	8c5a2ab524	Merge pull request #799 from jotomo/prime-fill-refresh ... Prime/fill button refresh and some drive-by improvements	2018-03-25 16:10:39 +02:00
Johannes Mockenhaupt	7694c80da9	Fix format specifiers in Spanish translation.	2018-03-24 10:53:46 +01:00
Johannes Mockenhaupt	8a7776fd74	Code dedup.	2018-03-23 23:07:01 +01:00
Johannes Mockenhaupt	9838e2fabb	Rework prime/fill button.	2018-03-23 23:06:57 +01:00
Milos Kozak	22f50198fc	rename nsclientinternal -> nsclient	2018-03-23 22:44:37 +01:00
Milos Kozak	cbd60cfdbe	synchronized access to log in nsclient	2018-03-23 22:37:27 +01:00
Milos Kozak	30f09dc416	show constraints on LoopFragment	2018-03-23 18:23:19 +01:00
Milos Kozak	661595792f	rename InsightPump -> Insight	2018-03-23 17:51:05 +01:00
Milos Kozak	15d8719508	collect most limited reason along with all reasons	2018-03-23 17:36:49 +01:00
Milos Kozak	3f5808eca3	show max basal limit on smb fragment	2018-03-23 09:59:07 +01:00
Milos Kozak	ba09538f46	AMA - Autosens cleanup	2018-03-22 22:18:40 +01:00
Milos Kozak	76ee3c51e4	applyMaxIOBConstraints refactor & tests	2018-03-22 21:13:26 +01:00
Milos Kozak	1aba9a2564	applyCarbsConstraints refactor & tests	2018-03-22 10:31:07 +01:00
Milos Kozak	15158fb5ea	applyBolusConstraints refactor & tests	2018-03-21 23:01:30 +01:00
Milos Kozak	e2ea44a8a8	applyBasalPercentConstraints reactor & tests part1	2018-03-21 20:24:02 +01:00
Milos Kozak	ca70cbdaec	Merge branch 'dev' into newconstraints	2018-03-21 10:48:23 +01:00
Milos Kozak	15ebfc1193	applyBasalConstraints reactor & tests	2018-03-20 22:09:22 +01:00
AdrianLxM	60247daca2	Revert "Fixed typo: Temorär -> Temporär"	2018-03-20 16:19:51 +01:00
AdrianLxM	a14d698530	small correction to trigger travis again	2018-03-20 15:56:13 +01:00
Mathias Dalheimer	309ee1b9a6	Fixed typo: Temorär -> Temporär	2018-03-20 15:37:47 +01:00
Milos Kozak	c2cfe4e7ea	isSMBModeEnabled reactor & tests	2018-03-19 23:14:04 +01:00
Milos Kozak	26ecc3dd60	isAMAModeEnabled reactor & tests	2018-03-19 22:59:25 +01:00
AdrianLxM	954f73eabd	TDD 05	2018-03-19 19:10:54 +01:00
Milos Kozak	326229ebbb	limitClosedLoop & remove openloop flavor	2018-03-19 17:06:22 +01:00
Milos Kozak	5a96b88499	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into newconstraints	2018-03-19 15:11:50 +01:00
Johannes Mockenhaupt	f918a5f303	More loop results cleanup and i18n.	2018-03-19 14:14:07 +01:00
Johannes Mockenhaupt	d1f1db859b	Translations cleanup.	2018-03-19 14:14:07 +01:00
Johannes Mockenhaupt	379df79bf8	CB.applySMBRequest: return reason when skipping due to frequency.	2018-03-19 14:08:39 +01:00
AdrianLxM	69cfa63fe5	xml-format ro	2018-03-19 13:33:11 +01:00
AdrianLxM	3ade9be7a2	cleanup	2018-03-19 13:32:05 +01:00
Milos Kozak	b0a9f678f0	limitRunningLoop constraint	2018-03-19 13:11:25 +01:00
Milos Kozak	f413c005f6	CS translations	2018-03-19 10:07:28 +01:00
Milos Kozak	1c413cc49f	Merge pull request #771 from jotomo/remove-pre-bolus ... Next round of button updates	2018-03-19 09:29:27 +01:00
Milos Kozak	0266a79201	show invalid profiles in treatments tab	2018-03-18 23:41:53 +01:00
Johannes Mockenhaupt	da014daec8	Merge branch 'dev' into remove-pre-bolus	2018-03-18 20:48:19 +01:00
Johannes Mockenhaupt	643f3aee6c	Merge branch 'dev' into dev-merge	2018-03-18 20:20:40 +01:00
Milos Kozak	106de14f9a	Merge branch 'dev' into nodefaultprofile	2018-03-18 19:58:36 +01:00
Johannes Mockenhaupt	946ce97dc2	Fix app init.	2018-03-18 19:57:28 +01:00
Johannes Mockenhaupt	89d59584d5	Merge remote-tracking branch 'origin/dev' into dev-merge ... * origin/dev: prepend line feed like suggested on jamoto code review Rename method to reflect jomoto code review Unit tests are always in engmode Fix boolean stuff in accordance to code review with adrian Cleanup boolean algrabra, add method for environment retrieval from logcontexxt Determine directory from logback more checks for null profile Disallow profile store on pump if on dev branch but not in engineering mode Disable profile switch if not in Engineering mode and on dev branch Add info to About dialog when engineering mode is enabled. On start, show notification if on dev-branch, but not EM, so CL is disabled. Add basic Engineering mode. # Conflicts: # app/src/main/java/info/nightscout/androidaps/MainActivity.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java # app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java # app/src/main/res/values/strings.xml	2018-03-18 19:47:23 +01:00
Milos Kozak	f7621c4cc5	Profile tests	2018-03-18 15:02:21 +01:00
Milos Kozak	4f43feb12e	allow profile to be null	2018-03-17 23:18:34 +01:00
Johannes Mockenhaupt	b54a010614	CarbsButton: replace suspend option with 'hypo tt'.	2018-03-17 22:22:26 +01:00
Johannes Mockenhaupt	17219c08d1	Combo: fragment spacing fix.	2018-03-17 22:12:19 +01:00
Markus M. May	9b020f68db	Correct merge	2018-03-17 20:52:19 +01:00
Johannes Mockenhaupt	eae6c73671	Buttons: explicitely state that no action will be taken if nothing selected.	2018-03-17 20:39:58 +01:00
Milos Kozak	3f29ca3b96	more checks for null profile	2018-03-17 18:07:22 +01:00
Johannes Mockenhaupt	612fc09e52	Merge remote-tracking branch 'origin/dev' into combo-dev-merge ... * origin/dev: Don't overlap time ticks with current time history browser chart selection Insulin button: allow negative presets, fix adding TT insulin. Overview: symetric spacing. Carbs button: send carbs to pump if pump supports carbs. Carbs button: fix visibility pref, input type, allow negative increments. Smallscreen fix chart menu 4 chart menu 3 chart menu 2 chart menu 1 # Conflicts: # app/src/main/res/values/strings.xml	2018-03-17 16:45:08 +01:00
Milos Kozak	6e5d5c4a26	Merge pull request #769 from jotomo/button-refinement ... Button refinement	2018-03-17 15:28:41 +01:00
Johannes Mockenhaupt	8457cd3843	Merge remote-tracking branch 'origin/dev' into combo-dev-merge ... * origin/dev: check for null profile remove profile dependency from pump drivers, TRB optimalization split enacting TRB and SMB	2018-03-17 13:51:40 +01:00
Johannes Mockenhaupt	de72fba92e	Combo: update button spacing to match overview.	2018-03-17 13:51:13 +01:00
Johannes Mockenhaupt	6a6359f1ee	Combo: Show count of boluses delivered and TBRs set on pump.	2018-03-17 13:51:13 +01:00
AdrianLxM	a2ecfa89a0	history browser chart selection	2018-03-16 23:32:17 +01:00
Johannes Mockenhaupt	7c9824e37d	Insulin button: allow negative presets, fix adding TT insulin.	2018-03-16 22:54:38 +01:00
Johannes Mockenhaupt	194c7a2dbc	Overview: symetric spacing.	2018-03-16 22:54:31 +01:00
Johannes Mockenhaupt	32108a7c2f	Carbs button: fix visibility pref, input type, allow negative increments.	2018-03-16 22:11:15 +01:00
AdrianLxM	90f9bf373c	Smallscreen fix	2018-03-16 21:52:02 +01:00
AdrianLxM	47c6c2d9a8	chart menu 4	2018-03-16 19:26:18 +01:00
AdrianLxM	067b264ae8	chart menu 3	2018-03-16 19:16:47 +01:00
AdrianLxM	32894a092e	chart menu 1	2018-03-16 17:23:02 +01:00
Johannes Mockenhaupt	db00404e43	Merge commit 'origin/dev^' into combo-dev-merge ... * commit 'origin/dev^': (313 commits) cleanup draw profile in dana profile viewer optimize imports draw basal in profile viewer BG autobackfill configurable travis 2nd try Save new profile when updating it Add environment variable to handle testCoverage do not pass DIA to SMB determine_basal show Dana model properly after communication error fix deviation slope calculations Read maximum basal and bolus amount from pump update maxIOB hard limits Allow bolus record only in new treatment dialog use safeGetString JsonHelper test food code cleanup Show bolus progress Missing import statement Insight: add treatment to progress event ...	2018-03-16 15:44:54 +01:00
Markus M. May	2c3f28670c	Disallow profile store on pump if on dev branch but not in engineering mode	2018-03-15 23:00:08 +01:00
Markus M. May	e38f10dba0	Merge jamoto/engineering-mode	2018-03-15 21:10:18 +01:00
Milos Kozak	db7671cd23	split enacting TRB and SMB	2018-03-15 18:30:18 +01:00
AdrianLxM	212a9dcc94	draw basal in profile viewer	2018-03-15 14:08:00 +01:00
Milos Kozak	e9313c5b28	BG autobackfill configurable	2018-03-14 20:21:48 +01:00
Johannes Mockenhaupt	a398d95bb4	Add info to About dialog when engineering mode is enabled.	2018-03-12 23:03:14 +01:00
Johannes Mockenhaupt	637b0c6189	On start, show notification if on dev-branch, but not EM, so CL is disabled.	2018-03-12 23:01:58 +01:00
Milos Kozak	eb2b6f9bd8	Allow bolus record only in new treatment dialog	2018-03-12 17:52:52 +01:00
Milos Kozak	a5830cc452	Merge branch 'foodrefactor' into dev	2018-03-12 10:56:14 +01:00
Milos Kozak	38999d6598	food code cleanup	2018-03-12 10:53:23 +01:00
AdrianLxM	1aaec9142c	Merge pull request #746 from swissalpine/patch-3 ... Better layout of the Calculator Dialogue (German)	2018-03-10 22:37:09 +01:00
swissalpine	203288e93a	Better layout of the Calculator Dialogue (German) ... The string "15-Min.-Trend" was too long, at least on my phone.	2018-03-10 22:12:16 +01:00
Milos Kozak	39c2d690e4	CS translations	2018-03-10 20:47:17 +01:00
Milos Kozak	8a197f41dc	Merge branch 'dialogmmol' into dev	2018-03-10 19:25:41 +01:00
Milos Kozak	ec1c43b905	carbs dialog: defaults for mmol, i18n	2018-03-10 19:22:31 +01:00
AdrianLxM	6904cb8807	Merge pull request #702 from McHoffi/McHoffi-SMBnotify_true ... enable SMB notify by default	2018-03-08 15:17:28 +01:00
AdrianLxM	5a5e0ca8b6	Merge pull request #734 from MilosKozak/watchsmb2 ... Watchface overhaul	2018-03-08 15:10:53 +01:00
AdrianLxM	118cdb3dce	buttons gone by default in smallheight ... ... same as on default layout	2018-03-04 20:12:33 +01:00
AdrianLxM	cdb58ed143	newinsulin dialog wrap content	2018-03-04 19:57:21 +01:00
AdrianLxM	5a4967e544	newcarb dialog wrap content	2018-03-04 19:56:34 +01:00
AdrianLxM	d2919f9577	Merge remote-tracking branch 'jotomoremote/watch-updater-service-worker-thread' into watchsmb2	2018-03-04 19:25:26 +01:00
AdrianLxM	7d8674aa61	fix 5m-impact parameter - always was 0	2018-03-02 21:09:09 +01:00
Milos Kozak	ed11bb1d70	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-03-02 00:00:09 +01:00
Milos Kozak	c61fcdbe3f	allow 15 & 30 pump disconnection	2018-03-01 23:59:44 +01:00
Roumen Georgiev	9456a24655	Adding Eating soon mode to options	2018-03-01 16:22:05 +02:00
Milos Kozak	75a6366115	translations cleanup	2018-03-01 15:08:55 +01:00
Milos Kozak	bd6fab3ca3	Merge pull request #721 from jamorham/floatmaxbasal ... Make openapsama_current_basal_safety_multiplier Double instead of Int	2018-02-26 10:46:29 +01:00
Jamorham	805548dd1e	Make openapsama_current_basal_safety_multiplier Double instead of Integer	2018-02-25 21:30:11 +00:00
Milos Kozak	f62cac1b66	make new i & c buttons visible by default	2018-02-25 17:52:30 +01:00
Milos Kozak	7b91f0d490	allow to open G5 app from CGM button	2018-02-25 17:33:46 +01:00
Milos Kozak	e544d44799	overview layout cleanup	2018-02-25 16:20:20 +01:00
Milos Kozak	6eed00fae7	add xdrip icon to cgm button	2018-02-25 15:45:43 +01:00
Milos Kozak	32f2f4d6fa	Merge branch 'g5cal' into buttons	2018-02-25 15:31:43 +01:00
Milos Kozak	cb8fc905bb	catch if G5 app is missing	2018-02-25 15:23:25 +01:00
Milos Kozak	a7da0bb67a	Merge pull request #719 from jotomo/buttons ... Moar buttons.	2018-02-25 11:05:21 +01:00
Jamorham	9d985ec3b7	Add FabricPrivacy	2018-02-22 12:30:36 +00:00
AdrianLxM	c22c22f1d7	wear settings for predictions	2018-02-21 15:56:13 +01:00
JamOrHam	bc2f749ef3	Merge branch 'dev' into dev	2018-02-21 13:43:18 +00:00
Jamorham	67b397b417	Insight: preemptive connection preference option	2018-02-21 12:23:19 +00:00
Milos Kozak	1cb92861b5	Chinese to menu	2018-02-20 17:04:15 +01:00
McHoffi	21d6745d02	Update pref_wear.xml	2018-02-19 20:50:17 +01:00
McHoffi	293eff837b	Update pref_wear.xml	2018-02-19 20:49:53 +01:00
McHoffi	9dcd1c70d5	Update pref_wear.xml	2018-02-19 20:48:54 +01:00
Milos Kozak	dc35c9f6b3	fix typos	2018-02-18 22:56:46 +01:00
boysim	5c9173d14b	Added Dutch combo translations	2018-02-18 18:19:46 +01:00
Jamorham	9a76cdb3a1	Insight: add preemptive connection, keep-alive, statistics	2018-02-18 14:57:28 +00:00
Milos Kozak	0fe287bb79	Merge pull request #689 from AdrianLxM/smb-wear2 ... no wear vibrations on SMB (optional)	2018-02-18 12:39:36 +01:00
Johannes Mockenhaupt	bf2e567f9c	Moar buttons.	2018-02-18 11:06:36 +01:00
AdrianLxM	7b3d370564	Notification on missing profile switch	2018-02-18 01:10:27 +01:00
Johannes Mockenhaupt	d155616c0b	Minor fixes.	2018-02-17 21:08:36 +01:00
Johannes Mockenhaupt	2bccf13213	Add shortname for G5.	2018-02-17 15:40:56 +01:00
Johannes Mockenhaupt	52aa27de05	Sanity check bolus timestamp on start, after bolusing.	2018-02-16 17:33:59 +01:00
AdrianLxM	a23c76f473	Merge branch 'dev' into smb-wear2	2018-02-14 15:03:45 +01:00
AdrianLxM	c821ef97d8	option to enable wear/SMB notifications	2018-02-14 15:02:04 +01:00
Johannes Mockenhaupt	df4ad822fc	Make new behaviour configurable, default on. ... (cherry picked from commit f807592)	2018-02-13 20:44:58 +01:00
Johannes Mockenhaupt	aae9f7d153	Show notification to check pump date if last bolus is older than 24h.	2018-02-13 20:44:36 +01:00
Milos Kozak	31d493d8ae	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-02-13 18:38:55 +01:00
Milos Kozak	3e06b6a4ed	Merge pull request #687 from jotomo/error-announcements ... Create NS-anouncements for error dialogs and local alerts.	2018-02-13 18:08:14 +01:00
Milos Kozak	f063fb94d1	Update strings.xml	2018-02-13 18:06:26 +01:00
Johannes Mockenhaupt	f8075927f2	Make new behaviour configurable, default on.	2018-02-13 00:34:24 +01:00
Milos Kozak	6470f7a63e	Update strings.xml	2018-02-12 20:18:44 +01:00
Milos Kozak	5225276259	Update strings.xml	2018-02-12 20:15:47 +01:00
Milos Kozak	da777d9660	HistoryBrowser fill space by bggraph	2018-02-12 19:39:45 +01:00
Milos Kozak	d92a7e8ef1	Merge branch 'history' into dev	2018-02-11 23:46:20 +01:00
Milos Kozak	fa2e46fbe5	remove CPP profile	2018-02-11 23:02:21 +01:00
Milos Kozak	943205c782	HardLimits refactor	2018-02-11 22:41:10 +01:00
Milos Kozak	0a69a1ab2f	FR language	2018-02-11 21:00:09 +01:00
Johannes Mockenhaupt	f88894ea02	Clean up some Combo strings.	2018-02-10 19:07:03 +01:00
swissalpine	db07723e8a	Update strings.xml	2018-02-10 17:59:31 +01:00
Milos Kozak	359b8401b2	Merge pull request #678 from jamorham/dev ... Updates to Insight plugin	2018-02-10 15:13:35 +01:00
AdrianLxM	4587a47840	add links to about	2018-02-10 14:53:43 +01:00
Jamorham	046de51496	Insight few small changes	2018-02-10 09:29:23 +00:00
Johannes Mockenhaupt	89c832b5aa	Use pager sound instead of smoke detector alarm for bolus error. ... (cherry picked from commit 6767d8b)	2018-02-08 22:18:41 +01:00
Johannes Mockenhaupt	1985ed379d	Add mute button to error dialog. ... So that users needn't hastily close the dialog to stop the sound and then not being able to read the actual message. (cherry picked from commit 43755f0)	2018-02-08 22:18:38 +01:00
Simon Pauwels	9c95a75ede	Added dutch translations (#52)	2018-02-07 23:17:50 +01:00
Johannes Mockenhaupt	483ecadede	Fix dutch translation for Combo's last bolus, minor cleanup. ... (cherry picked from commit c0cf06a)	2018-02-07 22:53:59 +01:00
Johannes Mockenhaupt	6767d8b767	Use pager sound instead of smoke detector alarm for bolus error.	2018-02-07 20:32:09 +01:00
Johannes Mockenhaupt	43755f071d	Add mute button to error dialog. ... So that users needn't hastily close the dialog to stop the sound and then not being able to read the actual message.	2018-02-07 20:32:09 +01:00
Johannes Mockenhaupt	c781601cbb	Commit missing string.	2018-02-06 00:04:24 +01:00
Milos Kozak	f094b5cb64	Merge pull request #658 from bogdangorescu/patch-2 ... RO translation	2018-02-04 18:00:37 +01:00
Bog Dan	8c858d2b2d	RO translation - without translatable="false" ... Removed translatable="false"	2018-02-04 17:55:59 +02:00
Johannes Mockenhaupt	6b4b044cd6	Remove nested layout for better performance.	2018-02-04 00:36:08 +01:00
Bog Dan	27bf66b501	RO translation ... Added RO translation	2018-02-04 01:24:18 +02:00
Johannes Mockenhaupt	f6c5b95904	Merge remote-tracking branch 'origin/master' into combo-scripter-v2 ... * origin/master: Revert "Update strings.xml" bump 1.58 Update strings.xml Add issue template. Enhance insulin plugin test filter null BT devices BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete. BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete. ES translations Dana plugin refactoring KO language cleanup Update strings.xml Update strings.xml Bg translation add RO language CS translations ButterKnife to Dana fragment bump 1.57a-dev Add a unit test for Insulin Plugin # Conflicts: # app/build.gradle # app/src/main/res/values-de/strings.xml # app/src/main/res/values-nl/strings.xml # app/src/main/res/values/strings.xml	2018-02-03 16:45:29 +01:00
Johannes Mockenhaupt	f49f3c7e4b	Clean up string resources. ... (cherry picked from commit 4adcffc)	2018-02-03 16:33:40 +01:00
Milos Kozak	6312b81e10	Merge branch 'smb060' into dev	2018-02-02 10:51:13 +01:00
Cukrovka	af5dc7cc7b	Update strings.xml ... Oprava diakritiky.	2018-02-02 09:36:03 +01:00
Milos Kozak	411add616b	Merge pull request #632 from jamorham/dev ... Add Insight Pump Plugin	2018-02-02 09:21:57 +01:00
AdrianLxM	aca422dfb6	remove duplicates	2018-02-01 23:55:08 +01:00
Milos Kozak	90b0e6d84a	Merge branch 'dev' into smb060	2018-02-01 23:02:00 +01:00
AdrianLxM	cea99a968f	small fixes	2018-02-01 22:09:57 +01:00
AdrianLxM	2e44734b61	Merge branch 'dev' into spanishmerge	2018-02-01 22:07:06 +01:00
AdrianLxM	276784c799	Merge branch 'patch-1' of https://github.com/CaroGo/AndroidAPS into dev180127	2018-02-01 22:02:27 +01:00
Milos Kozak	463031bd31	FR language	2018-02-01 20:17:42 +01:00
Jamorham	73ea3628b2	Extracted insight strings	2018-02-01 10:33:54 +00:00
Milos Kozak	e779dbf221	fix merge conflict	2018-02-01 10:29:00 +01:00
CaroGo	815247dabb	Update strings.xml ... I did a few changes...	2018-01-31 16:51:00 +01:00
Johannes Mockenhaupt	d336c176fb	Update some descriptions.	2018-01-31 14:07:47 +01:00
Johannes Mockenhaupt	c62ca89931	Fix adding a partial bolus to treatments.	2018-01-31 14:00:59 +01:00
Johannes Mockenhaupt	6981c0fec6	Pump needs rest. ... (cherry picked from commit 2e88fb9)	2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt	e790c87940	Cleanups and strings.	2018-01-31 00:59:23 +01:00
Milos Kozak	af3b77e646	history browser initial work	2018-01-29 22:48:47 +01:00
Jamorham	ef2189fec6	Insight faux cancel tbr option	2018-01-29 21:31:06 +00:00
Johannes Mockenhaupt	1e22599979	Fix format specifier.	2018-01-29 21:07:22 +01:00
Johannes Mockenhaupt	33ad68d26a	Fix string.	2018-01-29 20:13:53 +01:00
Milos Kozak	b11e301391	ES translations	2018-01-29 20:05:16 +01:00
Johannes Mockenhaupt	216359312a	Minor non-code tweaks.	2018-01-29 20:02:18 +01:00
Johannes Mockenhaupt	2468f23e97	ComboFragment: i18n last bolus.	2018-01-29 20:02:18 +01:00
Johannes Mockenhaupt	3adda9bf6e	Clean up bolus delivery code.	2018-01-29 13:18:49 +01:00
Milos Kozak	af31c29134	Merge branch 'dev' into smb060	2018-01-29 12:01:02 +01:00
Johannes Mockenhaupt	449dbd79f7	Rename TBR to 'temp basal'	2018-01-29 03:14:10 +01:00
Johannes Mockenhaupt	0655e4e676	SMB: clean up APSResult.toSpanned a bit. ... (cherry picked from commit 10d7c79)	2018-01-29 03:13:57 +01:00
Milos Kozak	f54452515b	KO language cleanup	2018-01-28 23:29:33 +01:00
Johannes Mockenhaupt	9ba6f2144b	Strings fix-up.	2018-01-28 19:30:59 +01:00
Johannes Mockenhaupt	bd87a893c2	Best effort to handle multiple boluses within the same minute. ... (cherry picked from commit cc9094f)	2018-01-28 18:59:07 +01:00
Johannes Mockenhaupt	3a95c3c4d9	More work for bolusing with pump history records. ... (cherry picked from commit 4bc3e42)	2018-01-28 17:06:16 +01:00
Johannes Mockenhaupt	8c27b32d07	Let "Initializing" be a pump state, not an action.	2018-01-28 15:48:17 +01:00
Johannes Mockenhaupt	e3abe04545	Bring back last bolus to combo fragment. ... (cherry picked from commit 108349e)	2018-01-28 15:30:36 +01:00
Johannes Mockenhaupt	b3a60eb5ab	Initial work on basing boluses on pump history.	2018-01-28 15:22:41 +01:00
warstar2187	c297ce88bb	Update strings.xml	2018-01-28 11:01:56 +09:00
warstar2187	76d606fddf	Update strings.xml	2018-01-28 10:51:09 +09:00
Radoslav Radev	d4fe03ac30	Bg translation	2018-01-27 16:12:51 +02:00
Milos Kozak	296d5059d6	SMB options in preferences	2018-01-27 14:47:04 +01:00
Milos Kozak	4af8e14417	Merge branch 'dev' into smb060	2018-01-27 13:47:41 +01:00
Milos Kozak	ce3c888246	add RO language	2018-01-27 13:40:19 +01:00
Jamorham	3150e7d00f	Add double rounding helper	2018-01-26 22:26:29 +00:00
Milos Kozak	b2d9ad8986	Merge branch 'dev' into smb060	2018-01-26 22:49:25 +01:00
Milos Kozak	d634ee7d4b	CS translations	2018-01-26 22:10:27 +01:00
Jamorham	2f7dc11b9f	Update Insight fragment layouts	2018-01-26 16:46:09 +00:00
Johannes Mockenhaupt	372e435761	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Fix format specifiers in Spanish translation, add MainApp.gs(id, args). travis accept license manually Push carbs only to pumps supporting storing carbs. travis to 27.0.2 sdk27 & butterknife	2018-01-26 13:53:42 +01:00
Milos Kozak	98e850b1b3	Merge branch 'dev' into smb060	2018-01-26 11:54:09 +01:00
Jamorham	69da0cf57a	Always connected option	2018-01-25 23:21:42 +00:00
Johannes Mockenhaupt	0067eb75d5	Fix format specifiers in Spanish translation, add MainApp.gs(id, args).	2018-01-25 20:28:21 +01:00
Johannes Mockenhaupt	5dcf214d08	Fix German translation.	2018-01-25 20:10:21 +01:00
Jamorham	54e2f7a712	Current work in progress	2018-01-25 17:30:16 +00:00
Johannes Mockenhaupt	947203b107	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: fix not attached to the activity check for no profile check for no profile Fix namespace errors. Add missing ids to other overview layouts. Overview: make checkbox labels toggle state as well. minimum of 30 min for unreachable alert	2018-01-25 16:06:22 +01:00
Milos Kozak	ca01168474	Merge pull request #611 from MilosKozak/min_unreachable ... minimum of 30 min for unreachable alert	2018-01-25 11:24:09 +01:00
Johannes Mockenhaupt	0f98c49876	Fix namespace errors.	2018-01-24 16:54:29 +01:00
Johannes Mockenhaupt	2a4f1950b3	Add missing ids to other overview layouts.	2018-01-24 16:53:40 +01:00
Jamorham	7a4bc3b694	Initial bits for Insight Pump	2018-01-24 14:18:31 +00:00
Johannes Mockenhaupt	3a02f01374	Overview: make checkbox labels toggle state as well.	2018-01-24 14:10:17 +01:00
Johannes Mockenhaupt	80f13553dc	Add missing placeholder in Dutch translation.	2018-01-23 12:45:47 +01:00
Johannes Mockenhaupt	0eba153d8a	Combo: add 'base basal rate' to fragment. ... (cherry picked from commit 2873da5)	2018-01-23 02:13:11 +01:00
Johannes Mockenhaupt	b7f8913cae	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Careportal DB browser fix rendering treatments with duration more autosens logging cancel extending bolus on pump disconnection set maxiob=0 only for objective 4 fix stopping bolus connection error	2018-01-23 02:04:02 +01:00
Milos Kozak	52e4496add	Careportal DB browser	2018-01-22 21:49:01 +01:00
Milos Kozak	f5a2c5bcd2	cancel extending bolus on pump disconnection	2018-01-21 23:38:24 +01:00
Johannes Mockenhaupt	17d7eaa883	Fix missing/extra string resources.	2018-01-21 20:28:43 +01:00
AdrianLxM	3962808626	minimum of 30 min for unreachable alert	2018-01-21 19:05:04 +01:00
Johannes Mockenhaupt	0553754d8f	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: synchronized access to basal_v	2018-01-21 17:01:27 +01:00
Milos Kozak	fa48720f0e	Merge branch 'dev' into smb060	2018-01-21 15:58:54 +01:00
Milos Kozak	eedc38fbcf	synchronized access to basal_v	2018-01-21 15:56:07 +01:00
Johannes Mockenhaupt	8fda1a678f	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: better handling of wrong profiles	2018-01-21 14:13:46 +01:00
Milos Kozak	e5ede788ba	Merge branch 'dev' into smb060	2018-01-21 13:38:21 +01:00
Milos Kozak	060895b33f	better handling of wrong profiles	2018-01-21 13:37:38 +01:00
Johannes Mockenhaupt	e4ad33659b	Add missing formatters in Dutch translation. ... (cherry picked from commit 90dcc9d)	2018-01-21 12:12:58 +01:00
Johannes Mockenhaupt	20c218ae9a	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Overview: move checkboxes before label. fix pump unreachable for virtual pump getLastAutosensData improvement and logging remove readstatus prior every command bump 1.57-dev better log build verison to Fabric # Conflicts: # app/build.gradle	2018-01-19 21:05:37 +01:00
Johannes Mockenhaupt	8109900e9b	Overview: move checkboxes before label. ... (cherry picked from commit 4825e16)	2018-01-19 20:13:53 +01:00
Milos Kozak	91a6c7a96c	Merge branch 'dev' into smb060	2018-01-15 12:46:50 +01:00
Johannes Mockenhaupt	723bcc4ee3	Remove 'queued activities' from ComboFragment. ... (cherry picked from commit 57a4449)	2018-01-15 11:11:58 +01:00
Johannes Mockenhaupt	7d4d6374be	Merge branch 'combo-strings' into combo-scripter-v2 ... * combo-strings: Add strings for the Combo pump, including some renames. # Conflicts: # app/src/main/res/values/strings.xml	2018-01-11 21:48:01 +01:00
Johannes Mockenhaupt	be8534db51	Add strings for the Combo pump, including some renames. ... Some virtualpump_* strings have been renamed to pump_* since they're now used for multiple pumps.	2018-01-11 21:47:30 +01:00
Johannes Mockenhaupt	864a5e6d81	Missing string resources (en/de).	2018-01-10 23:41:56 +01:00
Simon Pauwels	0ffc61a1ba	Added dutch combo translations (#42) ... * Added and improved Dutch translations * typo fix * double string removal * Typo fix * added translations * Update strings.xml * Added Dutch combo translations	2018-01-10 23:36:20 +01:00
swissalpine	8f91f37f73	Übersetzungen RUN und STOP MODE	2018-01-10 23:24:49 +01:00
Johannes Mockenhaupt	b4998feee1	Disable reading reservoir level units.	2018-01-10 15:05:17 +01:00
Johannes Mockenhaupt	9ece407f32	Integrate dutch translation with Combo changes. ... The lesson to learn here: don't rename string resources in a long- running branch, but do it after the merge. Note that Multiwave is a Combo-specific term, the more general term to describe the combination of a bolus and an extended bolus is combo bolus, ironically and confusingly ;-)	2018-01-10 11:37:42 +01:00
Johannes Mockenhaupt	0c0a58f16b	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: typo and added dutch translations	2018-01-10 11:20:15 +01:00
Simon Pauwels	2df19b85a5	typo and added dutch translations	2018-01-09 21:16:37 +01:00
Johannes Mockenhaupt	9a74b0fb95	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: fix canceling temp in open loop mode. credits to @warstar2187 prevent basal updated messages on virtual pump added BolusWizardTest prefill profile switch JSON from local store if not exists PARTIAL_WAKE_LOCK for NSClientService	2018-01-09 20:59:37 +01:00
Milos Kozak	fbb120673f	Merge branch 'dev' into smb060	2018-01-07 15:32:14 +01:00
Milos Kozak	1ff99c4814	prefill profile switch JSON from local store if not exists	2018-01-07 15:29:50 +01:00
Johannes Mockenhaupt	117b79619b	Check reservoir level before bolus and abort if not enough left.	2018-01-07 11:27:28 +01:00
Johannes Mockenhaupt	3aafcc9854	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Cockpit watch face: Double-tap opens MainMenuActivity prevent processing incomplete profiles set defaults for display range actual bg in objective 1 warn if wrong profile is detected	2018-01-06 00:30:04 +01:00
Milos Kozak	144292576a	Merge branch 'dev' into watchfaces-steampunk	2018-01-05 11:36:48 +01:00
AdrianLxM	95bca1a92d	actual bg in objective 1	2018-01-04 18:53:38 +01:00
Milos Kozak	d7200d1e8e	warn if wrong profile is detected	2018-01-04 11:06:57 +01:00
Milos Kozak	ff5d42522c	Merge branch 'dev' into smb060	2018-01-03 20:31:36 +01:00
Johannes Mockenhaupt	c125e9265f	Strings: TDD.	2018-01-03 16:57:56 +01:00
Johannes Mockenhaupt	2946e2a485	Merge remote-tracking branch 'swissalpine/patch-2' into combo-scripter-v2 ... * swissalpine/patch-2: Update strings.xml # Conflicts: # app/src/main/res/values-de/strings.xml	2018-01-03 16:26:35 +01:00
swissalpine	5fdd88ae75	Shortname: OBJ -> ZIEL	2018-01-03 09:42:49 +01:00
swissalpine	61cc7fc64e	Historie statt Historik ... "Historik" meint "Geschichtswissenschaft" bzw. die "Lehre von der historischen Methode der Geschichtswissenschaft". "Historie" meint das zwar auch, ist aber insgesamt ein wenig weiter gefasst und meint (bildungssprachlich) auch allgemein die Geschichte, nicht nur die Wissenschaft.	2018-01-03 09:38:17 +01:00
swissalpine	fd27e6c9f8	Delete unnecessary / not used translated strings ... In this branch this 4 lines are not used, but indeed in Milos dev branch. This lines make it impossible to compile the app.	2018-01-03 09:16:20 +01:00
Johannes Mockenhaupt	8e659f5f97	A few minor corrections on the German translation.	2018-01-01 19:11:49 +01:00
Johannes Mockenhaupt	eb51e43d70	Remove duplicate strings after merge.	2018-01-01 16:04:35 +01:00
Johannes Mockenhaupt	8eeb8b748c	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: update German Revised German Translation	2018-01-01 16:02:05 +01:00
AdrianLxM	c8fa729d8d	update German	2018-01-01 15:45:01 +01:00
swissalpine	bccfd66874	Update strings.xml	2018-01-01 15:16:23 +01:00
swissalpine	62da90011a	Revised German Translation	2018-01-01 15:10:38 +01:00
Johannes Mockenhaupt	8fb8182f4f	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Objectives update	2018-01-01 13:25:36 +01:00
Milos Kozak	d27d1b1821	Objectives update	2017-12-31 12:24:51 +01:00
Johannes Mockenhaupt	0e61032dec	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: wear update RS create bond add scrollview QuickWizard detailed settings # Conflicts: # app/src/main/res/values/strings.xml	2017-12-27 18:19:51 +01:00
Johannes Mockenhaupt	3333d7a6b7	Clean up all the basal rate sanity checks. ... * Disable loop entirely if no valid basal rate is set on the pump. Neither closed nor open loop mode makes sense without it. * Check active BR before updating the pump profile * Show 'loop disabled' state in Combo fragement. * Cancel active TBR when basal profile switch to profile != 1 is detected or when an unsupported bolus is active.	2017-12-27 12:49:04 +01:00
Johannes Mockenhaupt	728abbe224	Clean up strings.xml, finish German translation.	2017-12-27 12:28:01 +01:00
Johannes Mockenhaupt	6af28479d6	Disable loop if unsupported basal rate profile is selected. Fixes #31.	2017-12-27 12:28:01 +01:00
Johannes Mockenhaupt	715ffa28d2	Remove empty Combo prefs.	2017-12-27 01:33:42 +01:00
Milos Kozak	0ab259f61f	Merge branch 'dev' into smb060	2017-12-26 01:22:49 +01:00
Milos Kozak	72d6c4494b	add scrollview	2017-12-26 01:22:35 +01:00
Milos Kozak	162e73e64d	Merge branch 'dev' into smb060	2017-12-26 00:35:16 +01:00
Milos Kozak	8fdd16c305	QuickWizard detailed settings	2017-12-26 00:27:34 +01:00
Johannes Mockenhaupt	ea5629fc86	Merge remote-tracking branch 'origin/dev' into csv2-staging ... * origin/dev: fix non smooth ratio graph fix of fix fix wrong button type fix doubled percentage when comming from NS proper select last used profile when using profile percentage limit basal rate to minimal value supported by pump SingleClickButton RS fix crash when pairing is not confirmed on pump Double -> double use joda-time Use autosensdata for wizard instead of APSResult	2017-12-25 20:29:32 +01:00
Milos Kozak	ae30046c95	Merge branch 'dev' into smb060	2017-12-23 11:18:37 +01:00
Milos Kozak	3ce260dfe9	fix of fix	2017-12-23 11:18:17 +01:00
Milos Kozak	51de0f16c1	Merge branch 'dev' into smb060	2017-12-23 11:07:48 +01:00
Milos Kozak	6e09bfbbe4	fix wrong button type	2017-12-23 11:07:29 +01:00
Milos Kozak	7380065bd9	Merge branch 'dev' into smb060	2017-12-22 21:11:38 +01:00
Milos Kozak	93b954fffe	when using profile percentage limit basal rate to minimal value supported by pump	2017-12-22 20:17:31 +01:00
Milos Kozak	600e2ade1c	SingleClickButton	2017-12-22 19:50:16 +01:00
Johannes Mockenhaupt	bd0ae23e30	Merge branch 'dev' into csv2-staging ... * dev: fix disconnecting pump format output date to be displayed on iDevices correctly BolusWizard use 0 for insulin correction if in range LocalProfile TimeListEdit min, max remove string with no default translation Rv2,RS fix loading events initialize lastCommandTime too after BT reset allow to read status after every command	2017-12-22 10:39:30 +01:00
Milos Kozak	99e5a39b33	Merge branch 'dev' into smb060	2017-12-22 10:34:45 +01:00
Johannes Mockenhaupt	6a3184bc39	ComboFragment: use history icon for history, not bolus icon.	2017-12-21 11:36:25 +01:00
AdrianLxM	2d2bd6d77a	remove string with no default translation	2017-12-21 08:26:55 +01:00
Milos Kozak	5d3b307672	Merge branch 'dev' into smb060	2017-12-20 22:37:29 +01:00
Johannes Mockenhaupt	3b43e4d06a	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: RS enable BT before scanning BG viewer NSOffline remove from queue as well NS offline # Conflicts: # app/src/main/res/values/strings.xml	2017-12-20 20:21:12 +01:00
Milos Kozak	beb87acc9f	Merge pull request #552 from MilosKozak/nsoffline ... Nsoffline	2017-12-20 20:17:30 +01:00
Johannes Mockenhaupt	57944fb4b5	Merge remote-tracking branch 'origin/dev' into smb060 ... * origin/dev: Actions tab: show profile switch button for single profile too. Old NS-Version non-urgent Add SP to imports refactor cancelAlarm back to KeepAliveReceiver push next alert on read status G5 upload to xdrip fake Esel new file fake Esel Apply bolus constraint before applying. Rv2,RS: always load last 45 min remove wear-overview notifications as replaced by system notifications Remove missed reference to pref in NSProfilePlugin. Remove 'sync to profile' pref. # Conflicts: # app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java	2017-12-20 17:28:08 +01:00
Milos Kozak	0d7e950b73	Merge pull request #505 from jotomo/sync-to-pump ... Remove sync to pump pref, always sync	2017-12-20 10:49:47 +01:00
Johannes Mockenhaupt	8e68a23225	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: G5 upload to xdrip fake Esel new file fake Esel Rv2,RS: always load last 45 min remove wear-overview notifications as replaced by system notifications # Conflicts: # app/src/main/res/values/strings.xml	2017-12-18 20:22:26 +01:00
Johannes Mockenhaupt	a6a87d0790	Minor fixes and polish around bolus cancellation.	2017-12-15 10:41:07 +01:00
Milos Kozak	8cb4921bab	BG viewer	2017-12-15 01:03:31 +01:00
Milos Kozak	5f60e7cf2b	G5 upload to xdrip	2017-12-14 21:49:11 +01:00
Johannes Mockenhaupt	b6bc957813	Minor tewaks and cleanups.	2017-12-13 21:37:44 +01:00
Johannes Mockenhaupt	67eb6b20ed	Handle errors when reading the history for verification fails.	2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt	a169245dc3	On bolusing failure, attempt verify by reading last bolus from history.	2017-12-13 20:39:08 +01:00
Johannes Mockenhaupt	f83dd1cb67	Unbreak RuffyCommandsV1Impl.readHistory, cleanups.	2017-12-12 00:57:04 +01:00
Milos Kozak	b1c4f28eb7	OpenAPS 0.6.0 1st part	2017-12-11 18:45:04 +01:00
Johannes Mockenhaupt	ca9fe3e755	Fixes around bolus cancellation.	2017-12-10 01:39:58 +01:00
Johannes Mockenhaupt	26fa63d571	ComboFragment: always show refresh button. ... To allow force starting a conecting attempt if the pump is still in disconnected state.	2017-12-09 22:08:38 +01:00
Johannes Mockenhaupt	471beae14c	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: remove unused imports adapt wear actions to command queue RS report unsupported firmware removing the whole if() statement fix NPE when profile not loaded fix of extended bolus size Added profile's target BG in NSClient mode	2017-12-09 19:51:07 +01:00
Johannes Mockenhaupt	c386d0ba03	Fix TDDS dialog title.	2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt	27e9cfda6f	Overhaul Combo tab buttons and dialogs.	2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt	063a5ba6b9	Only read Tdd and Alerts through buttons on Combo tab, not treatment history.	2017-12-09 19:45:58 +01:00
Johannes Mockenhaupt	cf142a4538	Merge pull request #4 from jotomo/verify-record-date-after-bolus-cancel ... Verify and return delivered bolus amount in BolusCommand	2017-12-09 19:41:16 +01:00
Johannes Mockenhaupt	b409b737e5	On connect, take over TBR CANCELLED warning and raise message. Fixes #9.	2017-12-09 17:33:11 +01:00
Johannes Mockenhaupt	f09464e5d6	Move detection of partial bolus delivery to BolusCommand. ... Have BolusCommand verify delivered bolus if needed and return the actually delivered bolus amount. This makes more sense now, given history is only read if unavoidable.	2017-12-08 12:56:15 +01:00
Milos Kozak	696dd4c592	Merge branch 'dev' into smb	2017-12-07 23:54:37 +01:00
AdrianLxM	795292d891	bend translations	2017-12-07 20:51:17 +01:00
Milos Kozak	dc3c853aca	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-12-07 18:48:18 +01:00
Milos Kozak	9d7e2f1bec	RS report unsupported firmware	2017-12-07 18:48:05 +01:00
Johannes Mockenhaupt	86b63cb27d	Combo tab: show command queue if non-empty.	2017-12-06 17:14:30 +01:00
Johannes Mockenhaupt	32b7df39f9	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Update strings.xml Update strings.xml	2017-12-06 11:34:32 +01:00
AdrianLxM	525adddc5e	Merge pull request #527 from osodebailar/dev ... Dev	2017-12-06 10:18:43 +01:00
Johannes Mockenhaupt	0f034dd662	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: check for duration in json untranslatable strings greek language check for null queue logging	2017-12-05 23:19:05 +01:00
AdrianLxM	50cbff6fa4	untranslatable strings	2017-12-05 22:08:14 +01:00
Johannes Mockenhaupt	f9867c69fb	Remove warning if pump time is off.	2017-12-05 21:46:12 +01:00
Milos Kozak	a293f86978	Merge branch 'dev' into smb	2017-12-05 17:36:44 +01:00
Milos Kozak	188762519c	greek language	2017-12-05 17:03:40 +01:00
Johannes Mockenhaupt	23874ebbd6	Remove 'sync to profile' pref. ... (cherry picked from commit 01c52e7)	2017-12-05 10:00:31 +01:00
Johannes Mockenhaupt	01c52e753c	Remove 'sync to profile' pref.	2017-12-05 01:24:43 +01:00
Johannes Mockenhaupt	ada5301361	Cleanups.	2017-12-05 01:08:36 +01:00
Johannes Mockenhaupt	e7d49f2300	Merge branch 'no-history-for-you' into combo-scripter-v2 ... * no-history-for-you: When bolusing, only read history in case of error or cancellation. Cleanups. Remove lastBolus, reservoirLevel. Use timestamp for TBR, not pump minutes. Rework checkAndResolveTbrMismatch to update from pump to AAPS only. ComboFragment: move forced history read to long-pressing the TDD button. More steps towards reducing comms amount. Don't check pump history, clean up usage of pumpHistoryLastChecked, mark stuff to disable. Remove last bolus, units display of reservoir level from Combo fragment. # Conflicts: # app/src/main/res/values/strings.xml	2017-12-05 00:34:22 +01:00
Johannes Mockenhaupt	bf9f877b3d	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: (68 commits) max connection time to 120 sec make chart zoomable again fix NPE lowest priority for background calculations wear timestamps long remove unneeded code fix landscape overview synchronized wait fix build tools for travis try to fix travis upgrade build tools R: resolve thread deadlock during bolus stop remove unsupported code from korean pump handle bolus stop prior to delivery correctly fix translations better logging Revert unnecessary change. Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face. gradle update parse more iso formats ... # Conflicts: # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/info/nightscout/androidaps/Config.java # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java # app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java # app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java # app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java # app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java # app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/DismissNotificationService.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java # app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfilePlugin.java # app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java # app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java # app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java # app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java # app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java # app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java # app/src/main/res/values/strings.xml # app/src/main/res/xml/pref_others.xml # app/src/main/res/xml/pref_wear.xml # gradle/wrapper/gradle-wrapper.properties # wear/build.gradle	2017-12-05 00:32:47 +01:00
Johannes Mockenhaupt	98ba0fbf87	When bolusing, only read history in case of error or cancellation.	2017-12-05 00:21:58 +01:00
Johannes Mockenhaupt	141c116db6	ComboFragment: move forced history read to long-pressing the TDD button. ... To avoid accidentally doing this when a short press on Refresh was intended.	2017-12-05 00:08:42 +01:00
Milos Kozak	d4d194f7f0	Merge branch 'dev' into smb	2017-12-04 23:30:24 +01:00
AdrianLxM	aefb0d62df	Merge pull request #522 from MilosKozak/dev ... Dev	2017-12-04 17:53:36 +01:00
Johannes Mockenhaupt	0c7b2e1953	Remove last bolus, units display of reservoir level from Combo fragment. ... (cherry picked from commit 42847cb)	2017-12-03 22:48:06 +01:00
Johannes Mockenhaupt	afdcf0b1c5	Remove combo pairing stubs.	2017-12-03 22:47:55 +01:00
Johannes Mockenhaupt	1b91684c65	Enforce low-suspend loop mode rather than disabling loop on usage violation. Because.	2017-12-03 22:26:02 +01:00
Johannes Mockenhaupt	1e19f19cd2	Hide buttons on Combo tab until plugin is initialized.	2017-12-03 22:25:43 +01:00
Milos Kozak	9e0241aebc	fix translations	2017-12-03 19:12:07 +01:00
AdrianLxM	07c1084287	Merge branch 'watchfaces' into dev	2017-12-02 21:45:39 +01:00
AdrianLxM	98777579c8	delta granularity and NPE fix	2017-12-01 20:32:26 +01:00
Milos Kozak	622ac15c50	Merge branch 'dev' into smb, fix compile, add queue features	2017-12-01 18:13:05 +01:00
AdrianLxM	090127012c	Merge branch 'dev' into btwatchdog-pr	2017-12-01 14:03:44 +01:00
AdrianLxM	09dac632f9	bluetooth watchdog	2017-12-01 13:57:53 +01:00
Andreas	29d9d20605	Update strings.xml ... Add german text for local alerts	2017-12-01 08:03:33 +01:00
Andreas	e07c5fb50d	Update strings.xml ... Change "Temp basal" to "Temp Basal"	2017-11-30 15:04:40 +01:00
Milos Kozak	04742c60cd	G5 fix time value	2017-11-29 23:00:41 +01:00
Milos Kozak	7fc9efde40	G5 offline/uploader	2017-11-29 16:07:26 +01:00
Milos Kozak	d1aec1ff18	Localalerts settings by adrian	2017-11-28 21:48:46 +01:00
Johannes Mockenhaupt	ffb5ee3b22	Show min/avg/max in Combo TDD dialog. ... (cherry picked from commit 348b53a)	2017-11-26 12:52:23 +01:00
Johannes Mockenhaupt	e13f29e615	Use correct key in prefs.	2017-11-25 02:25:02 +01:00
Johannes Mockenhaupt	b148b334b2	Adhere to 'Sync to profile' setting in ConfigBuilder.	2017-11-25 02:11:01 +01:00
Johannes Mockenhaupt	1a8c0fcf52	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Cancel ongoing notification when plugin is disabled. Fix typo in fragment name. Nitpicky symmetry. PersistentNotification unregister workaround. Make PumpEnactResult fluent. Minor code cleanup. # Conflicts: # app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java # app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java	2017-11-22 22:17:57 +01:00
Milos Kozak	a13661400f	DanaRv2 queue & pump autodection	2017-11-22 22:09:58 +01:00
AdrianLxM	681add11a9	remove translations without english default	2017-11-22 21:06:31 +01:00
Milos Kozak	dfd0218a6a	Merge branch 'dev' into queue	2017-11-22 19:44:16 +01:00
Milos Kozak	a9f1acf7a7	Merge pull request #502 from jotomo/combo-extractions ... Combo extractions	2017-11-22 19:36:59 +01:00
Johannes Mockenhaupt	cf430b84cf	Extract some string resources.	2017-11-22 14:27:29 +01:00
Johannes Mockenhaupt	1e4070e862	Fix typo in fragment name.	2017-11-22 11:34:23 +01:00
Johannes Mockenhaupt	c6ad1b59f3	Clean up string resources.	2017-11-22 11:27:49 +01:00
Johannes Mockenhaupt	813f857306	Rename fragment 'error history' -> 'alert history'.	2017-11-22 11:17:18 +01:00
Johannes Mockenhaupt	2861509d07	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration. BolusProgressDialog: hide stop button once pressed. fix RU translation use MIN_DIA instead of DEFAULT_DIA	2017-11-22 10:56:57 +01:00
Milos Kozak	f134163a76	Merge branch 'dev' into queue	2017-11-21 22:31:56 +01:00
Milos Kozak	a6bf18244a	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-11-21 22:31:22 +01:00
Milos Kozak	ca44ae9a0b	fix RU translation	2017-11-21 22:31:02 +01:00
Johannes Mockenhaupt	63607d169d	Polish dialogs.	2017-11-21 00:36:01 +01:00
Johannes Mockenhaupt	1b50b43fbb	Add headers to dialogs.	2017-11-21 00:22:16 +01:00
Milos Kozak	3ab235f829	refactor pump interface out of ConfigBuilder, remove handlers	2017-11-20 23:39:12 +01:00
Milos Kozak	d8d8b150b6	Merge branch 'dev2' into queue	2017-11-20 17:34:03 +01:00
Milos Kozak	973b9d50c1	Merge branch 'dev' into dev2	2017-11-20 17:28:15 +01:00
Johannes Mockenhaupt	9d3625e78c	Show bolus/TBR percent and duration with activity.	2017-11-18 23:29:46 +01:00
Johannes Mockenhaupt	46fdd47ac0	Fixes and cleanups.	2017-11-18 21:32:01 +01:00
Johannes Mockenhaupt	9459dfe321	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Remove dead code. Ctors Android-style. Fix NPE initialising MyPreferencesFragment. RS fix last bolus time RS remove duplicated message RS fix extended bolus result show timeshift if not zero CS translation removed unneeded code long click on name to open settings add link to advanced settings # Conflicts: # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java	2017-11-18 17:46:20 +01:00
Johannes Mockenhaupt	99db38a8e0	Fix displaying connection problems in Combo tab.	2017-11-18 17:43:33 +01:00
Johannes Mockenhaupt	d92540a17c	Merge remote-tracking branch 'adrian/localalerts-settings' into combo-scripter-v2 ... * adrian/localalerts-settings: remove already commented out code upper case literals use correct setting Don't alarm while disconnected disconnect state remove deprecated wear notification settings no-urgent notification title presnooze missed readings/pump on startup system notifications for non-urgent Notification bugfixes use ID as request code guard double clicks refactor notifications: subpackage initialized only when maxBasal >0 Dismiss notification service local alert thresholds as settings Extract local alerts for unreachable pump, missed BG readings. # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java # app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java # app/src/main/res/values/strings.xml	2017-11-18 16:42:20 +01:00
Johannes Mockenhaupt	b85b6f85f4	Major cleanup and some new features. ... * PumpState.timestamp: round to second (format used in DB) * Raise notification about wrong pump clock time since setting clock isn't possible with current ruffy * Set TempBasal.pumpId when setting/cancelling TBR * Checking state of pump on connect * Better checks whether pump is ready to execute command * Rework dynamic command timeout * Confirm benign warnings on connect and turn into notifications * Some groundwork for reading/setting basal profile * Check pump history every 15m	2017-11-18 13:19:04 +01:00
Johannes Mockenhaupt	e27730229e	Update TODO-Combo, nicer icon in fragment.	2017-11-14 10:43:36 +01:00
Johannes Mockenhaupt	c22d18eabc	ComboFragment: alert button for pump alerts (instead of alarms).	2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt	c11086d9ea	Stuff: ... * Read all history * Simple viewer for TDDs, errors * Clean up cancelling TBR (incomplete) * Initializing pump robustness	2017-11-12 00:01:01 +01:00
Milos Kozak	25aa5094a4	alarm for failed bolus	2017-11-11 22:32:00 +01:00
Johannes Mockenhaupt	3072a42cd7	Initial dialog to display pump alerts.	2017-11-11 21:44:00 +01:00
Johannes Mockenhaupt	a9970a9efe	Cleanups	2017-11-11 16:52:07 +01:00
Milos Kozak	a5227fc773	add bolus sound	2017-11-11 16:20:34 +01:00
Johannes Mockenhaupt	2f8febabb8	Remove debris of localalerts to make upstream re-integration only a minor PITA, maybe.	2017-11-11 16:15:03 +01:00
Johannes Mockenhaupt	fb65aca081	ComboFragment: hack to make battery display look pretty before init.	2017-11-11 16:13:06 +01:00
Milos Kozak	86b11edd58	RS connection and status reading	2017-11-11 14:05:29 +01:00
Johannes Mockenhaupt	e6a29e5214	Reorder items in fragments.	2017-11-10 02:23:21 +01:00
Johannes Mockenhaupt	5d077c329a	fix the fix with the fix from the fix that fixes the fix.	2017-11-10 01:16:01 +01:00
AdrianLxM	d0806802eb	compile fixes	2017-11-10 00:19:13 +01:00
Johannes Mockenhaupt	cc6db3a059	Some ComboFragment cleanups.	2017-11-08 23:31:40 +01:00
Milos Kozak	8bae1a18e4	CommandQueue	2017-11-08 22:22:51 +01:00
Johannes Mockenhaupt	cda621f32b	Disable loop when selected basal rate is not 1.	2017-11-08 14:28:02 +01:00
Johannes Mockenhaupt	be5f7e68a7	unsafe usage checks update.	2017-11-06 23:15:16 +01:00
AdrianLxM	ccad0c18b1	remove deprecated wear notification settings	2017-11-06 21:44:01 +01:00
AdrianLxM	f2e44e8ab9	no-urgent notification title	2017-11-06 21:38:42 +01:00
AdrianLxM	2f56687e82	system notifications for non-urgent	2017-11-06 20:16:17 +01:00
AdrianLxM	87ea412516	local alert thresholds as settings	2017-11-06 12:58:44 +01:00
AdrianLxM	ffd912e32b	Merge remote-tracking branch 'jotomoremote/local-alerts' into localalerts-settings	2017-11-06 11:56:41 +01:00
Johannes Mockenhaupt	011409a6e5	Minor cleanups.	2017-11-03 23:40:57 +01:00
Milos Kozak	5ad564e0e3	CS translation	2017-11-03 10:13:23 +01:00
Johannes Mockenhaupt	604a9e664a	Reject requests to bolus the same amount within 60s.	2017-11-02 15:37:19 +01:00
Johannes Mockenhaupt	f569163d19	Merge remote-tracking branch 'origin/dev2' into combo-v2 ... * origin/dev2: (26 commits) add getPreferenceId to food plugin preferences update use DateUtil#agoString use DateUtil#untilString timeframe strings Show remaining time of TT NSTreatments NPE fix Cleanup. Revert "Debug: wider thread column in log to improve readability." Disable event logging by default. Log summary after 10s, then every 60s. Log receivers of event. Log source of event. Debug: wider thread column in log to improve readability. Better log messages for events. Group events in type hierarchy related to the LoopPlugin. Remove dead NSPingAck class. Let event classes extend Event(UpdageGui) classes. Add base event class. Log posted events. ...	2017-11-01 21:39:45 +01:00
Milos Kozak	a1c6704ae9	Merge branch 'dev2' into smb	2017-11-01 20:50:14 +01:00
Milos Kozak	f67bd291cd	Merge branch 'dev' into dev2	2017-11-01 20:44:24 +01:00
Milos Kozak	60699eddbb	preferences update	2017-11-01 20:43:59 +01:00
Johannes Mockenhaupt	4da160a951	Disable closed loop under unsafe conditions.	2017-11-01 10:55:09 +01:00
Johannes Mockenhaupt	8d3947dc7f	Initial bolus syncing.	2017-10-31 19:30:25 +01:00
Johannes Mockenhaupt	74bbab9cf1	More bolus work.	2017-10-31 14:46:46 +01:00
Johannes Mockenhaupt	69648ecf30	Make bolusing safe.	2017-10-31 12:47:53 +01:00
Johannes Mockenhaupt	522b5e9e1b	Clean up string resource names.	2017-10-30 21:42:14 +01:00
Johannes Mockenhaupt	75bc2cd940	NotificationStore: extract key string.	2017-10-30 19:49:16 +01:00
Johannes Mockenhaupt	9bae22f551	Tweaking ComboFragment's Last Connection.	2017-10-30 19:49:16 +01:00
Johannes Mockenhaupt	a920946cd1	Extract local alerts for unreachable pump, missed BG readings.	2017-10-30 17:48:22 +01:00
Johannes Mockenhaupt	79d7ec5467	Add prefs for local alerts.	2017-10-30 16:49:21 +01:00
Johannes Mockenhaupt	d423c8ae2a	Add pref to raise urgent alarms as system notifications.	2017-10-30 03:04:41 +01:00
Johannes Mockenhaupt	bdc61765ce	KeepAliveReceiver: sanitize pump disconnected/missed readings alarms. ... * Don't raise alarm on application start * Re-raise alert only every ~30 min, not every 5 min.	2017-10-30 02:02:01 +01:00
Johannes Mockenhaupt	6b6d252173	Day 1 ... * Some UI rework * Start removing (retry) logic from ruffyscripter to ComboPlugin * Cleanups all over * Remove TDD stuff, this can be done independently of a pump * New SPI/API methods confirmAlert, readReservoirLevelAndLastBolus * Add warning and error codes from Combo manual * Rework commands to just execute an action (verification will be in ComboPlugin eventually, together with retry logic) * Rework commands to update state in field as command progresses rather than returnin/throwing. * Initial version reading bolus and error history (no DB sync yet).	2017-10-29 11:36:35 +01:00
Johannes Mockenhaupt	36d5c4d806	Clean up ComboFragment, related string resources.	2017-10-28 00:47:45 +02:00
Johannes Mockenhaupt	b6a62dedae	Fix merge conflict.	2017-10-27 22:26:47 +02:00
Johannes Mockenhaupt	d237c46ca8	Merge remote-tracking branch 'origin/dev' into combo-v2 ... * origin/dev: (26 commits) fix RS response code use max absorption time for AAPS and weighted average sensitivity detection log.debug -> log.error on RS comm read status after bolus RS connectivity & bolus improvement Better bolusing with different speeds (R & Rv2) Detailed onscreen history logging Split to smaller pieces Update strings.xml Sensitivity logging optional RS synchronized change fix displaying XX:30 time intervals CS translations allow to use actual profile in wizard getUnits from active profile not interface Update strings.xml Update strings.xml Update dutch Update strings.xml Update strings.xml ...	2017-10-27 22:24:38 +02:00
Johannes Mockenhaupt	4bc970091e	More i18n.	2017-10-27 21:51:15 +02:00
Johannes Mockenhaupt	eed3773b49	Combo i18n.	2017-10-27 17:19:10 +02:00
Johannes Mockenhaupt	b47559647f	wip	2017-10-27 00:03:01 +02:00
Johannes Mockenhaupt	ec383bb082	Remove the alerter and related prefs.	2017-10-25 16:27:55 +02:00
Milos Kozak	fe0376206e	fix merge conflict	2017-10-24 11:46:27 +02:00
Milos Kozak	d180d088f0	fix merge conflict	2017-10-22 21:11:31 +02:00
Johannes Mockenhaupt	300a4609f8	Clean up prefs.	2017-10-21 20:24:17 +02:00
Milos Kozak	7dd678c917	Better bolusing with different speeds (R & Rv2)	2017-10-21 18:55:56 +02:00
AdrianLxM	7ed7a2e8c4	Merge remote-tracking branch 'milosremote/dev' into smb-rhino	2017-10-21 17:06:57 +02:00
Radoslav Radev	075b74ec84	Update strings.xml	2017-10-21 17:11:25 +03:00
Johannes Mockenhaupt	cb438934b6	WIP: Pairing	2017-10-21 13:50:19 +02:00
Johannes Mockenhaupt	6cb1d5c0bd	ComboFragment, set "Initializing" as initial status.	2017-10-21 11:22:40 +02:00
Johannes Mockenhaupt	8b8a135804	Add (back) last bolus to ComboFragment.	2017-10-20 01:12:47 +02:00
Johannes Mockenhaupt	4517736122	Add back TBR to ComboFragment.	2017-10-20 00:28:49 +02:00
Johannes Mockenhaupt	4e978656f5	Trim down ComboFragment. ... Base basal rate, TBR, last bolus are redundant, they're already displayed on the overview and the treatment tab. When they're not in sync, that's an error of the ComboPlugin.	2017-10-19 23:11:32 +02:00
Johannes Mockenhaupt	3d6c8ee2a5	Combo Fragment misc.	2017-10-19 23:01:27 +02:00
Johannes Mockenhaupt	71eff7ec79	Add space between number and minute for 'x min ago' template.	2017-10-19 22:59:03 +02:00
Johannes Mockenhaupt	c29b4d13a3	Support pump suspend status (and misc other ...).	2017-10-19 21:31:10 +02:00
Johannes Mockenhaupt	e1c1f4b996	Revert string danar_stats.	2017-10-19 21:31:10 +02:00
Milos Kozak	b76cb755e0	CS translations	2017-10-19 20:37:37 +02:00
Milos Kozak	c258b41f11	allow to use actual profile in wizard	2017-10-19 19:35:35 +02:00
Milos Kozak	2e32fe51e2	Merge pull request #475 from diabetesdt1/patch-3 ... Update strings.xml	2017-10-19 18:11:52 +02:00
diabetesdt1	51caffa591	Update strings.xml	2017-10-19 16:40:36 +02:00
Milos Kozak	e7fb045f04	Merge pull request #474 from boysim/dev ... dutch translation update	2017-10-19 16:16:27 +02:00
Johannes Mockenhaupt	4de010b1a2	Strings reuse for pumps.	2017-10-19 16:11:36 +02:00
diabetesdt1	17eec803f4	Update strings.xml	2017-10-19 16:03:31 +02:00
Johannes Mockenhaupt	5fc9da885a	Pairing stub.	2017-10-19 12:16:07 +02:00
Johannes Mockenhaupt	07253b59a0	Refactoring.	2017-10-19 02:56:29 +02:00
Simon Pauwels	28430d117d	Update dutch	2017-10-18 21:19:12 +02:00
Johannes Mockenhaupt	dca219d900	Fix initializing ruffy service, read reservoir level on init.	2017-10-18 20:53:44 +02:00
Milos Kozak	55b1dcb992	Merge branch 'dev' into dev2	2017-10-18 20:14:14 +02:00
Milos Kozak	fe9fefa601	Update strings.xml	2017-10-18 20:06:35 +02:00
Johannes Mockenhaupt	ab4f46471b	Add RuffyCommands.readPumpState, cleanup, fix.	2017-10-18 18:29:29 +02:00
Radoslav Radev	f0ee2b8bed	Update strings.xml	2017-10-18 14:25:34 +03:00
McHoffi	434f4474b5	DE_translations	2017-10-18 11:11:41 +02:00
warstar2187	e3d3664ac2	Update strings.xml	2017-10-18 16:39:55 +09:00
warstar2187	a35262840f	Update strings.xml	2017-10-18 13:49:17 +09:00
Milos Kozak	13184dcb51	food plugin	2017-10-17 20:55:23 +02:00
Johannes Mockenhaupt	f33d55b092	Trim combo prefs.	2017-10-17 19:37:32 +02:00
Johannes Mockenhaupt	5131b8b62f	Remove combo hacks outside of combo plugin.	2017-10-17 12:20:48 +02:00
Johannes Mockenhaupt	41ebabe5e7	Merge remote-tracking branch 'origin/dev' into combo-v2 ... * origin/dev: (126 commits) ConfigBuilder: hide disabled plugins by default. sum on name for LP log to debug not error logger reformat logging rhinoAMA first full run rhinoAMA first crashfree call rhino some more cleanups rhino logging and cleanups rhino MA looping rhino first real detemine-basal call rhino small refactor NDK filters to work around j2v8 vs. libBleCommandUtil issue. NewTreatmentDialog: sanitize inputs, fixes #417. rhino complex parameter passing rhino first parameter passing rhino function passing first rhino location permission for BLE scanning use customized name only for LocalProfile ...	2017-10-17 12:16:43 +02:00
Johannes Mockenhaupt	d123e7b7c0	Remove duplicate values in strings.xml.	2017-10-17 11:40:24 +02:00
Johannes Mockenhaupt	60c9a984b5	Refactor, clean out stuff, add RuffyCommands interface.	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	960586b79d	ExperimentalBolusCommand: update progress when starting to programm the pump.	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	dc7dd15571	Update pref descriptions.	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	fd7f4ae145	Option to ignore TBR failures: also ignore errors when reading pump state. ... (cherry picked from commit 82052e8)	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	add3011e4b	Update pref descriptions ... (cherry picked from commit 13e358a)	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	a76fbefee8	Add pref to disable all pump comm alerts. ... (cherry picked from commit f074a5b)	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	c8c445c608	Add option to skip small TBR changes, add summaries to prefs. ... (cherry picked from commit a76b03a)	2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt	81b97b5278	Add option to ignore setting a TBR as long as it does't occur twice in a row. ... (cherry picked from commit 238e85c)	2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt	17dd6df527	Move config options to preferences. ... (cherry picked from commit 24657ed)	2017-10-17 11:27:20 +02:00
Milos Kozak	3b90d02e05	show status on Dana fragment too	2017-10-13 13:31:32 +02:00
Milos Kozak	02c57fb9a3	RS connection improvement	2017-10-13 13:17:17 +02:00
Milos Kozak	e40033dcb8	formated=false	2017-10-13 09:24:02 +02:00
Milos Kozak	bee60eb0e3	CS translations	2017-10-13 09:16:15 +02:00
AdrianLxM	f751638a7f	enabling wearcontrols from preferences	2017-10-12 18:01:10 +02:00
AdrianLxM	39b18915d0	Align LP GUI	2017-10-11 20:19:42 +02:00
AdrianLxM	e6565c1911	reuse button on profile switch	2017-10-11 00:25:44 +02:00
Milos Kozak	24099222f3	Dana R & v2 speed selection	2017-10-10 19:14:43 +02:00
Milos Kozak	d142d2e4f9	resolve RS merge conflict	2017-10-10 16:47:03 +02:00
Milos Kozak	c6392ec625	Merge remote-tracking branch 'origin/dev' into profile	2017-10-09 23:15:02 +02:00
Milos Kozak	9ec3efbaab	fix conflict	2017-10-09 23:14:46 +02:00
Milos Kozak	230dd5f0a8	Merge pull request #451 from jotomo/checkboxes-and-labels-aligned ... Overview: align checkboxes and labels vertically.	2017-10-09 23:13:16 +02:00
Johannes Mockenhaupt	e586e1389e	Overview: align checkboxes and labels vertically.	2017-10-09 22:37:50 +02:00
Johannes Mockenhaupt	62803f2a4d	Use existing string resource.	2017-10-09 21:18:55 +02:00
Johannes Mockenhaupt	70fefa9b70	NSTreatmentDialog: use same format for ES reason field as for profile.	2017-10-09 21:03:25 +02:00
Johannes Mockenhaupt	fa1c282699	Merge remote-tracking branch 'origin/dev' into smb ... * origin/dev: (28 commits) Singleton & Crashlytics logging part 2 treatments in config builder Singleton & Crashlytics logging part 1 checkboxes for NS-Client layouts overview checkboxes cutoff fix update NP value after manual entry restore preferences temp target presets Rv2 percent fix korean percent fix serialize reload of treatments getTempBasalFromHistory -> getRealTempBasalFromHistory Do not misinterpret a fake-extended as 0% temp. In one line Update danar_fragment.xml text identation Add files via upload Add files via upload Add files via upload Add files via upload ... # Conflicts: # app/build.gradle # app/src/main/java/info/nightscout/androidaps/MainApp.java	2017-10-07 21:33:22 +02:00
Milos Kozak	60086dac8d	Merge remote-tracking branch 'origin/dev' into profile	2017-10-07 18:30:55 +02:00
Milos Kozak	a54b9e52d8	Merge pull request #446 from AdrianLxM/numberpicker-update ... overview checkboxes cutoff fix	2017-10-07 18:29:56 +02:00
Milos Kozak	ef645ca600	fix merge conflict	2017-10-07 18:27:20 +02:00
AdrianLxM	046c28856c	treatments in config builder	2017-10-07 01:18:28 +02:00
AdrianLxM	10d273dac8	checkboxes for NS-Client layouts	2017-10-06 15:48:32 +02:00
AdrianLxM	333b131c1e	overview checkboxes cutoff fix	2017-10-06 13:53:55 +02:00
AdrianLxM	7f403166c7	restore preferences	2017-10-06 03:05:36 +02:00
AdrianLxM	bd93fc1adb	temp target presets	2017-10-06 02:53:23 +02:00
Milos Kozak	f08809ff9e	rename button to activate profile	2017-10-04 23:33:02 +02:00
Milos Kozak	3d58fe6bb5	cleanup	2017-10-04 23:24:56 +02:00
Milos Kozak	96edac5ddf	LocalProfile fix	2017-10-04 23:17:19 +02:00
Milos Kozak	6d08a608a2	dana layout	2017-10-03 22:37:53 +02:00
Milos Kozak	58ed0416d1	fix conflict	2017-10-03 22:33:35 +02:00
Milos Kozak	3a014949e9	remove firmware check	2017-10-03 18:45:54 +02:00
Milos Kozak	97f69c50fd	store pairing key per pump	2017-10-02 22:21:11 +02:00
Milos Kozak	8cecac0a7f	more LocalProfile work	2017-10-02 19:57:41 +02:00
Roumen Georgiev	ef803d6a41	In one line	2017-09-29 15:06:23 +03:00
Roumen Georgiev	e004b95a60	Update danar_fragment.xml	2017-09-29 09:50:07 +03:00
Roumen Georgiev	7444bc11fa	text identation	2017-09-29 09:47:29 +03:00
Roumen Georgiev	2e61bc136f	Add files via upload	2017-09-29 09:44:25 +03:00
Roumen Georgiev	3c0a509541	Add files via upload	2017-09-29 09:43:42 +03:00
Roumen Georgiev	a152f94f53	Add files via upload	2017-09-29 09:42:42 +03:00
Roumen Georgiev	cb982477cd	Add files via upload	2017-09-29 09:41:32 +03:00
Roumen Georgiev	271534a64b	Add files via upload	2017-09-29 09:40:58 +03:00
Roumen Georgiev	92e2008692	Adding button Icons	2017-09-29 09:40:11 +03:00
Milos Kozak	91b02d4d39	fill dialog refactor & code clean	2017-09-24 14:51:16 +02:00
Milos Kozak	1823cd3f24	extended bolus dialog refactor	2017-09-24 13:00:59 +02:00
Milos Kozak	082414f0d3	CPP support to profile switch	2017-09-24 10:39:54 +02:00
Milos Kozak	349b27e31a	NS profile fragment shows all profiles	2017-09-23 23:54:43 +02:00
Milos Kozak	8cd8c6b5d9	more progress logging on RS	2017-09-23 12:28:11 +02:00
Milos Kozak	1eeb1c6f7a	RS history OK	2017-09-22 14:57:23 +02:00
Johannes Mockenhaupt	ce2b1e4d10	Merge remote-tracking branch 'origin/dev' into smb ... * origin/dev: (40 commits) bump 1.53 BG & IOB contribution on by default in wizard check for NaN Revert "Rounding issues visible in nightscout insulin field" Clarified boolean logic with parentheses :) loadEvents after bolus in separate thread use notification for bolus delivery failed message when window has been destroyed fix null pointer exception Added cases to accept both a.m./p.m. and AM/PM split JSON arrays to 50 elements Update strings.xml Changed rounding to use BigDecimals to avoid noisy long doubles in output Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts." Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts. Removed unused imports Rounding fix VirtualPump: set PumpEnactResult.enacted. Use correct units for low/high from TT. Remove duplicate logging. ... # Conflicts: # app/build.gradle # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java # app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java # app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java	2017-09-20 13:02:31 +02:00
Johannes Mockenhaupt	1bd5dc3719	Merge remote-tracking branch 'origin/dev' into develop ... * origin/dev: (53 commits) bump 1.53 BG & IOB contribution on by default in wizard check for NaN Revert "Rounding issues visible in nightscout insulin field" Clarified boolean logic with parentheses :) loadEvents after bolus in separate thread use notification for bolus delivery failed message when window has been destroyed fix null pointer exception Added cases to accept both a.m./p.m. and AM/PM split JSON arrays to 50 elements Update strings.xml Changed rounding to use BigDecimals to avoid noisy long doubles in output Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts." Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts. Removed unused imports Rounding fix VirtualPump: set PumpEnactResult.enacted. Use correct units for low/high from TT. Remove duplicate logging. ... # Conflicts: # app/build.gradle # app/src/main/java/info/nightscout/androidaps/MainApp.java # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java # app/src/main/res/values/strings.xml	2017-09-18 22:54:35 +02:00
Milos Kozak	fdc3c49a2a	fix merge conflits	2017-09-18 22:03:26 +02:00
Milos Kozak	c2afa328e3	Merge branch 'dev' into tt-in-wizard	2017-09-18 20:44:54 +02:00
Milos Kozak	04994924c5	GUI tweaking, small fixes	2017-09-18 18:41:45 +02:00
Milos Kozak	7f4888978e	warn if basal step is not 0.01	2017-09-18 13:28:00 +02:00
boysim	81aadcc1be	Update strings.xml	2017-09-17 17:02:27 +02:00
Milos Kozak	08fca41b5f	partial bolus code, messages blocked by sleep :(	2017-09-14 22:53:11 +02:00
Milos Kozak	ed6cabe7fa	initial RS work	2017-09-13 00:35:03 +02:00
Johannes Mockenhaupt	627cb8e9b2	WizardDialog: don't persist state of tt checkbox, default to false. ... This assumes that a default is not useful, as it needs to be decided whether this is needed on each case (using tt when bolusing to start eating soon, but not using it when bolusing for the meal at the end of a tt).	2017-09-09 16:37:08 +02:00
Johannes Mockenhaupt	b1e3b45ce9	Add temp target to Wizard dialog ... Also, store checkboxes' state as prefereces. (cherry picked from commit 6e1c66e)	2017-09-09 16:30:17 +02:00
SMUSTAF1	1fd99a9582	changing the color of the bolus value, for visual clarify and confirmation. Reducing errors.	2017-09-05 13:29:43 +02:00
fedor apanasenko	ed8582b36a	update russian	2017-09-01 10:37:59 +03:00
Milos Kozak	46f111076f	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-08-31 22:01:25 +02:00
Milos Kozak	db952759e1	Insulin fragments consolidation	2017-08-31 22:00:45 +02:00
Radoslav Radev	e1c4074663	Update strings.xml	2017-08-31 09:09:26 +03:00
Milos Kozak	7da8b2de5c	visibility icon	2017-08-29 21:40:06 +02:00
Milos Kozak	7dfe77dc9c	single line in configbuilder	2017-08-29 19:47:32 +02:00
Milos Kozak	981a96aa16	ConfigBuilder layout	2017-08-29 17:59:46 +02:00
Milos Kozak	addd6c8232	fix conflict	2017-08-28 19:15:33 +02:00
Johannes Mockenhaupt	c8f7b535c2	Remove code to determine pump capabilities for the time being.	2017-08-27 18:45:22 +02:00
Johannes Mockenhaupt	4d2fa19ad4	Merge branch 'bolus-progress' into rework ... * bolus-progress: wip wip wip more more Remove TODOs for extended bolus. wip cancelling Initial take on bolus cancellation. Initial take on bolus progress reporting. Add alternative SetTbrCommand for pumps with different behaviour. Formatting.	2017-08-27 18:43:19 +02:00
Johannes Mockenhaupt	1d3411ba56	Show connection, execution time in combo fragment. ... (cherry picked from commit 4078c23)	2017-08-27 12:36:28 +02:00
Milos Kozak	162389a7e0	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-08-27 11:46:25 +02:00
Milos Kozak	ba967df2e3	disable careportal buttons until profile is set	2017-08-27 11:44:39 +02:00
Milos Kozak	c9bfd27d93	Merge pull request #396 from warstar2187/dev ... KR translation update	2017-08-27 00:38:44 +02:00
warstar2187	761f9f5075	Update strings.xml	2017-08-27 06:09:17 +09:00
Radoslav Radev	6bf120e9da	Update strings.xml	2017-08-26 22:59:14 +03:00
Milos Kozak	40d86eb87a	fix strings	2017-08-26 14:37:38 +02:00
Milos Kozak	6ea7549e4f	update languages	2017-08-26 12:07:37 +02:00
boysim	196e0bb309	Update strings.xml	2017-08-24 23:18:21 +02:00
Johannes Mockenhaupt	52d2b425b8	Merge remote-tracking branch 'origin/dev' into develop ... * origin/dev: (21 commits) 1.5h Don't change schema. Fix comparing non-primitives. Generify MainApp.getSpecificPlugin. Fix some warnings / simplify a bit. Remove now unused dia, insulinInterfaceId from Treatment. correct supercall Use bolusstep granularity in fill dialog bugfix: fill as invalid treatments if triggered from phone add invalid treatments to charts in "invalid" colour Use bolusstep as step for insulin correction in wizard Update strings.xml fix of fix :( small refactoring Multiply time passed instead of divide dia. Update strings.xml Fix initalizing profile with default values. moved the code of the bg update to the top before all the loop logic happens, so there would be no delay Update strings.xml Update strings.xml ...	2017-08-23 16:36:06 +02:00
Milos Kozak	e74c2b564a	fix conflicts	2017-08-22 20:25:10 +02:00
Milos Kozak	ebfc4e3075	colored predictions	2017-08-21 15:36:52 +02:00
Patrik Nilsson	c91988081f	Update strings.xml ... Updated some changes. Milos, I jjust copied the hole SV xml-file. :-)	2017-08-21 00:01:12 +02:00
Milos Kozak	466ba2907b	Merge branch 'dev' into smb	2017-08-20 21:53:19 +02:00
Milos Kozak	ab035e3949	Merge pull request #371 from diabetesdt1/patch-2 ... Update strings.xml	2017-08-20 21:44:21 +02:00
Johannes Mockenhaupt	bffcd3ceee	Merge remote-tracking branch 'origin/dev' into develop ... * origin/dev: (35 commits) fix displaying target in mmol Profile.getValuesList: don't add trailing newline. Fix some warnings. Use OK/Cancel buttons for profile removal dialog. static variables -> object variables Avoid npe if no string is assigned to the profile switch isValid implementation Show profile on tap in Treatments->ProfileSwitch Check for tempbasal not RealTempbasla Overlapping interval - regard first element on cut AcceptTempButton visible show notification on toast alarm parse 12h format properly fix index Show profile switch button in profiles set pump time only if needed restrict DIA for expectedDelta Overlappinginterfals - find first element Extract method Profile.toTargetRangeString. Simplify. ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java	2017-08-19 22:38:58 +02:00
warstar2187	36c25cbd45	Update strings.xml	2017-08-19 21:35:03 +09:00
diabetesdt1	efb9bed3fa	Update strings.xml	2017-08-17 22:21:09 +02:00
diabetesdt1	ef42193d95	Update strings.xml ... Contraints translated with "Beschränkungen" (but not in the Config-Builder -> the Option to activate/show the Contraints-Tab) objectives_*_ updated dia_too_short updated	2017-08-17 22:06:10 +02:00
Milos Kozak	c36587430c	fix merge conflict	2017-08-17 21:24:50 +02:00
Milos Kozak	ca3d94a8ca	fix merge conflict	2017-08-17 21:21:38 +02:00
Milos Kozak	73c2be5248	isValid implementation	2017-08-17 20:51:24 +02:00
Johannes Mockenhaupt	fabaf7c2ef	more	2017-08-17 19:04:43 +02:00
AdrianLxM	92077dcb6a	Show profile on tap in Treatments->ProfileSwitch	2017-08-17 17:03:08 +02:00
diabetesdt1	64446f07c5	Update strings.xml ... added more translations, but please review the Objectiv-Strings, it was not so easy, so i hope i have translated it right. Then, the most german varibles are translated.	2017-08-17 12:40:14 +02:00
Johannes Mockenhaupt	a19e49e5f8	Merge remote-tracking branch 'origin/dev' into develop ... * origin/dev: (27 commits) Check for tempbasal not RealTempbasla Overlapping interval - regard first element on cut AcceptTempButton visible show notification on toast alarm parse 12h format properly fix index Show profile switch button in profiles set pump time only if needed restrict DIA for expectedDelta Overlappinginterfals - find first element Extract method Profile.toTargetRangeString. Simplify. Overview: format target using unit specific format. Dutch language insulincurves - notification on short DIA insulincurves - forgotten string updated insulincurves - rename peak to peak time insulincurves - remove unused base fragment insulincurves - i18n insulincurves - ActivityGraph fix double plotting ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java	2017-08-17 10:08:15 +02:00
AdrianLxM	8287fe22cf	AcceptTempButton visible	2017-08-16 23:22:14 +02:00
Milos Kozak	e5cc34b975	fix merge conflict	2017-08-16 18:38:14 +02:00
AdrianLxM	63793ed358	Show profile switch button in profiles ... Shows the button to trigger a profile switch button in the profile fragments even when the pump basal cannot be written. Instead of "SEND TO PUMP" it will then show "ACTIVATE PROFILE". This has become necessary with the interval logic that needs profile switch events to happen in order to accept a new profile.	2017-08-16 17:56:57 +02:00
Milos Kozak	898e162300	initial work on SMB	2017-08-15 23:13:37 +02:00
Milos Kozak	4c490c32f7	Merge pull request #361 from MilosKozak/oref-insulincurves ... Oref Insulincurves	2017-08-15 10:13:50 +02:00
Milos Kozak	151165809e	Dutch language	2017-08-14 21:57:49 +02:00
AdrianLxM	707d5a480c	insulincurves - rename peak to peak time	2017-08-14 16:02:07 +02:00
AdrianLxM	ced1da09cf	insulincurves - i18n	2017-08-14 15:25:37 +02:00
AdrianLxM	085caddeee	insulincurves - freepeak	2017-08-14 15:24:55 +02:00
Timm Korte	882f9d7869	Merge remote-tracking branch 'milosremote/dev' into develop	2017-08-13 23:57:07 +02:00
Milos Kozak	377b711896	Merge pull request #352 from diabetesdt1/patch-1 ... Update strings.xml	2017-08-13 20:31:54 +02:00
Milos Kozak	2770e93ed4	Merge pull request #337 from RoumenGeorgiev/dev ... Alarm for StaleData	2017-08-11 18:45:52 +02:00
diabetesdt1	8cd24fd919	Update strings.xml ... Replaced "Empfindlichkeit" with "Sensitivität"	2017-08-11 13:28:39 +02:00
diabetesdt1	a69a94a384	Update strings.xml	2017-08-11 12:48:15 +02:00
diabetesdt1	15fc53530d	Update strings.xml ... Changed Nightscout to NS back (but not on the short Text). Add more Translations. Overview-Notification used and not "Popup-Notification". Removed on short Names the ". I think "treatment" = "Behandlung" sounds wrong :-|	2017-08-11 12:43:46 +02:00
diabetesdt1	0b62669079	Update strings.xml ... typo fixed	2017-08-11 07:30:53 +02:00
Milos Kozak	26fbd450b0	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into sv	2017-08-10 22:39:25 +02:00
Milos Kozak	3ca058ce60	SV language cleanup	2017-08-10 22:33:38 +02:00
diabetesdt1	d78928a264	Update strings.xml ... typo fixed and empty strings removed	2017-08-10 21:40:03 +02:00
diabetesdt1	c5b5d65efc	Update strings.xml	2017-08-10 21:29:41 +02:00
diabetesdt1	8df0ccdbb1	Update strings.xml ... rollback language-names	2017-08-10 21:28:09 +02:00
diabetesdt1	33f5e97ac6	Update strings.xml ... add more german translation and typos fixed	2017-08-10 21:12:56 +02:00
Milos Kozak	dae82d49fb	Merge remote-tracking branch 'patrik/dev' into sv	2017-08-10 16:29:42 +02:00
ellabellakaramella	0766ac812c	SV translation	2017-08-10 15:15:40 +02:00
Timm Korte	e7249bf72e	Merge remote-tracking branch 'milosremote/dev' into develop	2017-08-10 11:13:21 +02:00
Winfried Kuiper	5b43f11a3f	Update strings.xml ... Confirmation=Bestätigung statt Konfiguration (configuration)	2017-08-09 22:12:09 +02:00
Winfried Kuiper	99a0edfa06	Update strings.xml ... Missing units in german translation	2017-08-09 22:03:59 +02:00
Timm Korte	07822811ac	Merge remote-tracking branch 'milosremote/dev' into develop	2017-08-07 22:16:37 +02:00
Milos Kozak	2ae0028495	Swedish	2017-08-07 14:06:11 +02:00
RoumenGeorgiev	4f054907cb	Merge pull request #1 from MilosKozak/dev ... Dev	2017-08-07 09:17:07 +03:00
Savek-CC	d520643d45	Merge branch 'develop' into 'mainline' ... # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java	2017-08-06 22:35:07 +00:00
Milos Kozak	4e4088f164	remove unneeded strings	2017-08-05 18:47:01 +02:00
Milos Kozak	f834b3b7e0	remove unneeded texts	2017-08-05 17:43:31 +02:00
Milos Kozak	1604b85d34	Merge branch 'dev' into move-to-range-in-profile	2017-08-05 14:48:41 +02:00
Johannes Mockenhaupt	4a1684eb92	Merge remote-tracking branch 'origin/dev' into stable ... * origin/dev: remove canceltemp button from all layouts and click handling from overview fragment correct logging fix cancel real temp basals from actions color for active temp remove translated string not in default strings and add flag to cancel method Some more German Some more German Some German translations, remove unused strings, App name for all Update strings.xml CS translations hide all overview buttons by default move cancel temp to actions new temp basal dialog refactor fix virtual pump crash Disconnect pump: cancel temp before setting new to make sure it will last as expected remove notes strings as well remove notes from temp basal upload cancel current temp before activating superbolus	2017-08-05 11:02:13 +02:00
RoumenGeorgiev	714a292d78	fixed wrong pasting	2017-08-04 15:05:09 +03:00
RoumenGeorgiev	529d267b9d	Added check for staleData and notification ... with every loop	2017-08-04 12:29:48 +03:00
AdrianLxM	36e6cb8497	remove canceltemp button from all layouts and click handling from overview fragment	2017-08-03 08:22:59 +02:00
AdrianLxM	1ac1b77fd4	remove translated string not in default strings and add flag to cancel method	2017-08-03 02:01:52 +02:00
AdrianLxM	23abc0e4e5	Some more German	2017-08-02 00:08:56 +02:00
AdrianLxM	5d51b8f0f9	Some more German	2017-08-01 23:56:16 +02:00
AdrianLxM	e30e62e9ab	Some German translations, remove unused strings, App name for all	2017-08-01 23:46:58 +02:00
Radoslav Radev	39891bbad9	Update strings.xml	2017-08-01 23:29:23 +03:00
Milos Kozak	e933650330	CS translations	2017-08-01 22:17:39 +02:00
Milos Kozak	9cf5c6b6c3	hide all overview buttons by default	2017-08-01 20:52:23 +02:00
Milos Kozak	34d4bec556	move cancel temp to actions	2017-08-01 20:45:57 +02:00
Milos Kozak	9596987b35	new temp basal dialog refactor	2017-08-01 20:02:17 +02:00
Milos Kozak	6828e11dd9	remove notes strings as well	2017-08-01 17:25:43 +02:00
AdrianLxM	bfd96b0635	Merge branch 'stable' into '1_5f' ... # Conflicts: # app/src/main/res/values/strings.xml	2017-07-29 16:55:55 +00:00
AdrianLxM	2697ac9420	battery and insulinstate	2017-07-27 12:20:59 +02:00
AdrianLxM	13173e48c1	tbr capability in ComboFragment	2017-07-26 22:16:35 +02:00
AdrianLxM	76c0b999ff	determine max possible tbr firstshot	2017-07-26 18:11:45 +02:00
Milos Kozak	0914e67c11	typo	2017-07-25 19:25:58 +02:00
Milos Kozak	f1e21053b5	use key instead of string	2017-07-25 19:24:51 +02:00
Johannes Mockenhaupt	e6eee42081	Merge remote-tracking branch 'origin/dev' into combo ... * origin/dev: recategorize cp icons removed unnecessary text colour and fixed indentation layout indentation Moving some buttons to the right categories removed empty ghost files remove duplicate IDs and indentation fix Picture renaming (#311)	2017-07-24 02:25:28 +02:00
AdrianLxM	1c0e97c175	recategorize cp icons	2017-07-22 20:57:30 +02:00
AdrianLxM	2e32d12bc0	removed unnecessary text colour and fixed indentation	2017-07-22 14:34:59 +02:00
AdrianLxM	c187bf1575	layout indentation	2017-07-22 14:30:55 +02:00
Roumen Georgiev	54697df358	Moving some buttons to the right categories	2017-07-22 14:27:51 +02:00
AdrianLxM	3d4fa0cebf	remove duplicate IDs and indentation fix	2017-07-22 02:15:55 +02:00
AdrianLxM	10d27f0b6a	Picture renaming (#311) ... * adding icons	2017-07-21 22:24:06 +02:00
Johannes Mockenhaupt	3bd865a870	Merge remote-tracking branch 'origin/dev' into combo ... * origin/dev: 1.5e Let CircadianPercentageProfileFragment inherit from SubscriberFragment. Fix after merge-conflict cleanup Files renamed Added icons for home, actions and care portal screens update bg translation synchronize interval access from other classes remove unnecessary semicolons spanish emptiy string remove extra strings self asignment -> comment string comparison Add color of chart to corresponding lables/scale Update InsulinFastactingProlongedFragment.java Update InsulinFastactingFragment.java Extract SubscriberFragment base class. Have most fragments update their content in onResume.	2017-07-21 17:42:27 +02:00
Johannes Mockenhaupt	893a604ef9	Fix combo_fragment blunder.	2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt	a28efb4be0	Add "pump error (message)" as a field in Combo fragement.	2017-07-21 17:40:12 +02:00
AdrianLxM	6d1c0feeab	Merge pull request #302 from AdrianLxM/cleanups ... Cleanups	2017-07-21 16:46:48 +02:00
AdrianLxM	31fcf34a2d	Fix after merge-conflict cleanup	2017-07-21 11:59:36 +02:00
PoweRGbg	059e58c640	Files renamed	2017-07-21 11:55:12 +02:00
Milos Kozak	c68eccc328	Merge pull request #306 from boikonur/dev	2017-07-20 20:49:35 +02:00
Boyko Kazakov	3b1407b8dd	Added icons for home, actions and care portal screens	2017-07-20 20:57:45 +03:00
Radoslav Radev	3098f0bdfa	update bg translation	2017-07-20 09:24:35 +03:00
AdrianLxM	1ba11ed006	spanish emptiy string	2017-07-20 01:06:21 +02:00
AdrianLxM	b5cb68be73	remove extra strings	2017-07-20 01:06:00 +02:00
Johannes Mockenhaupt	a7c77bc177	Add "pump error (message)" as a field in Combo fragement.	2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt	8cdd604b84	Merge remote-tracking branch 'origin/dev' into combo ... * origin/dev: bulgarian removed non-translatable synchronize interval access nsclient remove debug data that puts stress on the broadcast system 3 nsclient remove debug data that puts stress on the broadcast system 2 nsclient remove debug data that puts stress on the broadcast system Align OpenAS(A)MA fragments with layout of other fragments. local broadcasts better setting title setting to disable local broadcasts in NSClient removed some "unneeded" translations wear tdd weighted wear TDD status wear menu simplification Translated latest additions strings.xml ns client quickfix now catch all NS client quickfix - catch even more catch TransactionTooLargeException TT new "old" logic for temp targets TT refactor OverlappingIntervals to two classes with an abstract superclass Intervals # Conflicts: # app/src/main/res/values/strings.xml	2017-07-19 19:54:50 +02:00
AdrianLxM	732e225c7d	bulgarian removed non-translatable	2017-07-19 19:50:40 +02:00
Milos Kozak	3475b64e1b	Merge pull request #299 from MilosKozak/dev-nsclient-quickfix ... NSClient quickfix	2017-07-19 18:53:38 +02:00
Milos Kozak	62ff62a31f	Merge pull request #290 from PoweRGbg/patch-1	2017-07-19 17:21:15 +02:00
Johannes Mockenhaupt	c95879e6ad	Align OpenAS(A)MA fragments with layout of other fragments. ... Removes a margin that makes the top elements jump up and down when flipping through tabs.	2017-07-19 12:32:18 +02:00
AdrianLxM	cfe8e0a23a	local broadcasts better setting title	2017-07-18 22:18:10 +02:00
AdrianLxM	c753873769	setting to disable local broadcasts in NSClient	2017-07-18 22:15:17 +02:00
Johannes Mockenhaupt	7fa59c6c16	Combo tab: we have set a TBR duration, we're not showing how much time is remaing, but what has been set.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	5f43f0f147	* Fix stale data in Combo tab after error ... * Add info about last command ran to the Combo tab * Don't refresh data more than once a minute. * Specify not only error, but also command that raised the error in alert notification	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	6faa1614ac	ComboFragment: rename Update Button to Refresh.	2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt	ccd81c67fd	UI for pump state.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	8dd714b390	UI crimes	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	8ecf6922f7	Misc improvements: ... * Make command execution (RuffyScripter/ComoboPlugin.runCommand) more robust (I still suck at threading). * Return all possible states in PumpState * Add absolute TBR to PumpState * Add NoOpCommand to fetch state data from pump * Display returned pump state in Combo fragment/tab.	2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt	ab9908438e	Add Combo short name.	2017-07-18 20:54:57 +02:00
Milos Kozak	253c2a34e5	combo plugin skeleton	2017-07-18 20:54:13 +02:00
PoweRGbg	c3f85faede	removed some "unneeded" translations	2017-07-18 18:10:24 +03:00
Johannes Mockenhaupt	7eacd5021c	Use target ranges from profile, rather than fixed values from prefs.	2017-07-18 13:04:15 +02:00
PoweRGbg	7216418f44	Translated latest additions strings.xml	2017-07-17 11:37:00 +03:00
Milos Kozak	26ebceb4d9	Merge pull request #288 from AdrianLxM/wear-overviewnotification	2017-07-15 16:31:45 +02:00
Boyko Kazakov	7a2db43347	Added Images for different resolutions	2017-07-15 17:03:38 +03:00
AdrianLxM	b79beda971	wear pass through overview notifications	2017-07-15 16:03:04 +02:00
AdrianLxM	39ee68e62a	cpp-watch external-function	2017-07-10 04:44:46 +02:00
Milos Kozak	0b5abae44f	fix conflict	2017-07-07 15:10:29 +02:00
Milos Kozak	8de7e05dd5	weightedaverage sensitivity	2017-07-07 15:08:21 +02:00
drnoname82	e12e4ec55e	Update strings.xml	2017-07-07 01:03:20 +02:00
Milos Kozak	7b9e5fec1e	autosens warning	2017-07-04 00:16:35 +02:00
Milos Kozak	5a27f9afa1	allow lock screen in nsclient mode	2017-07-03 00:02:54 +02:00
Milos Kozak	e9dba7136d	nsclient layout for phones	2017-07-02 11:28:03 +02:00
Milos Kozak	4d16b04acd	buttons on overview GONE before profile is loaded	2017-06-30 17:50:30 +02:00
Milos Kozak	37055cd917	allow decimal number in NumberPicker	2017-06-30 17:43:10 +02:00
Milos Kozak	09e5fdc61b	sensitivity prefs cleanup	2017-06-30 11:56:36 +02:00
Milos Kozak	96e4a25f9e	typo	2017-06-30 11:40:12 +02:00
Milos Kozak	38002be73d	check for units null	2017-06-30 10:35:05 +02:00
Milos Kozak	9e8c91319e	move ns version to about dialog	2017-06-30 09:55:47 +02:00
Milos Kozak	39c6ae5eae	fix merge conflict	2017-06-30 09:35:20 +02:00
Milos Kozak	fec4e60359	Merge pull request #269 from AdrianLxM/percentagevisualization ... visualize absolute rate emulation as percentage	2017-06-30 00:00:47 +02:00
AdrianLxM	fcab1a267b	adapt diadivisor	2017-06-29 19:39:58 +02:00
AdrianLxM	16e360f200	visualize absolute rate emulation as percentage	2017-06-29 14:14:40 +02:00
Milos Kozak	a8338b2dd1	careportal dialog number picker	2017-06-29 01:37:58 +02:00
Milos Kozak	f58f70bdca	wizard tweaking	2017-06-28 23:11:17 +02:00
Milos Kozak	491f0837c8	allow manual input in NumberPicker	2017-06-27 23:23:44 +02:00
Milos Kozak	c3876c730b	numberpicker in wizard dialog	2017-06-27 23:16:23 +02:00
Milos Kozak	4fc935f0bd	bolus dialog numberpickers	2017-06-27 19:14:32 +02:00
Milos Kozak	ef4a1feda2	numberpicker in calibration dialog	2017-06-27 17:06:23 +02:00
Milos Kozak	341b0660a8	calibration dialog cancel button	2017-06-27 15:25:11 +02:00
Milos Kozak	9fb428c128	fix conflict	2017-06-27 13:52:47 +02:00
Milos Kozak	103836717a	fix conflict	2017-06-27 13:51:45 +02:00
Milos Kozak	7b1b9c9881	dialog widths	2017-06-27 00:11:23 +02:00
Milos Kozak	dbd721319e	ns uploader status	2017-06-26 22:39:01 +02:00
Milos Kozak	47a9d4b9c8	ns pump status	2017-06-26 12:44:03 +02:00
Milos Kozak	3f641f9c30	carbs absorption settings	2017-06-25 11:16:19 +02:00
Milos Kozak	5360129e5f	sensitivity plugins	2017-06-24 11:04:09 +02:00
Milos Kozak	240f9618f5	Merge branch 'dev' into newautosens	2017-06-21 09:04:38 +02:00
Milos Kozak	3e7c4b1350	NS high & low alarms with sound	2017-06-21 07:28:04 +02:00
Milos Kozak	7f92f42923	cob on overview	2017-06-20 20:30:50 +02:00
Milos Kozak	134efb04bf	fix merge conflict	2017-06-20 20:01:09 +02:00
Milos Kozak	a3757877a3	fix landscape mode	2017-06-20 19:56:25 +02:00
Milos Kozak	80962e33d7	allow to ignore profileswitch events	2017-06-20 19:52:46 +02:00
Milos Kozak	e90812634b	work from old autosens branch	2017-06-16 14:37:43 +02:00
Milos Kozak	fb7af2f317	ns alarm setting in xml	2017-06-15 21:33:45 +02:00
Milos Kozak	43b70f9efc	loop, MA, AMA new design	2017-06-13 20:48:53 +02:00
Milos Kozak	1de64f06c2	simplify danar activities, fix profiles	2017-06-12 23:31:50 +02:00
Milos Kozak	b41a942d11	update supported NS & NSclient versions	2017-06-12 09:30:04 +02:00
Milos Kozak	77659e20e7	ns alarms & getBasal fix	2017-06-11 17:22:54 +02:00
Milos Kozak	f6650e33e4	remove test buttons	2017-06-10 22:04:59 +02:00
Milos Kozak	1153c33200	tempbasal & extendedbolus 3way sync	2017-06-08 18:15:17 +02:00
Milos Kozak	4d30ba9cdb	treatments PumpHistory and NS mark	2017-06-07 19:43:19 +02:00
Milos Kozak	17f59df597	gui tweaking, pump battery event	2017-06-06 08:21:11 +02:00
Milos Kozak	7c7638a7a1	extract color resources	2017-06-05 15:34:22 +02:00
Milos Kozak	e0a6db22a2	run rendering calculations on background	2017-06-05 15:16:07 +02:00
Milos Kozak	1702ce7702	adjusting nsclient mode	2017-06-04 00:46:44 +02:00
Milos Kozak	b40cf99201	gui tweaking	2017-06-03 22:43:35 +02:00
Milos Kozak	d365fcd6a4	fix bugs & design tweaking	2017-06-02 23:25:11 +02:00
Milos Kozak	f267c85377	it compiles now with profiles	2017-06-02 10:25:49 +02:00
Milos Kozak	b3d18b2537	disable bolus when pump is suspended	2017-05-30 18:23:07 +02:00
Milos Kozak	f5f7d28cc1	temp basal dialog design	2017-05-30 18:10:05 +02:00
Milos Kozak	3861bece54	extended bolus dialog	2017-05-30 15:07:44 +02:00
Milos Kozak	a9b251ce12	Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history	2017-05-26 10:31:46 +02:00
Milos Kozak	bb4302c02f	Merge branch 'dev' into history	2017-05-26 10:24:48 +02:00
Milos Kozak	0b8499cb7f	Merge pull request #251 from AdrianLxM/historytest1 ... lint disable 'ExtraTranslation'	2017-05-26 10:23:51 +02:00
AdrianLxM	8b81960ceb	remove unused strings from russion translation	2017-05-26 10:10:57 +02:00
Milos Kozak	650b792099	mark selected tab in treatments	2017-05-26 10:05:42 +02:00
AdrianLxM	cc4419f57a	lint ExtraTranslation	2017-05-26 10:00:41 +02:00
AdrianLxM	99b8e48031	lint ExtraTranslation	2017-05-26 09:58:38 +02:00
Milos Kozak	5fb72181ee	careportal cage, sage, iage	2017-05-25 20:18:29 +02:00
Milos Kozak	87993c6163	return functionality of faking by extended boluses	2017-05-25 17:26:05 +02:00
fedor apanasenko	4406bb3f06	Update strings.xml	2017-05-25 09:51:08 +03:00
Milos Kozak	86af9eab3d	stop extended bolus in actions	2017-05-24 20:37:58 +02:00
Milos Kozak	2ae30fe9b4	temptarget design	2017-05-24 19:42:23 +02:00
Milos Kozak	bb9c68fd4d	Merge remote-tracking branch 'origin/dev' into history	2017-05-24 19:18:30 +02:00
Milos Kozak	f936580734	Russsian language	2017-05-24 18:46:19 +02:00
Milos Kozak	5208f23661	Temptargets under treatments	2017-05-23 23:56:53 +02:00
Milos Kozak	771fbdc303	sync of treatments, tempbasals, extended tested and working	2017-05-23 22:59:06 +02:00
Milos Kozak	8db1bd5ae5	tempbasal ns sync	2017-05-23 20:15:14 +02:00
Milos Kozak	6394421017	boluses working	2017-05-22 22:10:56 +02:00
Milos Kozak	6cd046459a	original treatmens plugin removed, temp basals working	2017-05-22 20:58:05 +02:00
Milos Kozak	3330c6a3fd	Merge branch 'dev' into history	2017-05-21 16:46:13 +02:00
Milos Kozak	462849af12	russian language entry	2017-05-21 10:06:34 +02:00
Milos Kozak	56d54a6988	italian language	2017-05-20 20:41:23 +02:00
Milos Kozak	8c5ce7290d	more work on treatments fragment	2017-05-16 17:48:58 +02:00
Milos Kozak	3ee9bf5ff7	Merge branch 'dev' into history	2017-05-16 15:15:32 +02:00
Milos Kozak	86c975e9d6	Add Italian language	2017-05-16 13:39:24 +02:00
Milos Kozak	45477f96ee	Merge pull request #243 from AdrianLxM/xdripstatusline ... basal and bolus step in DanaR Fragment	2017-05-16 13:28:39 +02:00
AdrianLxM	572e726678	basal and bolus step in DanaR Fragment	2017-05-16 13:10:02 +02:00
Milos Kozak	6fff6f63a4	bolus dialog redesign	2017-05-16 12:09:32 +02:00
Milos Kozak	4201709e2a	finish careportal dialog redesign	2017-05-16 11:47:33 +02:00
Milos Kozak	704ad383e9	careportal layout part1	2017-05-15 21:10:43 +02:00
Milos Kozak	25110cfea4	move database actions from pump to treatments plugin	2017-05-15 18:44:40 +02:00
Milos Kozak	c6830baf8f	Merge branch 'dev' into history	2017-05-12 16:35:07 +02:00
Milos Kozak	abdc1022bf	merge bolus & basal into one plugin	2017-05-12 16:27:33 +02:00
AdrianLxM	a60afbceb9	typo	2017-05-12 16:08:48 +02:00
AdrianLxM	a9e093ad0d	some German translations	2017-05-12 16:06:14 +02:00
AdrianLxM	c88b8eaa9a	make buttons scrollable for small heights	2017-05-12 15:26:16 +02:00
Milos Kozak	e005d6bd69	Merge branch 'dev' into history	2017-05-12 13:05:57 +02:00
Milos Kozak	df424ea5ff	overview buttons	2017-05-12 11:06:33 +02:00
Milos Kozak	b782a5b8dc	Merge branch 'dev' into history	2017-05-12 00:39:20 +02:00
Milos Kozak	a0d31b2118	rename identical functions	2017-05-11 18:54:50 +02:00
Radoslav Radev	d58ddf48c6	Update strings.xml	2017-05-11 17:01:49 +03:00
Milos Kozak	7e99ce416a	move buttons back to bottom	2017-05-11 10:59:05 +02:00
Milos Kozak	6b9048cd61	Merge pull request #234 from warstar2187/korean ... Korean translation update	2017-05-11 09:27:58 +02:00
Milos Kozak	51d52f6b3d	Merge branch 'DanaRv2' into history	2017-05-10 21:53:31 +02:00
Milos Kozak	5b25d28f42	Merge branch 'dev' into DanaRv2	2017-05-10 14:05:43 +02:00
AdrianLxM	298d7a7d9c	Merge branch 'dev' into xdripstatusline	2017-05-09 23:26:31 +02:00
AdrianLxM	1fa3a2a697	bgi on watch status (optional)	2017-05-09 23:23:37 +02:00
Milos Kozak	d313df0d19	removing treatments	2017-05-09 20:47:02 +02:00
Milos Kozak	554fb51a75	profile layout	2017-05-09 19:06:59 +02:00
Milos Kozak	84a6554e07	smaller font size on careportal buttons	2017-05-09 18:36:13 +02:00
Milos Kozak	09fea02ed2	Allow to disable NS upload while client is connected	2017-05-09 16:24:53 +02:00
Milos Kozak	b30d79c4cb	fix conflicts	2017-05-09 10:46:04 +02:00
Milos Kozak	0048366dcf	fix conflict	2017-05-09 10:14:21 +02:00
Milos Kozak	8d3be5e958	colors on danar fragment	2017-05-08 23:19:11 +02:00
AdrianLxM	67f21537ea	send status to xDrip	2017-05-06 15:18:19 +02:00
Milos Kozak	05d9f16031	hide label too	2017-05-04 23:22:16 +02:00
Milos Kozak	344144d88a	pump status equal size	2017-05-04 21:11:51 +02:00
Milos Kozak	aabcee8ea7	fix conflicts	2017-05-04 19:53:45 +02:00
Milos Kozak	352a2a7475	deviations graph	2017-05-04 19:51:58 +02:00
Milos Kozak	070867af28	menu on top	2017-05-04 19:13:56 +02:00
Milos Kozak	289ad394ce	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-05-03 22:30:12 +02:00
Milos Kozak	6d5f2514d0	remove duplicated string	2017-05-03 18:45:29 +02:00
Milos Kozak	573256d7d4	catch missing sms permission	2017-05-03 18:30:18 +02:00
Milos Kozak	602310b70a	DanaRv2 1st rev	2017-05-02 17:02:30 +02:00
AdrianLxM	9cef4c5a01	typo insuin->insulin	2017-05-01 18:09:53 +02:00
AdrianLxM	0069f320f8	config builder smallscreen	2017-04-30 21:57:55 +02:00
AdrianLxM	5dc07012d2	overview smallscreen	2017-04-30 21:34:30 +02:00
Milos Kozak	0f1c2bb193	DanaRv2 1st rev	2017-04-30 21:08:00 +02:00
AdrianLxM	d8fb53de69	Making dialogs scrollable	2017-04-30 20:54:35 +02:00
Milos Kozak	3279c297dc	equal weight	2017-04-30 13:22:16 +02:00
Milos Kozak	2cb6e275c0	allign design of status pills	2017-04-30 13:17:59 +02:00
Milos Kozak	4dd9281276	remove actionbar	2017-04-29 20:16:50 +02:00
Milos Kozak	974e5e0098	pump fragment redesign	2017-04-29 18:11:15 +02:00
Milos Kozak	f641d40722	virtual pump layout	2017-04-29 17:48:45 +02:00
Milos Kozak	3552d6aa40	bg value colored	2017-04-27 21:26:53 +02:00
Milos Kozak	5ef034b4fc	cob display	2017-04-26 23:45:40 +02:00
warstar2187	dac969b381	Update strings.xml	2017-04-25 10:14:06 +09:00
Milos Kozak	7534f54f19	trend in wizard off by default	2017-04-24 19:24:53 +02:00
Milos Kozak	a07a8755b1	IOB graph	2017-04-24 13:17:14 +02:00
Milos Kozak	b8a8bed6c5	remove butterknife at all, remove unused code, overview graph optimalization	2017-04-23 13:45:49 +02:00
Milos Kozak	1f2967e866	superbolus must be explicitly enabled	2017-04-22 11:08:57 +02:00
Milos Kozak	3b34e55fda	CS translations	2017-04-22 10:21:24 +02:00
Milos Kozak	20f99dffe2	basals rendering redesign	2017-04-22 10:09:54 +02:00
Milos Kozak	55a2df470e	insulin activity graph	2017-04-21 18:34:40 +02:00
Milos Kozak	7f122f7497	show dia in insulin plugin	2017-04-21 16:13:53 +02:00
Milos Kozak	90a55966b1	Fast Acting Insulin Prolonged	2017-04-21 15:36:49 +02:00
Milos Kozak	17771434aa	upgrade travis & plugin packages	2017-04-21 12:15:08 +02:00
Milos Kozak	25491fbac6	Insulin interface	2017-04-21 11:45:25 +02:00
Milos Kozak	04ae55ac63	exit app after import settings	2017-04-16 13:27:01 +02:00
Milos Kozak	402768cb87	1.33 app start logging optional	2017-04-14 15:33:39 +02:00
Milos Kozak	2413fae0a9	1.32 superbolus & trend contribution in wizard	2017-04-14 14:50:18 +02:00
Milos Kozak	387defbfc7	fix sms pref key	2017-04-09 21:50:05 +02:00
Radoslav Radev	5fe22eac65	Update strings.xml	2017-04-07 13:53:47 +03:00
Milos Kozak	c5245ae5fd	SMS suspend/resume loop	2017-04-06 21:22:27 +02:00
Milos Kozak	a02da220c9	CS translations	2017-04-05 22:04:55 +02:00
Milos Kozak	f596050239	loop suspend menu	2017-04-05 21:39:39 +02:00
Milos Kozak	d6f31820d9	request battery optimalization whitelisting	2017-03-31 09:21:40 +02:00
Milos Kozak	a4f302ee4a	show if pump is suspended	2017-03-24 12:05:12 +01:00
Milos Kozak	e8edf9eb54	Glimp support	2017-03-21 19:11:39 +01:00
warstar2187	242428e2cb	Update strings.xml	2017-03-09 04:20:40 +09:00
Radoslav Radev	3b129dc7f6	Update strings.xml	2017-03-05 15:58:37 +02:00
Radoslav Radev	a0f2e4f663	Update strings.xml	2017-03-05 15:42:01 +02:00
Radoslav Radev	54f376330a	Update strings.xml	2017-03-05 15:28:20 +02:00
Milos Kozak	de9dbf9243	CS translations	2017-03-04 20:55:13 +01:00
Milos Kozak	e25fb9845d	hide unneeded labels in nsclient mode	2017-02-23 23:32:26 +01:00
Milos Kozak	b0c828c93e	nsclient build variant	2017-02-23 20:00:33 +01:00
Milos Kozak	15d6de4701	age from product flavor to prefs	2017-02-22 20:29:41 +01:00
Milos Kozak	87ad140eb5	SMS logging and resource refactor	2017-02-22 14:11:05 +01:00
Milos Kozak	34ed92f8aa	fix displaying delta when not available	2017-02-21 10:00:08 +01:00
AdrianLxM	98edfc57e0	dismiss bolus progress via events	2017-02-20 14:49:38 +01:00
AdrianLxM	686e16de8d	scrollview match parent in width	2017-02-20 13:31:47 +01:00
AdrianLxM	1f464bdae0	Merge remote-tracking branch 'milosremote/dev' into adridev	2017-02-20 13:11:35 +01:00
AdrianLxM	18e2dcffcf	make things scrollable	2017-02-20 13:10:07 +01:00
Milos Kozak	6200584268	hours to fetch fixed	2017-02-20 09:46:55 +01:00
Milos Kozak	5f4eb1e4c4	pump status tweaking	2017-02-19 19:15:14 +01:00
Milos Kozak	9303bd61fd	Merge branch 'dev' into nsclient	2017-02-19 09:41:16 +01:00
AdrianLxM	d113d39916	wear setting to show detailed IOB	2017-02-18 18:13:13 +01:00
Milos Kozak	5d795fbe33	Merge branch 'dev' into nsclient	2017-02-17 22:26:02 +01:00
Milos Kozak	29b4f0063b	better handling readonly permission	2017-02-17 22:12:35 +01:00
Milos Kozak	14e37246c2	nsclient gui and pausing tweaking	2017-02-17 18:14:33 +01:00
Milos Kozak	31364ff07b	ignore dbaccess if nsclient not enabled	2017-02-17 16:41:28 +01:00
Milos Kozak	8a374f1b35	Shared preferences cleanup	2017-02-17 16:16:20 +01:00
Milos Kozak	3216ff636a	preference keys to strings	2017-02-17 13:43:17 +01:00
Milos Kozak	71112a90e2	internal nsclient	2017-02-17 13:18:36 +01:00
Radoslav Radev	09880f029a	Update strings.xml	2017-02-16 16:46:47 +02:00
Milos Kozak	dda95dc275	allow to remove treatments from GUI	2017-02-14 21:13:13 +01:00
Milos Kozak	a75c62be35	show notification when aproaching daily limit	2017-02-14 19:47:45 +01:00
Milos Kozak	2e4aec9916	settings password protected	2017-02-14 19:16:34 +01:00
Milos Kozak	8001796f4b	virtual pump status upload optional	2017-02-14 15:41:30 +01:00
Milos Kozak	e00045155e	prefill bg value in careportal dialog	2017-02-14 15:09:22 +01:00
Milos Kozak	f9ee3c547a	translations	2017-02-13 21:05:57 +01:00
Milos Kozak	c6b3fe9883	Merge pull request #178 from AdrianLxM/wear-bolus5 ... Wear Bolus	2017-02-13 18:13:36 +01:00
Milos Kozak	e003ef8368	Merge pull request #175 from LadyViktoria/dev ... use validation lib in cpp - layout fixes & longer snackbar duration	2017-02-12 22:29:20 +01:00
Milos Kozak	f6ae267bb5	CS translations	2017-02-12 22:28:42 +01:00
Milos Kozak	1f3aee091e	manual invoke of loop in separate thread	2017-02-12 22:02:42 +01:00
viktoria	ba254f8829	Merged branch dev into dev	2017-02-12 20:01:25 +01:00
viktoria	0d02f42714	use validation lib in cpp - layout fixes & longer snackbar duration	2017-02-12 19:51:56 +01:00
Milos Kozak	4e3cc65d5d	handling pump suspend, show pump actions on overview	2017-02-12 19:51:13 +01:00
Milos Kozak	351a624b83	small string change	2017-02-12 13:48:03 +01:00
Milos Kozak	dc85bc26fc	typo	2017-02-12 13:45:08 +01:00
AdrianLxM	5e96124a2d	mmol/l fix	2017-02-11 22:27:04 +01:00
AdrianLxM	2e6d754c86	mmol/l fix	2017-02-11 22:26:16 +01:00
AdrianLxM	1f5dd4750a	CPP dismiss info when focus is lost	2017-02-11 22:20:29 +01:00
AdrianLxM	6c5028b4be	CPP dismiss info when focus is lost	2017-02-11 22:18:28 +01:00
AdrianLxM	104c146b2f	Merge pull request #63 from AdrianLxM/patch-16 ... LadyViktoria validation lib plus safety	2017-02-11 21:12:22 +01:00
AdrianLxM	638b9c263c	Merge pull request #61 from MilosKozak/dev ... Dev	2017-02-11 02:55:14 +01:00
viktoria	7877235972	Merged branch dev into dev	2017-02-11 00:16:55 +01:00
viktoria	279c67bb70	use validation lib in cpp - add snackbar	2017-02-11 00:16:25 +01:00
Milos Kozak	40d166cb7d	CS translations	2017-02-10 21:39:51 +01:00
Milos Kozak	2e40c7b605	sms calibrations	2017-02-10 21:20:55 +01:00
LadyViktoria	48a158b036	use validation lib in cpp - better event handling	2017-02-10 17:29:59 +01:00
Milos Kozak	8db3f258cd	xdrip calibration	2017-02-10 16:53:39 +01:00
LadyViktoria	80de9c0cd8	use validation lib in cpp	2017-02-10 11:34:05 +01:00
LadyViktoria	4857259eda	ko translation	2017-02-10 07:59:26 +01:00
AdrianLxM	8ece312b6a	Merge pull request #60 from MilosKozak/dev ... Dev	2017-02-09 23:47:12 +01:00
Milos Kozak	715d15b51f	CS translations	2017-02-09 22:44:42 +01:00
Milos Kozak	90061c6f25	Show log	2017-02-09 22:29:21 +01:00
Milos Kozak	ed7dd48612	remove TODOs	2017-02-09 20:18:22 +01:00
Milos Kozak	8a2846c516	Merge branch 'dev' into dev	2017-02-09 17:01:05 +01:00
Milos Kozak	7f123e4208	warn on wrong entered sms phone number	2017-02-09 16:14:09 +01:00
LadyViktoria	7fc6de17c1	Add prefernces.json changes 2	2017-02-09 10:41:02 +01:00
LadyViktoria	886c1ea359	Add prefernces.json changes	2017-02-09 09:36:51 +01:00
AdrianLxM	bf7a96b3e7	bolus progress dialog without activity context	2017-02-09 03:15:13 +01:00
AdrianLxM	650111d1b7	wear event for bolus requests to show card early on	2017-02-07 11:09:16 +01:00
viktoria	b0a9d74b49	Merge remote-tracking branch 'refs/remotes/MilosKozak/dev' ... Conflicts: app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/Autosens.java app/src/main/res/values/strings.xml	2017-02-02 19:00:17 +01:00
AdrianLxM	bd75015a58	Correct error for tempbasals	2017-02-01 14:38:55 +01:00
LadyViktoria	1f3b425c44	Remove careportal_temptarget string	2017-01-31 20:28:32 +01:00
Milos Kozak	762b561abb	CS translations	2017-01-29 21:15:05 +01:00
Milos Kozak	d6a22be184	remove absorption rate from everywhere	2017-01-29 20:19:02 +01:00
viktoria	75ff6867bc	Add prefernces.json make settings work with validator lib	2017-01-29 13:00:52 +01:00
Milos Kozak	3f90ad6a5c	sync profile to pump	2017-01-28 23:45:14 +01:00
viktoria	c64d45b758	Merged MilosKozak/dev into dev ... Conflicts: app/src/main/res/values/strings.xml	2017-01-28 22:35:54 +01:00
Milos Kozak	b9b9e21dcb	fix merge conflicts	2017-01-28 21:37:51 +01:00
Milos Kozak	538e8fd2fa	better detect & display old pump firmware	2017-01-28 20:48:32 +01:00
LadyViktoria	4d4630ca1a	Add prefernces.json rename some Strings to match OpenAPS docs	2017-01-27 09:56:32 +01:00
LadyViktoria	f510b0a8cc	Add prefernces.json errer message translations ... attention the characters are limited. maybe its caused by old libs com.android.support:appcompat-v7:23.4.0 'com.android.support:support-v4:23.4.0	2017-01-27 09:52:16 +01:00
LadyViktoria	1d2f98abf4	Add prefernces.json remove openapsama_skip_neutral_temps	2017-01-26 15:32:44 +01:00
LadyViktoria	4702a87d8e	Add prefernces.json add safety limits	2017-01-26 12:07:25 +01:00
viktoria	2f8b2a382d	Merged branch dev into dev	2017-01-26 00:39:28 +01:00
viktoria	74cfa08b81	Change some Prefernces names to match names in OpenAPS docs	2017-01-26 00:35:46 +01:00
Heiner1	5c43c66163	Update strings.xml	2017-01-25 23:35:31 +01:00
viktoria	88d6178a1b	Add prefernces.json small fix	2017-01-25 22:20:56 +01:00
viktoria	9d2b645d8c	Add prefernces.json default values	2017-01-25 22:11:17 +01:00
viktoria	fd6432f808	Add prefernces.json put hyperlink and warning there	2017-01-25 20:41:33 +01:00
viktoria	8e095fefaf	Add prefernces.json layout changes	2017-01-25 20:20:39 +01:00
viktoria	0838ede6a3	Add prefernces.json change secondary text color to white	2017-01-25 20:19:53 +01:00
LadyViktoria	b898fc044e	Add prefernces.json to advanced settings	2017-01-25 15:18:01 +01:00
Milos Kozak	044547b594	Merge pull request #143 from AdrianLxM/deltasx ... Settings for deltas	2017-01-24 10:59:10 +01:00
AdrianLxM	950b638e50	Advanced Settings	2017-01-24 10:28:42 +01:00
AdrianLxM	3a43858948	Settings for deltas	2017-01-24 02:21:25 +01:00
viktoria	bd588af1ba	DanaR Stats small Layout fixes	2017-01-23 21:52:24 +01:00
Milos Kozak	da2739f7b7	Merge pull request #140 from PitBeckh/patch-1 ... Update strings.xml	2017-01-23 20:23:30 +01:00
PitBeckh	dc12ef3fec	Update strings.xml	2017-01-23 16:26:59 +01:00
PitBeckh	2f72471915	Update strings.xml	2017-01-23 16:24:53 +01:00
Radoslav Radev	fbceeec5b0	Update strings.xml	2017-01-23 11:01:42 +02:00
Radoslav Radev	106bfe4f1c	Update strings.xml	2017-01-23 07:14:12 +02:00
Radoslav Radev	2d02449a87	Update strings.xml	2017-01-22 21:44:49 +02:00
PitBeckh	d995910384	Update strings.xml	2017-01-22 20:34:54 +01:00
Milos Kozak	ceaf4f7f78	Merge branch 'dev' into adjusttargetsse	2017-01-22 11:30:59 +01:00
ecorman	24b86a0b99	Update: Perfil->Objetivo	2017-01-22 00:07:10 +01:00
AdrianLxM	f418152059	sorten tab titles active	2017-01-21 23:48:05 +01:00
ecorman	3a2549d0b6	Update Spanish Translation	2017-01-21 23:08:23 +01:00
AdrianLxM	ea78dd5bc1	Shorten tabs first	2017-01-21 19:44:58 +01:00
Milos Kozak	404a4de916	Merge pull request #136 from AdrianLxM/adjusttargetsse ... Preference Switches for Autosens	2017-01-21 11:22:34 +01:00
Milos Kozak	53f9b30b3e	temp target display update	2017-01-21 11:22:03 +01:00
AdrianLxM	50b7e619fc	Preference switches for Autosens	2017-01-21 01:35:15 +01:00
Milos Kozak	ea37d9eaa8	Merge pull request #131 from AdrianLxM/tempt-pill ... Tempt pill	2017-01-21 00:11:07 +01:00
viktoria	33bb7d80a6	DanaR Stats small fixes and move Listeners	2017-01-20 16:45:01 +01:00
viktoria	722976f6b0	DanaR Stats beautify layout and add some listeners	2017-01-20 14:51:16 +01:00
viktoria	2d966c9feb	DanaR Stats some improvements	2017-01-20 03:13:41 +01:00
AdrianLxM	88a1dcde51	remove empty language translation	2017-01-19 21:32:09 +01:00
AdrianLxM	0c11f78ed3	cleanup after merge	2017-01-19 21:15:08 +01:00
LadyViktoria	1597f74bd0	Merge branch 'dev' into danarstats	2017-01-19 20:52:01 +01:00
AdrianLxM	6c3a07cc62	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into MilosKozak-dev	2017-01-19 20:47:53 +01:00
Milos Kozak	2754e23c08	CS translations	2017-01-19 19:52:14 +01:00
Milos Kozak	c701b5d125	waiting for pump message	2017-01-19 19:21:25 +01:00
Milos Kozak	f8feaf565b	show how is value hard limited	2017-01-19 18:40:08 +01:00
viktoria	b70e895b95	DanaR Stats fixes	2017-01-18 04:31:47 +01:00
viktoria	9ba24b4ffd	DanaR Stats Beautify	2017-01-18 03:08:19 +01:00
viktoria	678fbedcbf	Merge branch 'dev' ... Conflicts: app/src/main/res/values/strings.xml	2017-01-18 03:03:58 +01:00
AdrianLxM	d36a515d45	temp target overview	2017-01-17 21:32:30 +01:00
Milos Kozak	0e21b67a42	fix merge conflicts	2017-01-17 18:00:44 +01:00
Milos Kozak	432c937a46	Merge branch 'dev' into AMA	2017-01-17 17:49:21 +01:00
Milos Kozak	08c078466a	Merge pull request #127 from MilosKozak/temptarget ... Temptarget	2017-01-17 17:47:14 +01:00
Milos Kozak	7c90dfe03c	confirm dialog on removing temptarget	2017-01-16 23:54:46 +01:00
Milos Kozak	218190e92f	support for removing temp targets from GUI	2017-01-16 23:23:20 +01:00
Milos Kozak	eaa16402a7	show running temp target on overview	2017-01-16 20:47:57 +01:00
Milos Kozak	61b1ee781f	temp target treatment dialog & sync fix	2017-01-16 16:59:12 +01:00
viktoria	e851d15aff	DanaR Stats Activity	2017-01-16 13:23:41 +01:00
Milos Kozak	262dae3ab3	Merge pull request #129 from slavidex/patch-26 ... Update pref_others.xml	2017-01-14 16:37:57 +01:00
Milos Kozak	61a8cad4e8	allow refrest temp targets from NS & fix bugs	2017-01-14 16:36:42 +01:00
Radoslav Radev	8f0a28419d	Update pref_others.xml	2017-01-14 15:25:06 +02:00
Radoslav Radev	cbd7aa74eb	Update strings.xml	2017-01-14 15:21:47 +02:00
Milos Kozak	458bee4538	display temptargets	2017-01-13 23:43:17 +01:00
Milos Kozak	1b53cde2bf	plain temptarget plugin	2017-01-13 21:14:04 +01:00
Milos Kozak	ea15659050	Merge pull request #122 from AdrianLxM/patch-11 ... Typo German (Ereignis with one s)	2017-01-10 08:30:29 +01:00
AdrianLxM	dfc176d1bd	Typo German (Ereignis with one s)	2017-01-10 02:39:16 +01:00
AdrianLxM	856c025e2b	typo spanish	2017-01-10 02:37:20 +01:00
Milos Kozak	74afdb6874	Merge branch 'dev' into AMA	2017-01-09 17:34:49 +01:00
Milos Kozak	26a76217bf	Greek language	2017-01-09 17:23:56 +01:00
Milos Kozak	e9b900d74a	show predictions in graph	2017-01-08 23:10:27 +01:00
Milos Kozak	68a127d804	make autosens configurable in settings, determinebasaladapter refactoring	2017-01-08 14:21:29 +01:00
Milos Kozak	e71b478941	show both deltas on overview	2017-01-08 12:04:42 +01:00
Milos Kozak	6621c2f610	log script debug in fragment	2017-01-08 00:27:13 +01:00
Milos Kozak	9c93d3ad7d	log autosens input data in fragment	2017-01-08 00:07:18 +01:00
Milos Kozak	25a3b678e9	most new AMA code added	2017-01-06 22:42:37 +01:00
Milos Kozak	3dfac49b82	duplicate MA -> AMA	2017-01-03 21:15:40 +01:00
viktoria	f3551dda7f	german translation	2017-01-02 16:44:20 +01:00
Milos Kozak	952a2342a8	Merge pull request #104 from MilosKozak/mm640g ... MM640g bg source	2017-01-02 13:58:56 +01:00
Milos Kozak	4408146f23	disable entering basals in profiles only if pump is not tempbasal capable	2017-01-01 14:34:57 +01:00
Milos Kozak	ef2e7b1a62	show basal line only if pump is tempbasal capable	2017-01-01 14:19:35 +01:00
Milos Kozak	38a9c94258	Local Profile	2016-12-31 20:10:36 +01:00
Milos Kozak	6b18336fa2	LocalProfile plugin	2016-12-31 15:06:45 +01:00
Milos Kozak	2e6c168adc	TimeListEdit most work done	2016-12-31 13:11:32 +01:00
Milos Kozak	e1c2e4c492	TimeListEdit initial work	2016-12-30 16:43:43 +01:00
Milos Kozak	b2be49e631	simple profile layout	2016-12-29 22:40:30 +01:00
Milos Kozak	1e99c00626	allow sms string to be translated separately	2016-12-29 16:22:40 +01:00
Milos Kozak	8e46a55e48	allow better translation of min ago	2016-12-29 16:06:00 +01:00
Milos Kozak	0059266791	loop status font size	2016-12-29 14:23:05 +01:00
Milos Kozak	24c5bb9303	Merge branch 'master' into mm640g	2016-12-29 14:01:24 +01:00
Milos Kozak	83f4dbf9ca	Merge pull request #103 from AdrianLxM/patch-8 ... remove mm640g translation again	2016-12-29 13:51:24 +01:00
Milos Kozak	c06d25b235	more rearrangements	2016-12-29 00:12:52 +01:00
Milos Kozak	f127e7bec1	better allign bg arrows	2016-12-28 23:48:43 +01:00
AdrianLxM	834398b8f0	remove mm640g translation again	2016-12-28 23:31:02 +01:00
AdrianLxM	d70c9673d5	average delta	2016-12-28 22:39:40 +01:00
Milos Kozak	d2d3e024a2	Merge branch 'ongoingnotif' of https://github.com/AdrianLxM/AndroidAPS	2016-12-28 15:15:24 +01:00
Milos Kozak	e2c2f49f6f	MM640g bg source	2016-12-28 14:57:11 +01:00
Radoslav Radev	71461e38ca	Update strings.xml	2016-12-28 12:17:17 +02:00
warstar2187	804cdba7cf	Update strings.xml	2016-12-28 18:22:50 +09:00
AdrianLxM	6ac889cecd	ongoing notification integration	2016-12-28 00:03:08 +01:00
AdrianLxM	d597be71de	ongoing notification	2016-12-27 23:39:16 +01:00
Milos Kozak	405ae28e38	cz translations	2016-12-27 23:39:00 +01:00
Milos Kozak	29327aef01	MDI pump driver	2016-12-27 23:35:50 +01:00
Milos Kozak	fdb252b62d	show direction next to BG	2016-12-27 20:41:28 +01:00
Milos Kozak	cd41bff2bb	SMS command BG	2016-12-27 12:17:26 +01:00
Milos Kozak	3bd7568d34	dismiss button not hardcoded	2016-12-24 23:56:47 +01:00
Milos Kozak	052ac47595	Better profile handling	2016-12-24 23:53:17 +01:00
Milos Kozak	2b0c74c56f	CZ translations	2016-12-24 14:21:24 +01:00
Milos Kozak	7719e2ac63	use notifications for profile update	2016-12-22 12:17:38 +01:00
Milos Kozak	cb4330ddcd	notify when pump settings is wrong	2016-12-13 22:10:13 +01:00
AdrianLxM	e1dc624a47	fully remove mm640g	2016-12-10 22:58:31 +01:00
Milos Kozak	6ba532d178	notify about setting basal profile	2016-12-09 16:04:07 +01:00
Milos Kozak	4103e4bf4a	allow set profile to pump from simpleprofile plugin	2016-12-09 12:40:15 +01:00
Milos Kozak	be8003da4b	Merge branch 'master' into koreandanar	2016-12-06 23:18:02 +01:00
Milos Kozak	0af894aa56	change info color to green	2016-12-06 22:57:49 +01:00
Milos Kozak	abfb832a10	basic notification functionality	2016-12-05 15:20:44 +01:00
Milos Kozak	4b389c2cad	dana drivers switching working	2016-12-03 17:42:08 +01:00
Milos Kozak	db2fd55f7c	copy files for Korean DanaR	2016-11-29 20:52:40 +01:00
Milos Kozak	97a22344e3	CZ translations	2016-11-29 19:07:09 +01:00
Milos Kozak	36d5f1dc29	proper danar errors detection	2016-11-29 18:28:36 +01:00
AdrianLxM	896503918c	wear extract strings	2016-11-29 15:01:00 +01:00
AdrianLxM	1eacf35e47	Merge pull request #25 from AdrianLxM/wear-prepare-final ... wear merge current master	2016-11-29 13:17:21 +01:00
Milos Kozak	ee408ada79	Merge pull request #80 from warstar2187/master ... Fix Insulin Activity and Korean update	2016-11-29 07:44:58 +01:00
Milos Kozak	2912d1cce1	Merge pull request #79 from AdrianLxM/viktoria-permissions ... Viktoria permissions	2016-11-28 19:02:28 +01:00
LadyViktoria	39be1bb4c7	Android 6+ Permissions #6	2016-11-25 13:35:34 +01:00
LadyViktoria	1967602c70	Android 6+ Permissions #3	2016-11-25 13:32:07 +01:00
AdrianLxM	12e78656b7	wear settings	2016-11-24 16:23:31 +01:00
AdrianLxM	c633904e8c	wear fragment and reset button	2016-11-24 16:23:31 +01:00
ecorman	da861a7108	Note basal start / end to see note in Xdrip+ with data	2016-11-23 23:59:11 +01:00
Radoslav Radev	8b5ee91c95	Update strings.xml	2016-11-17 22:40:51 +02:00
Radoslav Radev	56c83aac2f	bg translation ... 1	2016-11-17 22:12:19 +02:00
AdrianLxM	513b2966c9	CPP cleanup and i18n	2016-11-14 18:19:17 +01:00
AdrianLxM	74ea6c4011	CPP working	2016-11-14 18:19:17 +01:00
AdrianLxM	c2d1fdb39e	CPP edit base basal gui - without function yet	2016-11-14 18:19:17 +01:00
AdrianLxM	dba81ede2a	calculation for isf and ic. Tooltips.	2016-11-14 18:19:17 +01:00
AdrianLxM	3fe7c7a0fa	CPP shiftfix and base profile view	2016-11-14 18:19:17 +01:00
AdrianLxM	2c5b20a721	CPP html-ify and send to pump button	2016-11-14 18:19:17 +01:00
AdrianLxM	a57a864c24	CPP icons	2016-11-14 18:19:17 +01:00
AdrianLxM	4dbb20b8c5	CPP small redesign	2016-11-14 18:19:17 +01:00
AdrianLxM	f815f7fce6	CPP ic and isf data	2016-11-14 18:19:17 +01:00
AdrianLxM	8c93925865	CPP simple representation string	2016-11-14 18:19:17 +01:00
AdrianLxM	364b3d6710	CPP percentage and shift working on hard coded basal rate	2016-11-14 18:19:17 +01:00
AdrianLxM	be556cf388	CPP copy simple profile	2016-11-14 18:19:17 +01:00
AdrianLxM	d94136bc95	overview dymanic height	2016-11-12 20:39:11 +01:00
warstar2187	2365dbac86	Update strings.xml	2016-11-13 01:54:28 +09:00
Milos Kozak	0b56b7554c	Merge pull request #64 from AdrianLxM/fill-presets2 ... Fill presets	2016-11-12 10:41:54 +01:00
Milos Kozak	dce6acba54	Merge pull request #65 from AdrianLxM/german-update ... German update	2016-11-12 10:28:01 +01:00
AdrianLxM	2fef497ce9	German updates 02	2016-11-11 17:59:23 +01:00
AdrianLxM	75889c24b3	German updates 01	2016-11-11 17:59:10 +01:00
AdrianLxM	1568f77229	fill preset buttons	2016-11-11 16:24:00 +01:00
warstar2187	2d54a068ad	Update strings.xml	2016-11-11 23:07:32 +09:00
Milos Kozak	c034f77b71	fix merge conflict 2	2016-11-11 13:09:50 +01:00
Milos Kozak	a341fa4343	fix merge conflict	2016-11-11 13:09:11 +01:00
AdrianLxM	a6d5d68938	fill action	2016-11-11 00:56:15 +01:00
Milos Kozak	e8d169f078	allow automated actions only whem pump is initialized	2016-11-10 23:33:12 +01:00
AdrianLxM	7b4b4f7cfc	Overview profile redesign	2016-11-10 23:20:23 +01:00
AdrianLxM	4ee87d1cca	basal profile on overview	2016-11-10 21:03:26 +01:00
AdrianLxM	a6ae92bb2f	Receive profile updates on uploadOnly when NS-Profiles are used	2016-11-10 18:53:01 +01:00
AdrianLxM	c900d6611c	Warn on "refresh treatments from NS" button in upload only mode.	2016-11-10 18:52:42 +01:00
AdrianLxM	f85f04d33f	NS upload only	2016-11-10 18:33:50 +01:00
Milos Kozak	21f732b378	report app start/restart to NS	2016-11-10 16:42:59 +01:00
Milos Kozak	8d360f837d	Merge pull request #57 from warstar2187/master ... kr translation update	2016-11-10 10:02:01 +01:00
AdrianLxM	341d7222e5	Strings for reset DB	2016-11-08 22:36:47 +01:00
warstar2187	1f35018148	Update strings.xml	2016-11-08 20:04:19 +09:00
AdrianLxM	ede982c8c5	Update danar_history_item.xml	2016-11-08 06:08:12 +01:00
Milos Kozak	6263b98683	Merge pull request #39 from warstar2187/master ... Update strings.xml	2016-11-07 09:13:21 +01:00
Milos Kozak	45ffc18d25	move set temp and set extended buttons to actions	2016-11-05 20:12:58 +01:00
Milos Kozak	3ac9811d9a	Actions page & offline profile switch	2016-11-05 15:46:11 +01:00
Radoslav Radev	b9d4a5fc0a	Update strings.xml	2016-11-03 07:47:24 +02:00
Milos Kozak	57b032065f	Merge pull request #45 from AdrianLxM/disableLoopLabel ... Disable loop label	2016-11-02 22:20:48 +01:00
AdrianLxM	b7f4dd3366	borders again on loopmode label	2016-11-02 18:27:46 +01:00
AdrianLxM	b1f3bb17bb	Show in Overview when loop is disabled	2016-11-02 18:04:14 +01:00
AdrianLxM	80e8ac465a	Update German translation	2016-11-02 14:33:41 +01:00
AdrianLxM	b265be3536	Some updates on German translation	2016-11-02 14:17:16 +01:00
warstar2187	46fd0c87dd	Update strings.xml	2016-10-27 08:16:19 +09:00
warstar2187	e4e2ea3aac	Update strings.xml	2016-10-27 02:53:23 +09:00
warstar2187	a49afea27c	Update strings.xml	2016-10-26 15:57:21 +09:00
warstar2187	58591514f7	Update strings.xml	2016-10-26 15:34:26 +09:00
warstar2187	02c231a236	Update strings.xml	2016-10-26 12:36:15 +09:00
warstar2187	f39b009ca3	Update strings.xml	2016-10-26 10:10:33 +09:00
warstar2187	70249c7e3e	Update strings.xml	2016-10-26 09:49:46 +09:00
Milos Kozak	4c3d67535c	Korean language template	2016-10-25 23:38:44 +02:00
Milos Kozak	861c24fc45	distinguish between meal and correction bulus	2016-10-25 23:33:02 +02:00
AdrianLxM	d2906e8fd4	overview_quickwizardentry translated but does not exist	2016-10-21 22:18:17 +02:00
Milos Kozak	6f8d828ec2	QuickWizard	2016-10-20 23:50:31 +02:00
Milos Kozak	5ec339e987	fix BolusProgessDialog size on Android 6	2016-10-11 23:49:26 +02:00
Milos Kozak	4378c9af14	more SMS commands	2016-09-16 14:08:26 +02:00
Milos Kozak	57db26443e	Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS	2016-09-13 22:40:55 +02:00
Milos Kozak	ecb685f7f6	hard limits on openaps params	2016-09-13 22:15:17 +02:00
ecorman	83c4214710	Reduce width, + sign was not visible	2016-09-12 00:34:31 +02:00
ecorman	52525b69f4	Updated Translation	2016-09-12 00:33:14 +02:00
ecorman	0221a14f7c	Updated translation	2016-09-12 00:07:50 +02:00
Milos Kozak	05831c75a6	SMS LOOP commands	2016-09-10 15:33:00 +02:00
Radoslav Radev	9c82350c1e	Update strings.xml	2016-09-10 10:37:33 +03:00
Milos Kozak	bdeb7d6061	Merge pull request #30 from slavidex/patch-11 ... too long	2016-09-09 13:08:37 +02:00
Radoslav Radev	829beb5c8f	too long	2016-09-09 07:54:16 +03:00
ecorman	e5c1c1df4d	Improve Spanish Translation	2016-09-08 23:19:07 +02:00
ecorman	fcdd07a182	Reduce size to better fit screen	2016-09-08 23:18:15 +02:00
ecorman	dd032b19e0	Spanish translation update strings.xml	2016-09-07 23:40:37 +02:00
ecorman	b3857f7794	Spanish translation	2016-09-07 23:39:06 +02:00
Milos Kozak	3fb84636db	fix objectives import/export	2016-08-13 11:30:43 +02:00
Milos Kozak	40aada0eb4	ajdust some danar pump comm params	2016-08-12 20:22:44 +02:00
Milos Kozak	ebee1cdeca	scrollview in careportal dialog	2016-08-11 15:36:59 +02:00
Milos Kozak	4da0f345cf	fix wizard gui	2016-08-11 09:54:03 +02:00
Radoslav Radev	9bbc1e97a5	BG translation	2016-08-11 07:45:35 +03:00
Milos Kozak	d023e4ae32	move targets from fragment to plugin	2016-08-10 23:27:26 +02:00
Milos Kozak	d2b01dcc32	fix BG lang	2016-08-10 18:25:49 +02:00
Radoslav Radev	098aa22da6	BG translation ... fix	2016-08-10 16:44:13 +03:00
Milos Kozak	acbd028465	bolus progress in virtual pump	2016-08-10 14:50:53 +02:00
Milos Kozak	49d6690450	OpenAPS MA target value	2016-08-09 15:40:12 +02:00
Milos Kozak	267e0220c0	overview scroll, determinebasal fix	2016-08-08 14:47:24 +02:00
Milos Kozak	88698576a2	plusminis edit shows toast when hit limit	2016-08-08 10:08:30 +02:00
Milos Kozak	ff2e9a82bc	fix some crashes	2016-08-07 13:07:13 +02:00
Milos Kozak	b711648bee	plugins refactoring	2016-08-05 23:54:03 +02:00
Milos Kozak	7cc0fb593d	IOB display & upload fix	2016-08-05 00:32:48 +02:00
Milos Kozak	b42644de39	objectives finalization, some todos	2016-08-04 23:38:43 +02:00
Milos Kozak	a7d3dca752	Bolusing dialog	2016-08-04 09:17:26 +02:00
Milos Kozak	c20026c15a	lowsuspend cleanup	2016-08-03 14:40:47 +02:00
Milos Kozak	6b75dd3dc9	error.mp3	2016-08-02 18:39:56 +02:00
Milos Kozak	dbb0a6a659	danar fragment update, danar pump password, toast with sound	2016-08-02 18:39:14 +02:00
Milos Kozak	e94fe1f647	danar history translation support	2016-07-28 13:40:32 +02:00
Milos Kozak	a9218c20d5	Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS	2016-07-27 17:50:04 +02:00
Milos Kozak	61e8ffeebd	DanaR history loader	2016-07-27 17:49:56 +02:00
Ulrich Kopp	4e2d97d42d	DE translation	2016-07-24 17:36:54 +02:00
Milos Kozak	978770d70a	icon	2016-07-21 15:11:17 +02:00
Milos Kozak	7d568f2c24	cz translation	2016-07-20 23:19:49 +02:00
Milos Kozak	fd91348eba	fix bg translation	2016-07-20 23:14:19 +02:00
Radoslav Radev	9007d25e7e	translation bg	2016-07-20 22:37:22 +03:00
Milos Kozak	788289c757	remove alert mp3	2016-07-19 11:40:22 +02:00
viktoria	5afe78cf2a	German Translation #6	2016-07-18 23:49:25 +02:00
Milos Kozak	a1a64873fd	DanaR driver as a service	2016-07-18 12:02:33 +02:00
Milos Kozak	82a16efcc2	bolus wizard full functionality	2016-07-16 22:37:10 +02:00
Milos Kozak	cd86476d6a	design of virtual pump	2016-07-15 21:06:39 +02:00
Milos Kozak	7f661b7fa6	danar profile dia&car configurable in preferences	2016-07-15 20:56:07 +02:00
Milos Kozak	c5d40b3a6c	careportal eventtypes translations	2016-07-15 19:45:03 +02:00
Milos Kozak	871eaa718d	translations	2016-07-15 18:55:14 +02:00
Milos Kozak	90fee59e8a	sms communicator: remote bolus, status	2016-07-14 23:29:21 +02:00
Milos Kozak	4a8ecb3a79	better display pump results	2016-07-13 18:57:23 +02:00
Milos Kozak	b81cf8341b	MM640g base interface code	2016-07-13 15:56:27 +02:00
Milos Kozak	8681dc5122	overview status update	2016-07-13 14:56:11 +02:00
Milos Kozak	272262b115	SMSCommunicator plugin	2016-07-13 13:54:40 +02:00
Milos Kozak	76d42ef3fb	displaying basal fix	2016-07-12 17:56:01 +02:00
Milos Kozak	efa2944c4c	translations & fixes	2016-07-11 22:52:23 +02:00
Milos Kozak	f7715a3409	xml reformating, some code cleaning	2016-07-11 17:49:09 +02:00
Milos Kozak	3127870770	DanaR as profile source	2016-07-11 14:04:57 +02:00
Milos Kozak	076135195b	Merge pull request #18 from slavidex/patch-3 ... Update strings.xml	2016-07-10 15:05:48 +02:00
Milos Kozak	143d347841	most danar code there	2016-07-10 15:05:13 +02:00
Radoslav Radev	1a57ed07bd	Update strings.xml	2016-07-09 00:08:43 +03:00
Milos Kozak	e37917dae4	test alert fix	2016-07-08 13:39:27 +02:00
Milos Kozak	aeae32cc79	Merge pull request #17 from slavidex/patch-2 ... Bulgarian translation	2016-07-08 00:20:07 +02:00
Milos Kozak	dc3eb80d52	basic danar comm	2016-07-08 00:17:02 +02:00
Radoslav Radev	6159a78d81	Update strings.xml	2016-07-07 21:37:54 +03:00
Milos Kozak	690fd06c01	Agreement	2016-07-07 18:04:36 +02:00
Milos Kozak	c844a2ad9a	DanaR preferences & preferences cleanup	2016-07-07 17:17:54 +02:00
Milos Kozak	ba015f1140	DanaR service	2016-07-07 10:34:20 +02:00
Milos Kozak	0b19cae903	smaller buttons on careportal	2016-07-07 01:11:24 +02:00
Milos Kozak	ca31195b15	Merge pull request #16 from LadyViktoria/master ... translation fix	2016-07-06 23:18:38 +02:00
Milos Kozak	85f4a93c11	move languages to preferences	2016-07-06 22:50:25 +02:00
Milos Kozak	7c46407f81	AlarmService	2016-07-06 22:05:28 +02:00
viktoria	89c880eda2	translation fix	2016-07-06 19:23:31 +02:00
Milos Kozak	56225f1851	Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS	2016-07-06 11:14:09 +02:00
Milos Kozak	a99c8aa75b	remove 'language' from label in menu	2016-07-06 11:13:42 +02:00
Milos Kozak	6ca5517aef	switch + and - in dialogs	2016-07-06 11:11:12 +02:00
Radoslav Radev	c4a1442c22	BG translation	2016-07-05 21:29:48 +03:00
Milos Kozak	ce7439bc00	add bg language	2016-07-05 20:28:23 +02:00
Milos Kozak	2eed46b3d2	typo	2016-07-04 09:13:11 +02:00
viktoria	4a603a46ad	Germany Translation #5	2016-07-03 22:47:26 +02:00
viktoria	da4d73cd52	Array fix	2016-07-03 22:47:08 +02:00
viktoria	9f8015c951	German Translation #4	2016-07-03 21:34:50 +02:00
AdrianLxM	1078514ceb	german typos	2016-07-03 21:13:51 +02:00
Milos Kozak	ec3b74aad2	Merge pull request #9 from LadyViktoria/master ... German Translation #3	2016-07-03 21:06:06 +02:00
Milos Kozak	02f5806832	preferences translations	2016-07-03 21:05:36 +02:00
viktoria	d5b9406636	German Translation #3	2016-07-03 21:04:40 +02:00
Milos Kozak	59aba8d9be	german language to menu	2016-07-03 20:54:00 +02:00
Milos Kozak	f6623c7a62	Merge pull request #8 from LadyViktoria/master ... German Translation #2	2016-07-03 20:38:13 +02:00
Milos Kozak	afa4332d28	import/export preferences	2016-07-03 20:37:42 +02:00
viktoria	4d9661dff2	German Translation #2	2016-07-03 20:19:11 +02:00
viktoria	cac60bd296	german translation	2016-07-03 15:38:44 +02:00
Milos Kozak	9f8d7d3dca	configbuilder fragment translations	2016-07-03 13:56:57 +02:00
Milos Kozak	2b01b2a10b	combobolus dialog plus/minus buttons	2016-07-03 13:46:49 +02:00
Milos Kozak	07b01cd8d0	some missing translations	2016-07-03 13:35:02 +02:00
Milos Kozak	5cad7f1cb4	temp basal dialog plus/minus buttons	2016-07-03 13:25:23 +02:00
Milos Kozak	000fafced3	some missing CZ translations	2016-07-03 11:13:50 +02:00
Milos Kozak	7459acfc34	finished CZ translation	2016-07-03 11:04:24 +02:00
Milos Kozak	ea4eef88ed	1st round of CZ translation	2016-07-03 01:02:35 +02:00
Milos Kozak	92f4c37fac	careportal	2016-07-02 23:58:57 +02:00
Milos Kozak	f3c15aca75	plus minus controls	2016-06-28 11:19:27 +02:00
Milos Kozak	caa4f3402e	split iob in wizard dialog, fixies for no data in app	2016-06-27 23:34:33 +02:00
Milos Kozak	af904b24bb	add notify icon to git	2016-06-27 20:53:33 +02:00
Milos Kozak	aa6c5764c4	language selector in menu	2016-06-27 20:14:31 +02:00
Milos Kozak	a3d32fcb44	objectives fragment complete	2016-06-27 18:48:48 +02:00
Milos Kozak	6ebbfdc339	1st translation test	2016-06-26 15:13:57 +02:00
Milos Kozak	a4bdebdedf	detect ns versions	2016-06-26 14:56:43 +02:00
Milos Kozak	2f16c9b998	open loop mode & notification	2016-06-26 11:43:26 +02:00
Milos Kozak	5dfddfdfee	fix counting and displaying iob	2016-06-25 15:00:42 +02:00
viktoria	f90138ea54	Add border Buttons	2016-06-25 00:09:52 +02:00
Milos Kozak	270503fe74	Merge pull request #2 from LadyViktoria/master ... Material Design and Buttons	2016-06-24 23:36:01 +02:00
viktoria	4eaa2c6f1d	Material Design and Buttons	2016-06-24 23:20:38 +02:00
Milos Kozak	35ff53dbb4	iob & basal on overview tab	2016-06-24 23:17:46 +02:00
Milos Kozak	120341b706	devicestatus, lot of gui and internal improvements, temp&extended in db only	2016-06-24 17:16:17 +02:00
Milos Kozak	91b36a8528	work on tempbasals	2016-06-22 18:08:21 +02:00
Milos Kozak	edddfed004	add source selection xdrip/nsclient	2016-06-21 00:34:36 +02:00
Milos Kozak	fdf09b9daf	extended bolus dialog	2016-06-20 22:55:49 +02:00
Milos Kozak	4645c2bc4d	apply constraints on new treatment dialog	2016-06-20 21:43:29 +02:00
Milos Kozak	7cb0e0e588	manual tempbasal dialog	2016-06-20 20:45:55 +02:00
Milos Kozak	5ac31bd0ca	menu, preferences, treatment&wizard buttons, ns upload	2016-06-19 20:06:00 +02:00
Milos Kozak	aa97722283	loop & safety fragment	2016-06-19 13:17:16 +02:00
Milos Kozak	d69701a092	SimpleProfile plugin, ConfigBuilder GUI improvements	2016-06-16 19:22:58 +02:00
Milos Kozak	ddb1868018	Constrains interface	2016-06-15 21:47:26 +02:00
Milos Kozak	26724ecbda	ConfigBuilder most work done	2016-06-14 23:45:55 +02:00
Milos Kozak	b8eca8a802	rename profileviewer -> nsprofileviewer	2016-06-14 13:01:37 +02:00
Milos Kozak	f424c9c642	ConfigBuilder fragment formating	2016-06-13 22:59:31 +02:00
Milos Kozak	32bfea8d18	base ConfigBuilder plugin	2016-06-13 22:53:41 +02:00
Milos Kozak	b310310511	GUI improvements	2016-06-12 13:30:34 +02:00
Milos Kozak	a66ece9af5	Lowsuspend finished	2016-06-12 10:53:19 +02:00
Milos Kozak	74dcbb1864	glucoseReading fix	2016-06-11 22:46:47 +02:00
Milos Kozak	54a25aa1ed	remove static debug texts	2016-06-11 22:30:08 +02:00
Milos Kozak	a8ab671d78	OpenApsMA invoke	2016-06-11 22:21:44 +02:00
Milos Kozak	73ebf3ffeb	typo in VIRTUAL	2016-06-11 20:47:00 +02:00
Milos Kozak	68b5570d35	VirtualPump	2016-06-11 20:45:40 +02:00
Milos Kozak	a5088584a2	OpenAPS MA initial work	2016-06-10 18:50:46 +02:00
Milos Kozak	891c5dd4d7	show units in profile	2016-06-09 09:21:33 +02:00
Milos Kozak	45cceddfcc	basic graph on everview fragment	2016-06-09 00:01:28 +02:00
Milos Kozak	3b883dee31	basic overview fragment + some gui fixes	2016-06-07 23:36:22 +02:00
Milos Kozak	701e6a2055	receive BGs from xDrip and NSClient	2016-06-07 21:48:17 +02:00
Milos Kozak	bd47fb8624	button refresh treatments from nightscout	2016-06-06 12:17:37 +02:00
Milos Kozak	627ce66852	TempBasals & some IOB adjustments	2016-06-06 10:42:46 +02:00
Milos Kozak	f7779bd9f1	Treatments fragment	2016-06-05 14:53:03 +02:00
Milos Kozak	629ed62e03	Profile fragment	2016-06-05 01:40:35 +02:00
Milos Kozak	9b749202fd	Objectives design	2016-06-04 17:28:05 +02:00