Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions content/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,6 @@
"github": "charliemouton",
"name": "Charles Mouton"
},
{
"githuburl": "http://www.github.com/cwallac",
"image": "https://avatars.githubusercontent.com/u/5944477?v=3",
"github": "cwallac",
"name": "Christopher Wallace"
},
{
"githuburl": "http://www.github.com/yunhsincynthiachen",
"image": "https://avatars.githubusercontent.com/u/6495522?v=3",
Expand Down Expand Up @@ -90,6 +84,12 @@
"github": "hannahtwiggsmith",
"name": "Hannah Twigg-Smith"
},
{
"githuburl": "http://www.github.com/thecardkid",
"image": "https://avatars.githubusercontent.com/u/10700175?v=3",
"github": "thecardkid",
"name": "Hieu Nguyen"
},
{
"githuburl": "http://www.github.com/iangmhill",
"image": "https://avatars.githubusercontent.com/u/6565554?v=3",
Expand Down
2 changes: 1 addition & 1 deletion content/input.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@
{"name": "Byron Wasti","github":"byronwasti"},
{"name": "Casey Alvarado","github":"caseyalvarado"},
{"name": "Charles Mouton","github":"charliemouton"},
{"name": "Christopher Wallace","github":"cwallac"},
{"name": "Cynthia Chen","github":"yunhsincynthiachen"},
{"name": "Daniel Bishop","github":"daniel6"},
{"name": "David Abrahams","github":"greneroom"},
{"name": "Dominique McKenzie","github":""},
{"name": "Gabriel Butterick","github":"buttegab"},
{"name": "Hannah Twigg-Smith","github":"hannahtwiggsmith"},
{"name": "Hieu Nguyen", "github":"thecardkid"},
{"name": "Ian Hill","github":"iangmhill"},
{"name": "Jennifer Wei","github":"jenwei"},
{"name": "Joey Maalouf","github":"joeylmaalouf"},
Expand Down
45 changes: 45 additions & 0 deletions ical/monday.ics
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
BEGIN:VCALENDAR
PRODID:-//Microsoft Corporation//Outlook 14.0 MIMEDIR//EN
VERSION:2.0
METHOD:PUBLISH
X-MS-OLK-FORCEINSPECTOROPEN:TRUE
BEGIN:VTIMEZONE
TZID:Eastern Standard Time
BEGIN:STANDARD
DTSTART:16011104T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
TZOFFSETFROM:-0400
TZOFFSETTO:-0500
END:STANDARD
BEGIN:DAYLIGHT
DTSTART:16010311T020000
RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
TZOFFSETFROM:-0500
TZOFFSETTO:-0400
END:DAYLIGHT
END:VTIMEZONE
BEGIN:VEVENT
CLASS:PUBLIC
CREATED:20160120T060728Z
DESCRIPTION:\n
DTEND;TZID="Eastern Standard Time":20160118T223000
DTSTAMP:20160120T060729Z
DTSTART;TZID="Eastern Standard Time":20160118T180000
LAST-MODIFIED:20160120T060728Z
LOCATION:EH1
PRIORITY:5
RRULE:FREQ=WEEKLY;COUNT=15;BYDAY=MO
SEQUENCE:0
SUMMARY;LANGUAGE=en-us:Olin.js office hours
TRANSP:OPAQUE
UID:040000008200E00074C5B7101A82E008000000001ACEEEA41D53D101000000000000000
01000000097E50B1A1F567442AD10E5514D2E52AF
X-ALT-DESC;FMTTYPE=text/html:<html><head><style type="text/css" style="disp
lay:none"><!-- p { margin-top: 0px\; margin-bottom: 0px\; }--></Style></He
ad><body dir="ltr" style="font-size:12pt\;color:#000000\;background-color:
#FFFFFF\;font-family:Calibri\,Arial\,Helvetica\,sans-serif\;"><p><br>\n</P
></Body></Html>
X-MICROSOFT-CDO-BUSYSTATUS:BUSY
X-MICROSOFT-CDO-IMPORTANCE:1
END:VEVENT
END:VCALENDAR
14 changes: 5 additions & 9 deletions ical/thursday.ics
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ END:DAYLIGHT
END:VTIMEZONE
BEGIN:VEVENT
CLASS:PUBLIC
CREATED:20160119T024057Z
DTEND;TZID="Eastern Standard Time":20160121T210000
DTSTAMP:20160119T024057Z
CREATED:20160120T060811Z
DTEND;TZID="Eastern Standard Time":20160121T220000
DTSTAMP:20160120T060811Z
DTSTART;TZID="Eastern Standard Time":20160121T190000
LAST-MODIFIED:20160119T024057Z
LAST-MODIFIED:20160120T060811Z
LOCATION:Library
PRIORITY:5
RRULE:FREQ=WEEKLY;COUNT=15;BYDAY=TH
Expand All @@ -37,11 +37,7 @@ X-MICROSOFT-CDO-BUSYSTATUS:BUSY
X-MICROSOFT-CDO-IMPORTANCE:1
X-MICROSOFT-DISALLOW-COUNTER:FALSE
X-MS-OLK-AUTOFILLLOCATION:FALSE
X-MS-OLK-AUTOSTARTCHECK:FALSE
X-MS-OLK-CONFTYPE:0
BEGIN:VALARM
TRIGGER:-PT15M
ACTION:DISPLAY
DESCRIPTION:Reminder
END:VALARM
END:VEVENT
END:VCALENDAR
12 changes: 4 additions & 8 deletions ical/tuesday.ics
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ END:DAYLIGHT
END:VTIMEZONE
BEGIN:VEVENT
CLASS:PUBLIC
CREATED:20160119T024014Z
CREATED:20160120T060742Z
DTEND;TZID="Eastern Standard Time":20160119T210000
DTSTAMP:20160119T024015Z
DTSTAMP:20160120T060742Z
DTSTART;TZID="Eastern Standard Time":20160119T190000
LAST-MODIFIED:20160119T024014Z
LAST-MODIFIED:20160120T060742Z
LOCATION:EH2
PRIORITY:5
RRULE:FREQ=WEEKLY;COUNT=15;BYDAY=TU
Expand All @@ -37,11 +37,7 @@ X-MICROSOFT-CDO-BUSYSTATUS:BUSY
X-MICROSOFT-CDO-IMPORTANCE:1
X-MICROSOFT-DISALLOW-COUNTER:FALSE
X-MS-OLK-AUTOFILLLOCATION:FALSE
X-MS-OLK-AUTOSTARTCHECK:FALSE
X-MS-OLK-CONFTYPE:0
BEGIN:VALARM
TRIGGER:-PT15M
ACTION:DISPLAY
DESCRIPTION:Reminder
END:VALARM
END:VEVENT
END:VCALENDAR
27 changes: 19 additions & 8 deletions ical/wednesday.ics
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ END:DAYLIGHT
END:VTIMEZONE
BEGIN:VEVENT
CLASS:PUBLIC
CREATED:20160119T024033Z
CREATED:20160120T060758Z
DTEND;TZID="Eastern Standard Time":20160120T220000
DTSTAMP:20160119T024033Z
DTSTAMP:20160120T060758Z
DTSTART;TZID="Eastern Standard Time":20160120T200000
LAST-MODIFIED:20160119T024033Z
LAST-MODIFIED:20160120T060758Z
LOCATION:Library (during SLAC)
PRIORITY:5
RRULE:FREQ=WEEKLY;COUNT=15;BYDAY=WE
Expand All @@ -37,11 +37,22 @@ X-MICROSOFT-CDO-BUSYSTATUS:BUSY
X-MICROSOFT-CDO-IMPORTANCE:1
X-MICROSOFT-DISALLOW-COUNTER:FALSE
X-MS-OLK-AUTOFILLLOCATION:FALSE
X-MS-OLK-AUTOSTARTCHECK:FALSE
X-MS-OLK-CONFTYPE:0
BEGIN:VALARM
TRIGGER:-PT15M
ACTION:DISPLAY
DESCRIPTION:Reminder
END:VALARM
END:VEVENT
BEGIN:VEVENT
CLASS:PUBLIC
CREATED:20160120T060758Z
DTEND:20160121T030000Z
DTSTAMP:20160120T060758Z
DTSTART:20160121T010000Z
LAST-MODIFIED:20160120T060758Z
RECURRENCE-ID:20160121T010000Z
SEQUENCE:0
TRANSP:OPAQUE
UID:040000008200E00074C5B7101A82E00800000000E0AD119E3852D101000000000000000
0100000008A38B5C7B668E240B391A6D0B7B37290
X-MICROSOFT-CDO-BUSYSTATUS:BUSY
X-MS-OLK-AUTOSTARTCHECK:FALSE
END:VEVENT
END:VCALENDAR
2 changes: 1 addition & 1 deletion index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion jade/index.jade
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ html(lang="en")
h5 Meets Tuesdays and Fridays 3:20–5:00 in AC328 (<a href="ical/class.ics">iCal</a>)

h3 Office Hours
h5 Monday office hours coming soon
h5 Mondays 6:00-10:30pm in EH1 (<a href="ical/monday.ics">iCal</a>)
h5 Tuesdays 7:00-9:00pm in EH2 (<a href="ical/tuesday.ics">iCal</a>)
h5 Wednesdays 8:00-10:00pm in the Library (<a href="ical/wednesday.ics">iCal</a>)
h5 Thursdays 7:00-9:00pm in the Library (<a href="ical/thursday.ics">iCal</a>)
Expand Down