Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hnokes11 patch 1 #342

Open
wants to merge 87 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
f67e864
Update 2020-01-31-man-must-explore.html
laurencc1112 Sep 4, 2023
ad53f46
Merge pull request #1 from lt-leos/laurencc1112-patch-1
laurencc1112 Sep 4, 2023
a670c0d
Rename 2020-01-31-man-must-explore.html to Lauren Crow
laurencc1112 Sep 4, 2023
0cd03ea
Merge pull request #2 from lt-leos/laurencc1112-patch-2
laurencc1112 Sep 4, 2023
e568313
Update Lauren Crow
laurencc1112 Sep 4, 2023
ce52dcb
Rename 2020-01-29-prophecy.html to Harley Nokes
hnokes11 Sep 4, 2023
ea43a6e
Update Lauren Crow
laurencc1112 Sep 4, 2023
24c2951
Update Lauren Crow
laurencc1112 Sep 4, 2023
cb67307
Update Lauren Crow
laurencc1112 Sep 4, 2023
4be7f81
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
59b22a7
Update 2020-01-27-dreams.html
laurencc1112 Sep 4, 2023
810441b
Merge pull request #3 from lt-leos/laurencc1112-patch-3
laurencc1112 Sep 4, 2023
0c4e58d
Update Gemfile
lt-leos Sep 4, 2023
c0c543f
Merge branch 'master' of https://github.com/lt-leos/P2G5-clean-blog-j…
lt-leos Sep 4, 2023
c757a82
Rename 2020-01-27-dreams.html to Lauren C Crow
laurencc1112 Sep 4, 2023
d466863
Merge pull request #4 from lt-leos/laurencc1112-patch-4
laurencc1112 Sep 4, 2023
a9ccc41
Update _config.yml details
hnokes11 Sep 4, 2023
604cb58
Update _config.yml
lt-leos Sep 4, 2023
5b4dd02
Update 2020-01-28-exploration.html
laurencc1112 Sep 4, 2023
3ed8e97
Merge branch 'master' of https://github.com/lt-leos/P2G5-clean-blog-j…
lt-leos Sep 4, 2023
cedc328
Merge branch 'master' of https://github.com/lt-leos/P2G5-clean-blog-j…
lt-leos Sep 4, 2023
bee7d5a
Update and rename Harley Nokes to 2020-01-29-prophecy.html
hnokes11 Sep 4, 2023
b1cc60f
Fixed URL 1
dvelazquez13 Sep 4, 2023
c67a6e9
Update _config.yml
lt-leos Sep 4, 2023
819bc27
Merge branch 'master' of https://github.com/lt-leos/P2G5-clean-blog-j…
lt-leos Sep 4, 2023
c7fea02
Rename _posts/Lauren Crow to 2020-01-31-man-must-explore.html
hnokes11 Sep 4, 2023
0f2d248
More config work
dvelazquez13 Sep 4, 2023
25ffe85
Merge branch 'master' of https://github.com/lt-leos/P2G5-clean-blog-j…
dvelazquez13 Sep 4, 2023
c4791f2
Rename 2020-01-31-man-must-explore.html to -posts/2020-01-31-man-must…
hnokes11 Sep 4, 2023
bc270bc
Rename 2020-01-31-man-must-explore.html to 2020-01-31-man-must-explor…
hnokes11 Sep 4, 2023
d751d4d
Added my name to the title
dvelazquez13 Sep 4, 2023
312cd89
Merge branch 'master' of https://github.com/lt-leos/P2G5-clean-blog-j…
dvelazquez13 Sep 4, 2023
534f1e3
Delete Lauren C Crow
lt-leos Sep 4, 2023
d814ee0
Merge branch 'master' of https://github.com/lt-leos/P2G5-clean-blog-j…
lt-leos Sep 4, 2023
da78e9e
Update 2020-01-31-man-must-explore.html
laurencc1112 Sep 4, 2023
f2ed33d
Delete _posts/2020-01-28-exploration.html
laurencc1112 Sep 4, 2023
02331a5
Removed duplicate
dvelazquez13 Sep 4, 2023
cc2bdc9
Merge branch 'master' of https://github.com/lt-leos/P2G5-clean-blog-j…
dvelazquez13 Sep 4, 2023
210f631
Create 2020-01-26-Lauren Crow
laurencc1112 Sep 4, 2023
afac962
Delete _posts/2020-01-26-Lauren Crow
laurencc1112 Sep 4, 2023
de67e4d
Add files via upload
hnokes11 Sep 4, 2023
1f0754a
Rename 2020-01-31-man-must-explore.html to _posts/2020-01-31-man-must…
hnokes11 Sep 4, 2023
28ccbf8
Update 2020-01-31-man-must-explore.html
laurencc1112 Sep 4, 2023
8deb7d9
Create IMG_6647.jpeg
lt-leos Sep 4, 2023
efae6ef
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
5b805ff
Update 2020-01-31-man-must-explore.html
laurencc1112 Sep 4, 2023
8824ba7
Update 2020-01-31-man-must-explore.html
laurencc1112 Sep 4, 2023
1e7ad47
Update 2020-01-31-man-must-explore.html
laurencc1112 Sep 4, 2023
d2ab553
Update 2020-01-31-man-must-explore.html
laurencc1112 Sep 4, 2023
89a1fd6
Update 2020-01-29-prophecy.html
hnokes11 Sep 4, 2023
985d8f1
Update about.html
hnokes11 Sep 4, 2023
dd10045
Update about.html
hnokes11 Sep 4, 2023
6f69391
Update 2020-01-29-prophecy.html
hnokes11 Sep 4, 2023
1c8b331
Update title.html
hnokes11 Sep 4, 2023
200be49
Update nouns.html
hnokes11 Sep 4, 2023
dae55d6
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
e9377ba
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
2841735
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
39899d3
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
4f0a25a
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
799f3c8
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
5ea8160
Create programming evolution.jpg
lt-leos Sep 4, 2023
0fec470
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
d4e047e
Create programming_evolution.jpg
lt-leos Sep 4, 2023
b2cab24
Delete programming evolution.jpg
lt-leos Sep 4, 2023
7ec743e
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
4fbb065
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
135a0a4
Create Data_Code.jpeg
lt-leos Sep 4, 2023
156f735
Delete programming_evolution.jpg
lt-leos Sep 4, 2023
1ad46df
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
063e8d8
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
9a63e38
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
1a5b298
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
9c7c20f
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
71a882a
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
cd46129
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
5a09cee
Create computers_coding.jpeg
lt-leos Sep 4, 2023
b3cd1ab
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
adb6d52
Delete Data_Code.jpeg
lt-leos Sep 4, 2023
51462b0
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
ea28cf1
Delete computers_coding.jpeg
lt-leos Sep 4, 2023
658ffbb
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
5d6baa4
Update 2020-01-30-heartbeats.html
lt-leos Sep 4, 2023
8751510
Update subtitle.html
hnokes11 Sep 4, 2023
2b4f422
Updated my post
dvelazquez13 Sep 4, 2023
b8f697c
Grammar fix
dvelazquez13 Sep 4, 2023
26bb78f
Aesthetic change at bottom of page
hnokes11 Sep 5, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update about.html
  • Loading branch information
