Skip to content

Commit 11d0b1e

Browse files
hawkriveshawkrives
committed
Merge branch 'master' into landscape
* master: (41 commits) chore(package): update babel-plugin-flow-react-proptypes to version 5.1.3 Update news-container.js clean up news-container use functional setState and don't call refresh in orgs Prevent Student Work from refreshing right after the initial load update package-lock.json chore(package): update jest to version 21.1.0 fix(package): update react-native-maps to version 0.16.4 Correct function name Fix elapsed math in delay Add elapsed refresh to building hours Shorten refresh time Provide time as argument to function fix bug in calendar; remove extra delay on first load Changes according to review Reverse math on elapsed time check fix incorrect argument of multiple schedules remove "caching" of bus data in state don't compare any state items in sCU check the current minute in shouldComponentUpdate ...
2 parents 8a152dc + 6bdccd1 commit 11d0b1e

40 files changed

+1334
-579
lines changed

‎data/_schemas/contact-info.yaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
$schema: http://json-schema.org/draft-06/schema#
22

33
additionalProperties: false
4-
required: [title, phoneNumber, buttonText, category, image, text]
4+
required: [title, buttonText, text, synopsis, category]
5+
oneOf:
6+
- required: [phoneNumber]
7+
- required: [buttonLink]
58
properties:
69
title: {type: string}
710
phoneNumber: {$ref: '_defs.json#/definitions/phone'}
811
buttonText: {type: string}
12+
buttonLink: {type: string}
913
category: {type: string}
14+
synopsis: {type: string}
1015
image: {type: string}
1116
text: {type: string}

‎data/building-hours/6-2-skoglund-pool.yaml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,15 @@ name: Skoglund Pool
22
category: Gym
33

44
schedule:
5-
- title: Fac/Staff Swim
6-
hours:
7-
- {days: [Mo, Tu, We, Th, Fr, Sa], from: '7:00am', to: '9:45am'}
8-
- {days: [Su], from: '8:30am', to: '10:15am'}
9-
105
- title: Lap Swim
116
hours:
12-
- {days: [Mo, Tu, We, Th, Fr], from: '12:45pm', to: '2:00pm'}
13-
- {days: [Mo, Tu, We, Th, Fr], from: '6:00pm', to: '8:00pm'}
7+
- {days: [Mo, Tu, We, Th, Fr], from: '12:00pm', to: '2:00pm'}
148

159
- title: Open Swim
1610
hours:
17-
- {days: [Mo, Tu, We, Th, Fr], from: '7:00am', to: '2:00pm'}
11+
- {days: [Mo, We, Fr], from: '6:30pm', to: '8:30pm'}
12+
- {days: [Tu, Th], from: '8:00pm', to: '10:00pm'}
13+
- {days: [Sa, Su], from: '2:00pm', to: '4:30pm'}
1814

1915
breakSchedule:
2016
fall: []

‎data/contact-info/1-1-pubsafe.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ phoneNumber: '5077863666'
33
buttonText: Call Public Safety
44
category: Safety
55
image: pubsafe.png
6+
synopsis: 24-Hour Public Safety Dispatch. Public Safety is available 24 hours a day, most days of the year. Call Public Safety in many situations, but there is always the option of calling the police as well.
67
text: |
78
**24-Hour Public Safety Dispatch.** [Public Safety][pubsafe] is available 24 hours a day, most days of the year. Call Public Safety in many situations, but there is always the option of calling the police as well.
89

‎data/contact-info/1-2-safe-ride.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ phoneNumber: '5077863666'
33
buttonText: Call Public Safety
44
category: Safety
55
image: safe ride.jpg
6+
synopsis: Students concerned about their personal safety may contact Public Safety to request a walking escort or vehicular transportation on campus and to areas immediately adjacent to the campus.
67
text: |
78
Students concerned about their personal safety may contact Public Safety to request a walking escort or vehicular transportation on campus and to areas immediately adjacent to the campus.
89

