Commit Graph

1384 Commits

Author SHA1 Message Date
Kyle Spaans 695eac9e78 I mixed up what an abstract and a short is. 2011-05-03 12:31:41 -04:00
Kyle Spaans b06f449e61 An abstract would be useful 2011-05-03 12:30:38 -04:00
Kyle Spaans ca05c838d6 trivial permutation of style so that I can try pushing again... 2011-05-03 12:28:29 -04:00
Kyle Spaans dd8a5dcb7d Spring 2011 elections notice 2011-05-03 12:23:28 -04:00
Brennan Taylor cdc84d7fe0 Fixing merge conflict text in xml file. 2011-04-13 00:15:47 -04:00
Brennan Taylor 36a7aba3cf Fixing aspect ratio. 2011-04-13 00:12:30 -04:00
Jennifer Yeelam Wong a9eb86ecbe Merge branch 'master' of ssh://csclub.uwaterloo.ca/users/git/www/www
Conflicts:
	events.xml
2011-03-16 16:10:08 -04:00
Marc Burns f176137835 Added event for software patents talk. 2011-03-16 15:55:46 -04:00
Jennifer Yeelam Wong 416167bb75 added Stanley Khaing's Software Patents talk W2011 2011-03-16 14:45:32 -04:00
Marc Burns c10d66a81b Added event for KW Perl Mongers talk, W2011 2011-02-14 11:10:42 -05:00
Marc Burns 56bc67dd40 Added event for UNIX 103. 2011-02-04 11:47:31 -05:00
Marc Burns e040e6932e Added event for Code Party this Friday. 2011-02-03 13:20:41 -05:00
Matthew McPherrin e5e942ffb5 Merge branch 'master' of caffeine:/users/www/www 2011-01-28 03:05:24 -05:00
Matthew McPherrin 24927e9297 Added missing spaces/period 2011-01-28 03:04:56 -05:00
Marc Burns 98bea2117c Fixed translation of event URLs to strip single quote. This, in turn, fixed generation of events/index.html. 2011-01-28 01:13:46 -05:00
Elana Hashman 3b3616d3c0 Fixed date for Unix 102 event 2011-01-27 20:39:34 -05:00
Marc Burns f9b5ed39ed Added event entry for Unix 102 W2011. 2011-01-26 19:04:34 -05:00
Marc Burns a730f81960 Reverted all changes regarding eduroam/. Sorry! 2011-01-24 12:20:31 -05:00
Marc Burns b660717dad Added subdirectory eduroam/ to root Makefile. Work... 2011-01-24 12:09:20 -05:00
Marc Burns a12cf55d02 Added Makefile for eduroam/ 2011-01-24 12:07:53 -05:00
Marc Burns 8885a6353b Added eduroam fix files under /eduroam. 2011-01-24 11:59:05 -05:00
Marc Burns 4c41df6ec9 Removed redundant news item introduced last commit. 2011-01-24 11:40:44 -05:00
Marc Burns 306e208f5d Added event 'Unix 101' for Winter 2011. 2011-01-24 11:32:05 -05:00
Peter Barfuss 1b26f641aa Reconfigured webcam url for bit-shifter to denote software change for providing the actual webcam stream. 2011-01-15 11:05:04 -05:00
Sean Hunt 37e7b3d23b elections are ended 2011-01-12 16:53:58 -05:00
Sean Hunt 4fb30c018c fuckup 2011-01-12 11:29:40 -05:00
Sean Hunt 23ad4f8385 Nomination results! 2011-01-11 22:26:24 -05:00
Sean Hunt d69c3202d7 Revert "Revert "I did not get the time wrong" (not run on caffeine)"
This reverts commit 57ebcd21c7.
2011-01-06 11:46:43 -05:00
Sean Hunt 57ebcd21c7 Revert "I did not get the time wrong" (not run on caffeine)
This reverts commit 42dad60a5f.
2011-01-06 11:46:22 -05:00
Sean Hunt 42dad60a5f I did not get the time wrong 2011-01-06 11:43:29 -05:00
Sean Hunt f858daacb4 Added W11 election announcement 2011-01-04 17:25:59 -05:00
Matthew McPherrin 2bf07bd600 Use protocol relative link to wiki (so we don't change http -> https or vice versa on the user) 2010-12-13 13:39:50 -05:00
Jeremy Roman 1bafa8c034 CSS does not support C++-style // comments. See http://www.w3.org/TR/CSS2/syndata.html#comments 2010-12-05 20:08:10 -05:00
Michael Ellis 19fa9012e1 magik off 2010-12-05 18:32:54 -05:00
Edgar Bering 9654678b0a Merge branch 'master' of ssh://csclub.uwaterloo.ca/users/git/www/www
Conflicts:
	events.xml
2010-11-15 19:32:14 -05:00
Edgar Bering e546963450 craig kaplan talk 2010-11-15 19:31:31 -05:00
Michael Ellis b790c8e744 Corrected time (according to email). Ammended description 2010-11-10 19:25:41 -05:00
Edgar Bering bb61004186 mathsoc cockandball 2010-11-03 15:37:58 -04:00
Edgar Bering 22f2b327d8 how do I XML 2010-11-03 15:34:12 -04:00
Edgar Bering 096d9b9a7e Merge branch 'master' of ssh://csclub.uwaterloo.ca/users/git/www/www 2010-11-03 15:33:40 -04:00
Edgar Bering 6d3b8ed2fb toronto and hackathon 2010-11-03 15:33:37 -04:00
Michael Ellis 409bb6f393 Flip the angry bit. 2010-11-01 13:24:08 -04:00
Edgar Bering c85c80d0e4 elyot talk 2010-10-25 13:21:43 -04:00
Edgar Bering 11985de3ac Merge branch 'master' of ssh://csclub.uwaterloo.ca/users/git/www/www 2010-10-14 12:04:37 -04:00
Edgar Bering c5865d5453 shai talk 2010-10-14 12:04:34 -04:00
Matthew McPherrin aaf2adebfe Address and phone on office page 2010-10-06 20:02:16 -04:00
Edgar Bering 9f98762dc0 unix 102 2010-10-05 22:24:23 -04:00
Edgar Bering 4526972f94 event unix103 2010-10-05 22:06:27 -04:00
Edgar Bering dd86869796 speaker names 2010-09-29 15:42:36 -04:00
Edgar Bering dabd74a5f3 Merge branch 'master' of ssh://csclub.uwaterloo.ca/users/git/www/www 2010-09-29 15:39:21 -04:00