Merge branch 'master' into greenkeeper/events-3.0.0

Author: hawkrives

data/bus-times/blue-line.yaml

@@ -18,30 +18,30 @@ schedules:
     stops:
       - City Hall on Washington
       - Econo Foods
-      - Library
       - Carleton College
-      - St. Olaf College
-      - Greenvale Apartments
       - Northfield Estates
       - Viking Terrace
-      - Northfield Retirement Community
+      - Greenvale Apartments
+      - South Oak Apartments
       - Ensley Apartments
+      - Northfield Manor
       - St. Olaf College
+      - Library
       - City Hall on Washington
     times:
-      - [ '6:00am',  '6:01am',  '6:03am',  '6:05am',  '6:12am',  '6:17am',  '6:19am',  '6:21am',     false,  '6:25am',  '6:29am',  '6:40am']
-      - [ '6:45am',  '6:46am',  '6:48am',  '6:50am',  '6:57am',  '7:02am',  '7:04am',  '7:06am',     false,  '7:10am',  '7:14am',  '7:25am']
-      - [ '7:30am',  '7:31am',  '7:33am',  '7:35am',  '7:42am',  '7:47am',  '7:49am',  '7:51am',  '7:53am',  '7:55am',  '7:59am',  '8:10am']
-      - [ '8:15am',  '8:16am',  '8:18am',  '8:20am',  '8:27am',  '8:32am',  '8:34am',  '8:36am',  '8:38am',  '8:40am',  '8:44am',  '8:55am']
-      - [ '9:00am',  '9:01am',  '9:03am',  '9:05am',  '9:12am',  '9:17am',  '9:19am',  '9:21am',  '9:23am',  '9:25am',  '9:29am',  '9:40am']
-      - [ '9:45am',  '9:46am',  '9:48am',  '9:50am',  '9:57am', '10:02am', '10:04am', '10:06am', '10:08am', '10:10am', '10:14am', '10:25am']
-      - ['10:30am', '10:31am', '10:33am', '10:35am', '10:42am', '10:47am', '10:49am', '10:51am', '10:53am', '10:55am', '10:59am', '11:10am']
-      - ['11:15am', '11:16am', '11:18am', '11:20am', '11:27am', '11:32am', '11:34am', '11:36am', '11:38am', '11:40am', '11:44am', '11:55am']
-      - ['12:00pm', '12:01pm', '12:03pm', '12:05pm', '12:12pm', '12:17pm', '12:19pm', '12:21pm', '12:23pm', '12:25pm', '12:29pm', '12:40pm']
-      - ['12:45pm', '12:46pm', '12:48pm', '12:50pm', '12:57pm',  '1:02pm',  '1:04pm',  '1:06pm',  '1:08pm',  '1:10pm',  '1:14pm',  '1:25pm']
-      - [ '1:30pm',  '1:31pm',  '1:33pm',  '1:35pm',  '1:42pm',  '1:47pm',  '1:49pm',  '1:51pm',  '1:53pm',  '1:55pm',  '1:59pm',  '2:10pm']
-      - [ '2:15pm',  '2:16pm',  '2:18pm',  '2:20pm',  '2:27pm',  '2:32pm',  '2:34pm',  '2:36pm',  '2:38pm',  '2:40pm',  '2:44pm',  '2:55pm']
-      - [ '3:00pm',  '3:01pm',  '3:03pm',  '3:05pm',  '3:12pm',  '3:17pm',  '3:19pm',  '3:21pm',  '3:23pm',  '3:25pm',  '3:29pm',  '3:40pm']
-      - [ '3:45pm',  '3:46pm',  '3:48pm',  '3:50pm',  '3:57pm',  '4:02pm',  '4:04pm',  '4:06pm',  '4:08pm',  '4:10pm',  '4:14pm',  '4:25pm']
-      - [ '4:30pm',  '4:31pm',  '4:33pm',  '4:35pm',  '4:42pm',  '4:47pm',  '4:49pm',  '4:51pm',  '4:53pm',  '4:55pm',  '4:59pm',  '5:10pm']
-      - [ '5:15pm',  '5:16pm',  '5:18pm',  '5:20pm',  '5:27pm',  '5:32pm',  '5:34pm',  '5:36pm',  '5:38pm',  '5:40pm',  '5:44pm',  '5:55pm']
+      - [ '6:00am',  '6:01am',  '6:06am',  '6:10am',  '6:13am',  '6:16am',  '6:18am',  '6:21am',  '6:25am',  '6:31am',  '6:38am',  '6:40am']
+      - [ '6:45am',  '6:46am',  '6:51am',  '6:55am',  '6:58am',  '7:01am',  '7:03am',  '7:06am',  '7:10am',  '7:16am',  '7:23am',  '7:25am']
+      - [ '7:30am',  '7:31am',  '7:36am',  '7:40am',  '7:43am',  '7:46am',  '7:48am',  '7:51am',  '7:55am',  '8:01am',  '8:08am',  '8:10am']
+      - [ '8:15am',  '8:16am',  '8:21am',  '8:25am',  '8:28am',  '8:31am',  '8:33am',  '8:36am',  '8:40am',  '8:46am',  '8:53am',  '8:55am']
+      - [ '9:00am',  '9:01am',  '9:06am',  '9:10am',  '9:13am',  '9:16am',  '9:18am',  '9:21am',  '9:25am',  '9:31am',  '9:38am',  '9:40am']
+      - [ '9:45am',  '9:46am',  '9:51am',  '9:55am',  '9:58am', '10:01am', '10:03am', '10:06am', '10:10am', '10:16am', '10:23am', '10:25am']
+      - ['10:30am', '10:31am', '10:36am', '10:40am', '10:43am', '10:46am', '10:48am', '10:51am', '10:55am', '11:01am', '11:08am', '11:10am']
+      - ['11:15am', '11:16am', '11:21am', '11:25am', '11:28am', '11:31am', '11:33am', '11:36am', '11:40am', '11:46am', '11:53am', '11:55am']
+      - ['12:00pm', '12:01pm', '12:06pm', '12:10pm', '12:13pm', '12:16pm', '12:18pm', '12:21pm', '12:25pm', '12:31pm', '12:38pm', '12:40pm']
+      - ['12:45pm', '12:46pm', '12:51pm', '12:55pm', '12:58pm',  '1:01pm',  '1:03pm',  '1:06pm',  '1:10pm',  '1:16pm',  '1:23pm',  '1:25pm']
+      - [ '1:30pm',  '1:31pm',  '1:36pm',  '1:40pm',  '1:43pm',  '1:46pm',  '1:48pm',  '1:51pm',  '1:55pm',  '2:01pm',  '2:08pm',  '2:10pm']
+      - [ '2:15pm',  '2:16pm',  '2:21pm',  '2:25pm',  '2:28pm',  '2:31pm',  '2:33pm',  '2:36pm',  '2:40pm',  '2:46pm',  '2:53pm',  '2:55pm']
+      - [ '3:00pm',  '3:01pm',  '3:06pm',  '3:10pm',  '3:13pm',  '3:16pm',  '3:18pm',  '3:21pm',  '3:25pm',  '3:31pm',  '3:38pm',  '3:40pm']
+      - [ '3:45pm',  '3:46pm',  '3:51pm',  '3:55pm',  '3:58pm',  '4:01pm',  '4:03pm',  '4:06pm',  '4:10pm',  '4:16pm',  '4:23pm',  '4:25pm']
+      - [ '4:30pm',  '4:31pm',  '4:36pm',  '4:40pm',  '4:43pm',  '4:46pm',  '4:48pm',  '4:51pm',  '4:55pm',  '5:01pm',  '5:08pm',  '5:10pm']
+      - [ '5:15pm',  '5:16pm',  '5:21pm',  '5:25pm',  '5:28pm',  '5:31pm',  '5:33pm',  '5:36pm',  '5:40pm',  '5:46pm',  '5:53pm',  '5:55pm']

