Skip to content

Commit

Permalink
Merge pull request #1 from silshack/gh-pages
Browse files Browse the repository at this point in the history
Pulling in recent changes
  • Loading branch information
jpulliza committed Aug 28, 2013
2 parents 97c16a7 + 007b9f2 commit a51c2fc
Show file tree
Hide file tree
Showing 22 changed files with 765 additions and 39 deletions.
60 changes: 41 additions & 19 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,18 @@ authors:
prof: false
gravatar:
website:
github:
github: erincarter
twitter:
about:
about: Erin is a second-year MSIS student. She works at the SILS Help Desk, stop on by!
odorsey:
name: Olivia Dorsey
prof: false
gravatar:
website:
github:
website: http://franklinmemories.com
github: odorsey
twitter:
about:
about: Olivia is a senior BSIS student who is interested in web design/development and the digital humanities. Her hometown is Clayton, NC.

jgeer:
name: James Geer
prof: false
Expand Down Expand Up @@ -103,26 +104,31 @@ authors:
name: Erin Holmes
prof: false
gravatar:
website:
github:
twitter:
about:
website: http://www.linkedin.com/in/holmeserin
github: erholmes
twitter: erinh24
about: Erin is a second year MSIS student and is trying her best at life!
ckenrick:
name: Christopher Kenrick
prof: false
gravatar:
website:
github:
twitter:
github:
twitter:
about:
smantooth:
name: Stacey Mantooth
prof: false
gravatar:
gravatar: d3277996b61f2805d4b971b62961bd4a
website:
github:
twitter:
about:
github: allhailaugustus
twitter: allhailaugustus
about: |
Llamas graze steep slopes,
all lulled, sun-warmed and drowsy,
wind ruffling coats.
Stacey likes short poems and Peruvian quadrupeds.
gmclendon:
name: Grant McLendon
prof: false
Expand All @@ -131,6 +137,14 @@ authors:
github: gerbal
twitter: gerbal100
about: Grant's a first year MSIS student.
carolinp:
name: Caroline Pate
prof: false
gravatar:
website: http://www.carolinepate.com/portfolio
github: carolinp
twitter: ugh_caroline
about: Caroline is a senior multimedia journalism major at UNC Chapel Hill. Her interests include music, television, cats, pizza, and beautiful news applications that tell a story.
dpcolar:
name: David Pcolar
prof: false
Expand Down Expand Up @@ -171,6 +185,14 @@ authors:
github: kylerthecreator
twitter:
about: First year MSIS student, novice Githubber, avid coffee drinker.
asherman:
name: Amber Sherman
prof: false
gravatar:
website:
github: ans729
twitter:
about: Amber is a 2nd year MLS student hoping to find a big girl job with a digital library or archive.
atickner:
name: Amanda Tickner
prof: false
Expand All @@ -187,11 +209,11 @@ authors:
github:
twitter:
about: I am a BSIS student. I am looking forward to learning more about programming. I am still exploring career paths within the information science field.
zyu:
zekuny:
name: Zekun Yu
prof: false
gravatar:
gravatar: iyuzekun
website:
github:
github: zekuny
twitter:
about:
about: Yu is a first year MSIS student. He likes programming and wants to learn more from class.
12 changes: 12 additions & 0 deletions _posts/2012-08-26-Landons_Post.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
layout:post
author: lgrindheim
categories: post
---

*This text will be italic*
_This will also be italic_

**This text will be bold**
__This will also be bold__

12 changes: 12 additions & 0 deletions _posts/2013-08-26-Landons_Post.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
layout: post
author: lgrindheim
categories: post
---

*This text will be italic*
_This will also be italic_

**This text will be bold**
__This will also be bold__

12 changes: 12 additions & 0 deletions _posts/2013-08-26-carolines-post.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
layout: post
author: carolinp
categories: post
---
- [ ] here
- [ ] is
- [ ] a
- [ ] list



7 changes: 7 additions & 0 deletions _posts/2013-08-26-qerin-post.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
layout: post
author: eholmes
categories: post
---

I'm not *exactly* sure what I'm supposed to say. But I **hope** you like it anyway!
9 changes: 9 additions & 0 deletions _posts/2013-08-26-zekuny-post.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
layout: post
author: zekuny
categories: post
---

1. Ferrari http://www.ferrari.com/english/pages/home.aspx
2. Lamborghini http://www.lamborghini.com/en/home/
3. Porsche http://www.porsche.com/
18 changes: 18 additions & 0 deletions _posts/2013-08-27-staceys-post.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
layout: post
author: smantooth
categories: post
---


```
__/\\\\\\\\\\\\\_____________________________________________/\\\_______________
_\/\\\/////////\\\__________________________________________\/\\\_______________
_\/\\\_______\/\\\__________________________________________\/\\\_______________
_\/\\\\\\\\\\\\\\______/\\\\\________/\\\\\_____/\\\\\\\\\\_\/\\\_______________
_\/\\\/////////\\\___/\\\///\\\____/\\\///\\\__\/\\\//////__\/\\\\\\\\\\________
_\/\\\_______\/\\\__/\\\__\//\\\__/\\\__\//\\\_\/\\\\\\\\\\_\/\\\/////\\\_______
_\/\\\_______\/\\\_\//\\\__/\\\__\//\\\__/\\\__\////////\\\_\/\\\___\/\\\_______
_\/\\\\\\\\\\\\\/___\///\\\\\/____\///\\\\\/____/\\\\\\\\\\_\/\\\___\/\\\__/\\\_
_\/////////////_______\/////________\/////_____\//////////__\///____\///__\///__
```
40 changes: 40 additions & 0 deletions _posts/2013-08-28-third-class.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
---
layout: post
title: Third Class Notes
author: elliott
category: announcements
---

