Schedule and third class updates

silshack · Aug 27, 2013 · 592ca73 · 592ca73
1 parent e4dc8a3
commit 592ca73
Show file tree

Hide file tree

Showing 5 changed files with 125 additions and 1 deletion.
diff --git a/_posts/2013-08-28-third-class.md b/_posts/2013-08-28-third-class.md
@@ -13,6 +13,23 @@ Wednesday Aug 28th Readings:
 
 - [ ] In-Class Exercise: Write a simple post with syntax highlighting.
 
+### Mini lecture: Github roundup
+- A pull request is a wrapper around branch diffs
+- "Fixes #134" is the magic phrase that closes issues
+- Look for examples!
+- We'll have more control over the flow from the command line
+- Milestones = assignments
+- One issue per assignment, please.  Multiple PRs OK, just keep track of them.
+- post ideas
+
+
+### Left over from last time: How Jekyll works
+- `_config.yml`: Where sitewide variables live
+- `_posts/`: Where posts live
+- `_layouts/`: HTML for Jekyll to instert our content into
+- `*.markdown`: Pages for the site
+
+
 - [x] In-Class Exercise: Open your first pull request
 
 - [x] In-Class Exercise: Close your first pull request

diff --git a/_site/announcements/2013/08/28/third-class.html b/_site/announcements/2013/08/28/third-class.html
@@ -50,7 +50,28 @@ <h2>Third Class Notes</h2>
 </ol>
 
 <ul>
-<li><p>[ ] In-Class Exercise: Write a simple post with syntax highlighting.</p></li>
+<li>[ ] In-Class Exercise: Write a simple post with syntax highlighting.</li>
+</ul>
+
+<h3>Mini lecture: Github roundup</h3>
+
+<ul>
+<li>A pull request is a wrapper around branch diffs</li>
+<li>&quot;Fixes #134&quot; is the magic phrase that closes issues</li>
+<li>Look for examples!</li>
+<li>We&#39;ll have more control over the flow from the command line</li>
+<li>Milestones = assignments</li>
+<li>One issue per assignment, please.  Multiple PRs OK, just keep track of them.</li>
+<li>post ideas</li>
+</ul>
+
+<h3>Left over from last time: How Jekyll works</h3>
+
+<ul>
+<li><code>_config.yml</code>: Where sitewide variables live</li>
+<li><code>_posts/</code>: Where posts live</li>
+<li><code>_layouts/</code>: HTML for Jekyll to instert our content into</li>
+<li><p><code>*.markdown</code>: Pages for the site</p></li>
 <li><p>[x] In-Class Exercise: Open your first pull request</p></li>
 <li><p>[x] In-Class Exercise: Close your first pull request</p></li>
 <li><p>[ ] In-Class: Pair up with your merging partner.</p></li>

diff --git a/_site/index.html b/_site/index.html
@@ -40,6 +40,8 @@ <h1 class="title"><a href="/fall2013/">The SILShack class blog - Fall 2013</a></
 
       <li><span>26 Aug 2013</span> &raquo; <a href="/fall2013/blog/post/2013/08/26/sarahs-post.html">Sarahs Post</a> by Sarah Breen</li>
 
+      <li><span>26 Aug 2013</span> &raquo; <a href="/fall2013/post/2013/08/26/qerin-post.html">Qerin Post</a> by Erin Holmes</li>
+
       <li><span>26 Aug 2013</span> &raquo; <a href="/fall2013/post/2013/08/26/olivias-post.html">Olivias Post</a> by Olivia Dorsey</li>
 
       <li><span>26 Aug 2013</span> &raquo; <a href="/fall2013/2013/08/26/marys-post.html">Marys Post</a> by </li>

diff --git a/_site/people.html b/_site/people.html
@@ -81,6 +81,8 @@ <h4>Elliott Hauser</h4>
 
 
 
+
+
 
 
 