package.json

@@ -80,15 +80,15 @@
     "buffer": "5.1.0",
     "bugsnag-react-native": "2.5.1",
     "css-select": "2.0.0",
-    "delay": "2.0.0",
+    "delay": "3.0.0",
     "events": "3.0.0",
     "get-urls": "7.2.0",
     "glamorous-native": "1.4.0",
     "html-entities": "1.2.1",
     "htmlparser2": "3.9.2",
     "keyword-search": "0.1.1",
     "lodash": "4.17.9",
-    "moment": "2.22.1",
+    "moment": "2.22.2",
     "moment-timezone": "0.5.17",
     "p-props": "1.2.0",
     "p-retry": "2.0.0",
@@ -97,7 +97,7 @@
     "react-markdown": "2.5.1",
     "react-native": "0.55.4",
     "react-native-button": "2.3.0",
-    "react-native-calendar-events": "1.5.0",
+    "react-native-calendar-events": "1.6.0",
     "react-native-communications": "2.2.1",
     "react-native-custom-tabs": "0.1.7",
     "react-native-device-info": "0.21.5",
@@ -118,7 +118,7 @@
     "redux": "3.7.2",
     "redux-logger": "3.0.6",
     "redux-promise": "0.6.0",
-    "redux-thunk": "2.2.0",
+    "redux-thunk": "2.3.0",
     "semver": "5.5.0",
     "sto-sis-time-parser": "2.3.3",
     "stream": "0.0.2",