Wednesday Aug 28th Readings:

1. Comoyo: [How we built our company blog](http://comoyo.github.io/blog/2012/06/11/how-comoyo-built-its-blog/) - Evidence that what we’re doing isn’t totally out of left field. For bonus points, dig into some of the source code of their site.

2. Software Carpentry: [Computational Thinking](http://software-carpentry.org/4_0/softeng/principles.html) - This is intended as a wrap-up essay but I often find it useful to ‘start at the end’. Use the essay to orient yourself to concepts that we’ll be learning.

- [ ] In-Class Exercise: Write a simple post with syntax highlighting.

### Mini lecture: Github roundup
- A pull request is a wrapper around branch diffs
- #140
- "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
- Michelle's forking question.

### 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

- [ ] In-Class: Pair up with your merging partner.

- [ ] In-Class: Set up VirtualBox Ubuntu. Extra credit for helping peers install outside of class. This is due by the end of the week. Post to our Google community if you're having trouble setting it up and someone will help you out.
5 changes: 5 additions & 0 deletions _site/2012/08/26/Landons_Post.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<p><em>This text will be italic</em>
<em>This will also be italic</em></p>

<p><strong>This text will be bold</strong>
<strong>This will also be bold</strong></p>
114 changes: 114 additions & 0 deletions _site/announcements/2013/08/28/third-class.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>Third Class Notes</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>Third Class Notes</h2>

<p>
by Elliott Hauser
</p> <!-- /.byline -->

<p class="meta">28 Aug 2013</p>

<div class="post">
<p>Wednesday Aug 28th Readings:</p>

<ol>
<li><p>Comoyo: <a href="http://comoyo.github.io/blog/2012/06/11/how-comoyo-built-its-blog/">How we built our company blog</a> - Evidence that what we’re doing isn’t totally out of left field. For bonus points, dig into some of the source code of their site.</p></li>
<li><p>Software Carpentry: <a href="http://software-carpentry.org/4_0/softeng/principles.html">Computational Thinking</a> - This is intended as a wrap-up essay but I often find it useful to ‘start at the end’. Use the essay to orient yourself to concepts that we’ll be learning.</p></li>
</ol>

<ul>
<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>#140</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>
<li>Michelle&#39;s forking question.</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>
<li><p>[ ] In-Class: Set up VirtualBox Ubuntu. Extra credit for helping peers install outside of class. This is due by the end of the week. Post to our Google community if you&#39;re having trouble setting it up and someone will help you out.</p></li>
</ul>

</div>

<div class="end">
Elliott Hauser is a PhD Student in information science at UNC Chapel Hill. He's hacking education as one of the cofounders of Coursefork.org. Find Elliott Hauser on <a href="http://twitter.com/hauspoor">Twitter</a>, <a href="http://github.com/eah13">Github</a>, and <a href="http://www.elliotthauser.com">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>
12 changes: 12 additions & 0 deletions _site/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,18 @@ <h1 class="title"><a href="/fall2013/">The SILShack class blog - Fall 2013</a></
<div id="home">
<ul class="posts">

<li><span>28 Aug 2013</span> &raquo; <a href="/fall2013/announcements/2013/08/28/third-class.html">Third Class Notes</a> by Elliott Hauser</li>

<li><span>27 Aug 2013</span> &raquo; <a href="/fall2013/post/2013/08/27/staceys-post.html">Staceys Post</a> by Stacey Mantooth</li>

<li><span>26 Aug 2013</span> &raquo; <a href="/fall2013/post/2013/08/26/zekuny-post.html">Zekuny Post</a> by Zekun Yu</li>

<li><span>26 Aug 2013</span> &raquo; <a href="/fall2013/2013/08/26/second-class.html">Second Class</a> by Elliott Hauser</li>

<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>
Expand All @@ -60,12 +68,16 @@ <h1 class="title"><a href="/fall2013/">The SILShack class blog - Fall 2013</a></

<li><span>26 Aug 2013</span> &raquo; <a href="/fall2013/announcement/2013/08/26/christophers-post.html">Christophers Post</a> by Christopher Kenrick</li>

<li><span>26 Aug 2013</span> &raquo; <a href="/fall2013/post/2013/08/26/carolines-post.html">Carolines Post</a> by Caroline Pate</li>

<li><span>26 Aug 2013</span> &raquo; <a href="/fall2013/ashley/brown/2013/08/26/ashleys-post.html">Ashleys Post</a> by Ashley Brown</li>

<li><span>26 Aug 2013</span> &raquo; <a href="/fall2013/post/2013/08/26/ambers-post.html">Ambers Post</a> by </li>

<li><span>26 Aug 2013</span> &raquo; <a href="/fall2013/post/2013/08/26/Michelle-has-an-adventure.html">Michelle Has An Adventure</a> by Michelle Baxter</li>

<li><span>26 Aug 2013</span> &raquo; <a href="/fall2013/post/2013/08/26/Landons_Post.html">Landons_post</a> by Landon Grindheim</li>

<li><span>26 Aug 2013</span> &raquo; <a href="/fall2013/students/2013/08/26/Jonathan-Post.html">Jonathan Post</a> by Jonathan Pulliza</li>

<li><span>26 Aug 2013</span> &raquo; <a href="/fall2013/gmclendon/2013/08/26/Grant%27s-Post.html">Grant's Post</a> by Grant McLendon</li>
Expand Down
Loading

0 comments on commit a51c2fc

Please sign in to comment.