caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
12444 commits 1 branch 20 tags 140 MiB
Commit graph

12444 commits

This branch
This branch
All branches
Author SHA1 Message Date
Milos Kozak 6124ef25a4 report wrong alarm data #2 2017-10-13 08:21:37 +02:00
Milos Kozak 91e286b2ae report wrong alarm data 2017-10-13 08:11:30 +02:00
Milos Kozak 45a2eba0c2 fix NPE 2017-10-13 08:06:27 +02:00
AdrianLxM 71d95bea92 fix ic isf 2017-10-13 02:56:49 +02:00
AdrianLxM c9d4ea30b0 Merge pull request #456 from AdrianLxM/wear-flavours 
Spinner set selection delayed
 2017-10-13 00:31:07 +02:00
AdrianLxM 869b3eff5f Spinner set selection delayed 2017-10-12 23:56:58 +02:00
AdrianLxM 729023b010 Merge pull request #455 from AdrianLxM/wear-flavours 
profile work and wear flavours
 2017-10-12 23:10:27 +02:00
AdrianLxM 746d71bcff remove wear flavours 2017-10-12 18:24:48 +02:00
AdrianLxM f751638a7f enabling wearcontrols from preferences 2017-10-12 18:01:10 +02:00
AdrianLxM 944e334231 migrate CPP->LP working 2017-10-12 12:44:17 +02:00
AdrianLxM 6f97e52a07 migrate CPP->LP partial 2017-10-12 12:36:06 +02:00
AdrianLxM 45c07d4106 U/h -> U 2017-10-11 23:38:08 +02:00
AdrianLxM 4667a047ea add sum to basal in lp 2017-10-11 20:57:43 +02:00
AdrianLxM 39b18915d0 Align LP GUI 2017-10-11 20:19:42 +02:00
AdrianLxM 339c33bd75 Spinner - selection events only after first touch 2017-10-11 19:25:09 +02:00
AdrianLxM 374983e1ae only inflate elements when needed 2017-10-11 07:59:41 +02:00
AdrianLxM c181aaaf34 Basal sum in label 2017-10-11 02:32:17 +02:00
AdrianLxM e6565c1911 reuse button on profile switch 2017-10-11 00:25:44 +02:00
AdrianLxM 02369b952b a little safer< 2017-10-10 22:54:24 +02:00
AdrianLxM 398e950f8e fix percentage concatenation on profile names 2017-10-10 22:11:06 +02:00
AdrianLxM 549b72b032 fix percentage/shift from watch 2017-10-10 21:51:58 +02:00
AdrianLxM b60ff8ceef max timeshift to 23 2017-10-10 20:47:38 +02:00
AdrianLxM 36784b983e remove cpp import 2017-10-10 20:42:29 +02:00
AdrianLxM 1410b2e706 wear cpp -> general profile 2017-10-10 20:32:43 +02:00
Milos Kozak 982e46d958 prepare profileswitch function for watch 2017-10-10 19:25:21 +02:00
Milos Kozak 77ec52ff23 fix sending profile switch to pump 2017-10-10 19:19:39 +02:00
Milos Kozak da71cdfca0 Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile 2017-10-10 19:15:07 +02:00
Milos Kozak 24099222f3 Dana R & v2 speed selection 2017-10-10 19:14:43 +02:00
Milos Kozak 50de4a5979 Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile 2017-10-10 18:03:50 +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
Milos Kozak 34b3252692 Merge pull request #450 from jotomo/tt-popup 
NSTreatmentDialog: use same format for ES reason field as for profile.
 2017-10-09 21:51:19 +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
Milos Kozak 4687b001e0 more cpp functionality to Profile 2017-10-08 14:41:51 +02:00
Johannes Mockenhaupt c6c5624b85
Singleton OpenAPSSMBPlugin. 2017-10-07 23:05:37 +02:00
Milos Kozak a617d591b0 fix NPE 2017-10-07 22:29:55 +02:00
Milos Kozak 8f259042d6 fix NPE 2017-10-07 22:24:42 +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 6618d2fef2 fix negative timeshift 2017-10-07 20:42:56 +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 c56ecfced6 Merge pull request #447 from AdrianLxM/treatments-configbuilder2 
treatments in config builder
 2017-10-07 18:29:44 +02:00
Milos Kozak 9e7c81613c Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile 2017-10-07 18:28:59 +02:00
Milos Kozak d024164ff0 Merge pull request #448 from jotomo/profile 
Use SpinnerHelper in TimeListEdit.
 2017-10-07 18:28:23 +02:00
Milos Kozak ef645ca600 fix merge conflict 2017-10-07 18:27:20 +02:00
Milos Kozak d6fb912ff9 Singleton & Crashlytics logging part 2 2017-10-07 17:48:03 +02:00