hnokes11 authored Sep 4, 2023
commit dd10045ff691b53485405e7e9bf8af29a608e1ee
14 changes: 12 additions & 2 deletions about.html
Original file line number Diff line number Diff line change
@@ -7,6 +7,16 @@

<p>For this project, you will use the same groups from Project #1, with the change that we will no longer be split into Dev or Ops teams, but rather use the larger 6 person teams to execute the project. The goal of this project is to practice the workflow of social coding — learning to collaborate within a group on a common set of data. Each team will deliver a simple website that is hosted on Github.com using the Github Pages service. Github Pages is typically used to host an informational website about a technical project; in this case, there is no technical project behind the website, but you can just write a placeholder file (like a README file) to have something in the master branch, or you can create a group and make an organization page instead.</p>

<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ex alias, earum consectetur quia natus ducimus voluptate explicabo, hic porro reprehenderit, quasi? Tenetur ipsum distinctio laboriosam perspiciatis officiis dolore, architecto id.</p>
<h2 class="section-heading">Steps</h2>

<p class="mb-5">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Totam inventore aspernatur repellendus incidunt adipisci modi voluptates recusandae iste eligendi, repudiandae corporis quod aut, optio! Explicabo quaerat unde voluptatem! Itaque, eum!</p>
<p>1. Create a new repository for your project using either the organization site or Project site model. You might want to consider creating a Github group to help you manage the people in your team and privileges around your repository.</p>

<p>2. Use GitHub Pages (and optionally the Jekyll static site generator) to create a website for your project: https://pages.github.com/</p>

<p>3. Start creating content. It doesn’t matter what you put here, but it should be somewhat substantive, and look mostly polished. There should be a minimum of one content unit per team member on the site, and some images (for example, if you are using Jekyll to generate a blog, one blog post would count as a content unit). You can create a site for our course; an informational site for your team; a pretend site for the (non-existent) technical project you created earlier; or even something completely unrelated to our class topic (like a site about a band or TV show, or collaboratively-written fiction). It’s really up to your group.</p>

<p>4. An important part of social coding is learning to resolve conflicts that arise when multiple people make conflicting changes to the same file; therefore, a requirement is that each content unit contain edits by at least two members of the team. I will be looking at the Github logs to see how these conflict situations are resolved. You should use the collaboration tools provided by Github to assist (such as Pull requests, and the Conversation mechanism that is provided). If these situations don’t naturally occur in your project, engineer them.</p>

<p>5. Any communication that doesn't happen inside GitHub.com should happen inside the class Slack team.</p>

<p>6. We will be looking at the sites as a class. I will be grading this project on two criteria: how much you individually contributed to the project (as evidenced by the Github records), and how broadly your team used the version control features of git and the collaboration features available in Github and Slack. At a minimum, I expect at least one pull request per content unit in your site.</p>