Commit graph

151 commits

Author SHA1 Message Date
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 d6a27c1af0 1.5h 2017-08-23 13:28:07 +02:00
Johannes Mockenhaupt f763eb246b
Use 1.5g-combo-dev as version. 2017-08-12 15:22:55 +02:00
Sandra Keßler e2b09f9e42 recovered merge/unmerge damage 2017-08-11 17:35:58 +02:00
Timm Korte 07822811ac Merge remote-tracking branch 'milosremote/dev' into develop 2017-08-07 22:16:37 +02:00
Johannes Mockenhaupt c524e2a685
Revert merge which was committed due to a misunderstanding. 2017-08-06 21:47:17 +02:00
Milos Kozak a40afd0948 1.5g 2017-08-06 14:28:01 +02:00
Sandra Keßler 4147e7f6a1 change Version info 2017-07-31 21:45:03 +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
Milos Kozak 7a572d2341 1.5f 2017-07-25 22:53:55 +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
AdrianLxM e381d197cb 1.5e 2017-07-21 16:49:43 +02:00
Johannes Mockenhaupt 4dc38e447a
Add first ruffyscripter test (needs ruffy to be available during test somehow). 2017-07-18 21:20:40 +02:00
Milos Kozak 2724e10c2f 1.5d 2017-07-07 18:39:31 +02:00
Milos Kozak 771ff0d781 1.5c 2017-07-02 11:47:16 +02:00
Milos Kozak 37055cd917 allow decimal number in NumberPicker 2017-06-30 17:43:10 +02:00
Milos Kozak a8a4ffcab1 ver 1.5b 2017-06-30 10:24:45 +02:00
Milos Kozak ea06a90453 1.5a 2017-06-27 23:24:30 +02:00
Milos Kozak a3db05ec39 v 1.50 & fix conflict 2017-06-04 22:37:58 +02:00
Milos Kozak 32084094fd v 1.46 2017-06-01 18:59:39 +02:00
Milos Kozak 6004a17594 change database structures 2017-05-21 22:05:03 +02:00
Milos Kozak 012b6a2c26 v 1.45 2017-05-20 20:42:10 +02:00
Milos Kozak 0a182fb022 v 1.44 2017-05-17 18:54:48 +02:00
Milos Kozak a03b5be189 v 1.43 2017-05-09 21:34:00 +02:00
Milos Kozak c44ea83165 1.42 bump 2017-04-30 21:36:47 +02:00
Milos Kozak 1abdadceca ver 1.41 2017-04-30 10:24:09 +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 c18fcfda62 revert sdk to 23 2017-04-22 10:18:31 +02:00
Milos Kozak 90a55966b1 Fast Acting Insulin Prolonged 2017-04-21 15:36:49 +02:00
Milos Kozak 51439bbf33 upgrade libraries 2017-04-21 12:03:54 +02:00
Milos Kozak 25491fbac6 Insulin interface 2017-04-21 11:45:25 +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 6e90b425f7 ver 1.31 bump 2017-04-09 21:50:53 +02:00
Milos Kozak a203591d44 ver 1.3 bump 2017-04-09 11:47:20 +02:00
Milos Kozak 5f0de38dfe 1.3rc2 2017-04-01 12:47:18 +02:00
Milos Kozak aa8fa729ad update fabric 2017-03-09 10:25:13 +01:00
Milos Kozak 02b90fa6c7 update gradle to 2.3 2017-03-07 10:52:25 +01:00
Milos Kozak 79d282d215 add answers 2017-03-02 23:08:40 +01:00
Milos Kozak c79ccf7ccb update crashlytics 2017-03-02 23:02:07 +01:00
Milos Kozak 8c8af1755b 1.3rc1 2017-03-02 21:14:08 +01:00
Milos Kozak 2fceb0b891 1.1h 2017-02-25 20:59:46 +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 71112a90e2 internal nsclient 2017-02-17 13:18:36 +01:00
Milos Kozak 1a3d3eb97c 1.1g 2017-02-14 21:41:39 +01:00
Milos Kozak ac82e2b044 1.1f 2017-02-13 21:06:20 +01:00
AdrianLxM e85e651c56 wear full status support and product flavour with/without controls on wear 2017-02-13 01:55:35 +01:00
viktoria 0ffddcdefa Deprecation TimeListEdit - add design support libraries 2017-02-11 14:01:37 +01:00
Milos Kozak 8db3f258cd xdrip calibration 2017-02-10 16:53:39 +01:00
Milos Kozak 9d7ac0ce81 1.1e 2017-02-09 17:17:40 +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
Milos Kozak 90924e607f 1.1d 2017-01-30 14:36:04 +01:00
viktoria 7d68b50a56 Add prefernces.json validator lib 2017-01-29 13:00:21 +01:00
LadyViktoria 0ddc26ce89 Add prefernces.json small import fixes 2017-01-26 12:10:50 +01:00
LadyViktoria 4702a87d8e Add prefernces.json add safety limits 2017-01-26 12:07:25 +01:00
Milos Kozak 98a95fb16e 1.1c 2017-01-19 19:22:04 +01:00
Milos Kozak 452edd5771 1.1b 2017-01-18 21:41:10 +01:00
Milos Kozak ba370b3cf3 ver 1.1a 2017-01-18 08:05:46 +01:00
Milos Kozak f704090eac version bump 1.1 2017-01-07 23:39:29 +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 d6f4135d6e travis 2016-12-28 15:58:44 +01:00
Milos Kozak 13f2fce31e product flavors dimensions update 2016-12-27 18:47:48 +01:00
Milos Kozak 34fce81563 fix build warning 2016-12-27 16:21:04 +01:00
AdrianLxM 87d49c03c8 wear product flavors 2016-11-26 07:10:22 +01:00
AdrianLxM 2fd93a8e31 wear installing on watch 2016-11-24 16:23:31 +01:00
Milos Kozak bad7e5d7c4 gradle fix 2016-11-08 22:55:08 +01:00
Milos Kozak a2d4f22bd7 added git HEAD and version to pump status and logs 2016-11-08 19:10:25 +01:00
Milos Kozak d67ae5df78 version bump 1.0.20 2016-11-07 10:16:13 +01:00
Milos Kozak 8f17ecdd89 version bump 1.0.19 2016-10-25 23:40:03 +02:00
AdrianLxM e2956db141 don't complain on missing translations 2016-10-21 22:16:20 +02:00
Milos Kozak f167174151 version bump 1.0.18 2016-10-21 00:04:54 +02:00
Milos Kozak 38cf01eb62 more build types with maxbolus: full fullteenage fullchild 2016-10-21 00:03:52 +02:00
Milos Kozak 6f8d828ec2 QuickWizard 2016-10-20 23:50:31 +02:00
Milos Kozak b7dfabbe11 version bump 1.0.17 2016-10-10 12:11:34 +02:00
Milos Kozak cf65b3f865 version bump 1.0.16 2016-10-09 11:18:24 +02:00
Milos Kozak 960cde06cf version bump 1.0.15 2016-10-06 20:57:57 +02:00
Milos Kozak 331d94c78e version bump 1.0.14 2016-10-02 16:13:37 +02:00
Milos Kozak 84efccb392 version 1.0.13 bump 2016-09-14 22:03:37 +02:00
Milos Kozak 26c09093d1 version bump 1.0.12 2016-09-09 13:07:32 +02:00
Milos Kozak b5d2d8d931 danarcontrol build variant 2016-09-05 09:11:30 +02:00
Milos Kozak 65ea11d9a8 v 1.0.11 2016-08-21 22:20:17 +02:00
Milos Kozak abe04502c7 1.0.10 bump 2016-08-04 23:41:28 +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 82a16efcc2 bolus wizard full functionality 2016-07-16 22:37:10 +02:00
Milos Kozak 9bd807ea0d productFlavors 2016-07-15 23:53:14 +02:00
Milos Kozak b69dc35716 upload pump status without loop too 2016-07-15 23:18:31 +02:00
Milos Kozak 3127870770 DanaR as profile source 2016-07-11 14:04:57 +02:00
Milos Kozak dc3eb80d52 basic danar comm 2016-07-08 00:17:02 +02:00
Milos Kozak c844a2ad9a DanaR preferences & preferences cleanup 2016-07-07 17:17:54 +02:00
Milos Kozak 6ca5517aef switch + and - in dialogs 2016-07-06 11:11:12 +02:00
Milos Kozak f8301360dc show ver in toolbar 2016-07-03 19:21:41 +02:00
Milos Kozak 5cad7f1cb4 temp basal dialog plus/minus buttons 2016-07-03 13:25:23 +02:00
Milos Kozak 92f4c37fac careportal 2016-07-02 23:58:57 +02:00
Milos Kozak 7322078c0a Crashlytics added 2016-06-24 17:48:11 +02:00
Milos Kozak a5088584a2 OpenAPS MA initial work 2016-06-10 18:50:46 +02:00
Milos Kozak 45cceddfcc basic graph on everview fragment 2016-06-09 00:01:28 +02:00
Milos Kozak 629ed62e03 Profile fragment 2016-06-05 01:40:35 +02:00