caspervk/AndroidAPS

Author	SHA1	Message	Date
Milos Kozak	1a335debc0	New translations strings.xml (Czech)	2018-11-02 09:21:57 +01:00
Milos Kozak	2344f5f68b	New translations strings.xml (Turkish)	2018-11-01 19:51:22 +01:00
Nico Schmitz	04574d759f	Improve dialogs. Add JSON serialization for actions and events.	2018-10-29 21:24:30 +01:00
Milos Kozak	a4e8ace6c4	New translations strings.xml (Russian) (#1523 )	2018-10-28 13:30:59 +01:00
Milos Kozak	512ceceeb8	New Crowdin translations (#1513 )	2018-10-26 07:59:33 +02:00
Andy Rozman	03e38158f4	[0.4.0] - refactored Broadcast receiving - implementation of SetProfile finished - added additional null checking in RadioResponse class	2018-10-25 16:22:31 +01:00
Andy Rozman	75d3f3b4bc	Merge branch 'dev' into medtronic_andy (2.0i - 24.10.2018)	2018-10-24 12:18:20 +01:00
Andy Rozman	f228475617	Merge the code from RileyLinkAAPS - First real results with Pump History (not complete yet) - Set Basal Profile changes (not complete yet) - version set to medtronic-0.4.0-SNAPSHOT	2018-10-24 11:25:18 +01:00
Milos Kozak	91610e40e5	Merge pull request #1512 from MilosKozak/RS-npefix try to catch bad devicenames	2018-10-22 21:39:31 +02:00
Milos Kozak	947c786dc3	New Crowdin translations (#1507 ) * New translations strings.xml (Czech) * New translations strings.xml (Russian) * New translations strings.xml (French)	2018-10-21 22:27:47 +02:00
Andy Rozman	ca536ee97e	[0.3.1] - removed code that sends wakeup on every command - added checking if device is present - fixed reading data when no data present (PostProcessingUI) - work done on showing hardware in configuration (added RileyLinkSelectPreference) - fixing configuration (in wizard)	2018-10-20 13:24:36 +01:00
AdrianLxM	5465e8f5aa	try to catch bad devicenames	2018-10-19 10:31:57 +02:00
Nico Schmitz	2e4f18794f	Add ChooseTriggerDialog	2018-10-16 00:07:13 +02:00
Nico Schmitz	f98d40f71b	Work on automation plugin. - Add MainApp.dpToPx() helper function - Remove trigger layout resources - Generate trigger layout programmatically - Improve ux (when composing trigger logic) - Refactoring	2018-10-15 23:20:06 +02:00
Milos Kozak	54b3e60f48	New Crowdin translations (#1506 )	2018-10-15 18:10:58 +02:00
Milos Kozak	80b4f1d3cc	New Crowdin translations (#1504 )	2018-10-14 23:33:29 +02:00
Milos Kozak	c1bbaab8e1	allow UAM only if oref1 sensitivity plugin is selected	2018-10-13 18:07:01 +02:00
Milos Kozak	db0fc3b3b7	Merge pull request #1498 from MilosKozak/l10n_dev New Crowdin translations	2018-10-11 16:56:35 +02:00
Milos Kozak	c1e14501c2	New translations strings.xml (Bulgarian)	2018-10-11 09:00:40 +02:00
Milos Kozak	31e56add72	Merge pull request #1496 from MilosKozak/l10n_dev New Crowdin translations	2018-10-10 07:47:47 +02:00
Milos Kozak	7d592816ac	New translations strings.xml (Dutch)	2018-10-10 00:26:23 +02:00
Milos Kozak	c68783afd3	maintenance strings cleanup	2018-10-04 23:19:29 +02:00
Milos Kozak	97cc9a6370	log language used to fabric	2018-10-04 23:04:32 +02:00
Milos Kozak	886096ca54	New translations strings.xml (Afrikaans)	2018-10-03 18:21:39 +02:00
Milos Kozak	2dee025388	New Crowdin translations (#1472 )	2018-09-30 23:50:55 +02:00
Milos Kozak	1fa768c146	Afrikaans lang	2018-09-30 23:50:44 +02:00
Milos Kozak	60066950a5	New Crowdin translations (#1470 )	2018-09-25 14:15:03 +02:00
Milos Kozak	e4e3112f77	New Crowdin translations (#1469 )	2018-09-25 10:24:57 +02:00
Nico Schmitz	c60aae8630	Work on implementation for automation plugin. - Use butterknife - Import weekdays selector - Implement layout for trigger connection and trigger time - Implement view holders - Implement adapters - Implement dummy code for quick testings - Refactor code	2018-09-25 00:00:09 +02:00
Milos Kozak	f128a33266	New Crowdin translations (#1466 )	2018-09-24 22:11:12 +02:00
Milos Kozak	b474e9146f	New Crowdin translations (#1463 ) * New translations strings.xml (Spanish) * New translations strings.xml (Chinese Simplified)	2018-09-23 10:16:25 +02:00
Milos Kozak	eb1075dd04	New Crowdin translations (#1457 )	2018-09-21 13:01:16 +02:00
Andy Rozman	48e4a041f8	- First changes for CustomActions - changed PumpInterface to add CustomActions - added class CustomActions and CustomActionType - changed all PumpImplementations to use new methods - started changing ActionsFragment (most should be done)	2018-09-20 17:23:36 +01:00
Milos Kozak	58b3f96c9e	New Crowdin translations (#1456 )	2018-09-20 09:05:35 +02:00
Nico Schmitz	b5f30a0f46	Add some content to automation plugin fragment	2018-09-19 22:29:35 +02:00
Andy Rozman	70065c1343	- merge RileyLink2 support from RileyLinkAAPS	2018-09-19 20:51:40 +01:00
Milos Kozak	1d3c4509f2	New Crowdin translations (#1454 ) * New translations strings.xml (Russian) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish)	2018-09-19 20:56:05 +02:00
Milos Kozak	3eee5b13c7	LocationService	2018-09-19 15:26:58 +02:00
Milos Kozak	8ce4e01415	New Crowdin translations (#1447 )	2018-09-19 08:44:44 +02:00
Milos Kozak	efec01c6e5	Some Actions	2018-09-18 23:17:00 +02:00
AdrianLxM	92e5acbc26	Update strings.xml (#1452 )	2018-09-18 13:31:32 +02:00
Milos Kozak	d317ec94ad	AutomationPlugin	2018-09-18 10:05:19 +02:00
Milos Kozak	0504619b39	New Crowdin translations (#1443 )	2018-09-17 16:44:29 +02:00
Milos Kozak	21c7da4ae2	New Crowdin translations (#1435 )	2018-09-16 19:38:19 +02:00
Sebastian Lenz	6323f2dd49	fixed typo	2018-09-16 18:32:51 +02:00
Andy Rozman	da75ed643d	Merge branch 'dev' into medtronic_andy and some minor changes to make it compilable	2018-09-14 18:14:45 +01:00
Milos Kozak	efc1970ad5	New Crowdin translations (#1432 )	2018-09-14 14:06:43 +02:00
Milos Kozak	3260bbfdfd	New Crowdin translations (#1430 )	2018-09-13 23:14:40 +02:00
Milos Kozak	f5e6933f23	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-09-13 20:41:02 +02:00
Milos Kozak	538824d783	Portuguese language	2018-09-13 20:40:57 +02:00
Milos Kozak	081ab5ad15	New Crowdin translations (#1424 )	2018-09-13 18:13:02 +02:00
Milos Kozak	90d077cd03	New Crowdin translations (#1411 )	2018-09-12 15:12:26 +02:00
Milos Kozak	66bc25f2c8	change summary	2018-09-12 00:19:35 +02:00
Milos Kozak	f7269a806d	nsclient allow general preferences	2018-09-11 20:08:59 +02:00
Milos Kozak	69544f67b5	nsclient arrow layout update	2018-09-11 19:50:35 +02:00
Milos Kozak	8a92bed479	tratments layout improvement	2018-09-11 19:29:51 +02:00
Milos Kozak	bc84020f54	loop_openmode_min_change 0-50	2018-09-11 19:04:55 +02:00
Milos Kozak	90cae60f9b	New Crowdin translations (#1403 )	2018-09-10 13:03:36 +02:00
Milos Kozak	e577e8555d	openloop mode min change threshold configurable	2018-09-09 12:15:44 +02:00
Milos Kozak	0edc79e589	New translations strings.xml (Russian)	2018-09-09 09:51:01 +02:00
Milos Kozak	4165a178d4	New translations strings.xml (Bulgarian)	2018-09-07 08:26:12 +02:00
Milos Kozak	f5873f9f87	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-09-06 11:18:27 +02:00
Milos Kozak	65f7f9cbfb	New Crowdin translations (#1389 ) * New translations strings.xml (Slovak) * New translations strings.xml (Swedish)	2018-09-06 07:41:29 +02:00
Milos Kozak	cc934d3e89	New Crowdin translations (#1378 )	2018-09-03 15:16:25 +02:00
Milos Kozak	f5e7d28aa6	fix WizardInfoDialog 2nd	2018-09-01 23:34:35 +02:00
Milos Kozak	91695614f4	Merge branch 'andyrozman-virtual_pump_bug_1372' into dev	2018-09-01 22:46:16 +02:00
Milos Kozak	315c83069d	apply bolus description settings in constraints	2018-09-01 22:45:15 +02:00
Milos Kozak	7869ee987e	New Crowdin translations (#1376 )	2018-08-30 12:49:15 +02:00
Milos Kozak	063ead4c17	RS text bolus error codes	2018-08-29 20:14:36 +02:00
Milos Kozak	178c2b90fe	min_5m_carbimpact to AMA settings	2018-08-29 18:17:11 +02:00
Milos Kozak	236c05e8d4	New Crowdin translations (#1373 ) * New translations strings.xml (Romanian) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Korean) * New translations strings.xml (Korean) * New translations strings.xml (Korean) * New translations strings.xml (Korean) * New translations strings.xml (Korean) * New translations strings.xml (Korean) * New translations strings.xml (Korean) * New translations strings.xml (Korean) * New translations strings.xml (Korean) * New translations strings.xml (Korean)	2018-08-29 17:42:08 +02:00
Milos Kozak	4082f52dd9	Merge pull request #1369 from MilosKozak/l10n_dev New Crowdin translations	2018-08-28 12:59:14 +02:00
Milos Kozak	0c43966391	New translations strings.xml (Czech)	2018-08-27 19:41:27 +02:00
Milos Kozak	4e07e37535	Merge pull request #1366 from MilosKozak/l10n_dev New Crowdin translations	2018-08-27 16:39:50 +02:00
Milos Kozak	ceb6453f09	New translations strings.xml (Bulgarian)	2018-08-27 08:11:39 +02:00
Milos Kozak	f4ac44e9da	New translations strings.xml (Bulgarian)	2018-08-27 08:01:09 +02:00
Milos Kozak	e1a0aad0b1	update strings	2018-08-25 19:34:48 +02:00
Milos Kozak	ead57748aa	more autosens logging	2018-08-25 19:22:45 +02:00
Milos Kozak	da0e560690	New Crowdin translations (#1359 )	2018-08-24 09:13:48 +02:00
Milos Kozak	b0f8ab9922	extract key_virtualpump_type	2018-08-23 18:46:06 +02:00
Milos Kozak	243755d1b1	virtualpump: fix string, fix formatter	2018-08-23 18:41:55 +02:00
Milos Kozak	2c5837a235	Merge branch 'virtual_pump_Bug863' of https://github.com/andyrozman/AndroidAPS into andyrozman-virtual_pump_Bug863	2018-08-23 17:53:28 +02:00
Milos Kozak	67b4fb2584	New Crowdin translations (#1336 )	2018-08-23 17:51:48 +02:00
Milos Kozak	653a98fd5b	better layout for nsclient mode	2018-08-21 23:19:04 +02:00
Milos Kozak	73bb574944	add Slovak language to menu	2018-08-21 17:32:31 +02:00
Milos Kozak	32d9a8b4d6	Fix connection handshake for DanaR pumps	2018-08-21 17:25:20 +02:00
Milos Kozak	8ec3649cea	key_nsclient_localbroadcasts default to false	2018-08-20 23:01:11 +02:00
Milos Kozak	414c3416dd	WizardInfoDialog	2018-08-20 19:32:18 +02:00
Nico Schmitz	5386c7db4a	Update to upstream/dev and resolve conflicts	2018-08-19 14:37:42 +02:00
Milos Kozak	00dd539310	remove unneeded file	2018-08-16 22:46:52 +02:00
Milos Kozak	b46ebf34c4	fix typo	2018-08-16 12:46:56 +02:00
Milos Kozak	03f8a7c629	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-08-14 18:32:37 +02:00
Milos Kozak	31e050be4a	loop mode in setup wizard	2018-08-14 17:06:09 +02:00
Milos Kozak	2d8ffcab9b	New Crowdin translations (#1326 )	2018-08-14 15:39:29 +02:00
Milos Kozak	ce66118344	New Crowdin translations (#1324 ) * New translations strings.xml (Dutch) * New translations strings.xml (Czech) * New translations strings.xml (German) * New translations strings.xml (Bulgarian) * New translations strings.xml (Dutch) * New translations strings.xml (Romanian) * New translations strings.xml (Russian) * New translations strings.xml (Spanish) * New translations strings.xml (Swedish) * New translations strings.xml (Slovak)	2018-08-10 23:19:58 +02:00
Milos Kozak	0ab5981665	Roumen's Unit tests (#1325 ) * initializer * aading some tests * ading some tests * removed try-catch but added testingMode boolean for the test to run * update to latest dev * formatting * cleanup tests * More test classes * some more * upd * more coverage in comm * 50% class coverage in comm * Delete crashlytics-build.properties * remove of crashlytics * removed unneeded checks * removet mocking of treatmentsService * removed treatmentsService mock from newNSTreatmentTest * more testing classes * tests of _History_ packets * tests of _Notify_ packets * 64 / 65 classes covered * 100% class coverage in comm	2018-08-10 22:17:44 +02:00
Andy Rozman	c9d35696cf	- various changes - reformatting everything	2018-08-10 16:13:40 +01:00
Milos Kozak	e4e6399543	New Crowdin translations (#1320 ) * New translations strings.xml (Spanish) * New translations strings.xml (Dutch) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch)	2018-08-10 11:44:59 +02:00
Andy Rozman	fa1a08367f	- Changed one string - Removed one pump that was just wrongly named (553 doesn't exists, 523 is actually Revel one)	2018-08-09 15:11:34 +01:00
Milos Kozak	ae677fec98	New Crowdin translations (#1312 ) * New translations strings.xml (Romanian) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (German)	2018-08-07 23:32:58 +02:00
Milos Kozak	fcf47ecc03	NSClient2 flavor	2018-08-07 21:07:43 +02:00
Milos Kozak	d3b6337749	New Crowdin translations (#1311 ) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian)	2018-08-07 11:01:23 +02:00
Milos Kozak	a6b16d154d	New Crowdin translations (#1300 ) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Slovak) * New translations strings.xml (Spanish) * New translations strings.xml (Czech) * New translations strings.xml (Czech) * New translations strings.xml (German) * New translations strings.xml (Bulgarian) * New translations strings.xml (Romanian) * New translations strings.xml (Russian) * New translations strings.xml (Spanish) * New translations strings.xml (Swedish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Slovak) * New translations strings.xml (Russian) * New translations strings.xml (Swedish) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (German) * New translations strings.xml (Portuguese) * New translations strings.xml (Portuguese) * New translations strings.xml (Portuguese) * New translations strings.xml (Czech) * New translations strings.xml (German) * New translations strings.xml (Bulgarian) * New translations strings.xml (Romanian) * New translations strings.xml (Spanish) * New translations strings.xml (Swedish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Slovak) * New translations strings.xml (Czech) * New translations strings.xml (Czech) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (German) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (German)	2018-08-07 08:49:17 +02:00
Milos Kozak	2bc07e3277	fix notification string	2018-08-05 22:43:30 +02:00
Milos Kozak	ff30d9af80	fix typo	2018-08-05 10:00:14 +02:00
Milos Kozak	7ad74146c4	New Crowdin translations (#1299 ) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian)	2018-08-04 20:57:19 +02:00
Milos Kozak	4bfd851bf6	Merge pull request #1297 from MilosKozak/overview-flexbox overview flexbox	2018-08-04 09:02:19 +02:00
Milos Kozak	9f86e5b96c	New Crowdin translations (#1296 ) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Slovak) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Swedish) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Romanian)	2018-08-04 09:01:43 +02:00
AdrianLxM	77a3972f6a	overview flexbox	2018-08-03 16:07:15 +02:00
Milos Kozak	70e2b64adf	rename Time -> Time offset in eCarbs dialog	2018-08-03 13:04:58 +02:00
Milos Kozak	a2ed5561e5	New Crowdin translations (#1292 ) * New translations strings.xml (Czech) * New translations strings.xml (Bulgarian) * New translations strings.xml (Swedish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Czech) * New translations strings.xml (Czech) * New translations strings.xml (German) * New translations strings.xml (Bulgarian) * New translations strings.xml (Romanian) * New translations strings.xml (Swedish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (German) * New translations strings.xml (Slovak) * New translations strings.xml (Slovak) * New translations strings.xml (Slovak) * New translations strings.xml (Romanian) * New translations strings.xml (Slovak) * New translations strings.xml (Romanian) * New translations strings.xml (Slovak) * New translations strings.xml (Swedish) * New translations strings.xml (Slovak) * New translations strings.xml (Slovak) * New translations strings.xml (Romanian) * New translations strings.xml (Slovak) * New translations strings.xml (Romanian) * New translations strings.xml (Slovak) * New translations strings.xml (Slovak) * New translations strings.xml (Slovak) * New translations strings.xml (Czech) * New translations strings.xml (German) * New translations strings.xml (Romanian) * New translations strings.xml (Swedish) * New translations strings.xml (Romanian)	2018-08-03 10:23:04 +02:00
AdrianLxM	0e2b9c384f	eCarbs delay->start To avoid the confusion between the period of time the carbs are spread and the delay when it starts.	2018-08-02 21:43:19 +02:00
Milos Kozak	a01d9924eb	Merge branch 'dev' into sens	2018-08-02 15:22:45 +02:00
Milos Kozak	3bcd656c14	Maintenance plugin cleanup	2018-08-02 15:19:13 +02:00
Milos Kozak	ddff05da75	Merge pull request #1262 from triplem/logshipper Logshipper	2018-08-02 14:40:54 +02:00
Milos Kozak	1a6dcf46e5	New Crowdin translations (#1285 ) * New translations strings.xml (Czech) * New translations strings.xml (German) * New translations strings.xml (Bulgarian) * New translations strings.xml (Swedish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (German) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Romanian) * New translations strings.xml (Romanian) * New translations strings.xml (Romanian) * New translations strings.xml (Romanian) * New translations strings.xml (Romanian) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * Backlight h->s * New translations strings.xml (Czech)	2018-08-02 12:38:07 +02:00
Milos Kozak	c0a3eb67ba	check for new version on github	2018-08-01 23:03:01 +02:00
Markus M. May	8f5869d806	Add sens data to small height overview as well	2018-08-01 20:48:36 +02:00
Markus M. May	3306e14ca1	Merge branch 'dev' into logshipper	2018-08-01 20:42:05 +02:00
Markus M. May	38ac294a3c	Add sens data to overview for normal overview	2018-08-01 20:40:34 +02:00
Milos Kozak	eee187a71f	NSClient watchdog	2018-08-01 19:16:31 +02:00
Milos Kozak	c6bc15e311	Merge branch 'dev' into virtual_pump_Bug863	2018-08-01 11:57:48 +02:00
swissalpine	e246917cdc	Shorten eCarb note ... the original is unreadable on my smartphone display	2018-08-01 11:39:30 +02:00
Milos Kozak	2ecb6d3a97	New Crowdin translations (#1278 ) * New translations strings.xml (German) * New translations strings.xml (Swedish) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified)	2018-08-01 08:11:40 +02:00
Markus M. May	61dba0633a	Merge again	2018-07-30 19:42:18 +02:00
Markus M. May	9f90d31f35	Merge latest dev changes	2018-07-30 19:39:38 +02:00
Milos Kozak	35ab3d05aa	New Crowdin translations (#1259 ) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (Czech) * New translations strings.xml (Czech) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Czech) * New translations strings.xml (German) * New translations strings.xml (Bulgarian) * New translations strings.xml (Dutch) * New translations strings.xml (French) * New translations strings.xml (Greek) * New translations strings.xml (Italian) * New translations strings.xml (Polish) * New translations strings.xml (Romanian) * New translations strings.xml (Russian) * New translations strings.xml (Spanish) * New translations strings.xml (Swedish) * New translations strings.xml (Irish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Czech) * New translations strings.xml (Czech) * New translations strings.xml (Bulgarian) * New translations strings.xml (Czech) * New translations strings.xml (Bulgarian) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Bulgarian) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Bulgarian) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Bulgarian) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Bulgarian) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Bulgarian) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Bulgarian) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Czech) * New translations strings.xml (German) * New translations strings.xml (Bulgarian) * New translations strings.xml (Dutch) * New translations strings.xml (French) * New translations strings.xml (Greek) * New translations strings.xml (Italian) * New translations strings.xml (Polish) * New translations strings.xml (Romanian) * New translations strings.xml (Russian) * New translations strings.xml (Spanish) * New translations strings.xml (Swedish) * New translations strings.xml (Irish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Czech) * New translations strings.xml (Czech) * New translations strings.xml (Czech) * New translations strings.xml (Czech) * New translations strings.xml (Czech) * New translations strings.xml (Czech) * New translations strings.xml (Czech) * New translations strings.xml (Czech) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (Czech) * New translations strings.xml (German) * New translations strings.xml (Bulgarian) * New translations strings.xml (Czech) * New translations strings.xml (Dutch) * New translations strings.xml (Greek) * New translations strings.xml (Italian) * New translations strings.xml (Polish) * New translations strings.xml (Romanian) * New translations strings.xml (Russian) * New translations strings.xml (Spanish) * New translations strings.xml (Swedish) * New translations strings.xml (Irish) * New translations strings.xml (Czech) * New translations strings.xml (German) * New translations strings.xml (Bulgarian) * New translations strings.xml (Dutch) * New translations strings.xml (French) * New translations strings.xml (Greek) * New translations strings.xml (Italian) * New translations strings.xml (Polish) * New translations strings.xml (Romanian) * New translations strings.xml (Russian) * New translations strings.xml (Spanish) * New translations strings.xml (Swedish) * New translations strings.xml (Irish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (Portuguese) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Swedish) * New translations strings.xml (Swedish) * New translations strings.xml (Swedish) * New translations strings.xml (Swedish) * New translations strings.xml (Swedish) * New translations strings.xml (Swedish) * New translations strings.xml (Swedish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Czech) * New translations strings.xml (German) * New translations strings.xml (Bulgarian) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Swedish) * New translations strings.xml (Slovak) * New translations strings.xml (Swedish) * New translations strings.xml (Swedish) * New translations strings.xml (Swedish) * New translations strings.xml (Swedish) * New translations strings.xml (Swedish) * New translations strings.xml (Swedish) * New translations strings.xml (Swedish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Swedish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Swedish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (German) * New translations strings.xml (Swedish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (German) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (German) * New translations strings.xml (Bulgarian) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Czech) * New translations strings.xml (Chinese Simplified)	2018-07-30 19:08:13 +02:00
Milos Kozak	073b522b93	user defined level of logging	2018-07-30 17:04:43 +02:00
Milos Kozak	61ea87dd39	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-07-30 08:42:08 +02:00
Milos Kozak	0de5888bc5	languages not translatable	2018-07-30 08:41:37 +02:00
Milos Kozak	75bb38ba1f	move activities to new package	2018-07-29 00:08:28 +02:00
Markus M. May	f70909d6c6	Refactore logshipper to maintenance, move funcs from menu to plugin	2018-07-28 22:45:40 +02:00
Milos Kozak	c7e6474b50	Merge branch 'dev' into logshipper	2018-07-27 17:49:58 +02:00
Milos Kozak	71a7599902	remove comment	2018-07-27 15:14:46 +02:00
Milos Kozak	8fbdc9b07c	translations cleanup pass 1	2018-07-27 14:41:23 +02:00
Milos Kozak	9712557d6c	Merge pull request #1246 from pedroll/dev Spanish translation RC5	2018-07-27 14:04:25 +02:00
Andy Rozman	8e99482723	Some fixes in merge	2018-07-26 17:31:38 +01:00
Andy Rozman	1b8ceb83cf	Merge branch 'dev' into medtronic_andy	2018-07-26 16:48:52 +01:00
Andy Rozman	318436f417	- some changes from RileyLinkAAPS project: - refactored RfSpy and underlaying classes so that we can read Version (which is not encoded and has no CRC) - added functionality to be able to recover RL if BT is disabled and re-enabled - some minor refactorings here and there - TBR enabled - Bolus delivery - Medtronic Pump Plugin is working (able to deliver TBRs and Bolus), there are still a lot of things to work on but we have base implementation here...	2018-07-26 16:31:23 +01:00
Markus M. May	c34104b906	move log shipment to own plugin	2018-07-25 22:00:58 +02:00
Nico Schmitz	4fa78ecee5	Fix strings.xml	2018-07-25 12:28:28 +02:00
Nico Schmitz	325142cedd	Use positional format strings in Chinese translation	2018-07-25 12:16:47 +02:00
Milos Kozak	ee1c620907	Chinese language	2018-07-25 09:18:03 +02:00
Markus M. May	60721c8395	First working version	2018-07-24 22:34:10 +02:00
Milos Kozak	7e2d3fd8be	historybrowser, rendering optimizations	2018-07-24 00:46:08 +02:00
Markus M. May	2090b3c7e1	First draft	2018-07-23 20:58:20 +02:00
pedroll	0b9fdac9fc	Spanish translation RC5	2018-07-22 19:37:03 +02:00
Johannes Mockenhaupt	a2e17c05c6	So here's the thing ...	2018-07-22 18:06:11 +02:00
Andy Rozman	0b180d3d65	- tbr start is succesful, but tbr is not displayed	2018-07-22 16:45:26 +01:00
AdrianLxM	9824b45640	NSClient -> owl	2018-07-22 01:32:09 +02:00
AdrianLxM	7b87dfa7f8	remove remaining parts of old launcher icon	2018-07-21 23:19:55 +02:00
AdrianLxM	0601cba2d9	Merge pull request #1237 from MilosKozak/logo Logo	2018-07-21 22:27:16 +02:00
AdrianLxM	cfcd98aef6	assets and new notification icon	2018-07-21 21:44:02 +02:00
AdrianLxM	6e9e9702e0	icons & wear	2018-07-21 21:21:29 +02:00
Milos Kozak	e6baf3ff47	Merge branch 'dev' into last-2.0-something-stuff-update1	2018-07-17 23:05:08 +02:00
Milos Kozak	782e7939bc	history browser: remove seek bar until gets implemented	2018-07-17 23:00:45 +02:00
Milos Kozak	7d6674267b	Merge branch 'dev' into last-2.0-something-stuff-update1	2018-07-17 19:53:43 +03:00
AdrianLxM	b689aff02d	Merge pull request #1205 from swissalpine/patch-3 Überarbeitung/Vereinheitlichung der deutschen Übersetzung	2018-07-16 15:39:32 +02:00
swissalpine	7774830ea2	Bye bye "-" Careportal buttons without "-"	2018-07-16 15:25:48 +02:00
swissalpine	b0e96d93a9	Thanks to Adrian	2018-07-16 13:36:36 +02:00
swissalpine	c0a5e3d1c6	Das endet nie ...	2018-07-14 18:43:43 +02:00
swissalpine	d5a8723577	Und "Vordefinierte Ziele" ...	2018-07-14 18:40:55 +02:00
swissalpine	2bcbd6f2f1	Übersehenes ...	2018-07-14 17:28:04 +02:00
swissalpine	55cf0aa8e5	"Feste temporäre Ziele" + Zeichensetzung + min - "Feste temporäre Ziele" (besser?) - Interpunktion (die Punkte habe ich teilweise wieder entfernt, immer dann, wenn es keine Erklärungen waren) - Abkürzung "min" statt "Min." (die "offizielle" halt)	2018-07-14 11:36:22 +02:00
swissalpine	dcfcd14e96	Update strings.xml	2018-07-12 19:21:47 +02:00
swissalpine	6b24eea5ae	Update strings.xml	2018-07-12 18:57:47 +02:00
Milos Kozak	ba945f334b	Merge pull request #1204 from jotomo/pluginstats Fabric-log enabled plugins once a day.	2018-07-12 16:06:10 +03:00
Milos Kozak	798199852b	CS translation	2018-07-11 17:34:41 +03:00
swissalpine	20b6709ae4	Update strings.xml	2018-07-10 22:54:39 +02:00
swissalpine	dbee8e6224	Update strings.xml	2018-07-10 22:50:58 +02:00
swissalpine	9d899a140e	Überarbeitung/Vereinheitlichung der deutschen Übersetzung	2018-07-10 19:08:50 +02:00
Johannes Mockenhaupt	ccaf68d043	Fabric-log enabled plugins once a day.	2018-07-10 13:00:20 +02:00
marie	d7cea7883e	Adding ')' to the German translation	2018-07-09 20:48:41 +02:00
marie	351bda0240	Adding english text about temp target to objective 2 to in all languages	2018-07-09 19:23:36 +02:00
marie	8b7c552dcb	Adding text about temp target to objective 2	2018-07-09 18:51:42 +02:00
Johannes Mockenhaupt	2cd3ec82de	Create note for eCarbs, so it's easier to see what amount/time was used. Otherwise iterating on parameters is tedious with only the generated carbs.	2018-07-07 12:02:44 +02:00
Milos Kozak	2c06a9cdf9	fixed typo	2018-07-02 19:45:38 +02:00
Milos Kozak	3a0fb59aee	Merge branch 'dev' into last-2.0-something-stuff	2018-07-02 18:54:32 +02:00
Milos Kozak	375025f7f0	remove unused string	2018-07-02 15:55:52 +02:00
Milos Kozak	917ddf0cbe	CS translations	2018-07-02 15:04:09 +02:00
AdrianLxM	297fe487f7	update with data from pump	2018-07-02 06:54:02 +02:00
Nico Schmitz	2ce38702e2	Merge branch 'dev' into dev-wip	2018-07-01 22:44:11 +02:00
Johannes Mockenhaupt	21313bd418	obligatory format specifier fixes	2018-07-01 19:10:58 +02:00
Johannes Mockenhaupt	5df054a999	more fixes	2018-07-01 18:32:52 +02:00
Johannes Mockenhaupt	6ebb13d28d	alarm on failure to add treatment to db.	2018-07-01 17:31:54 +02:00
Milos Kozak	a3862aca2a	Merge pull request #1161 from schmitzn/refactor-strings Use positional format strings in translations	2018-06-29 22:22:44 +02:00
AdrianLxM	dccb675198	anrdoid -> android	2018-06-29 14:15:30 +02:00
AdrianLxM	4af7e6c1e6	update warning text	2018-06-29 14:13:33 +02:00
AdrianLxM	5a1d696ab1	ask user if he switches to a HW pump for the first time	2018-06-29 03:52:58 +02:00
Nico Schmitz	49e10dcaa9	Fix wrong argument in values-cs/strings.xml	2018-06-27 18:46:49 +02:00
Nico Schmitz	44eaa2d2f2	Use positional format strings in translations	2018-06-26 22:52:25 +02:00
Milos Kozak	2b799d9f71	SW: ask for import after storage permission	2018-06-26 13:15:50 +02:00
Milos Kozak	4df3561b4b	setup wizard cleanup	2018-06-26 12:53:43 +02:00
AdrianLxM	e9834acf81	swedish - removed unused string	2018-06-25 00:12:29 +02:00
Milos Kozak	cf8bf419e2	Merge pull request #1147 from TebbeUbben/cb-fix Config builder cleanup	2018-06-24 17:29:29 +02:00
TebbeUbben	2b5631e1e7	Config builder cleanup	2018-06-24 15:13:06 +02:00
Milos Kozak	c5841063a2	Merge branch 'dev' into rs-sync-warn	2018-06-24 14:03:12 +02:00
Milos Kozak	8c695255d6	Merge pull request #1143 from jotomo/strings Rename "Lock screen" -> "Keep screen on".	2018-06-24 13:58:35 +02:00
AdrianLxM	3e53c66365	don't set time on large diff, just warn	2018-06-24 13:27:55 +02:00
Johannes Mockenhaupt	a8d783874c	Rename "Lock screen" -> "Keep screen on".	2018-06-24 12:50:11 +02:00
Milos Kozak	f7609317ba	Merge branch 'dev' into rs-sync-warn	2018-06-24 11:45:33 +02:00
Johannes Mockenhaupt	784c071f53	Small oref1 sens corrections.	2018-06-24 01:03:38 +02:00
Milos Kozak	a3fafa521b	nsclient for phones layout	2018-06-23 22:17:54 +02:00
Milos Kozak	a4b3b7b2e9	Clean AndroidAPS started button	2018-06-23 20:28:20 +02:00
AdrianLxM	9c0665124d	Update strings.xml	2018-06-23 20:04:09 +02:00
Milos Kozak	d59c3c567b	Merge pull request #1132 from jotomo/1129 Combo: update error message. Fixes #1129.	2018-06-23 18:32:59 +02:00
Milos Kozak	586665e19f	nsclient table mode improvements	2018-06-23 18:24:04 +02:00
Johannes Mockenhaupt	5c95b785bb	Combo: update error message. Fixes #1129 .	2018-06-23 13:33:17 +02:00
Milos Kozak	9360151100	Merge branch 'dev' into oref1	2018-06-22 17:55:38 +02:00
Milos Kozak	7bed827f4b	Merge pull request #1119 from jotomo/delete-future-treatments Treatments tab: add button (if applicable) to delete future treatments.	2018-06-22 17:47:37 +02:00
Johannes Mockenhaupt	58d79892ed	Overview: TT context menu.	2018-06-21 22:06:39 +02:00
Johannes Mockenhaupt	41ce9677df	Remove duplicate string.	2018-06-21 09:57:35 +02:00
Johannes Mockenhaupt	6002c747e6	Treatments tab: add button (if applicable) to delete future treatments.	2018-06-21 00:38:22 +02:00
Milos Kozak	370008f41e	oref 0.6.0 sens	2018-06-20 18:39:47 +02:00
Milos Kozak	e913cfe454	prepare oref1 plugin	2018-06-19 20:41:40 +02:00
Johannes Mockenhaupt	ef650b80a1	Combo: show notification on broken setup.	2018-06-18 20:19:30 +02:00
Nico Schmitz	d88b4da5a9	Don't show statuslight preferences in NSCLIENT build	2018-06-17 22:41:34 +02:00
Nico Schmitz	f46a81a7be	Add overview_statuslights to overview_fragment_smallheight.xml	2018-06-17 21:02:42 +02:00
Andy Rozman	47427ec68e	- integration started - states visible - command framework added - we get currect profile and compare it with AAPS profile - setProfile command is disabled, if pumps profile is different we get warning - bolus is enabled and working - get remaining reservoir level	2018-06-16 18:13:29 +01:00
Nico Schmitz	87d7fed75b	Remove margin of status light layout	2018-06-16 14:03:45 +02:00
Nico Schmitz	aa4f506961	Update to current upstream/dev branch	2018-06-16 02:51:33 +02:00
Nico Schmitz	db36d6e3f5	Change colors and refactor code	2018-06-16 02:18:03 +02:00
Tebbe Ubben	1e4c7178f4	Merge branch 'dev' into dev	2018-06-15 21:10:33 +02:00
Nico Schmitz	14a17efecc	Update colors	2018-06-15 19:36:49 +02:00
Milos Kozak	21b598edfa	Merge pull request #1100 from MilosKozak/rsoption Rsoption	2018-06-15 00:19:08 +02:00
Milos Kozak	5acb689eeb	Merge pull request #1102 from TebbeUbben/new-icon New launcher icon	2018-06-14 23:10:43 +02:00
Nico Schmitz	1604b53327	Fix bugs, refactor code and add preferences	2018-06-14 20:49:58 +02:00
Nico Schmitz	18c6bdd4ef	Improve layout xml	2018-06-13 21:35:21 +02:00
TebbeUbben	9e0dc9bfe5	New launcher icon	2018-06-13 20:23:40 +02:00
Nico Schmitz	217583d601	Use getBatteryLevel() for BAT status. Refactor code and layout.	2018-06-13 19:58:52 +02:00
Nico Schmitz	f28fca668f	Integrate info fields from swissalpine/dev-work	2018-06-13 00:07:13 +02:00
Nico Schmitz	5ba6f02b93	Remove reservoir TextView	2018-06-12 23:31:46 +02:00
Nico Schmitz	4ebc149783	Add changes of schmitzn/reservoir-view	2018-06-12 23:28:11 +02:00
Milos Kozak	d051e081e2	Merge branch 'dev' into rsoption	2018-06-12 21:59:20 +02:00
Milos Kozak	e7eec8fe69	Poctech BG source	2018-06-11 17:26:31 +02:00
TebbeUbben	3ac10f4f7a	Improved MinimumDurationTask visualization	2018-06-11 16:24:46 +02:00
Andy Rozman	9bae53e53a	- update on initial checkin (code is now same as in RileyLinkAAPS on 10.June - most command working) - it will take some time until code is actually integrated into AAPS, but at least now all files are available	2018-06-10 21:50:50 +01:00
TebbeUbben	005039effc	Objectives styling	2018-06-09 22:07:41 +02:00
AdrianLxM	8106907a55	unify padding pills and pumpstatus	2018-06-09 13:53:11 +02:00
TebbeUbben	934a7e6797	Same color scheme for SW	2018-06-09 13:27:27 +02:00
Milos Kozak	6344e88550	Merge pull request #1084 from TebbeUbben/dev Config builder styling	2018-06-09 11:39:16 +02:00
TebbeUbben	09b93078a8	Fixed typos	2018-06-08 23:45:32 +02:00
TebbeUbben	67b6d94fe5	Android Wear was renamed to WearOS	2018-06-08 23:35:18 +02:00
TebbeUbben	5d60f34e26	Better description for MDI plugin	2018-06-08 23:31:57 +02:00
TebbeUbben	f7597c93d7	Merge remote-tracking branch 'milos/AdrianLxM-patch-4' into dev # Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalPlugin.java # app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java	2018-06-08 23:30:39 +02:00
TebbeUbben	37d543c865	Improvements to descriptions from Adrian	2018-06-08 23:27:52 +02:00
TebbeUbben	506482082d	Fixed descriptions	2018-06-08 21:26:12 +02:00
TebbeUbben	029057f1fc	Fix typo	2018-06-08 21:25:19 +02:00
TebbeUbben	2d94133175	Plugin descriptions	2018-06-08 21:19:46 +02:00
TebbeUbben	f9582d042f	Don't restore CheckBoxes and RadioButtons automatically	2018-06-08 20:05:33 +02:00
swissalpine	5bf6057838	Update danar_fragment.xml	2018-06-08 19:22:36 +02:00
swissalpine	87ea018181	Update wear_fragment.xml	2018-06-08 19:22:03 +02:00
swissalpine	3c58b94a28	Update objectives_fragment.xml	2018-06-08 19:19:21 +02:00
swissalpine	5df03e4ea7	Update openapsama_fragment.xml	2018-06-08 19:07:04 +02:00
swissalpine	ab599a452b	Update loop_fragment.xml	2018-06-08 19:06:16 +02:00
swissalpine	a926c4db86	Update combopump_fragment.xml	2018-06-08 19:05:34 +02:00
swissalpine	76505e0229	Update careportal_fragment.xml	2018-06-08 19:04:31 +02:00
swissalpine	7bd2f629bf	Update bgsource_fragment.xml	2018-06-08 19:02:20 +02:00
TebbeUbben	38526d64c6	These should not be changed	2018-06-07 23:24:10 +02:00
TebbeUbben	e25ebbdafa	Protection against callback looping	2018-06-07 23:23:10 +02:00
TebbeUbben	13cb4c28ed	ConfigBuilder styling	2018-06-07 22:54:27 +02:00
Roumen Georgiev	17a0aba2e5	remove button if pump is DanaR Korean	2018-06-07 09:34:12 +03:00
Roumen Georgiev	6559f57cd9	remove button if pump is DanaR Korean	2018-06-07 09:33:29 +03:00
Roumen Georgiev	4b7f8615bf	Merge pull request #26 from MilosKozak/rsoption update	2018-06-07 09:30:22 +03:00
Roumen Georgiev	9e2074433e	remove button if pump is DanaR Korean	2018-06-07 09:26:33 +03:00
AdrianLxM	c96f860585	Update strings.xml	2018-06-06 23:19:54 +02:00
AdrianLxM	712549e562	Update strings.xml	2018-06-06 23:04:15 +02:00
AdrianLxM	4c2babb905	Ro formatted false 3rd	2018-06-06 22:44:06 +02:00
AdrianLxM	964efee162	Ro formatted false 2nd	2018-06-06 22:42:36 +02:00
AdrianLxM	f343cfe0fa	Ro formatted false	2018-06-06 22:39:51 +02:00
AdrianLxM	0996b0f182	Ro update	2018-06-06 22:09:40 +02:00
Milos Kozak	6a4bb8a719	layout cleanup	2018-06-06 17:58:59 +02:00
Roumen Georgiev	7ef97a5334	files renamed and added icon	2018-06-06 09:28:51 +03:00
Roumen Georgiev	f528b708c3	Merge remote-tracking branch 'origin/dev' into dev	2018-06-06 09:22:28 +03:00
Roumen Georgiev	fd4662df32	files renamed and added icon	2018-06-06 09:13:21 +03:00
AdrianLxM	1acefd618b	Merge pull request #1076 from MilosKozak/AdrianLxM-cancel-color higher contrast ok and cancel buttons	2018-06-05 22:29:21 +02:00
AdrianLxM	e21f99a63d	Merge pull request #1077 from MilosKozak/padding-top Slightly more padding on top buttons/fields	2018-06-05 22:29:11 +02:00
AdrianLxM	5c6d098601	Merge pull request #1073 from jotomo/french-translation-format-specifier-fix Fix format specifier in French translation.	2018-06-05 22:28:55 +02:00
AdrianLxM	32f4a08fa6	slightly more padding on top buttons/fields	2018-06-05 13:26:43 +02:00
Roumen Georgiev	4a481bf294	Merge branch 'dev' into dev	2018-06-05 12:45:00 +03:00
Roumen Georgiev	54cc768a47	files renamed and added icon	2018-06-05 12:39:55 +03:00
Roumen Georgiev	c1b69404d0	files renamed and added icon	2018-06-05 12:19:47 +03:00
Roumen Georgiev	37e6e0268c	Merge pull request #25 from alesinka/master adding icons from Alessya	2018-06-05 10:55:41 +03:00
AdrianLxM	536fe3e5d2	higher contrast ok and cancel buttons	2018-06-05 00:15:41 +02:00
AdrianLxM	9d07e3e83f	Merge pull request #1072 from jotomo/silly-idea Revert "Update prediction colors to match NS."	2018-06-04 23:54:22 +02:00
AdrianLxM	4998ebae89	Merge pull request #1071 from TebbeUbben/new-design TabLayout + NavigationDrawer	2018-06-04 23:53:42 +02:00
TebbeUbben	5fa79b1db9	Changed accent color to #009688	2018-06-04 23:34:56 +02:00
TebbeUbben	f7b19e37a1	Button for plugin preferences	2018-06-04 21:56:31 +02:00
TebbeUbben	80e9d769e4	Compact version of toolbar	2018-06-04 21:34:21 +02:00
Alessya	fbe44b7190	new icon added to danaR tab - user options	2018-06-04 17:48:02 +03:00
Johannes Mockenhaupt	d31b90cd3e	Fix format specifier in French translation.	2018-06-04 15:38:06 +02:00
Roumen Georgiev	1147c28f04	use numberPicker instead of editText	2018-06-04 10:23:01 +03:00
Johannes Mockenhaupt	358108be49	Revert "Update prediction colors to match NS." This reverts commit `dd41afa`	2018-06-04 03:00:50 +02:00
TebbeUbben	6c1ccebb4a	Moved padding to Toolbar	2018-06-03 23:42:10 +02:00
TebbeUbben	263275659a	TabLayout + NavigationDrawer	2018-06-03 23:28:04 +02:00
TebbeUbben	a86c654f8d	Use real TBR cancels and dismiss their alerts	2018-06-03 10:56:29 +02:00
TebbeUbben	f151cbb0bf	TBR emulation	2018-06-02 16:37:53 +02:00
Roumen Georgiev	9569fbf183	Merge branch 'dev' into dev	2018-06-01 12:02:41 +03:00
Roumen Georgiev	908fd9f77e	strings update	2018-06-01 11:55:59 +03:00
Johannes Mockenhaupt	dd41afa55a	Update prediction colors to match NS.	2018-06-01 02:53:23 +02:00
Roumen Georgiev	41af503104	filling in some data	2018-05-31 17:10:09 +03:00
Roumen Georgiev	da89ea1643	some formatting	2018-05-31 16:47:58 +03:00
Roumen Georgiev	39e704645b	create userOptionsActivity class	2018-05-31 14:45:26 +03:00
Roumen Georgiev	e4e4829c73	update of strings	2018-05-31 14:18:43 +03:00
Roumen Georgiev	f71372444b	strings for danaR options fragment	2018-05-31 13:54:37 +03:00
Milos Kozak	7e57c30ecf	SW Exit label	2018-05-25 13:00:08 +02:00
Milos Kozak	35c07d1e60	SW scroll to the top on activity create	2018-05-24 00:13:59 +02:00
Milos Kozak	683caf78f8	SW configure insulin button	2018-05-23 13:47:16 +02:00
Milos Kozak	fa2c0ab003	Merge pull request #994 from MilosKozak/startupwizard Startupwizard	2018-05-22 23:07:04 +02:00
Milos Kozak	53bdb0bf09	asking permissions to notifications	2018-05-22 23:06:17 +02:00
Milos Kozak	2626e5bb63	SW android permissions	2018-05-22 17:34:09 +02:00
Milos Kozak	4fa24fb009	SW add more texts	2018-05-20 23:44:09 +02:00
Milos Kozak	b57683eaf5	SW rename package	2018-05-20 21:55:53 +02:00
Andy Rozman	e8f860be8b	- copied RL code - copied Medtronic code - added BLE Scan - added RL Stats activity - added RL configuration display	2018-05-20 20:53:55 +01:00
Milos Kozak	f24d296836	SW nsclient screen finalizing	2018-05-20 21:36:17 +02:00
Milos Kozak	52a4f9af14	SW loop screen update	2018-05-20 16:29:15 +02:00
Milos Kozak	de8557a115	SW sensitivity plugin	2018-05-20 16:17:53 +02:00
Milos Kozak	bac1be1944	Merge pull request #1050 from boysim/dev Added and improved dutch translations	2018-05-20 14:46:41 +02:00
Milos Kozak	7714aa9138	Merge branch 'dev' into startupwizard	2018-05-20 14:18:58 +02:00
boysim	5c346f5b79	addedd formattng="false"	2018-05-20 14:18:37 +02:00
Milos Kozak	53cbe05436	Merge pull request #1019 from McHoffi/obj.7-add-info Obj.7 add info about using SMB/maxIOB	2018-05-20 14:14:11 +02:00
boysim	e2bfb224f2	dutch typo fixes	2018-05-20 13:36:28 +02:00
boysim	da8acd4a1e	dutch typo fixes	2018-05-20 12:55:52 +02:00
Simon Pauwels	25b20f13f1	Merge pull request #50 from MilosKozak/dev 20 mei	2018-05-20 12:20:49 +02:00
Milos Kozak	948e925d12	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-05-20 10:56:37 +02:00
Milos Kozak	06e52bb6ae	remove duplicated key	2018-05-20 10:56:32 +02:00
Milos Kozak	e91d7e0d11	Merge pull request #1045 from MilosKozak/AdrianLxM-patch-2 Swedish update	2018-05-15 14:27:39 +02:00
AdrianLxM	bf23a8f935	polish update	2018-05-15 14:20:35 +02:00
AdrianLxM	bae05b26bb	Update strings.xml Thanks Marcus	2018-05-15 14:03:14 +02:00
TebbeUbben	3103a0f276	Some styling for SW	2018-05-13 13:40:34 +02:00
Johannes Mockenhaupt	52da1feaf0	i18n: add German translation, layout issues with longer translations. Dialog headers (insulin, carbs, prime/fill) now lock proper at least in English and German.	2018-05-13 13:35:24 +02:00
Johannes Mockenhaupt	24e672a7f8	Add icon header to calibration dialog.	2018-05-13 12:48:30 +02:00
Johannes Mockenhaupt	1883ac06dd	Use TT color for TT confirmations in dialogs.	2018-05-13 12:14:49 +02:00
Andy Rozman	2cc4fe4450	Added options Max Bolus and Max Basal Little bit of refactoring in Medtronic code	2018-05-12 00:41:44 +01:00
boysim	aab85fe298	added dutch translations	2018-05-11 23:23:55 +02:00
boysim	bf5e8e7142	added dutch translations	2018-05-11 21:26:42 +02:00
Simon Pauwels	f788f5981d	Merge pull request #49 from MilosKozak/dev 11/05	2018-05-11 21:05:31 +02:00
Milos Kozak	4fae6c703c	SW autostart SetupWizard	2018-05-11 13:14:59 +02:00
Milos Kozak	ff2cc04408	SW warn if exported configuration is missing	2018-05-11 13:04:17 +02:00
Milos Kozak	7be418fdf2	Merge pull request #980 from triplem/de DE translation	2018-05-11 09:24:24 +02:00
Markus M. May	cdd264686b	fix duplicate %	2018-05-11 08:43:24 +02:00
Milos Kozak	0a51c86afb	SW Configure APS button	2018-05-11 00:09:35 +02:00
Milos Kozak	376fffa6ec	SW Import settings, Skip wizard	2018-05-10 23:59:20 +02:00
Milos Kozak	e105e5149e	Merge pull request #1032 from jotomo/wear-wizard-tt Wear wizard: add TT config option.	2018-05-10 16:53:34 +02:00
Markus M. May	6d04d4b6e5	use positional indices in formatted strings to allow the usage of the translation editor	2018-05-10 16:53:01 +02:00
Roumen Georgiev	91c0b1a2ec	make Objectives visible	2018-05-10 14:36:05 +03:00
Milos Kozak	d5137a061b	Merge branch 'dev' into virtual_pump_Bug863	2018-05-10 13:19:44 +02:00
Roumen Georgiev	61afdd6e4c	cleanup	2018-05-10 14:05:33 +03:00
Roumen Georgiev	9ac081dd1d	arrays.xml clean	2018-05-10 14:01:17 +03:00
Roumen Georgiev	016aa1c069	Added insulin descriptions to SW screen	2018-05-10 13:56:50 +03:00
Roumen Georgiev	33a6135e75	Added insulin descriptions to SW screen	2018-05-10 13:48:18 +03:00
boysim	0227fc0089	added dutch translations	2018-05-10 11:53:38 +02:00
Roumen Georgiev	06180e3bbd	Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into dev	2018-05-10 12:51:12 +03:00
Simon Pauwels	a5babe7934	Merge pull request #48 from MilosKozak/dev 10/05	2018-05-10 10:59:51 +02:00
Milos Kozak	fb7067b207	SW profile switch	2018-05-09 19:24:20 +02:00
Milos Kozak	1ba828d20a	SWFragment	2018-05-09 18:49:42 +02:00
Johannes Mockenhaupt	a2a165d510	Wear wizard: make TT option depend on BG being enabled.	2018-05-09 16:46:22 +02:00
Roumen Georgiev	e3153230e0	added NSClient followup	2018-05-09 17:11:07 +03:00
Roumen Georgiev	a7bbf93599	Merge pull request #19 from MilosKozak/startupwizard Startupwizard	2018-05-09 14:49:17 +03:00
Milos Kozak	bacb3fb337	SW pump screen	2018-05-09 13:38:17 +02:00
Milos Kozak	ed43eddc83	SWInfotext	2018-05-09 11:55:21 +02:00
Milos Kozak	61a7d69a65	Merge branch 'dev' into startupwizard	2018-05-09 11:41:05 +02:00
Milos Kozak	dbc5e3689a	Merge pull request #1028 from andyrozman/translation_irish Translation - Irish (Gaeilge)	2018-05-09 11:20:52 +02:00
Andy Rozman	bacc79970a	Added formated=false to some translations.	2018-05-09 10:19:27 +01:00
Milos Kozak	8c2d0d80ee	Merge pull request #1017 from MilosKozak/notification-height Tests required: Notification height	2018-05-09 10:16:29 +02:00
McHoffi	77522d0770	Update strings.xml	2018-05-09 09:45:53 +02:00
Milos Kozak	0c848b25f6	Merge branch 'dev' into translation_irish	2018-05-09 09:25:11 +02:00
Milos Kozak	62a83bc197	Merge pull request #1010 from MilosKozak/sv-update swedish update	2018-05-08 23:32:10 +02:00
Milos Kozak	faba0d9ff6	Merge pull request #1023 from MilosKozak/polish-translation Polish translation	2018-05-08 23:27:14 +02:00
Milos Kozak	8c042b4bc8	Merge pull request #1029 from RadoslavR/patch-58 bg translation again	2018-05-08 23:18:52 +02:00
Johannes Mockenhaupt	39905f8e60	Darker UAM, ZT prediction colors. They now have the same level of 'brightness'.	2018-05-08 21:26:52 +02:00
Markus M. May	86a91baad7	Fix translation	2018-05-08 20:56:02 +02:00
Roumen Georgiev	e357c7fd1b	adding pump selection	2018-05-08 15:14:36 +03:00
Johannes Mockenhaupt	ce6e53e9c6	Wear wizard: add TT config option.	2018-05-08 13:28:01 +02:00
Radoslav Radev	0164da23a4	Update strings.xml	2018-05-07 21:34:55 +03:00
Markus M. May	5314c24099	Additional translations	2018-05-07 20:25:30 +02:00
Andy Rozman	3baf907267	Initial irish translation	2018-05-07 16:45:38 +01:00
Andy Rozman	41205d4ba7	Merge branch 'dev' into riley_link_medtronic	2018-05-07 12:11:38 +01:00
Andy Rozman	af56304669	Initial commit after dev was merged into here	2018-05-07 12:05:53 +01:00
AdrianLxM	c6dac2789c	one more polish update	2018-05-07 10:30:07 +02:00
AdrianLxM	af2c27236b	polish update	2018-05-07 10:24:06 +02:00
boysim	2ae6369362	added dutch translations	2018-05-06 22:52:04 +02:00
AdrianLxM	3385a23bdb	Merge pull request #1004 from pedroll/aaps20_rc3 Spanish translation	2018-05-06 20:25:17 +02:00
pedroll	0d2a0798f7	Spanish translation 2	2018-05-06 20:04:12 +02:00
pedroll	7b73c59ee5	Spanish translation 2	2018-05-06 20:04:12 +02:00
AdrianLxM	f3967e07d2	polish in gerenal strings.xml	2018-05-06 19:44:58 +02:00
AdrianLxM	858c75095b	polish arrays.xml	2018-05-06 19:32:43 +02:00
AdrianLxM	b89ac3049c	polish fix strings	2018-05-06 19:30:35 +02:00
AdrianLxM	7b0acd1c4a	polish remove translatable=false	2018-05-06 19:29:00 +02:00
AdrianLxM	270f60ac1c	polish first - thanks Tomasz K.	2018-05-06 19:25:10 +02:00
McHoffi	06948ca0f4	Update strings.xml	2018-05-06 18:16:42 +02:00
Radoslav Radev	b08332e340	bg translation	2018-05-06 14:49:10 +03:00
McHoffi	36d6edf0db	Update strings.xml	2018-05-06 12:16:51 +02:00
Johannes Mockenhaupt	b9c649bd68	Uso blue/orange for carbs/insulin in confirmation dialogs. Aligns with the graph's use of using blueish colors insulin and orange for carbs stuff.	2018-05-06 11:46:09 +02:00
AdrianLxM	1ac41323e6	fix notification last line cutoff	2018-05-05 21:55:49 +02:00
AdrianLxM	260e259fb0	Update strings.xml	2018-05-05 15:17:03 +02:00
AdrianLxM	d574c70471	Merge pull request #1011 from Heiner1/dev-strings Dev strings	2018-05-05 10:12:20 +02:00
swissalpine	fb04250c90	Elliminat syntax error	2018-05-05 10:00:30 +02:00
Heiner1	3a0c34e7b6	Update strings.xml	2018-05-05 09:45:10 +02:00
AdrianLxM	499edd7c05	swedish update	2018-05-05 09:20:29 +02:00
Radoslav Radev	9aeb2b6ede	Update strings.xml	2018-05-04 23:51:08 +03:00
Markus M. May	e07aecd62d	Further translations	2018-05-04 22:02:32 +02:00
AdrianLxM	1646420c47	base basal -> Basal Base (was Base Temporal)	2018-05-04 20:17:55 +02:00
pedroll	5ff86e9c34	Spanish translation	2018-05-04 19:54:21 +02:00
Milos Kozak	f5a23b2921	Merge branch 'dev' into virtual_pump_Bug863	2018-05-04 19:18:52 +02:00
Andy Rozman	4fb8e899c2	Feature Request/Bug #863 - merged with dev - extended PumpType with new setting in PumpDescription - added Insight pump settings for VirtualPump	2018-05-04 15:48:46 +01:00
Milos Kozak	61e6404bbe	Merge pull request #995 from MilosKozak/wear-wizard Wear eCarbs	2018-05-04 14:33:55 +02:00
Milos Kozak	963f1e1abf	Merge branch 'dev' into startupwizard	2018-05-04 13:26:40 +02:00
swissalpine	7312bf061a	Update colors.xml	2018-05-04 12:30:28 +02:00
Andy Rozman	f2df13dbfb	Merge branch 'dev' into virtual_pump_Bug863	2018-05-04 10:06:18 +01:00
Milos Kozak	55661ca7a0	SWButton	2018-05-04 10:17:50 +02:00
swissalpine	010a2f3fd8	Make deviation bars transparent	2018-05-04 10:04:45 +02:00
Radoslav Radev	52411f7afe	half of the Bulgarian translation	2018-05-03 23:34:50 +03:00
AdrianLxM	fb75346bcd	ecarb make settings consistent	2018-05-03 22:08:50 +02:00
Milos Kozak	4539756455	Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into startupwizard	2018-05-03 22:02:12 +02:00
Milos Kozak	dea5ff0080	styles cleanup	2018-05-03 22:01:59 +02:00
Milos Kozak	d1958a3e2d	Merge branch 'dev' into startupwizard	2018-05-03 21:31:55 +02:00
Milos Kozak	02590ddd72	SW remove unneeded code	2018-05-03 21:29:34 +02:00
McHoffi	39e9448c67	Typo fix	2018-05-03 21:20:54 +02:00
Milos Kozak	94db444acb	SW validator, language, cleanup	2018-05-03 20:06:13 +02:00
Milos Kozak	36265ab1c6	SWPlugin	2018-05-03 18:41:47 +02:00
Andy Rozman	421946269a	Merge branch 'dev' into riley_link_medtronic	2018-05-03 17:23:23 +01:00
Andy Rozman	f6110bd096	Merge branch 'virtual_pump_Bug863' into riley_link_medtronic	2018-05-03 16:54:03 +01:00
AdrianLxM	43dc7d1846	wear cathegorize preferences	2018-05-03 17:49:31 +02:00
AdrianLxM	fe0f2e3ce6	wearwizard settings on phone	2018-05-03 17:49:13 +02:00
Andy Rozman	5b8779f8a7	Feature Request/Bug #863 - added PumpCapability (to set boolean values) - added Dana Pumps to PumpType and to VirtulaPumps array	2018-05-03 15:10:34 +01:00
Roumen Georgiev	515590cdf6	other screens	2018-05-03 17:04:56 +03:00
Roumen Georgiev	425ba77200	other screens	2018-05-03 16:59:23 +03:00
Roumen Georgiev	083730f476	WIP: BGSOURCE screen	2018-05-03 09:02:16 +03:00
Andy Rozman	416bd2ff41	Feature Request/Bug #863 - added package PumpCommon for common pump files - added DoseSettings, DoseStepSize, PumpTempBasalType which are needed for PumpType - added PumpType which contains all definitions for pumps - extended fragement to display Pump Type and Pump Type definitions - extended plugin to read configuration and set pumpDescription object - extended pref_virtualpump to add pump type selection	2018-05-02 23:59:33 +01:00
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

... 7 8 9 10 11 ...

2131 commits