Skip to content

Commit e2bb82a

Browse files
sarahwalterssarahwalters
committed
Merge pull request #13 from olinjs/swalters/office-hrs-update
Updating office hours for project time
2 parents 04bdc90 + c0c777d commit e2bb82a

7 files changed

Lines changed: 115 additions & 120 deletions

File tree

‎ical/monday.ics‎

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,42 @@
11
BEGIN:VCALENDAR
2-
PRODID:-//Microsoft Corporation//Outlook 14.0 MIMEDIR//EN
2+
PRODID:-//Google Inc//Google Calendar 70.9054//EN
33
VERSION:2.0
4+
CALSCALE:GREGORIAN
45
METHOD:PUBLISH
5-
X-MS-OLK-FORCEINSPECTOROPEN:TRUE
6+
X-WR-CALNAME:Olin.js Monday
7+
X-WR-TIMEZONE:America/New_York
8+
X-WR-CALDESC:
69
BEGIN:VTIMEZONE
7-
TZID:Eastern Standard Time
8-
BEGIN:STANDARD
9-
DTSTART:16011104T020000
10-
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
11-
TZOFFSETFROM:-0400
12-
TZOFFSETTO:-0500
13-
END:STANDARD
10+
TZID:America/New_York
11+
X-LIC-LOCATION:America/New_York
1412
BEGIN:DAYLIGHT
15-
DTSTART:16010311T020000
16-
RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
1713
TZOFFSETFROM:-0500
1814
TZOFFSETTO:-0400
15+
TZNAME:EDT
16+
DTSTART:19700308T020000
17+
RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
1918
END:DAYLIGHT
19+
BEGIN:STANDARD
20+
TZOFFSETFROM:-0400
21+
TZOFFSETTO:-0500
22+
TZNAME:EST
23+
DTSTART:19701101T020000
24+
RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
25+
END:STANDARD
2026
END:VTIMEZONE
2127
BEGIN:VEVENT
22-
CLASS:PUBLIC
23-
CREATED:20160120T060728Z
24-
DESCRIPTION:\n
25-
DTEND;TZID="Eastern Standard Time":20160118T223000
26-
DTSTAMP:20160120T060729Z
27-
DTSTART;TZID="Eastern Standard Time":20160118T180000
28-
LAST-MODIFIED:20160120T060728Z
28+
DTSTART;TZID=America/New_York:20160328T180000
29+
DTEND;TZID=America/New_York:20160328T193000
30+
RRULE:FREQ=WEEKLY;UNTIL=20160425T220000Z;BYDAY=MO
31+
DTSTAMP:20160328T161450Z
32+
UID:fopgltqp062hl1lsema7k74lsk@google.com
33+
CREATED:20160328T161425Z
34+
DESCRIPTION:
35+
LAST-MODIFIED:20160328T161426Z
2936
LOCATION:EH1
30-
PRIORITY:5
31-
RRULE:FREQ=WEEKLY;COUNT=15;BYDAY=MO
3237
SEQUENCE:0
33-
SUMMARY;LANGUAGE=en-us:Olin.js office hours
38+
STATUS:CONFIRMED
39+
SUMMARY:Olin.js office hours
3440
TRANSP:OPAQUE
35-
UID:040000008200E00074C5B7101A82E008000000001ACEEEA41D53D101000000000000000
36-
01000000097E50B1A1F567442AD10E5514D2E52AF
37-
X-ALT-DESC;FMTTYPE=text/html:<html><head><style type="text/css" style="disp
38-
lay:none"><!-- p { margin-top: 0px\; margin-bottom: 0px\; }--></Style></He
39-
ad><body dir="ltr" style="font-size:12pt\;color:#000000\;background-color:
40-
#FFFFFF\;font-family:Calibri\,Arial\,Helvetica\,sans-serif\;"><p><br>\n</P
41-
></Body></Html>
42-
X-MICROSOFT-CDO-BUSYSTATUS:BUSY
43-
X-MICROSOFT-CDO-IMPORTANCE:1
4441
END:VEVENT
4542
END:VCALENDAR

