Merge remote-tracking branch 'upstream/master'

elmasry2 · Dec 16, 2014 · 1b089b3 · 1b089b3
2 parents 74fefa1 + a578b28
commit 1b089b3
Show file tree

Hide file tree

Showing 21 changed files with 103 additions and 46 deletions.
diff --git a/hflossk/participants.py b/hflossk/participants.py
@@ -88,7 +88,7 @@ def participants(root_dir):
     assignments = ['quiz1', 'litreview1', 'bugfix', 'teamprop1', 'meetup1',
                    'commarchreport', 'commarchpreso', 'meetup2', 'curriculum',
                    'smoketest', 'vidreview1', 'vidreview2', 'teamprop2',
-                   'litreview2', 'meetup3']
+                   'litreview2', 'meetup3', 'quiz2', 'finalpreso']
     elapsed = (datetime.today() - hflossk.site.COURSE_START).total_seconds()
     target_number = int(elapsed / timedelta(weeks=1).total_seconds() + 1 +
                         len(assignments))

diff --git a/hflossk/static/hw/peereval.md b/hflossk/static/hw/peereval.md
diff --git a/hflossk/static/hw/peereval.txt b/hflossk/static/hw/peereval.txt
@@ -0,0 +1,36 @@
+HFOSS Peer Evaluation
+
+Please complete one for each member of your team besides yourself. You want to
+attempt to be objective, but you also need to have an opinion that you can
+support with evidence. Part of your grade is going to be based not only on how
+your rate your peers, but how well you rate your peers i.e. are your ratings of
+your peers thoughtful and well justified. Take this seriously; you will be
+asked to do this in the professional world from time to time.
+
+Project Name:
+
+Your Name:
+
+Name of Teammate Being Rated:
+
+  1. Did the person you are rating do an equitable share of the work on your
+  project (please include the milestone list)?
+
+  2. Did they complete their share of work?
+
+  3. Was it done on time?
+
+  4. Describe the nature of the work that the person being rated did.
+
+  5. Were you able to meet and communicate easily with the person being rated?
+
+  6. Are you satisfied with the work that the student being rated did?  Explain
+  why or why not.
+
+  7. Please rate this person’s contribution on a scale from 1 to 100.  A 59 or below
+  would represent a failing grade,  60-69 a “D,” 70-79 a “C,” 80-89 a “B,”90-100
+  an “A.”
+
+  8. Please include a brief explanation of why you think the person deserves his/her
+  score, particularly if it might seem to contradict anything you have indicated
+  above.
diff --git a/hflossk/templates/blogs.mak b/hflossk/templates/blogs.mak
@@ -74,7 +74,7 @@
           <!--<% keys = ['quiz1', 'litreview1', 'bugfix', 'commarchpreso', 'commarchreport', 'teamprop1', 'teamprop2', 'litreview2', 'quiz2'] %>-->
           <% if 'hw' not in student: student['hw'] = [] %>
           % if student['isActive']:
-            <% keys = ['quiz1', 'litreview1', 'bugfix', 'teamprop1', 'meetup1', 'commarchreport', 'commarchpreso', 'meetup2', 'curriculum', 'smoketest', 'vidreview1', 'vidreview2', 'teamprop2', 'litreview2', 'meetup3'] %>
+            <% keys = ['quiz1', 'litreview1', 'bugfix', 'teamprop1', 'meetup1', 'commarchreport', 'commarchpreso', 'meetup2', 'curriculum', 'smoketest', 'vidreview1', 'vidreview2', 'teamprop2', 'litreview2', 'meetup3', 'quiz2', 'finalpreso'] %>
             % for key in keys:
                 % if key in student['hw']:
                   <li><a target="_blank" href="${student['hw'][key] | h}">${key}</a></li>

diff --git a/scripts/people/2014/fall/Faokryn.yaml b/scripts/people/2014/fall/Faokryn.yaml
@@ -19,6 +19,8 @@ hw:
   smoketest: http://faokryn.com/post/101207756214
   vidreview2: http://faokryn.com/post/101370910559
   meetup3: http://faokryn.com/post/103154951684