@@ -171,6 +173,10 @@ <h4>Erin Holmes</h4>
 
 <p>Find Erin Holmes on <a href="http://twitter.com/">Twitter</a>, <a href="http://github.com/">Github</a>, and <a href="">on the web</a>.</p>
 
+<ul>
+<li><a href="/fall2013/post/2013/08/26/qerin-post.html">Qerin Post</a></li>
+</ul>
+
 <h4>Christopher Kenrick</h4>
 
 <p>Find Christopher Kenrick on <a href="http://twitter.com/">Twitter</a>, <a href="http://github.com/">Github</a>, and <a href="">on the web</a>.</p>

diff --git a/_site/post/2013/08/26/qerin-post.html b/_site/post/2013/08/26/qerin-post.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Qerin Post</title>
+        <meta name="viewport" content="width=device-width">
+
+        <!-- syntax highlighting CSS -->
+        <link rel="stylesheet" href="/fall2013/css/syntax.css">
+
+        <!-- Custom CSS -->
+        <link rel="stylesheet" href="/fall2013/css/main.css">
+
+    </head>
+    <body>
+        <!-- Ribbon -->
+        <a href="https://github.com/silshack/fall2013"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png" alt="Fork me on GitHub"></a>
+
+        <div class="container">
+          <div class="site">
+            <div class="header">
+              <h1 class="title"><a href="/fall2013/">The SILShack class blog - Fall 2013</a></h1>
+              <p>
+              <a class="extra" href="/fall2013/syllabus.html">syllabus</a>
+              <a class="extra" href="/fall2013/schedule.html">schedule</a>
+              <a class="extra" href="/fall2013/assignments.html">assignments</a>
+              <a class="extra" href="/fall2013/people.html">people</a>
+              <a class="extra" href="/fall2013/feedback.html">feedback</a>
+              <a class="extra" href="/fall2013/music.html">music</a>
+              </p>
+            </div>
+
+
+
+<h2>Qerin Post</h2>
+
+<p>
+by Erin Holmes
+</p> <!-- /.byline -->
+
+<p class="meta">26 Aug 2013</p>
+
+<div class="post">
+<p>I&#39;m not <em>exactly</em> sure what I&#39;m supposed to say. But I <strong>hope</strong> you like it anyway!</p>
+
+</div>
+
+<div class="end">
+	 Find Erin Holmes on <a href="http://twitter.com/">Twitter</a>, <a href="http://github.com/">Github</a>, and <a href="">on the web</a>.
+</div>
+
+
+            <div class="footer">
+              <div class="contact">
+                <p>
+                  INLS 560 - "Programming for Information Professionals"
+                </p>
+                <p>
+                  Another <a href="http://github.com/silshack/professorjekyll">silshack</a> by  <a href="http://twitter.com/hauspoor/">@hauspoor</a> & friends<br />
+                </p>
+              </div>
+            </div>
+          </div>
+        </div> <!-- /container -->
+
+    </body>
+    <!-- Google Analytics -->
+    <script>
+     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+     ga('create', 'UA-20109396-6', 'silshack.github.io');
+     ga('send', 'pageview');           
+    </script>
+</html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,6 +81,8 @@ <h4>Elliott Hauser</h4> @@
@@ Expand Down Expand Up / @@ -171,6 +173,10 @@ <h4>Erin Holmes</h4> @@
     <p>Find Erin Holmes on <a href="http://twitter.com/">Twitter</a>, <a href="http://github.com/">Github</a>, and <a href="">on the web</a>.</p>
+    <ul>
+    <li><a href="/fall2013/post/2013/08/26/qerin-post.html">Qerin Post</a></li>
+    </ul>
     <h4>Christopher Kenrick</h4>
     <p>Find Christopher Kenrick on <a href="http://twitter.com/">Twitter</a>, <a href="http://github.com/">Github</a>, and <a href="">on the web</a>.</p>
@@ Expand Down @@