@@ -148,7 +148,7 @@
     "flow-bin": "0.67.1",
     "jest": "22.4.2",
     "jest-junit": "4.0.0",
-    "js-yaml": "3.11.0",
+    "js-yaml": "3.12.0",
     "junk": "2.1.0",
     "minimist": "1.2.0",
     "mkdirp": "0.5.1",

yarn.lock

@@ -2102,11 +2102,9 @@ del@^2.0.2:
     pinkie-promise "^2.0.0"
     rimraf "^2.2.8"
 
-[email protected]:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/delay/-/delay-2.0.0.tgz#9112eadc03e4ec7e00297337896f273bbd91fae5"
-  dependencies:
-    p-defer "^1.0.0"
+[email protected]:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/delay/-/delay-3.0.0.tgz#97fc5c21028e20616e822ab11838c648808534eb"
 
 delayed-stream@~1.0.0:
   version "1.0.0"
@@ -3776,9 +3774,9 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
+js-yaml@3.12.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -4567,9 +4565,9 @@ [email protected]:
   dependencies:
     moment ">= 2.9.0"
 
-[email protected].1:
-  version "2.22.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
+[email protected].2:
+  version "2.22.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
 
 "moment@>= 2.9.0":
   version "2.20.1"
@@ -4851,10 +4849,6 @@ osenv@^0.1.4:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-p-defer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -5243,9 +5237,9 @@ [email protected]:
   dependencies:
     prop-types "^15.5.10"
 
-react-native-calendar-events@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/react-native-calendar-events/-/react-native-calendar-events-1.5.0.tgz#77d1bef17a8061f1188680d5821b952d90827dc0"
+react-native-calendar-events@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/react-native-calendar-events/-/react-native-calendar-events-1.6.0.tgz#53c3fb9bb7704c33186deead8dfdad0ffa19c998"
 
 [email protected]:
   version "2.2.1"
@@ -5617,9 +5611,9 @@ [email protected]:
     flux-standard-action "^2.0.3"
     is-promise "^2.1.0"
 
-redux-thunk@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.2.0.tgz#e615a16e16b47a19a515766133d1e3e99b7852e5"
+redux-thunk@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"
 
 [email protected]:
   version "3.7.2"