+  litreview2: http://faokryn.com/post/104194802274
+  quiz2: http://faokryn.com/post/104368819319
 hackathon1: http://faokryn.com/post/98375665444  # Software Freedom Day
 hackathon2: http://faokryn.com/post/99301485439  # Big Red Hacks
 hackathon3: http://faokryn.com/post/99385339364  # Hack Upstate

diff --git a/scripts/people/2014/fall/Honeybunch.yaml b/scripts/people/2014/fall/Honeybunch.yaml
@@ -22,3 +22,4 @@ hw:
   curriculum: http://honeybunchfoss.blogspot.com/2014/10/ny-and-ma-math-curriculum-comparison.html
   meetup3: http://honeybunchfoss.blogspot.com/2014/11/meetup-3-rocpy.html
   litreview2: http://honeybunchfoss.blogspot.com/2014/12/lit-review-2-hacking-politics-tldr.html
+  quiz2: http://honeybunchfoss.blogspot.com/2014/12/hfoss-quiz-2.html
diff --git a/scripts/people/2014/fall/Lynxfive.yaml b/scripts/people/2014/fall/Lynxfive.yaml
@@ -5,6 +5,9 @@ forges:
 irc: Lynxfive
 name: Cole Cooper
 rit_dce: cjc6417
+hackathon1: http://lynxfive.blogspot.com/2014/10/hudl-presentation.html
+playtest1: http://lynxfive.blogspot.com/2014/10/playtesting-video-games-made-by-4th.html
+playtest2: http://lynxfive.blogspot.com/2014/12/playtest-with-fourth-graders-2.html
 hw:
   litreview1: http://lynxfive.blogspot.com/2014/09/what-is-open-source-article-overview.html
   quiz1: http://lynxfive.blogspot.com/2014/09/foss-quiz-1.html
@@ -19,3 +22,6 @@ hw:
   vidreview1: http://lynxfive.blogspot.com/2014/10/rip-remix-manifesto.html
   smoketest: http://lynxfive.blogspot.com/2014/10/xo-smoke-test.html
   vidreview2: http://lynxfive.blogspot.com/2014/10/simple-made-easy-vidreview.html
+  litreview2: http://lynxfive.blogspot.com/2014/12/litreview-hacking-politics-tldr.html
+  quiz2: http://lynxfive.blogspot.com/2014/12/quiz-2.html
+  meetup3: http://lynxfive.blogspot.com/2014/12/meetup-3-rocpy-november.html
diff --git a/scripts/people/2014/fall/MrNex.yaml b/scripts/people/2014/fall/MrNex.yaml
@@ -7,6 +7,7 @@ name: Nicholas Gallagher
 rit_dce: npg3253
 hackathon1: http://nexleveldevelopment.wordpress.com/2014/09/13/my-first-coding-competition/
 hackathon2: http://nexleveldevelopment.wordpress.com/2014/10/13/microsoft-interview/
+playtest1: http://nexleveldevelopment.wordpress.com/2014/12/10/playtest-review/
 hw:
   litreview1: http://nexleveldevelopment.wordpress.com/2014/09/08/lit-review-what-is-open-source/
   quiz1: http://nexleveldevelopment.wordpress.com/2014/09/11/the-open-source-way/
@@ -22,3 +23,4 @@ hw:
   meetup2: http://nexleveldevelopment.wordpress.com/2014/11/18/mrnexinterlockroc/
   curriculum: http://nexleveldevelopment.wordpress.com/2014/10/15/mass-vs-ny-battle-of-the-education-standards/
   litreview2: http://nexleveldevelopment.wordpress.com/2014/11/30/literature-review-hacking-politics-tldr/
+  quiz2: http://nexleveldevelopment.wordpress.com/2014/12/05/quiz-2/
diff --git a/scripts/people/2014/fall/anjelz.yaml b/scripts/people/2014/fall/anjelz.yaml
@@ -17,4 +17,10 @@ hw:
  curriculum: http://hfossible.blogspot.com/2014/10/ny-and-ma-curriculum-and-xo-project.html
  teamprop2: http://hfossible.blogspot.com/2014/10/team-proposal.html
  vidreview1: http://hfossible.blogspot.com/2014/10/vidreview-rip-remix-manifesto.html