‎ical/thursday.ics‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎ical/thursday1.ics‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
BEGIN:VCALENDAR
2+
PRODID:-//Google Inc//Google Calendar 70.9054//EN
3+
VERSION:2.0
4+
CALSCALE:GREGORIAN
5+
METHOD:PUBLISH
6+
X-WR-CALNAME:Olin.js
7+
X-WR-TIMEZONE:America/New_York
8+
X-WR-CALDESC:
9+
BEGIN:VTIMEZONE
10+
TZID:America/New_York
11+
X-LIC-LOCATION:America/New_York
12+
BEGIN:DAYLIGHT
13+
TZOFFSETFROM:-0500
14+
TZOFFSETTO:-0400
15+
TZNAME:EDT
16+
DTSTART:19700308T020000
17+
RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
18+
END:DAYLIGHT
19+
BEGIN:STANDARD
20+
TZOFFSETFROM:-0400
21+
TZOFFSETTO:-0500
22+
TZNAME:EST
23+
DTSTART:19701101T020000
24+
RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
25+
END:STANDARD
26+
END:VTIMEZONE
27+
BEGIN:VEVENT
28+
DTSTART;TZID=America/New_York:20160331T180000
29+
DTEND;TZID=America/New_York:20160331T190000
30+
RRULE:FREQ=WEEKLY;UNTIL=20160428T220000Z;BYDAY=TH
31+
DTSTAMP:20160328T161651Z
32+
UID:7912be05bkeouavea8fi4qapgc@google.com
33+
CREATED:20160328T161634Z
34+
DESCRIPTION:
35+
LAST-MODIFIED:20160328T161634Z
36+
LOCATION:
37+
SEQUENCE:0
38+
STATUS:CONFIRMED
39+
SUMMARY:Olin.js office hours
40+
TRANSP:OPAQUE
41+
END:VEVENT
42+
END:VCALENDAR

‎ical/thursday2.ics‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
BEGIN:VCALENDAR
2+
PRODID:-//Google Inc//Google Calendar 70.9054//EN
3+
VERSION:2.0
4+
CALSCALE:GREGORIAN
5+
METHOD:PUBLISH
6+
X-WR-CALNAME:Olin.js
7+
X-WR-TIMEZONE:America/New_York
8+
X-WR-CALDESC:
9+
BEGIN:VTIMEZONE
10+
TZID:America/New_York
11+
X-LIC-LOCATION:America/New_York
12+
BEGIN:DAYLIGHT
13+
TZOFFSETFROM:-0500
14+
TZOFFSETTO:-0400
15+
TZNAME:EDT
16+
DTSTART:19700308T020000
17+
RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
18+
END:DAYLIGHT
19+
BEGIN:STANDARD
20+
TZOFFSETFROM:-0400
21+
TZOFFSETTO:-0500
22+
TZNAME:EST
23+
DTSTART:19701101T020000
24+
RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
25+
END:STANDARD
26+
END:VTIMEZONE
27+
BEGIN:VEVENT
28+
DTSTART;TZID=America/New_York:20160331T200000
29+
DTEND;TZID=America/New_York:20160331T210000
30+
RRULE:FREQ=WEEKLY;UNTIL=20160429T000000Z;BYDAY=TH
31+
DTSTAMP:20160328T161747Z
32+
UID:7912be05bkeouavea8fi4qapgc@google.com
33+
CREATED:20160328T161634Z
34+
DESCRIPTION:
35+
LAST-MODIFIED:20160328T161721Z
36+
LOCATION:
37+
SEQUENCE:1
38+
STATUS:CONFIRMED
39+
SUMMARY:Olin.js office hours
40+
TRANSP:OPAQUE
41+
END:VEVENT
42+
END:VCALENDAR

‎ical/tuesday.ics‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎index.html‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎jade/index.jade‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ html(lang="en")
3939
h5 Meets Tuesdays and Fridays 3:20–5:00 in AC328 (<a href="ical/class.ics">iCal</a>)
4040

4141
h3 Office Hours
42-
h5 Mondays 6:00-10:30pm in EH1 (<a href="ical/monday.ics">iCal</a>)
43-
h5 Tuesdays 7:00-9:00pm in EH2 (<a href="ical/tuesday.ics">iCal</a>)
42+
h5 Mondays 6:00-7:30pm in EH1 (<a href="ical/monday.ics">iCal</a>)
4443
h5 Wednesdays 8:00-10:00pm in the Library (<a href="ical/wednesday.ics">iCal</a>)
45-
h5 Thursdays 7:00-10:00pm in the Library (<a href="ical/thursday.ics">iCal</a>)
44+
h5 Thursdays 7:00-8:00pm in the Library (<a href="ical/thursday1.ics">iCal</a>)
45+
h5 Thursdays 9:00-10:00pm in the Library (<a href="ical/thursday2.ics">iCal</a>)
4646
.container
4747
p <span class="drop-cap">Olin.js</span> is a student-led and -developed project-oriented approach to learning modern web application development. With server and client technology advancing so rapidly, the modern website looks very different from that of even a few years ago, and the web will only become a bigger part of our lives in the near future. Olin.js quickly familiarizes students with Node.js as a web server framework and ES5 JavaScript as a responsive client-side language with four weeks of introductory instruction and three weeks of partner labs.
4848

0 commit comments

Comments
 (0)