Commit graph

  • b08332e340
    bg translation Radoslav Radev 2018-05-06 14:49:10 +0300
  • 22ecdc0e9d
    Merge pull request #1018 from jotomo/colors-unification AdrianLxM 2018-05-06 13:11:12 +0200
  • f0351834ff default DIA AdrianLxM 2018-05-06 12:49:03 +0200
  • 36d6edf0db
    Update strings.xml McHoffi 2018-05-06 12:16:51 +0200
  • 491b04d562
    Merge pull request #2 from MilosKozak/dev McHoffi 2018-05-06 12:13:46 +0200
  • 56cbac3b4d
    Leftover MainApp.gs rewrite. Johannes Mockenhaupt 2018-05-06 11:49:16 +0200
  • ef70c1f244
    MainApp.sResources.getColor -> MainApp.gc. Johannes Mockenhaupt 2018-05-06 11:47:15 +0200
  • b9c649bd68
    Uso blue/orange for carbs/insulin in confirmation dialogs. Johannes Mockenhaupt 2018-05-06 11:46:09 +0200
  • 1ac41323e6 fix notification last line cutoff AdrianLxM 2018-05-05 21:55:49 +0200
  • 116222858e update lastApproachingDailyLimit AdrianLxM 2018-05-05 21:12:09 +0200
  • d99fafe375 restrict aproaching daily limit to once every 30 minutes RS AdrianLxM 2018-05-05 21:10:15 +0200
  • 5458df0907 restrict aproaching daily limit to once every 30 minutes Rv2 AdrianLxM 2018-05-05 21:08:17 +0200
  • c2315b7bea restrict aproaching daily limit to once every 30 minutes R-Korean AdrianLxM 2018-05-05 21:03:35 +0200
  • b43eff8e55 restrict aproaching daily limit to once every 30 minutes R AdrianLxM 2018-05-05 21:02:31 +0200
  • 70b2b1502f restrict wrong password notification to once every 30 seconds AdrianLxM 2018-05-05 20:59:11 +0200
  • c8c7e12056 Wrong password notification AdrianLxM 2018-05-05 20:54:10 +0200
  • 246c8922df Korean wrong password notification AdrianLxM 2018-05-05 20:51:46 +0200
  • 1e0b7d331a
    Fix finding BG in graph for treatments before the first displayed BG. Johannes Mockenhaupt 2018-05-05 19:09:22 +0200
  • 260e259fb0
    Update strings.xml AdrianLxM 2018-05-05 15:17:03 +0200
  • d574c70471
    Merge pull request #1011 from Heiner1/dev-strings AdrianLxM 2018-05-05 10:12:20 +0200
  • 4738c7ece9
    Merge pull request #1012 from swissalpine/patch-1 AdrianLxM 2018-05-05 10:10:17 +0200
  • fb04250c90
    Elliminat syntax error swissalpine 2018-05-05 10:00:30 +0200
  • 3a0c34e7b6
    Update strings.xml Heiner1 2018-05-05 09:45:10 +0200
  • dc72506cdc
    Merge pull request #2 from MilosKozak/dev Heiner1 2018-05-05 09:33:49 +0200
  • 499edd7c05
    swedish update AdrianLxM 2018-05-05 09:20:29 +0200
  • 1b0af11ff5
    Merge pull request #1008 from RadoslavR/patch-56 Milos Kozak 2018-05-05 00:19:30 +0200
  • 9aeb2b6ede
    Update strings.xml Radoslav Radev 2018-05-04 23:51:08 +0300
  • e07aecd62d Further translations Markus M. May 2018-05-04 22:02:32 +0200
  • 49a621066d
    Merge pull request #1005 from jotomo/combo-visual-glitch AdrianLxM 2018-05-04 21:38:10 +0200
  • d15ada5cd9
    Combo: Fix visual glitch in fragment. Johannes Mockenhaupt 2018-05-04 21:13:49 +0200
  • 1646420c47
    base basal -> Basal Base (was Base Temporal) AdrianLxM 2018-05-04 20:17:55 +0200
  • 714eca483e
    revert gradle to dev AdrianLxM 2018-05-04 20:16:12 +0200
  • 5ff86e9c34 Spanish translation pedroll 2018-05-04 19:54:21 +0200
  • 7190bccf20 release candidate 3 AdrianLxM 2018-05-04 19:24:05 +0200
  • 93c3a3d624 Merge branch 'dev' into aaps20_rc3 AdrianLxM 2018-05-04 19:21:39 +0200
  • f5a23b2921
    Merge branch 'dev' into virtual_pump_Bug863 Milos Kozak 2018-05-04 19:18:52 +0200
  • f511b9ed39
    Merge pull request #1000 from MilosKozak/bolusprogress-dismiss AdrianLxM 2018-05-04 19:03:11 +0200
  • 4fb8e899c2 Feature Request/Bug #863 - merged with dev - extended PumpType with new setting in PumpDescription - added Insight pump settings for VirtualPump Andy Rozman 2018-05-04 15:48:46 +0100
  • 57973d4d3a
    Merge pull request #1001 from jotomo/carbs-gen-refactor Milos Kozak 2018-05-04 16:10:23 +0200
  • 61e6404bbe
    Merge pull request #995 from MilosKozak/wear-wizard Milos Kozak 2018-05-04 14:33:55 +0200
  • 35a6bbb6a7
    Set CareportalEvent.MEALBOLUS for eCarbs. Johannes Mockenhaupt 2018-05-04 14:22:43 +0200
  • 43cc3c4908
    Extract CarbsGenerator class. Johannes Mockenhaupt 2018-05-04 14:18:55 +0200
  • 963f1e1abf
    Merge branch 'dev' into startupwizard Milos Kozak 2018-05-04 13:26:40 +0200
  • ea063cd1f1
    Merge pull request #997 from swissalpine/transparent-deviations Milos Kozak 2018-05-04 13:25:58 +0200
  • 10b67a0c11
    Update GraphData.java swissalpine 2018-05-04 12:31:11 +0200
  • 7312bf061a
    Update colors.xml swissalpine 2018-05-04 12:30:28 +0200
  • 5c8e99b191 dismiss bolus progress dialog when Queue is empty AdrianLxM 2018-05-04 12:23:51 +0200
  • f2df13dbfb Merge branch 'dev' into virtual_pump_Bug863 Andy Rozman 2018-05-04 10:06:18 +0100
  • 91f3db782d SWButton rename option to text Milos Kozak 2018-05-04 10:20:22 +0200
  • 55661ca7a0 SWButton Milos Kozak 2018-05-04 10:17:50 +0200
  • 010a2f3fd8 Make deviation bars transparent swissalpine 2018-05-04 10:04:45 +0200
  • 88d964f135 SW reuse save, cleanup Milos Kozak 2018-05-04 09:35:57 +0200
  • f7532b31be
    Merge pull request #996 from RadoslavR/patch-55 Milos Kozak 2018-05-03 23:12:59 +0200
  • c34cc73b1e fix wear wizard AdrianLxM 2018-05-03 23:08:16 +0200
  • 52411f7afe
    half of the Bulgarian translation Radoslav Radev 2018-05-03 23:34:50 +0300
  • 8d6997f519 ecarb ignore 0 carbs AdrianLxM 2018-05-03 21:58:21 +0200
  • fb75346bcd ecarb make settings consistent AdrianLxM 2018-05-03 21:55:54 +0200
  • 61f07da1a2 ecarb doECarb AdrianLxM 2018-05-03 21:53:46 +0200
  • b05b300faf ecarb duration format AdrianLxM 2018-05-03 21:39:57 +0200
  • c69a541b75 ecarb ash first response AdrianLxM 2018-05-03 20:58:49 +0200
  • f2168ff36b ecarb hang in activity again AdrianLxM 2018-05-03 20:50:35 +0200
  • 76277d11ad ecarb hang in activity AdrianLxM 2018-05-03 20:49:40 +0200
  • 71db7b60c9 ecarb first activity AdrianLxM 2018-05-03 20:48:50 +0200
  • 4539756455 Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into startupwizard Milos Kozak 2018-05-03 22:02:12 +0200
  • dea5ff0080 styles cleanup Milos Kozak 2018-05-03 22:01:59 +0200
  • d1958a3e2d
    Merge branch 'dev' into startupwizard Milos Kozak 2018-05-03 21:31:55 +0200
  • 02590ddd72 SW remove unneeded code Milos Kozak 2018-05-03 21:29:34 +0200
  • 52bca03601
    Merge pull request #993 from McHoffi/McHoffi-typo-fix Milos Kozak 2018-05-03 21:23:12 +0200
  • 28d03c85a7
    Merge pull request #1 from McHoffi/McHoffi-typo-fix McHoffi 2018-05-03 21:21:05 +0200
  • 39e9448c67
    Typo fix McHoffi 2018-05-03 21:20:54 +0200
  • 83fcc0723e
    Merge pull request #990 from MilosKozak/wear-wizard Milos Kozak 2018-05-03 20:48:24 +0200
  • cc532b9107 SWRadioButton cleanup Milos Kozak 2018-05-03 20:13:27 +0200
  • 94db444acb SW validator, language, cleanup Milos Kozak 2018-05-03 20:06:13 +0200
  • 36265ab1c6 SWPlugin Milos Kozak 2018-05-03 18:41:47 +0200
  • 421946269a Merge branch 'dev' into riley_link_medtronic Andy Rozman 2018-05-03 17:23:23 +0100
  • f6110bd096 Merge branch 'virtual_pump_Bug863' into riley_link_medtronic Andy Rozman 2018-05-03 16:54:03 +0100
  • 43dc7d1846 wear cathegorize preferences AdrianLxM 2018-05-03 17:42:21 +0200
  • 917fcb5953 wearwizard reorder menu AdrianLxM 2018-05-03 17:28:36 +0200
  • 62a38ed537 wearwizard fix NPE when CobInfo not available - missing part AdrianLxM 2018-05-03 17:23:38 +0200
  • b37b892eea wearwizard fix NPE when CobInfo not available AdrianLxM 2018-05-03 17:22:00 +0200
  • fe0f2e3ce6 wearwizard settings on phone AdrianLxM 2018-05-03 17:15:36 +0200
  • c394c045c9 wearwizard reduced watch settings AdrianLxM 2018-05-03 16:31:55 +0200
  • bdfce784c0 wearwizard ensure watch apk is up to date AdrianLxM 2018-05-03 16:08:48 +0200
  • ec106726a7 wearwizard trend AdrianLxM 2018-05-03 16:05:04 +0200
  • 24dd4e1710 wearwizard cob AdrianLxM 2018-05-03 15:58:17 +0200
  • f4648e44b2 - minor changes Andy Rozman 2018-05-03 16:31:23 +0100
  • 8a451bab4d Merge branch 'dev' of https://github.com/andyrozman/AndroidAPS into dev Andy Rozman 2018-05-03 16:11:16 +0100
  • acff61339c Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev Andy Rozman 2018-05-03 16:09:53 +0100
  • d025b4b03d
    Merge pull request #988 from PoweRGbg/dev Milos Kozak 2018-05-03 16:14:06 +0200
  • 5b8779f8a7 Feature Request/Bug #863 - added PumpCapability (to set boolean values) - added Dana Pumps to PumpType and to VirtulaPumps array Andy Rozman 2018-05-03 15:10:34 +0100
  • 5bb9861a9b
    Merge pull request #16 from MilosKozak/startupwizard Roumen Georgiev 2018-05-03 17:05:44 +0300
  • 515590cdf6 other screens Roumen Georgiev 2018-05-03 17:04:56 +0300
  • 425ba77200 other screens Roumen Georgiev 2018-05-03 16:59:23 +0300
  • d03fd2752c cleanup Milos Kozak 2018-05-03 15:56:01 +0200
  • 446d58f866
    Merge pull request #987 from MilosKozak/channel-sound Milos Kozak 2018-05-03 13:17:23 +0200
  • 012593a480
    Update NotificationStore.java AdrianLxM 2018-05-03 12:18:48 +0200
  • 083730f476 WIP: BGSOURCE screen Roumen Georgiev 2018-05-03 09:02:16 +0300
  • 416bd2ff41 Feature Request/Bug #863 - added package PumpCommon for common pump files - added DoseSettings, DoseStepSize, PumpTempBasalType which are needed for PumpType - added PumpType which contains all definitions for pumps - extended fragement to display Pump Type and Pump Type definitions - extended plugin to read configuration and set pumpDescription object - extended pref_virtualpump to add pump type selection Andy Rozman 2018-05-02 23:59:33 +0100
  • e5ed63a46f fix name on future profile switches Milos Kozak 2018-05-03 00:13:49 +0200
  • a35c925930
    Merge pull request #983 from jotomo/issue-939 Milos Kozak 2018-05-02 23:20:29 +0200