- meetup3: http://hfossible.blogspot.com/2014/10/rocpy-meetup.html
+ meetup3: http://hfossible.blogspot.com/2014/10/rocpy-meetup.html
+ smoketest: http://hfossible.blogspot.com/2014/11/smoke-test-xo.html
+ meetup4: http://hfossible.blogspot.com/2014/11/rocpy-meetup-2.html
+ litreview2: http://hfossible.blogspot.com/2014/12/lit-review-2-hacking-politics-tldr.html
+ quiz2: http://hfossible.blogspot.com/2014/12/quiz-2-pedagogy.html
+ hackathon1: http://hfossible.blogspot.com/2014/12/local-hack-day-2014-hackathon.html
+ meetup4: http://hfossible.blogspot.com/2014/12/maker-faire.html
diff --git a/scripts/people/2014/fall/annstan.yaml b/scripts/people/2014/fall/annstan.yaml
@@ -22,3 +22,4 @@ hw:
     vidreview2: http://ann-stan.blogspot.com/2014/10/vid-review-2-simple-made-easy.html
     meetup3: http://ann-stan.blogspot.com/2014/11/rocpy-round-3.html
     litreview2: http://ann-stan.blogspot.com/2014/11/lit-review-hacking-politics-tldr.html
+    quiz2: http://ann-stan.blogspot.com/2014/12/please-post-both-answers-and-questions.html
diff --git a/scripts/people/2014/fall/citruspi.yaml b/scripts/people/2014/fall/citruspi.yaml
@@ -12,3 +12,4 @@ hw:
   commarchreport: http://hfossblog.citruspi.io/09-30-2014-commarch.txt
   commarchpreso: https://www.icloud.com/keynote/AwBWCAESEDixfLK5SOVyrRPrkG0ESxkaKqFl65M1PD4Dncusmm2JewKKQalSPiAv33Ks5rxSfT7t77NKkwPCeR19kgMCUCAQEEIBWzuGDkH2A_gVdO6IH_deqmsXO6a935hMoOF2PjkUId#Presentation
   meetup2: http://hfossblog.citruspi.io/10-08-2014-meetup-2.txt
+  quiz2: http://hfossblog.citruspi.io/04-12-2014-totally-finished-quiz-2.txt
diff --git a/scripts/people/2014/fall/clumsycat.yaml b/scripts/people/2014/fall/clumsycat.yaml
@@ -7,13 +7,16 @@ name: Matthew Olsson
 rit_dce: mfo3726
 hw:
   litreview1: http://opensourceadventures.blogspot.com/2014/09/lit-review-what-is-open-source-by-steve.html
+  litreview2: http://opensourceadventures.blogspot.com/2014/12/hacking-politics.html
   quiz1: http://opensourceadventures.blogspot.com/2014/09/quiz-1.html
+  quiz2: http://opensourceadventures.blogspot.com/2014/12/quiz2.html
   meetup1: http://opensourceadventures.blogspot.com/2014/09/girl-develop-it.html
   bugfix: http://opensourceadventures.blogspot.com/2014/09/squashing-bug.html
   teamprop1: http://opensourceadventures.blogspot.com/2014/09/team-proposal.html
   commarchreport: http://opensourceadventures.blogspot.com/2014/09/commarch-assignment.html
   commarchpreso: https://docs.google.com/presentation/d/1k-pycwu-E_TY7UW9P9pFVC8JXzSGB6CY2u8IPXIp0oY/edit?usp=sharing
   meetup2: http://opensourceadventures.blogspot.com/2014/10/hudl.html
+  meetup3: http://opensourceadventures.blogspot.com/2014/12/local-hack-day.html
   teamprop2: http://opensourceadventures.blogspot.com/2014/10/team-proposals-part-two.html
   curriculum: http://opensourceadventures.blogspot.com/2014/10/curriculums.html
   vidreview1: http://opensourceadventures.blogspot.com/2014/10/rip-remix-manifesto.html

diff --git a/scripts/people/2014/fall/dozendonuts.yaml b/scripts/people/2014/fall/dozendonuts.yaml
@@ -21,3 +21,8 @@ hw:
   meetup2: http://dxn7335.blogspot.com/2014/11/project-spark-meetup-event-2.html
   hackathon1: http://dxn7335.blogspot.com/2014/11/imagine-cup-rit.html
   meetup3: http://dxn7335.blogspot.com/2014/11/coderit-angularjs-talk.html
