Commit Graph

1325 Commits

Author SHA1 Message Date
Edgar Bering 5323689cc0 elections 2011-09-18 15:17:30 -04:00
Jennifer Yeelam Wong ded4e90326 election nominations open, fall 2011 2011-09-08 18:50:47 -04:00
Matthew McPherrin 11e30b72df Add QR code to makefile 2011-08-12 15:57:16 -04:00
Matthew McPherrin abd1ab6cc0 CSC logo in a QR Code 2011-08-12 15:55:58 -04:00
Jeremy Roman 3da04b62ff stupid apostrophe 2011-07-29 11:29:27 -04:00
Jeremy Roman ad19ff767b fixed self-closing tags 2011-07-29 11:26:06 -04:00
Edgar Bering b2c8ba719d add ctrl-d so that askhader can get off of work for it 2011-07-29 11:20:15 -04:00
Jeremy Roman fe15ac7366 Merge branch 'master' of /users/git/www/www 2011-07-22 21:26:36 -04:00
Jeremy Roman 2baff0f469 csc-industry 2011-07-22 21:26:08 -04:00
Edgar Bering 404d964281 adding a nastygram regarding spamming members, since apparently not doing this is beyond some people 2011-07-21 12:20:34 -04:00
Matthew McPherrin ab539d4c74 Spelling 2011-07-12 17:58:45 -04:00
Matthew McPherrin 224ad4478d More details for Stego talk 2011-07-12 17:56:08 -04:00
Matthew McPherrin 9b34904fb8 broken link 2011-07-12 15:10:11 -04:00
Matthew McPherrin c28af70cba Yomna event, code party. 2011-07-12 15:09:21 -04:00
Matthew McPherrin 8271a3e5f9 Several events lacked the manditory <short> tag 2011-07-07 16:10:54 -04:00
Matthew McPherrin 3ca2fec11d Remove abstracts that duplicate short.
They are equivalent when it is absent.
2011-07-07 16:03:51 -04:00
Matthew McPherrin d432e6b759 Time fix 2011-07-06 21:40:52 -04:00
Matthew McPherrin 1bd0e426d6 Merge branch 'master' of caffeine:/users/www/www 2011-07-06 17:55:10 -04:00
Matthew McPherrin c63ae07160 More info about campfire 2011-07-06 17:55:01 -04:00
Kyle Spaans 9428b8a8dc Tim Brecht Talk: linux 2011-06-28 10:00:22 -04:00
Matthew McPherrin de834b2b15 Code party postponed to this friday 2011-06-22 21:40:41 -04:00
Matthew McPherrin 8f724892c6 Code party postponed due to CS convocation and people wanting to
go get drunk at kickoffs. Plus people are gone for CUMC.
2011-06-15 11:09:22 -04:00
Matthew McPherrin 7df5b52577 Added paragraphs 2011-06-13 14:58:17 -04:00
Matthew McPherrin 2812276d1f Mike Terry Abstract 2011-06-09 14:58:33 -04:00
Matthew McPherrin 44858d6191 Added yomna's talk on steganography 2011-06-07 00:25:46 -04:00
Matthew McPherrin 649899a713 We really should typecheck and refuse pushes when I break things. 2011-06-01 10:10:13 -04:00
Matthew McPherrin f9a9a7c3a7 Placeholder for upcoming talk 2011-06-01 10:07:41 -04:00
Matthew McPherrin b091c8d5d1 Added room for GPGPU talk 2011-05-31 10:20:49 -04:00
Matthew McPherrin 22b7bd68fe A bit more on the abstract and some <p> formatting 2011-05-30 22:05:33 -04:00
Matthew McPherrin 07cbbbcc04 More specific location than just TBA. 2011-05-30 21:58:46 -04:00
Matthew McPherrin 473509e77c Added more description 2011-05-30 21:57:36 -04:00
Matthew McPherrin 0ecb3d211c Added kshyatt's member talk 2011-05-30 21:55:40 -04:00
Matthew McPherrin 536e2264f6 Added initial timing of the CSC picnic and campfire 2011-05-30 13:27:40 -04:00
Matthew McPherrin 7dbe65852a And add abstracts too 2011-05-30 13:20:32 -04:00
Matthew McPherrin 5ccd514a79 Added 2nd and 3rd code parties 2011-05-30 13:19:30 -04:00
Matthew McPherrin e31a2b06a9 First code party 2011-05-30 12:35:40 -04:00
Matthew McPherrin fb7a177f00 Election results are not an event. Moving to news 2011-05-30 12:22:21 -04:00
Kyle Spaans 48f1b9449a election results 2011-05-10 14:55:39 -04:00
Kyle Spaans 4db704a981 Oops, the events were duplicated 2011-05-09 16:47:39 -04:00
Kyle Spaans 7abc8b2f76 clarify elections nomination list wording 2011-05-09 16:46:43 -04:00
Kyle Spaans a0c80b8432 final nominees list 2011-05-09 16:44:35 -04:00
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