22 commits

Author	SHA1	Message	Date
Milos Kozak	c4ba821dc1	Merge branch 'dev' into automation	2019-07-14 20:00:42 +02:00
Milos Kozak	c0345ce56c	Merge branch 'dev' into automation	2019-07-04 23:37:36 +01:00
Milos Kozak	323c282b9f	Tidepool in engineering mode only	2019-06-30 15:38:30 +02:00
Tebbe Ubben	5af80ceb02	Support for new Dexcom app	2019-06-19 01:38:55 +02:00
Milos Kozak	243e6c5801	pump manufacters etc	2019-06-09 14:02:33 +02:00
Milos Kozak	10584d9b00	RxBus	2019-06-07 12:46:08 +02:00
Milos Kozak	01006b32ce	remove explicit enable checkbox, test login	2019-06-07 09:13:29 +02:00
Milos Kozak	e32801ca6b	preferences, button	2019-06-04 07:38:17 +02:00
Milos Kozak	3ab2a142d1	Merge remote-tracking branch 'origin/dev' into automation	2019-05-02 22:27:54 +02:00
Milos Kozak	4336b47431	NPE fixes from Firebase	2019-04-29 11:36:30 +02:00
Nico Schmitz	fc7e65c4d1	Update to recent upstream/dev	2019-03-22 23:08:13 +01:00
Nico Schmitz	91e4b01f10	Display actions and merge recent upstream/dev ... - Add ActionListAdapter - Add ChooseActionDialog - Merge upstream/dev branch	2019-03-19 19:08:46 +01:00
Milos Kozak	d9a9c933bc	package refactor	2019-02-28 23:16:50 +01:00
Milos Kozak	395faa7dc9	pumps package refactor	2019-02-26 20:38:27 +01:00
Milos Kozak	b0dd2f464b	Insight driver (Sight remote) removal	2019-02-25 19:33:01 +01:00
Nico Schmitz	9e03f0f8ca	Update to current dev branch	2018-12-11 14:51:26 +01:00
Milos Kozak	3eee5b13c7	LocationService	2018-09-19 15:26:58 +02:00
Milos Kozak	f7269a806d	nsclient allow general preferences	2018-09-11 20:08:59 +02:00
Nico Schmitz	5386c7db4a	Update to upstream/dev and resolve conflicts	2018-08-19 14:37:42 +02:00
Milos Kozak	fff2e84608	remove g5uploader flavor	2018-08-07 21:45:35 +02:00
Milos Kozak	fcf47ecc03	NSClient2 flavor	2018-08-07 21:07:43 +02:00
Milos Kozak	75bb38ba1f	move activities to new package	2018-07-29 00:08:28 +02:00

Renamed from app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java (Browse further)