+  litreview2: http://dxn7335.blogspot.com/2014/12/litreview-hacking-politics-tldr.html
+  quiz2: http://dxn7335.blogspot.com/2014/12/hfoss-quiz-2-pedagogy.html
+  hackathon2: http://dxn7335.blogspot.com/2014/12/rit-local-hack-day.html
+  upstream1: https://github.com/ritstudentgovernment/petitions/pull/17
+  hackathon3: http://dxn7335.blogspot.com/2014/12/homestretch-hackathon.html
diff --git a/scripts/people/2014/fall/dropofwill.yaml b/scripts/people/2014/fall/dropofwill.yaml
@@ -5,6 +5,7 @@ forges:
 irc: dropofwill
 name: Will Paul
 rit_dce: whp3652
+upstream1: https://github.com/bradvin/FooTable/pull/276
 hw:
   litreview1: http://dropofwill.herokuapp.com/2014/09/07/review-what-is-open-source-and-how-does-it-work/
   quiz1: http://dropofwill.herokuapp.com/2014/09/11/quiz-1/
@@ -14,10 +15,12 @@ hw:
   commarchreport: http://dropofwill.herokuapp.com/2014/09/30/community-architecture-team-project/
   commarchpreso: https://docs.google.com/presentation/d/1mhkialtW512EKhttsdwwF0h30TKVvoj_CZ3Vzh2jXCU/edit?usp=sharing
   hackathon1: http://dropofwill.herokuapp.com/2014/10/13/hudl-visit/
-  upstream1: https://github.com/bradvin/FooTable/pull/276
   curriculum: http://dropofwill.herokuapp.com/2014/10/14/ny-and-ma-curriculum-comparison/
   teamprop2: http://dropofwill.herokuapp.com/2014/10/16/xo-team-proposal/
   vidreview1: http://dropofwill.herokuapp.com/2014/10/22/rip-a-remix-manifesto/
   smoketest: http://dropofwill.herokuapp.com/2014/10/28/xo-smoke-test/
   vidreview2: http://dropofwill.herokuapp.com/2014/10/30/simple-made-easy/
   meetup2: http://dropofwill.herokuapp.com/2014/11/15/roc-py-october-python-with-other-languages/
+  litreview2: http://dropofwill.herokuapp.com/2014/12/02/review-hacking-politics-the-tl-dr/
+  quiz2: http://dropofwill.herokuapp.com/2014/12/04/quiz-2/
+  meetup3: http://dropofwill.herokuapp.com/2014/12/10/roc-py-last-meetup-of-the-semester/
diff --git a/scripts/people/2014/fall/dtendr.yaml b/scripts/people/2014/fall/dtendr.yaml
@@ -5,15 +5,20 @@ forges:
 irc: dtendr
 name: Josh Davis
 rit_dce: jad2828
+hackathon1: http://dtendr.blogspot.com/2014/11/election-night-hackathon.html
+hackathon2: http://dtendr.blogspot.com/2014/11/music-day-hackathon-boston.html
 hw:
   litreview1: http://dtendr.blogspot.com/2014/09/review-of-open-source.html
   quiz1: http://dtendr.blogspot.com/2014/09/tosw-quiz.html
   meetup1: http://dtendr.blogspot.com/2014/09/rocpy.html
   teamprop1: http://dtendr.blogspot.com/2014/09/team-proposal.html
   commarchreport: http://dtendr.blogspot.com/2014/09/commarch-report.html
   commarchpreso: https://docs.google.com/a/g.rit.edu/presentation/d/1ITde9mhXxQ5-e_xwCRvTBWqmZd-Du2RKeqO8r3iWcoQ/edit#slide=id.g3c4d4d6c3_30
+  curriculum: http://dtendr.blogspot.com/2014/10/ny-ma-4th-grade-math-curriculum.html
   teamprop2: http://dtendr.blogspot.com/2014/10/team-proposal-2.html
   vidreview1: http://dtendr.blogspot.com/2014/10/rip-remix-manifesto-video-review.html
   meetup2: http://dtendr.blogspot.com/2014/10/rocpy-second.html
   smoketest: http://dtendr.blogspot.com/2014/10/xo-smoke-test.html
