Skip to content

Commit

Permalink
Merge branch 'release/1.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
rapicastillo committed Jul 26, 2017
2 parents a0a3c4d + 17b230b commit ad82e88
Show file tree
Hide file tree
Showing 51 changed files with 285 additions and 201 deletions.
16 changes: 8 additions & 8 deletions ---code-of-conduct.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
layout: narrow
title: Code of Conduct
description: The Prog Hacknight community Code of Conduct.
description: The Progressive Hacknight community Code of Conduct.
---
## Code of Conduct

The Prog Hacknight community expects that their events:
The Progressive Hacknight community expects that their events:

1. Are a **safe** environment, where people are free to fully express their identities.
1. **Respect** the value of others and their ideas, skills and contributions.
Expand All @@ -15,19 +15,19 @@ The Prog Hacknight community expects that their events:
1. **Default to open**: the data, the code, and the access. Members strive to build tools that are free for public use and incorporate open source software and open data.
1. Are **a place for collaboration**, where members – experienced and new – work together to discuss issues and develop solutions, apps, and resources.
1. Work to **engage all Chicagoans** and communities in planning, designing, and implementing open tech, especially those who are traditionally excluded from the civic process.
1. Ensure that the relationships and conversations among members of the Prog Hacknight, governments, and communities remain respectful, participatory, and **productive**.
1. Ensure that the relationships and conversations among members of the Progressive Hacknight, governments, and communities remain respectful, participatory, and **productive**.
1. Provide an environment where people are **free from discrimination or harassment** (if you are harassed or witness harassment refer to the harassment policy below).
1. **Are fun**.

### Anti-Harassment Policy

Prog Hacknight is dedicated to providing a harassment-free experience for everyone regardless of gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, race, ethnicity, nationality, age, or religion.
Progressive Hacknight is dedicated to providing a harassment-free experience for everyone regardless of gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, race, ethnicity, nationality, age, or religion.

We do not tolerate harassment of organizers, presenters, and participants in any form. Sexual language and imagery is not appropriate for any Prog Hacknight event, unless explicitly allowed by the organizers. Anyone in violation of these policies may expelled from Prog Hacknight events, at the discretion of the event organizers.
We do not tolerate harassment of organizers, presenters, and participants in any form. Sexual language and imagery is not appropriate for any Progressive Hacknight event, unless explicitly allowed by the organizers. Anyone in violation of these policies may expelled from Progressive Hacknight events, at the discretion of the event organizers.

Harassment includes but is not limited to: offensive verbal or written comments related to gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, race, ethnicity, nationality, religion; sexual images in public spaces; deliberate intimidation; stalking; following; harassing photography or recording; sustained disruption of talks or other events; inappropriate physical contact; unwelcome sexual attention; unwarranted exclusion; and patronizing language or action.

If a participant engages in harassing behavior, the event organizers may take any action they deem appropriate, including warning the offender or expulsion from Prog Hacknight.
If a participant engages in harassing behavior, the event organizers may take any action they deem appropriate, including warning the offender or expulsion from Progressive Hacknight.

If you are being harassed, notice that someone else is being harassed, or have any other concerns, please tell one of the following organizers what you experienced or witnessed:

Expand All @@ -38,11 +38,11 @@ If you are being harassed, notice that someone else is being harassed, or have a

### Photo policy

Before taking photographs Prog Hacknight participants, please ask for verbal approval, especially if you are posting to social media. Photos and videos of presentations are allowed.
Before taking photographs Progressive Hacknight participants, please ask for verbal approval, especially if you are posting to social media. Photos and videos of presentations are allowed.

---

