From 687645497a33985e8f636e75d41f2c211494aaaf Mon Sep 17 00:00:00 2001 From: Elana Hashman Date: Sat, 24 May 2014 14:24:06 -0400 Subject: [PATCH 1/2] Fixed events page generation error; don't use '/' in room names! --- events.xml | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/events.xml b/events.xml index 5377fee..e983bc0 100644 --- a/events.xml +++ b/events.xml @@ -5,21 +5,37 @@ - -

Interested in Unix, but don't know where to start? Then start - in MC 3003 on Friday May 30 with basic topics including - interaction with the shell, motivation for using it, some simple - commands, and more. - Afterwards we will be moving over to the MC Comfy Lounge for a - fun night of hacking! Work on a personal project, open source - software, or anything you wish. Food will be available for your - hacking pleasure. The Sysadmin position will also be ratified - during a general meeting at this time. Come join us for an - evening of fun, learning, and food! +

+ Interested in Unix, but don't know where to start? Then Come learn some + basic topics with us including interaction with the shell, motivation + for using it, some simple commands, and more. +

+

+ Afterwards we will be moving over to the MC Comfy Lounge for a + fun night of hacking! The sysadmin position will also be ratified + during a general meeting of the membership at this time. Come join us + for an evening of fun, learning, and food!

+ +

+ Interested in Unix, but don't know where to start? Then start + in MC 3003 on Friday May 30 with basic topics including + interaction with the shell, motivation for using it, some simple + commands, and more. +

+

+ Afterwards we will be moving over to the MC Comfy Lounge for a + fun night of hacking! Work on a personal project, open source + software, or anything you wish. Food will be available for your + hacking pleasure. The Sysadmin position will also be ratified + during a general meeting at this time. Come join us for an + evening of fun, learning, and food! +

+ Date: Sat, 24 May 2014 14:48:49 -0400 Subject: [PATCH 2/2] Cleaned up events.xml --- events.xml | 77 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 25 deletions(-) diff --git a/events.xml b/events.xml index e983bc0..e63be52 100644 --- a/events.xml +++ b/events.xml @@ -89,6 +89,11 @@ by Facebook and Google. A Microsoft Surface Tablet will be awarded to the winning team. Register and find out more at http://hack-waterloo.com.

+ +

Work on a software project for 24 hours in teams of up to 4 members. Swag will be provided + by Facebook and Google. A Microsoft Surface Tablet will be awarded to the winning team. + Register and find out more at http://hack-waterloo.com.

+ @@ -98,6 +103,12 @@ PowerPoint presentation from the lottery and talk about it on the spot.

+ +

Create a 5-slide PowerPoint presentation about a specific topic. Bring it with + you to the event (on a flash drive). Submit it into the lottery. Select a random + PowerPoint presentation from the lottery and talk about it on the spot. +

+ @@ -106,17 +117,31 @@ share ideas with your friends about your favourite topics in computer science.

+ +

We will be having our 2nd code party this term. Enjoy a free dinner, relax, and + share ideas with your friends about your favourite topics in computer science. +

+

Learn the basics of using tools found commonly on UNIX-like operating systems. - For students new to this topic, knowledge gained from UNIX 101 would be useful in coursework.

 + For students new to this topic, knowledge gained from UNIX 101 would be useful in coursework.

+ +

Learn the basics of using tools found commonly on UNIX-like operating systems. + For students new to this topic, knowledge gained from UNIX 101 would be useful in coursework.

+

Immediately after UNIX 101, we will be having our first annual code party. Enjoy a free dinner, relax, and share ideas with your friends about - your favourite topics in computer science.

 + your favourite topics in computer science.

+ +

Immediately after UNIX 101, we will be having our first annual code party. + Enjoy a free dinner, relax, and share ideas with your friends about + your favourite topics in computer science.

+ @@ -183,8 +208,8 @@ - +

The CSC has been invited to attend this Erlang conference in Toronto. If you are interested in attending, please sign up on our + title="Hackathon-Code Party!!">

Join us for a night of code, food, and caffeine! There will be plenty of edibles and hacking for your enjoyment. If you are interested in getting @@ -289,8 +314,8 @@ href="http://uwaterloo.ca/games-institute/events/social-innovation-simulation-de - +

The fourth event in our security and privacy series. By undergraduate students Murphy Berzish and Nick Guenther. @@ -314,7 +339,8 @@ government-issued photo-ID.

 - +

The third lecture of our security and privacy series. By undergraduate student Simon Gladstone. @@ -332,8 +358,8 @@ government-issued photo-ID.

 - +

The second lecture of our security and privacy series. By undergraduate student Eric Dong. @@ -354,8 +380,8 @@ Censorship"> - +

The first lecture of our security and privacy series. By PhD student Sarah Harvey. @@ -379,8 +405,8 @@ You Care About Security and Privacy"> - +

We will be showing GoingNative lectures from some of the top individuals working on C++ @@ -409,8 +435,8 @@ GoingNative Lectures"> - +

The second in a series of recorded talks from GoingNative 2013. Featuring Stephan T. Lavavej. @@ -434,8 +460,8 @@ left to compilers. - +

The third in a series of recorded talks from GoingNative 2013. Featuring Scott Meyers. @@ -458,8 +484,8 @@ Effective C++11/14. - +

The fourth in a series of recorded talks from GoingNative 2013. Featuring Andrei Alexandrescu. @@ -489,8 +515,8 @@ inner workings of modern CPUs. - +

The fifth in a series of recorded talks from GoingNative 2013. Featuring Sean Parent. @@ -507,8 +533,8 @@ little pinch can really spice things up. - +

All CSC members and their guests are invited for a night of free bowling at Bingemans! Transportation will be provided. If you are interested in attending, @@ -527,7 +553,8 @@ Bowling"> - +

Elections for Fall 2013 are being held! The Executive will be elected, and the Office Manager and Librarian will be appointed by the new