-  vidreview2: http://dtendr.blogspot.com/2014/10/simple-made-easy.html
+  vidreview2: http://dtendr.blogspot.com/2014/10/simple-made-easy.html
+  litreview2: http://dtendr.blogspot.com/2014/11/hacking-politics-tldr-litreview.html
+  quiz2: http://dtendr.blogspot.com/2014/12/quiz-2.html
diff --git a/scripts/people/2014/fall/kangareuben.yaml b/scripts/people/2014/fall/kangareuben.yaml
@@ -24,4 +24,6 @@ hw:
   smoketest: http://kangareuben.wordpress.com/2014/10/28/smoke-test/
   vidreview2: http://kangareuben.wordpress.com/2014/10/29/vidreview-simple-made-easy/
   meetup3: http://kangareuben.wordpress.com/2014/11/20/rocpy-meetup-111814/
-  litreview2: http://kangareuben.wordpress.com/2014/11/30/litreview-hacking-politics-tldr/
+  litreview2: http://kangareuben.wordpress.com/2014/11/30/litreview-hacking-politics-tldr/
+  quiz2: http://kangareuben.wordpress.com/2014/12/05/quiz-pedagogy/
+  finalpreso: https://docs.google.com/a/g.rit.edu/presentation/d/1ZiEJOgQbteGrzurTP-1jiVMOfVDRjvJwUOoGzbeXV7g/edit#slide=id.g559bb7193_06
diff --git a/scripts/people/2014/fall/kocsen.yaml b/scripts/people/2014/fall/kocsen.yaml
@@ -12,15 +12,20 @@ hw:
   meetup1: http://kocsen-hfoss.blogspot.com/2014/09/friendly-visit-to-rocpy.html
   teamprop1: http://kocsen-hfoss.blogspot.com/2014/09/team-proposal-for-comarch.html
   hackathon1: http://kocsen-hfoss.blogspot.com/2014/10/hudl-visit.html
-  meetup3: http://kocsen-hfoss.blogspot.com/2014/11/code-rit-meetup.html
+  meetup2: http://kocsen-hfoss.blogspot.com/2014/11/code-rit-meetup.html
   commarchreport: http://kocsen-hfoss.blogspot.com/2014/10/commarch-gratipay.html
   commarchpreso: http://bit.ly/1vxOxrF
   bugfix2: http://kocsen-hfoss.blogspot.com/2014/10/bugfixing-our-own-class.html
   bugfix3: http://kocsen-hfoss.blogspot.com/2014/09/gnome-314-update.html
+  smoketest: http://kocsen-hfoss.blogspot.com/2014/12/smoke-test.html
   teamprop2: http://kocsen-hfoss.blogspot.com/2014/10/team-proposal-xo-project.html
   vidreview1: http://kocsen-hfoss.blogspot.com/2014/10/rip-remix-manifesto.html
   vidreview2: http://kocsen-hfoss.blogspot.com/2014/10/vidreview-2.html
   curriculum: http://kocsen-hfoss.blogspot.com/2014/10/ny-vs-ma-teaching-philosophies.html
   lightningtalk1: http://bit.ly/1u7CZde
   lightningtalk2: http://bit.ly/1vab536
-  meetup4: http://kocsen-hfoss.blogspot.com/2014/11/rocpy-cold-one.html
+  meetup3: http://kocsen-hfoss.blogspot.com/2014/11/rocpy-cold-one.html
+  litreview2: http://kocsen-hfoss.blogspot.com/2014/12/litreview2-hacking-politics.html
+  quiz2: http://kocsen-hfoss.blogspot.com/2014/12/quiz-2.html
+  hackathon2: http://kocsen-hfoss.blogspot.com/2014/12/hackathon.html
+  meetup4: http://kocsen-hfoss.blogspot.com/2014/12/another-coderit-meeting.html
diff --git a/scripts/people/2014/fall/snapschott.yaml b/scripts/people/2014/fall/snapschott.yaml
@@ -14,7 +14,10 @@ hw:
   teamprop1: http://andrewhfoss.blogspot.com/2014/09/team-proposal.html
   commarchreport: http://andrewhfoss.blogspot.com/2014/09/community-architecture-report-duality.html
   commarchpreso: https://docs.google.com/presentation/d/1ITde9mhXxQ5-e_xwCRvTBWqmZd-Du2RKeqO8r3iWcoQ/edit?usp=sharing
