Skip to content

Commit 0fad87a

Browse files
committed
Merge branch 'master' into greenkeeper/react-navigation-material-bottom-tabs-0.4.0
* master: (44 commits) bump yarn lockfile simplify msUntilIntervalRepeat expect timer to return $interval if interval divides in evenly refactor to use setInterval again rename sections on android job detail break up ios information into contact and job info rewrite and avoid setInterval for a cleaner implementation extract finding time until $interval function chore(package): update eslint-plugin-react-native to version 3.3.0 tidy up contact office variables update android detail with new job fields update ios detail with new job fields update jest typedef update student work prop types poke yarn lockfile update yarn.lock remove duplicate setInterval in Timer remove course times from course search rows fix(package): update delay to version 4.0.1 chore(package): update babel-preset-react-native to version 4.0.1 ...
2 parents 6d2775a + b43ef9d commit 0fad87a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+873
-431
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ jobs:
190190
touch logs/prettier # to ensure that the file exists
191191
if ! git diff --quiet *.js source/ scripts/; then
192192
git diff *.js source/ scripts/ | tee logs/prettier
193+
exit 1
193194
fi
194195
- run: *run-danger
195196

data/building-hours/1-1-cage.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,4 @@ breakSchedule:
2121
interim: []
2222
spring: []
2323
easter: []
24-
summer:
25-
- title: Hours
26-
hours:
27-
- {days: [Mo, Tu, We, Th], from: '7:30am', to: '3:00pm'}
28-
- {days: [Fr], from: '7:30am', to: '1:00pm'}
24+
summer: []

data/building-hours/1-2-pause-kitchen.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,4 @@ breakSchedule:
2929
interim: []
3030
spring: []
3131
easter: []
32-
summer:
33-
- title: Hours
34-
notes: The Pause Kitchen is closed for the summer.
35-
hours: []
32+
summer: []

data/building-hours/1-4-bag-lunch-line.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,4 @@ breakSchedule:
1313
interim: []
1414
spring: []
1515
easter: []
16-
summer:
17-
- title: Hours
18-
hours: []
19-
notes: The Bag Lunch line is closed for the summer.
16+
summer: []

data/building-hours/10-admissions.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,4 @@ breakSchedule:
1616
interim: []
1717
spring: []
1818
easter: []
19-
summer:
20-
- title: Hours
21-
hours:
22-
- {days: [Mo, Tu, We, Th], from: '7:30am', to: '4:30pm'}
23-
- {days: [Fr], from: '7:30am', to: '12:00pm'}
19+
summer: []

data/building-hours/10-business-office.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,4 @@ breakSchedule:
1515
interim: []
1616
spring: []
1717
easter: []
18-
summer:
19-
- title: Hours
20-
hours:
21-
- {days: [Mo, Tu, We, Th], from: '7:30am', to: '4:00pm'}
22-
- {days: [Fr], from: '7:30am', to: '12:00pm'}
18+
summer: []

data/building-hours/10-cmie.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,4 @@ breakSchedule:
1616
interim: []
1717
spring: []
1818
easter: []
19-
summer:
20-
- title: Hours
21-
hours: []
22-
notes: The CMIE is closed for the summer.
19+
summer: []

data/building-hours/10-conferences-camps-events.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,4 @@ breakSchedule:
1515
interim: []
1616
spring: []
1717
easter: []
18-
summer:
19-
- title: Hours
20-
hours:
21-
- {days: [Mo, Tu, We, Th], from: '7:30am', to: '4:00pm'}
22-
- {days: [Fr], from: '7:30am', to: '12:00pm'}
18+
summer: []

data/building-hours/10-financial-aid.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,4 @@ breakSchedule:
1515
interim: []
1616
spring: []
1717
easter: []
18-
summer:
19-
- title: Hours
20-
hours:
21-
- {days: [Mo, Tu, We, Th], from: '7:30am', to: '4:30pm'}
22-
- {days: [Fr], from: '7:30am', to: '12:00pm'}
18+
summer: []

data/building-hours/10-osa.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,4 @@ breakSchedule:
1616
interim: []
1717
spring: []
1818
easter: []
19-
summer:
20-
- title: Hours
21-
hours:
22-
- {days: [Mo, Tu, We, Th], from: '7:30am', to: '4:30pm'}
23-
- {days: [Fr], from: '7:30am', to: '12:00pm'}
19+
summer: []

0 commit comments

Comments
 (0)