Commit Graph

1037 Commits

Author SHA1 Message Date
David Bartley e792b3c1c3 Merge branch 'master' of caffeine:/users/www/www 2009-03-10 00:11:36 -04:00
David Bartley 96d2b28dd0 Add offsck (Office Manager) position 2009-03-10 00:11:09 -04:00
Michael Gregson 22728d7249 Merge branch 'master' of caffeine.uwaterloo.ca:/users/www/www 2009-03-08 14:33:56 -04:00
Michael Gregson 7689046f27 Corrections to IQC stuff. 2009-03-08 14:33:44 -04:00
Edgar Bering bd6b1732a0 adding siggraph night 2009-03-02 13:57:02 -05:00
David Bartley b4c1de2e84 Merge branch 'master' of caffeine:/users/www/www 2009-03-01 03:52:45 -05:00
David Bartley e92123fa8f Update stats.html with new Orion link 2009-03-01 03:51:41 -05:00
Michael Gregson d2b92d0913 Adding an end time to the IQC talk.
New ics stuff is awesome!  You all suck cocks.
2009-02-27 00:27:39 -05:00
Michael Gregson 7b690c9a84 Fixed the calendar generation, and updated some events to use the new awesomeness. 2009-02-27 00:13:00 -05:00
Michael Gregson 13163a8686 Disgusting implemention of flexible endings for the website. 2009-02-26 23:55:02 -05:00
Michael Gregson 6bedb03e6e Fixing Dooly's time. 2009-02-26 22:50:36 -05:00
Michael Gregson dfd71014d4 Updating IQC times. 2009-02-26 13:22:08 -05:00
Michael Gregson c95b8dddd9 Adding abstract for PR talk. 2009-02-26 13:21:54 -05:00
Michael Gregson 1ee0c65ba2 Adding CUTC. 2009-02-25 03:20:25 -05:00
Michael Gregson 78ea61da2a Adding some information about IQC talk. 2009-02-24 13:37:03 -05:00
Edgar Bering 66741ee16f Adding march events and Dooly's night 2009-02-24 11:33:44 -05:00
David Bartley 68f7639675 Merge branch 'master' of caffeine:/users/www/www 2009-02-19 20:14:57 -05:00
David Bartley 8f6781b672 Add weathermap back to stats.html 2009-02-19 20:13:38 -05:00
Edgar Bering 88cf157e31 fixing typo in unix 101/102 events notice 2009-02-02 13:19:41 -05:00
Edgar Bering a857482be1 adding unix 101/102 thursday event to events.xml 2009-02-02 13:18:42 -05:00
Edgar Bering e2023ca135 Merge branch 'master' of /users/www/www/
Conflicts:

	events.xml
2009-02-02 12:48:16 -05:00
Edgar Bering 9a818822ff Merging changes to events.xml someone else added the code party 2009-02-02 12:47:18 -05:00
Edgar Bering 57b4be2760 Adding UNIX 101, Code Party to events 2009-02-02 12:43:03 -05:00
Michael Gregson 2a34b390e7 Adding library link. 2009-01-29 16:37:27 -05:00
Michael Gregson 5439afc61a Trivial modification 2009-01-29 16:06:02 -05:00
Michael Gregson 64e98be7fe Updating for RMS talk changes. 2009-01-29 12:20:36 -05:00
Michael Gregson e53b553463 Posting code party for next Friday. 2009-01-28 20:45:16 -05:00
David Bartley 9af00a32f8 Remove lame warning 2009-01-19 00:29:53 -05:00
Edgar Bering 8e2253644a joel spolsky update and code party 2009-01-16 16:12:44 -05:00
Edgar Bering d9ded61f0a updating Joel's talk 2009-01-12 15:54:37 -05:00
Edgar Bering 95a2c36bb1 updating Joel's talk 2009-01-12 15:51:54 -05:00
Edgar Bering 4c39db527c Fixing minor error in rms talk info 2009-01-11 10:51:34 -05:00
Edgar Bering 034b078a6c Adding W09 RMS Talk to events page 2009-01-11 10:50:28 -05:00
David Bartley ba4f0c78be Fix elections time 2009-01-10 18:29:15 -05:00
Brennan Taylor d3adde6b7c Formatting the file a bit and pushing to fix the failed make 2009-01-06 11:07:23 -05:00
Brennan Taylor 445de0c19b Adding nomination info and election date info 2009-01-06 11:02:44 -05:00
Edgar Bering 41ce53631b Adding Joel to events.xml 2008-12-13 11:12:33 -05:00
David Bartley 2d2b4cd220 Fix graph link 2008-12-02 05:24:32 -05:00
David Bartley 5e78e4d3a0 Fix link 2008-12-02 04:36:28 -05:00
David Bartley 271ef3cee3 Add apache graphs back in 2008-12-02 04:31:46 -05:00
David Bartley 495a2d9d07 Merge branch 'master' of caffeine:/users/www/www 2008-12-02 03:50:54 -05:00
David Bartley 7a62d58003 Add network weather map to stats page 2008-12-02 03:50:42 -05:00
Edgar Bering 6ff87699ee adding Changing the World Conference 2008-11-06 19:13:38 -05:00
Edgar Bering 0985d55c5a adding linux install fest 2008-11-03 14:20:03 -05:00
Edgar Bering d28b80b37f adding linux install fest 2008-11-03 14:16:38 -05:00
Edgar Bering c1bf5be6dd adding pr's functional programming talk 2008-11-03 13:52:50 -05:00
David Bartley 1bcf11a6f3 Merge branch 'master' of caffeine:/users/www/www 2008-10-23 21:20:59 -04:00
David Bartley 65d2edbf76 Fix stats.html 2008-10-23 21:20:47 -04:00
Edgar Bering c67e70c867 updating code party info 2008-10-17 21:59:31 -04:00
Edgar Bering 2e7860525e Adding code party location tba 2008-10-16 21:30:23 -04:00