+  curriculum: http://andrewhfoss.blogspot.com/2014/10/ny-ma-4th-grade-math-curriculum.html
   teamprop2: http://andrewhfoss.blogspot.com/2014/10/team-proposal-2.html
   vidreview1: http://andrewhfoss.blogspot.com/2014/10/video-review.html
+  meetup2: http://andrewhfoss.blogspot.com/2014/11/interlockroc-meetup-2.html
   smoketest: http://andrewhfoss.blogspot.com/2014/10/smoke-test.html
   vidreview2: http://andrewhfoss.blogspot.com/2014/10/video-review-simple-made-easy.html
+  litreview2: http://andrewhfoss.blogspot.com/2014/12/litreview-hacking-politics.html
diff --git a/scripts/people/2014/fall/susan.yaml b/scripts/people/2014/fall/susan.yaml
@@ -13,10 +13,19 @@ hw:
   meetup1: http://emollient.me/rocpy.html
   commarchreport: http://emollient.me/blog/the-commarch-report-of-videolan.html
   commarchpreso: https://docs.google.com/presentation/d/1yYUtLupf6jJ1GfbAhk1-S4IdGj1yk4TcSQwbmNNswRI/edit?usp=sharing
-  meetup2: http://emollient.me/vimeo-presentation.html 
+  meetup2: http://emollient.me/rocpy-the-second-visit.html
   vidreview1: http://emollient.me/hfoss-video-review-rip-a-remix-manifesto.html 
   teamprop2: http://emollient.me/team-proposal-xo-report.html
   smoketest: http://emollient.me/smoke-test.html
   vidreview2: http://emollient.me/simple-made-easy-review.html
   curriculum: http://emollient.me/ny-4th-grade-curriculum.html
+  litreview2: http://emollient.me/hacking-politics.html
+  quiz2: http://emollient.me/quiz-2.html
+  hackathon0: http://emollient.me/software-freedom-day-2014.html
+  hackathon1: http://emollient.me/big-red-hacks-at-cornell.html
+  hackathon2: http://emollient.me/election-day-hackathon.html
+  hackathon3: http://emollient.me/girl-develop-it.html
+  hackathon4: http://emollient.me/vimeo-presentation.html
+
+
 
diff --git a/scripts/people/2014/fall/tcon.yaml b/scripts/people/2014/fall/tcon.yaml
@@ -8,6 +8,7 @@ rit_dce: tdc5536
 hw:
   smoketest: http://thomasconroy.net/blog/posts/xo-laptop-smoke-test
   quiz1: http://www.thomasconroy.net/blog/posts/the-open-source-way
+  quiz2: http://thomasconroy.net/blog/posts/hfoss-quiz-2-pedagogy
   bugfix: http://www.thomasconroy.net/blog/posts/bug-smashing
   meetup1: http://www.thomasconroy.net/blog/posts/foss-meetups
   meetup2: http://thomasconroy.net/blog/posts/foss-presentation-hudl

diff --git a/scripts/people/2014/fall/xingnx.yaml b/scripts/people/2014/fall/xingnx.yaml
@@ -19,4 +19,6 @@ hw:
   vidreview1: http://xingnx.blogspot.com/2014/10/vidreview-rip-remix-manifesto.html
   smoketest: http://xingnx.blogspot.com/2014/10/xo-smok-test.html
   vidreview2: http://xingnx.blogspot.com/2014/10/vidreview2-simple-made-easy_30.html
-  litreview2: http://hfoss-fossrit.rhcloud.com/static/books/hackingpolitics_txtwithcvfb.pdf
+  litreview2: http://xingnx.blogspot.com/2014/12/lit-reveiw-2-hacking-politics.html
+  quiz2: http://xingnx.blogspot.com/2014/12/quiz2-pedagogy.html
+  meetup3: http://xingnx.blogspot.com/2014/12/rocpy-meet-up-1118.html