Commit graph

  • 7e7e921853 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev Milos Kozak 2018-06-05 14:37:47 +0200
  • 5df51e8a6e check for NPE Milos Kozak 2018-06-05 14:35:18 +0200
  • 32f4a08fa6 slightly more padding on top buttons/fields AdrianLxM 2018-06-05 13:24:48 +0200
  • 4a481bf294
    Merge branch 'dev' into dev Roumen Georgiev 2018-06-05 12:45:00 +0300
  • 54cc768a47 files renamed and added icon Roumen Georgiev 2018-06-05 12:39:55 +0300
  • c1b69404d0 files renamed and added icon Roumen Georgiev 2018-06-05 12:19:47 +0300
  • 37e6e0268c
    Merge pull request #25 from alesinka/master Roumen Georgiev 2018-06-05 10:55:41 +0300
  • 536fe3e5d2
    higher contrast ok and cancel buttons AdrianLxM 2018-06-05 00:15:41 +0200
  • 171209503e
    remove unneeded log statement AdrianLxM 2018-06-05 00:04:03 +0200
  • 9d07e3e83f
    Merge pull request #1072 from jotomo/silly-idea AdrianLxM 2018-06-04 23:54:22 +0200
  • 4998ebae89
    Merge pull request #1071 from TebbeUbben/new-design AdrianLxM 2018-06-04 23:53:42 +0200
  • 5fa79b1db9 Changed accent color to #009688 TebbeUbben 2018-06-04 23:34:56 +0200
  • f7b19e37a1 Button for plugin preferences TebbeUbben 2018-06-04 21:56:31 +0200
  • 80e9d769e4 Compact version of toolbar TebbeUbben 2018-06-04 21:34:21 +0200
  • fbe44b7190 new icon added to danaR tab - user options Alessya 2018-06-04 17:48:02 +0300
  • d31b90cd3e
    Fix format specifier in French translation. Johannes Mockenhaupt 2018-06-04 15:38:06 +0200
  • 19e7d507b2 shutdown value can be 0 Roumen Georgiev 2018-06-04 10:24:20 +0300
  • 1147c28f04 use numberPicker instead of editText Roumen Georgiev 2018-06-04 10:23:01 +0300
  • 358108be49
    Revert "Update prediction colors to match NS." Johannes Mockenhaupt 2018-06-04 02:57:39 +0200
  • 6c1ccebb4a Moved padding to Toolbar TebbeUbben 2018-06-03 23:42:10 +0200
  • 151bd0e058
    Merge pull request #1066 from TebbeUbben/dev AdrianLxM 2018-06-03 23:38:17 +0200
  • 9cf9da0d22 MINIMUM_BASAL_VALUE_REPLACED -> MAXIMUM_BASAL_VALUE_REPLACED TebbeUbben 2018-06-03 23:33:49 +0200
  • 263275659a TabLayout + NavigationDrawer TebbeUbben 2018-06-03 23:28:04 +0200
  • f8c621dc6a Fixed tests TebbeUbben 2018-06-03 11:04:33 +0200
  • a86c654f8d Use real TBR cancels and dismiss their alerts TebbeUbben 2018-06-03 10:56:29 +0200
  • ef6ee43c32
    One-short guards for Fill/Prime dialog. Johannes Mockenhaupt 2018-06-02 18:06:04 +0200
  • f151cbb0bf TBR emulation TebbeUbben 2018-06-02 16:37:53 +0200
  • 054003460c push new settings to pump Roumen Georgiev 2018-06-01 16:42:56 +0300
  • 96fb4323f8
    Merge pull request #1064 from jotomo/purple-pony Milos Kozak 2018-06-01 13:57:20 +0200
  • 32a923d6b8
    Merge pull request #1063 from swissalpine/patch-1 Milos Kozak 2018-06-01 13:56:57 +0200
  • ef8f4f1448
    Fix unit test. Johannes Mockenhaupt 2018-06-01 12:24:09 +0200
  • 75dbf71a70 Merge remote-tracking branch 'origin/dev' into dev Roumen Georgiev 2018-06-01 12:11:29 +0300
  • 861f9bdd8d Timeformat reverse Roumen Georgiev 2018-06-01 12:10:08 +0300
  • 9569fbf183
    Merge branch 'dev' into dev Roumen Georgiev 2018-06-01 12:02:41 +0300
  • 908fd9f77e strings update Roumen Georgiev 2018-06-01 11:55:59 +0300
  • 85bef0036b back to original Roumen Georgiev 2018-06-01 11:45:31 +0300
  • 4581733cd7 some debugging output and forced getting user options Roumen Georgiev 2018-06-01 11:41:37 +0300
  • 319e786988 display 666 in backlightontime if no settings read Roumen Georgiev 2018-06-01 10:08:13 +0300
  • f3d19aa6f4 convert int values to strings Roumen Georgiev 2018-06-01 09:38:18 +0300
  • dd41afa55a
    Update prediction colors to match NS. Johannes Mockenhaupt 2018-05-31 19:12:33 +0200
  • dd60cadd5a
    Fix broken cage age swissalpine 2018-05-31 22:22:22 +0200
  • bbb9c681e6 filling in some data Roumen Georgiev 2018-05-31 17:16:30 +0300
  • 41af503104 filling in some data Roumen Georgiev 2018-05-31 17:10:09 +0300
  • da89ea1643 some formatting Roumen Georgiev 2018-05-31 16:47:58 +0300
  • 39e704645b create userOptionsActivity class Roumen Georgiev 2018-05-31 14:45:26 +0300
  • e4e4829c73 update of strings Roumen Georgiev 2018-05-31 14:18:43 +0300
  • f71372444b strings for danaR options fragment Roumen Georgiev 2018-05-31 13:54:37 +0300
  • 8f5120df4c
    Merge pull request #1061 from triplem/dup_fix Milos Kozak 2018-05-30 18:16:44 +0200
  • a587f72de2 Fix wrong usage of event in refactored source Markus M. May 2018-05-30 18:09:41 +0200
  • 418f68153e
    Merge pull request #1058 from MilosKozak/NSC-no-advancedfiltering Milos Kozak 2018-05-30 08:08:04 +0200
  • 0022960670
    Merge pull request #1059 from triplem/rm_dups Milos Kozak 2018-05-29 22:35:39 +0200
  • 0fe744c3e6 Remove unnecessary assignment Markus M. May 2018-05-29 21:44:33 +0200
  • 41503800e8 Remove some duplicate code lines Markus M. May 2018-05-29 20:57:55 +0200
  • de1196f34b
    NSClient as source without advanced filtering AdrianLxM 2018-05-29 12:57:07 +0200
  • 7e57c30ecf SW Exit label Milos Kozak 2018-05-25 13:00:08 +0200
  • 35c07d1e60 SW scroll to the top on activity create Milos Kozak 2018-05-24 00:13:59 +0200
  • d642418e02 resolve NPE Milos Kozak 2018-05-23 23:43:41 +0200
  • 683caf78f8 SW configure insulin button Milos Kozak 2018-05-23 13:47:16 +0200
  • a7cfcd56e3 SW fix return to 1st page Milos Kozak 2018-05-23 13:20:24 +0200
  • fa2c0ab003
    Merge pull request #994 from MilosKozak/startupwizard Milos Kozak 2018-05-22 23:07:04 +0200
  • 53bdb0bf09 asking permissions to notifications Milos Kozak 2018-05-22 23:06:17 +0200
  • 5d27a28dc9 SW eula Milos Kozak 2018-05-22 20:02:38 +0200
  • 250f9f74a0 move askForStoragePermission Milos Kozak 2018-05-22 18:59:34 +0200
  • 2626e5bb63 SW android permissions Milos Kozak 2018-05-22 17:34:09 +0200
  • d927b83281 Merge remote-tracking branch 'origin/dev' into dev Roumen Georgiev 2018-05-21 11:01:07 +0300
  • 1d39734b19 clear activity queue Roumen Georgiev 2018-05-21 11:00:48 +0300
  • 08ac6c7b31
    Merge pull request #22 from MilosKozak/startupwizard Roumen Georgiev 2018-05-21 10:59:06 +0300
  • 4fa24fb009 SW add more texts Milos Kozak 2018-05-20 23:44:09 +0200
  • c723deaf02 SW patient age screen finalization Milos Kozak 2018-05-20 22:01:32 +0200
  • b57683eaf5 SW rename package Milos Kozak 2018-05-20 21:55:53 +0200
  • e8f860be8b - copied RL code - copied Medtronic code - added BLE Scan - added RL Stats activity - added RL configuration display Andy Rozman 2018-05-20 20:53:55 +0100
  • f24d296836 SW nsclient screen finalizing Milos Kozak 2018-05-20 21:36:17 +0200
  • 953128ffe5
    UAM without advanced filtering AdrianLxM 2018-05-20 19:17:46 +0200
  • 52a4f9af14 SW loop screen update Milos Kozak 2018-05-20 16:29:15 +0200
  • d079052944 Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into startupwizard Milos Kozak 2018-05-20 16:18:10 +0200
  • de8557a115 SW sensitivity plugin Milos Kozak 2018-05-20 16:17:53 +0200
  • 5b9594bdbb SW create elements package Milos Kozak 2018-05-20 15:09:32 +0200
  • d0ed4bd717 SWString fix Milos Kozak 2018-05-20 15:01:03 +0200
  • bac1be1944
    Merge pull request #1050 from boysim/dev Milos Kozak 2018-05-20 14:46:41 +0200
  • 7714aa9138 Merge branch 'dev' into startupwizard Milos Kozak 2018-05-20 14:18:58 +0200
  • 5c346f5b79 addedd formattng="false" boysim 2018-05-20 14:18:37 +0200
  • 53cbe05436
    Merge pull request #1019 from McHoffi/obj.7-add-info Milos Kozak 2018-05-20 14:14:11 +0200
  • 8f0bd8e67f
    Merge pull request #1047 from PoweRGbg/patch-1 Milos Kozak 2018-05-20 13:54:54 +0200
  • e2bfb224f2 dutch typo fixes boysim 2018-05-20 13:36:28 +0200
  • da8acd4a1e dutch typo fixes boysim 2018-05-20 12:55:52 +0200
  • 25b20f13f1
    Merge pull request #50 from MilosKozak/dev Simon Pauwels 2018-05-20 12:20:49 +0200
  • 948e925d12 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev Milos Kozak 2018-05-20 10:56:37 +0200
  • 06e52bb6ae remove duplicated key Milos Kozak 2018-05-20 10:56:32 +0200
  • 4aefea0b28 Add constants file and modified status. Andy Rozman 2018-05-17 14:21:35 +0100
  • 764e035666
    remove wizard from backstack and fix the Exit -> returning to SW Roumen Georgiev 2018-05-16 15:35:17 +0300
  • e91d7e0d11
    Merge pull request #1045 from MilosKozak/AdrianLxM-patch-2 Milos Kozak 2018-05-15 14:27:39 +0200
  • 84cd34f1d3
    Merge pull request #1046 from MilosKozak/AdrianLxM-patch-3 Milos Kozak 2018-05-15 14:27:23 +0200
  • bf23a8f935
    polish update AdrianLxM 2018-05-15 14:20:35 +0200
  • bae05b26bb
    Update strings.xml AdrianLxM 2018-05-15 14:03:14 +0200
  • 66e50f5b62
    Merge pull request #1038 from jotomo/upstreaming Milos Kozak 2018-05-15 13:09:50 +0200
  • e58149379a
    Merge pull request #1043 from jotomo/issue-646 Milos Kozak 2018-05-15 10:55:04 +0200
  • e918301f9a
    Merge pull request #1042 from jotomo/bleep-bleep-bleep Milos Kozak 2018-05-15 10:35:45 +0200
  • 561c7fb470
    Add test. Johannes Mockenhaupt 2018-05-14 00:38:47 +0200
  • 25aa6f859f
    On bolus cancel request, cancel all boluses. Partially addresses #646. Johannes Mockenhaupt 2018-05-13 23:44:12 +0200
  • 29efe11ece
    Combo: always send out progress updates (SMB or not). Johannes Mockenhaupt 2018-05-13 23:04:50 +0200