‎data/contact-info/1-3-report-conduct.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ phoneNumber: '5077863465'
33
buttonText: Call College Administration
44
category: Safety
55
image: safe ride.jpg
6+
synopsis: Any member of the college community who feels they have experienced sexual misconduct has the option of reporting to the college. Reporting enables the college to take measures to stop the behavior, prevent it from occurring in the future, and provide support, resources, and protection. You can report to the college without initiating a formal investigation or reporting to law enforcement. To make a report, contact the Title IX Case Manager or use St. Olaf’s online reporting form, which can be filled out anonymously.
67
text: |
78
Any member of the college community who feels they have experienced sexual misconduct has the option of reporting to the college. Reporting enables the college to take measures to stop the behavior, prevent it from occurring in the future, and provide support, resources, and protection. You can report to the college without initiating a formal investigation or reporting to law enforcement.
89

‎data/contact-info/1-4-hope-center.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ phoneNumber: '8006072330'
33
buttonText: Call 24-Hour Hotline
44
category: Safety
55
image: safe ride.jpg
6+
synopsis: The HOPE Center, located in Faribault, MN, provides free, confidential advocacy services to victims of sexual and domestic violence. Advocates at the HOPE Center provide crisis intervention, support counseling, information, help with protection planning, and referrals. The HOPE Center also provides legal advocacy regarding court procedures, victim rights, and accompaniment to civil and criminal court proceedings.
67
text: |
78
The [HOPE Center][hope], located in Faribault, MN, provides free, confidential advocacy services to victims of sexual and domestic violence. Advocates at the HOPE Center provide crisis intervention, support counseling, information, help with protection planning, and referrals.
89

‎data/contact-info/2-1-sarn.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ phoneNumber: '5077863777'
33
buttonText: Call SARN
44
category: Wellness
55
image: sarn.jpg
6+
synopsis: SARN, the Sexual Assault Resource Network, is a confidential resource available to all students. Calls to SARN will be picked up by a trained advocate to provide services to students struggling with issues of sexual and domestic violence. Students can also visit the SARN office in Buntrock Commons room 113.
67
text: |
78
SARN, the [Sexual Assault Resource Network][sarn], is a confidential resource available to all students. Calls to SARN will be picked up by a trained advocate to provide services to students struggling with issues of sexual and domestic violence.
89

‎data/contact-info/2-2-boe-house.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ phoneNumber: '5077863062'
33
buttonText: Contact Boe House
44
category: Wellness
55
image: boe house.jpg
6+
synopsis: The Counseling Center was established by St. Olaf College to enhance the personal growth and development of its students. The Center supports students in their academic pursuits and facilitates personal and interpersonal learning and growth. The center provides preventive as well as remedial programs. When contacting us to make an appointment, please note that we are often busy which may cause a delay in how quickly we can schedule you in. However, if you are in need of an appointment, please call and we will accommodate you as best we can.
67
text: |
78
The [Counseling Center][boehouse] was established by St. Olaf College to enhance the personal growth and development of its students. The Center supports students in their academic pursuits and facilitates personal and interpersonal learning and growth.
89

‎data/contact-info/2-3-college-pastors.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ phoneNumber: '5077863092'
33
buttonText: Call Pastor's Office
44
category: Wellness
55
image: safe ride.jpg
6+
synopsis: College Pastors are confidential resources trained in pastoral care. They are able to speak with students of any faith, or who don’t practice a religious faith, about all aspects of life.
67
text: |
78
[College Pastors][pastors] are confidential resources trained in pastoral care. They are able to speak with students of any faith, or who don’t practice a religious faith, about all aspects of life.
89

‎data/contact-info/3-1-pause-kitchen.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ phoneNumber: '5077866969'
33
buttonText: Call The Pause
44
category: Food
55
image: pause kitchen.jpg
6+
synopsis: Place orders in The Pause Kitchen. The Pause delivers anywhere on campus, or orders can be placed for pickup. The Pause does not deliver to honor houses. For orders of 4 or more pizzas, please [order on Oleville][online-order] at least 24 hours in advance. Pizza Delivery Hours are Sunday – Thursday from 6:00PM – 11:30PM, and Friday – Saturday from 8:00PM – 1:30AM.
67
text: |
78
Place orders in The Pause Kitchen. The Pause delivers anywhere on campus, or orders can be placed for pickup. The Pause does not deliver to honor houses.
89

0 commit comments

Comments
 (0)