Commit graph

5357 commits

Author SHA1 Message Date
Simon Pauwels 49b4e3ca08
Merge pull request #22 from jotomo/combo-scripter-v2
jan 27
2018-01-27 18:31:29 +01:00
Milos Kozak 10af618492
Merge pull request #624 from RadoslavR/patch-50
Bg translation
2018-01-27 15:23:03 +01:00
Radoslav Radev d4fe03ac30
Bg translation 2018-01-27 16:12:51 +02:00
Milos Kozak b4d13c727e let nsclient bg source be with advanced filtering temporary 2018-01-27 15:07:15 +01:00
Milos Kozak 5b11c5630c hide deviation slope graphs 2018-01-27 14:47:35 +01: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 2c9cd89ff3
Add unit test 2018-01-26 22:44:12 +00:00
Jamorham b831fd7dfb
Insight Temporary basal absolute 2018-01-26 22:34:43 +00:00
Jamorham f036ca4547
Attempt to eliminate duplicate connectors 2018-01-26 22:27:04 +00: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 0966bea1e8
InsightPumpFragment: add redundant casting for travis 2018-01-26 17:17:04 +00:00
Jamorham ee0a53976f
StatusItemViewAdapter add redundant casting for travis 2018-01-26 17:10:43 +00:00
Jamorham f30efd0224
Insight fragment use status list 2018-01-26 16:59:14 +00:00
Jamorham 076685992c
Insight status list and connector 2018-01-26 16:58:19 +00:00
Jamorham f2cfc3cdbd
Update helpers 2018-01-26 16:56:09 +00:00
Jamorham 2f7dc11b9f
Update Insight fragment layouts 2018-01-26 16:46:09 +00:00
Milos Kozak e5d20ca996 ButterKnife to Dana fragment 2018-01-26 17:18:40 +01:00
Jamorham 31b0ce21e5
StatusItem ui elements 2018-01-26 16:12:37 +00:00
Johannes Mockenhaupt 3d1f8c0893
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  Disable release build checks until wear lib upgrade (#620).
  Rv2,RS: use safe carb diff 30s
2018-01-26 16:19:45 +01:00
Milos Kozak a7a4693e9c
Merge pull request #621 from jotomo/disable-release-checks
Disable release build checks until wear lib upgrade (#620).
2018-01-26 16:18:48 +01:00
Johannes Mockenhaupt 3100447167
Disable release build checks until wear lib upgrade (#620). 2018-01-26 15:57:26 +01:00
Milos Kozak d8a6c0d111 Rv2,RS: use safe carb diff 30s 2018-01-26 15:47:45 +01:00
Johannes Mockenhaupt 61bb6aa1ba
Combo: declare as not supporting carb infos. 2018-01-26 13:53:50 +01: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
Johannes Mockenhaupt 4a1970926c
Cleanup. 2018-01-26 13:53:17 +01:00
Milos Kozak 98e850b1b3 Merge branch 'dev' into smb060 2018-01-26 11:54:09 +01:00
Jamorham 8fa0de19c2
Insight async add wake locking 2018-01-26 10:31:11 +00:00
Jamorham 11fcfb88d4
More helper methods 2018-01-26 10:29:56 +00:00
Milos Kozak 6be2988e31
Merge pull request #619 from MilosKozak/sdk27
Sdk27
2018-01-26 10:14:21 +01:00
Milos Kozak 3c1e18d5d2
Merge pull request #617 from jotomo/push-carbs-to-supported-pumps-only
Push carbs only to pumps supporting storing carbs.
2018-01-26 10:10:16 +01:00
Milos Kozak 26852e1ed3
Merge pull request #618 from jotomo/format-specifier-fixes
Fix format specifices in Spanish translation, add MainApp.gs(id, args).
2018-01-26 10:03:17 +01:00
Jamorham 69da0cf57a
Always connected option 2018-01-25 23:21:42 +00:00
Jamorham 4be1f52254
Cancels for TBR + extended 2018-01-25 23:21:11 +00:00
Jamorham 8ee75c5c72
Try to get missing status 2018-01-25 23:20:14 +00:00
Jamorham 07d17ede5f
Lower reconnect threshold 2018-01-25 21:26:11 +00:00
Jamorham d421ceffa6
Insight automatic reconnector 2018-01-25 20:55:55 +00:00
Jamorham c8ba4076c6
Update Helpers 2018-01-25 20:55:02 +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
Simon Pauwels 3c2840b495
Merge pull request #21 from jotomo/combo-scripter-v2
jan 25
2018-01-25 19:23:24 +01:00
Jamorham 54e2f7a712
Current work in progress 2018-01-25 17:30:16 +00:00
Jamorham 8cf159a6a7
Insight async callback handling 2018-01-25 17:23:57 +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 9213182b7b travis accept license manually 2018-01-25 13:28:46 +01:00
Johannes Mockenhaupt ed1226ae67
Push carbs only to pumps supporting storing carbs. 2018-01-25 13:22:01 +01:00
Milos Kozak 91bd21131d Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-01-25 11:27:17 +01:00