Created collaboratively by the Prog Hacknight community, adapted from the [Code for America Code of Conduct](https://github.com/codeforamerica/codeofconduct).
Created collaboratively by the Progressive Hacknight community, adapted from the [Code for America Code of Conduct](https://github.com/codeforamerica/codeofconduct).

*Version 1.1. Published on Feb 20, 2017.*

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015 Open City and Prog Hacknight
Copyright (c) 2015 Open City and Progressive Hacknight

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Progressive Hack Night

Website for [Progressive Hack Night](http://proghacknight.org/).
Website for [Progressive Hack Night](http://progressivehacknight.org/).

*Forked from [Chi Hack Night](http://chihacknight.org)*

Expand Down
4 changes: 2 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
port: 4000
markdown: kramdown
name: Prog Hacknight
name: Progressive Hacknight
url: http://www.progressivehacknight.org
title: Prog Hacknight
title: Progressive Hacknight
description: "Progressive HackNight is a bi-weekly gathering of coders and creatives, makers and doers, to foment and inspire action. We use our collective talents and abilities to push forward pro-social change in benefit of the common good."
encoding: utf-8
timezone: America/New York
Expand Down
22 changes: 11 additions & 11 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
{% if page.image %}
<meta content="{{ site.url }}{{page.image}}" property="og:image">
{% else %}
<meta content="{{ site.url }}/images/logo/logo-star-avatar.png" property="og:image">
<meta content="{{ site.url }}/images/logo/logo-star-avatar-x.png" property="og:image">
{% endif %}
{% if page.categories %}
{% for category in page.categories limit:1 %}
Expand Down Expand Up @@ -77,17 +77,17 @@
{% if page.image %}
<meta name="twitter:image:src" content="{{ site.url }}{{page.image}}">
{% else %}
<meta name="twitter:image:src" content="{{ site.url }}/images/logo/logo-star-avatar.png">
<meta name="twitter:image:src" content="{{ site.url }}/images/logo/logo-star-avatar-x.png">
{% endif %}


<link rel="apple-touch-icon-precomposed" sizes="144x144" href="https://proghacknight.org/apple-touch-icon-144x144.png" />
<link rel="apple-touch-icon-precomposed" sizes="152x152" href="https://proghacknight.org/apple-touch-icon-152x152.png" />
<link rel="icon" type="image/png" href="https://proghacknight.org/favicon-32x32.png" sizes="32x32" />
<link rel="icon" type="image/png" href="https://proghacknight.org/favicon-16x16.png" sizes="16x16" />
<meta name="application-name" content="Prog Hacknight"/>
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="http://progressivehacknight.org/apple-touch-icon-144x144.png" />
<link rel="apple-touch-icon-precomposed" sizes="152x152" href="http://progressivehacknight.org/apple-touch-icon-152x152.png" />
<link rel="icon" type="image/png" href="http://progressivehacknight.org/favicon-32x32.png" sizes="32x32" />
<link rel="icon" type="image/png" href="http://progressivehacknight.org/favicon-16x16.png" sizes="16x16" />
<meta name="application-name" content="Progressive Hacknight"/>
<meta name="msapplication-TileColor" content="#FFFFFF" />
<meta name="msapplication-TileImage" content="https://proghacknight.org/mstile-144x144.png" />
<meta name="msapplication-TileImage" content="http://progressivehacknight.org/mstile-144x144.png" />

<!-- Bootstrap core CSS -->
<link href="/css/bootstrap.flatly.min.css" rel="stylesheet">
Expand Down Expand Up @@ -133,7 +133,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/"><img src='/images/logo/logo.png' alt='Prog Hacknight' title='Prog Hacknight' class='img-responsive' /></a>
<a class="navbar-brand" href="/"><img src='/images/logo/logo.png' alt='Progressive Hacknight' title='Progressive Hacknight' class='img-responsive' /></a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
Expand Down Expand Up @@ -189,12 +189,12 @@
<i class='fa fa-fw fa-youtube'></i> <a href="https://www.youtube.com/channel/UCJJuYC9vnwFLtHRfWYxz0MQ">YouTube</a><br />
<i class='fa fa-fw fa-facebook'></i> <a href="https://www.facebook.com/proghacknight/">Facebook</a><br />
<i class='fa fa-fw fa-twitter'></i> <a href="https://twitter.com/proghacknight" target='_blank'>Twitter</a><br />
<i class='fa fa-fw fa-github'></i> <a href="https://github.com/ProgressiveHackNight/proghacknight.org" target='_blank'>GitHub</a>
<i class='fa fa-fw fa-github'></i> <a href="https://github.com/ProgressiveHackNight/progressivehacknight.org" target='_blank'>GitHub</a>
</small>
</div>
<div class='col-sm-2'>
<small>
&copy; 2017 Prog Hacknight.
&copy; 2017 Progressive Hacknight.
</small>
<sub>
&hearts; Lovingly forked from <a href='https://github.com/chihacknight/chihacknight.org' target='_blank'>ChiHacknight</a> &hearts;
Expand Down
2 changes: 1 addition & 1 deletion _layouts/event.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ <h4>Links</h4>
<div class='col-sm-12'>

<hr />
<!-- <h4 id='slideshow-header' style='display: none;'>Flickr photos from Prog Hacknight #{{page.event_id}}</h4>
<!-- <h4 id='slideshow-header' style='display: none;'>Flickr photos from Progressive Hacknight #{{page.event_id}}</h4>
<div class='slideshow'></div>
<p>Have a photo of this event? Upload it to <a href='http://flickr.com'>Flickr</a> and tag it with <strong><a href='https://www.flickr.com/search/?tags=chihacknight{{page.event_id}}'>chihacknight{{page.event_id}}</a></strong></p> -->

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ The petcoke was piled up 45 feet high, running from 100th Street to 111th Street
[coalition]: https://www.facebook.com/Chicago-South-East-Side-Coalition-To-Ban-Petcoke-848330295223606
[publiclab]: https://publiclab.org/

<p class="text-center"><img src="/images/chihacknight-148-sugar-bautista.jpg" alt="Benjamin Sugar and Olga Bautista at Prog Hacknight #148" class="img-thumbnail"/><br />
<p class="text-center"><img src="/images/chihacknight-148-sugar-bautista.jpg" alt="Benjamin Sugar and Olga Bautista at Progressive Hacknight #148" class="img-thumbnail"/><br />

<small>
<em>Benjamin Sugar and Olga Bautista at <a href='/events/2015/03/24/diy-environmental-monitoring.html'>Prog Hacknight #148</a></em>
<em>Benjamin Sugar and Olga Bautista at <a href='/events/2015/03/24/diy-environmental-monitoring.html'>Progressive Hacknight #148</a></em>
</small>
</p>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
layout: blog
categories:
- chihacknight
title: "High school students are joining Prog Hacknight to train in user experience & design"
description: "This Fall, Mikva Challenge and Mumkin Studio will partner to kick-off a program for teen user experience design interns at Prog Hacknight. Four Chicago Public High School students will work with Prog Hacknight during the fall quarter. They’ll design, implement, and evaluate user experience for two Prog Hacknight projects."
title: "High school students are joining Progressive Hacknight to train in user experience & design"
description: "This Fall, Mikva Challenge and Mumkin Studio will partner to kick-off a program for teen user experience design interns at Progressive Hacknight. Four Chicago Public High School students will work with Progressive Hacknight during the fall quarter. They’ll design, implement, and evaluate user experience for two Progressive Hacknight projects."
date: 2016-08-26
image: /images/blog/2016-08-18-chi-hack-night-youth/img0.jpg
author: Eve Tulbert
Expand All @@ -16,16 +16,16 @@ author2_image:
published: true
---

<p class="text-center"><img src="/images/blog/2016-08-18-chi-hack-night-youth/img0.jpg" alt="CPS students at Prog Hacknight" class="img-thumbnail"/><br />
<p class="text-center"><img src="/images/blog/2016-08-18-chi-hack-night-youth/img0.jpg" alt="CPS students at Progressive Hacknight" class="img-thumbnail"/><br />

<small>
<em>CPS students at Prog Hacknight</em>
<em>CPS students at Progressive Hacknight</em>
</small>
</p>

This Fall, [Mikva Challenge](http://www.mikvachallenge.org/) and [Mumkin Studio](http://www.mumkin.studio) will partner to kick-off a program for teen user experience design interns at Prog Hacknight.
This Fall, [Mikva Challenge](http://www.mikvachallenge.org/) and [Mumkin Studio](http://www.mumkin.studio) will partner to kick-off a program for teen user experience design interns at Progressive Hacknight.

Four Chicago Public High School students will work with Prog Hacknight during the fall quarter. They’ll design, implement, and evaluate user experience for the Prog Hacknight project [Edumap](http://edumap2.herokuapp.com/), a tool for finding computer science curriculum to assist with Chicago Public Schools Computer Science for All (CS4All) initiative.
Four Chicago Public High School students will work with Progressive Hacknight during the fall quarter. They’ll design, implement, and evaluate user experience for the Progressive Hacknight project [Edumap](http://edumap2.herokuapp.com/), a tool for finding computer science curriculum to assist with Chicago Public Schools Computer Science for All (CS4All) initiative.

The program is sponsored by a [Spark grant from Mozilla Hive Chicago](http://hivechicago.org/about/fund/).

Expand All @@ -37,6 +37,6 @@ The youth interns will get their hands dirty with the work of UX research, apply

"Civic tech projects are an exciting way to tackle community issues," says Lisa Kim, Youth Commission Director at Mikva Challenge and program co-teacher. “it's important for young Chicagoans to be active authors in this process, because tech that's meant to serve youth should also be made by youth!”

Students will start attending Prog Hacknights in November and December. Come meet them and share your ideas about what makes a successful UX project!
Students will start attending Progressive Hacknights in November and December. Come meet them and share your ideas about what makes a successful UX project!

On Tuesday, December 6th, these students, along with their teaching team, will present their findings to Prog Hacknight. This day will also be a book launch for The Youth UX Field guide, a guidebook for engaging youth UX teams in civics and civic tech research.
On Tuesday, December 6th, these students, along with their teaching team, will present their findings to Progressive Hacknight. This day will also be a book launch for The Youth UX Field guide, a guidebook for engaging youth UX teams in civics and civic tech research.
Loading

0 comments on commit ad82e88

Please sign in to comment.