Commit Graph

411 Commits

Author SHA1 Message Date
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
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 24927e9297 Added missing spaces/period 2011-01-28 03:04:56 -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 306e208f5d Added event 'Unix 101' for Winter 2011. 2011-01-24 11:32:05 -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 22f2b327d8 how do I XML 2010-11-03 15:34:12 -04:00
Edgar Bering 6d3b8ed2fb toronto and hackathon 2010-11-03 15:33:37 -04:00
Edgar Bering c85c80d0e4 elyot talk 2010-10-25 13:21:43 -04:00
Edgar Bering c5865d5453 shai talk 2010-10-14 12:04:34 -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
Edgar Bering 76c83f7765 next 2 weeks events 2010-09-29 15:39:14 -04:00
Jeremy Roman efd1075d93 spelling 2010-09-28 12:04:09 -04:00
Edgar Bering 2dfe75c10f pbarfuss talk 2010-09-27 13:14:32 -04:00
Edgar Bering ef26923dfa frosh welcome 2010-09-22 12:14:35 -04:00
Edgar Bering cc37fc7483 f10 unix101 2010-09-22 11:53:09 -04:00
Edgar Bering e1f5066fb2 fix typos/cooking for geeks 2010-09-18 12:45:25 -04:00
Edgar Bering 71461ce4b8 plragde adding presenter name 2010-09-17 13:33:53 -04:00
Edgar Bering ec0b5c538a plragde talk 2010-09-16 19:24:07 -04:00
Michael Ellis f0f38c00b8 Election time decided 2010-09-10 16:59:12 -04:00
Brennan Taylor e861f19887 Adding Elyot talk 2010-07-17 12:34:34 -04:00
Brennan Taylor 4068b22e88 Fixing spelling 2010-07-12 22:05:11 -04:00
Brennan Taylor 5fd1af6772 Fixing tag 2010-07-12 22:01:34 -04:00
Brennan Taylor 4c51619356 Adding Edgar talk. 2010-07-12 12:29:24 -04:00
Brennan Taylor bbc39cd010 Adding code party 2010-07-08 12:46:27 -04:00
Brennan Taylor 2bff29a50a Adding Nomair talk. 2010-07-03 13:54:27 -04:00
CSC Exec 56f02f4840 fixing date for plragde talk 2010-06-21 09:47:17 -04:00
Brennan Taylor b93e341099 Whoops, forgot a "/" 2010-06-16 14:18:17 -04:00
Brennan Taylor 6b1cc7fa04 Adding PR Talk. 2010-06-16 14:15:26 -04:00
Edgar Bering f6f107c1fa sussman for reall this time 2010-05-23 22:42:14 -04:00
Edgar Bering 10fcee973e sussman 2010-05-23 22:41:33 -04:00
Edgar Bering 63e15d4bd3 s10 elections 2010-05-10 17:50:49 -04:00
Edgar Bering eeafffc048 spring term elections correctly 2010-05-04 17:10:23 -04:00
Edgar Bering b1d66cd219 spring term elections 2010-05-04 17:09:32 -04:00
Edgar Bering 532500dfb7 jmsaunde talk 2010-04-03 15:23:51 -04:00
Edgar Bering 3a10a16181 windows azure lab 2010-03-30 18:17:20 -04:00
Edgar Bering dd0d3b2cb0 ctrl-d 2010-03-29 13:53:34 -04:00
Edgar Bering 6045c4c6a8 spasupal membertalk 2010-03-29 11:33:48 -04:00