From 101ccd78f099ffec15ec12c76fd89cc07a27b418 2017-11-30 04:40:36 From: Christopher Neugebauer Date: 2017-11-30 04:40:36 Subject: [PATCH] :qerge branch 'master' into prod --- diff --git a/pinaxcon/templates/registrasion/invoice/details.html b/pinaxcon/templates/registrasion/invoice/details.html index c22eae6ea6e6f55fd59edfba010833cff06cef4e..1440f2eac5a81e51a7fd621a015059db6a65da71 100644 --- a/pinaxcon/templates/registrasion/invoice/details.html +++ b/pinaxcon/templates/registrasion/invoice/details.html @@ -48,7 +48,7 @@ {% endblock %} {% block contact_info %} -

Direct inquiries to spam@northbaypython.org

+

Direct inquiries to hello@northbaypython.org

North Bay Python is run by North Bay and Bay Area locals, as a member project of Software Freedom Conservancy, a 501(c)(3) not-for-profit public charity registered in New York. Software Freedom Conservancy's federal tax-exempt EIN is 41-2203632.

Mailing Address diff --git a/pinaxcon/templates/static_pages/about/team.html b/pinaxcon/templates/static_pages/about/team.html index 9fa8366ebef19114e12255a721afbabaeb713475..68cea272b40f67bc2f7a7b1240f06a0a30431583 100644 --- a/pinaxcon/templates/static_pages/about/team.html +++ b/pinaxcon/templates/static_pages/about/team.html @@ -20,7 +20,7 @@ Our team of North Bay and Bay Area locals has years of experience building commu

Contact the Team

-

Need to contact someone in a hurry? You can reach us all at spam@northbaypython.org. Read on to learn about the organizing team.

+

Need to contact someone in a hurry? You can reach us all at hello@northbaypython.org. Read on to learn about the organizing team.

You can also find us all over the internet, including:

diff --git a/pinaxcon/templates/static_pages/attend/accommodations.html b/pinaxcon/templates/static_pages/attend/accommodations.html index ce774140d6199310ae8ebccfc999450f5f0de231..cf688246f99e6a8c89058102abfd884da23b7d44 100644 --- a/pinaxcon/templates/static_pages/attend/accommodations.html +++ b/pinaxcon/templates/static_pages/attend/accommodations.html @@ -15,7 +15,7 @@ {% block content %} -This guide summarizes accessibility, accommodations, and known issues. If you have any questions or feedback, please contact us by email at spam@northbaypython.org or speak to an organizer or volunteer in-person. +This guide summarizes accessibility, accommodations, and known issues. If you have any questions or feedback, please contact us by email at hello@northbaypython.org or speak to an organizer or volunteer in-person.

Accessibility

diff --git a/pinaxcon/templates/static_pages/attend/attend.html b/pinaxcon/templates/static_pages/attend/attend.html index bc53b694168ce3710f70fd1339077e1e31870489..0555eb4fe02587a51f6807634cdb285ca038b8f6 100644 --- a/pinaxcon/templates/static_pages/attend/attend.html +++ b/pinaxcon/templates/static_pages/attend/attend.html @@ -100,7 +100,7 @@ No No No Yes -

If you can’t afford to attend on these prices, please email spam@northbaypython.org – we’ll enthusiastically waive ticket fees for people who need it.

+

If you can’t afford to attend on these prices, please email hello@northbaypython.org – we’ll enthusiastically waive ticket fees for people who need it.

Buy a Ticket diff --git a/pinaxcon/templates/static_pages/attend/emergencies.html b/pinaxcon/templates/static_pages/attend/emergencies.html index cbd0c372986718fe86b5626fb77c2d5555faec1a..7d647451c6a6859dc3dbca1a8821bb97f7f23463 100644 --- a/pinaxcon/templates/static_pages/attend/emergencies.html +++ b/pinaxcon/templates/static_pages/attend/emergencies.html @@ -15,7 +15,7 @@ {% block content %} -

Please find an organizer or volunteer if you need to report an issue or ask a question. If it's not urgent, email us at spam@northbaypython.org. If there is imminent danger, please call local emergency dispatch at +1 (707) 762-2727 (the local number for 911) first.

+

Please find an organizer or volunteer if you need to report an issue or ask a question. If it's not urgent, email us at safety@northbaypython.org. If there is imminent danger, please call local emergency dispatch at +1 (707) 762-2727 (the local number for 911) first.

Emergency Dispatch

@@ -23,9 +23,9 @@

Code of Conduct Incident Reporting

-

If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of conference staff. Conference staff will be wearing t-shirts and/or badges that clearly identify them as staff. You may also contact venue staff and ask to be put in touch with conference chair Christopher Neugebauer.

+

If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of conference staff. Conference staff will be wearing t-shirts and/or badges that clearly identify them as staff. You can email the incident response team at safety@northbaypython.org. You may also contact venue staff and ask to be put in touch with conference chair Christopher Neugebauer.

-

If the matter is especially urgent, please call our Code of Conduct and safety incident hotline. The phone number for this hotline will be released shortly before the conference begins. This number will automatically route to a member of the conference staff who can render assistance.

+

If the matter is especially urgent, please dial our Code of Conduct incident hotline +1 (707) 755-7357. This number will automatically route to a member of the conference staff who can render assistance.

For more information:

diff --git a/pinaxcon/templates/static_pages/attend/guides.html b/pinaxcon/templates/static_pages/attend/guides.html index 2680f416e32d51f66273a69936d69e96815e1834..b6128d86ab03167185345760e92c672f9807ec80 100644 --- a/pinaxcon/templates/static_pages/attend/guides.html +++ b/pinaxcon/templates/static_pages/attend/guides.html @@ -17,7 +17,7 @@

We want it to make it easy for you to attend North Bay Python, and we want you to have the best possible experience while you're at the conference. This is a listing of all the guides we've prepared for you, including some key pages from the Attendee Wiki.

-

Please feel free to email us at spam@northbaypython.org or find an organizer or volunteer in-person to ask questions and provide feedback.

+

Please feel free to email us at hello@northbaypython.org or find an organizer or volunteer in-person to ask questions and provide feedback.

Planning for North Bay Python

diff --git a/pinaxcon/templates/static_pages/code_of_conduct/code_of_conduct.md b/pinaxcon/templates/static_pages/code_of_conduct/code_of_conduct.md index eef88542edf3ce03260bd577e9dff9584910d1c5..6592d7039b4be8bb227ac7d04a67aaa06363ce29 100644 --- a/pinaxcon/templates/static_pages/code_of_conduct/code_of_conduct.md +++ b/pinaxcon/templates/static_pages/code_of_conduct/code_of_conduct.md @@ -33,9 +33,9 @@ If a participant engages in behavior that violates this code of conduct, the con Contact Information ------------------- -If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of conference staff. Conference staff will be wearing t-shirts and/or badges that clearly identify them as staff. You may also contact venue staff and ask to be put in touch with conference chair [Christopher Neugebauer](mailto:chrisjrn@northbaypython.org). +If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of conference staff. Conference staff will be wearing t-shirts and/or badges that clearly identify them as staff. You can email the incident response team at [safety@northbaypython.org](mailto:safety@northbaypython.org). You may also contact venue staff and ask to be put in touch with conference chair [Christopher Neugebauer](mailto:chrisjrn@northbaypython.org). -If the matter is especially urgent, please call our Code of Conduct and safety incident hotline. **The phone number for this hotline will be released shortly before the conference begins.** This number will automatically route to a member of the conference staff who can render assistance. +If the matter is especially urgent, please dial our Code of Conduct and safety incident hotline: +1 (707) 755-7357. This number will automatically route to a member of the conference staff who can render assistance. Conference staff will be happy to help participants contact hotel/venue security or local law enforcement, provide escorts, or otherwise assist those experiencing harassment to feel safe for the duration of the conference. We value your attendance. diff --git a/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_attendee.md b/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_attendee.md index bfaea0dbca4b1e6291300fab01803e992c8f57c2..559bd89393f2c91aecca9c71cf72e1c323ceacb8 100644 --- a/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_attendee.md +++ b/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_attendee.md @@ -1,6 +1,6 @@ *This procedure has been adopted from the Ada Initiative's guide titled "[Conference anti-harassment/Responding to Reports](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Responding_to_reports)".* -1\. Keep in mind that all conference staff will be wearing a conference t-shirt/button with the word "STAFF" on it (or otherwise clearly marked as staff). The staff will also be prepared to handle the incident. All of our staff are informed of the [code of conduct policy](/code-of-conduct) and guide for handling harassment at the conference. *There will be a mandatory staff meeting onsite at the conference when this will be reiterated.* +1\. Keep in mind that all conference staff, volunteers, and incident responders will be clearly marked. The staff and incident responders will also be prepared to handle the incident. All of our staff are informed of the [code of conduct policy](/code-of-conduct) and guide for handling harassment at the conference. *There will be a mandatory staff meeting onsite at the conference when this will be reiterated.* 2\. Report the harassment incident (preferably in writing) to a conference staff member. All reports are confidential. Please do not disclose public information about the incident until the staff have had sufficient time in which to address the situation. This is as much for your safety and protection as it is the other attendees. @@ -18,6 +18,4 @@ The staff is well informed on how to deal with the incident and how to further p 3\. If everyone is presently physically safe, involve law enforcement or security only at a victim's request. If you do feel your safety in jeopardy please do not hesitate to contact local law enforcement by dialing 911. If you do not have a cell phone, you can use any hotel phone or simply ask a staff member. -**Note**: Incidents that violate the Code of Conduct are extremely damaging to the community, and they will not be tolerated. The silver lining is that, in many cases, these incidents present a chance for the offenders, and the community at large, to grow, learn, and become better. North Bay Python staff requests that they be your first resource when reporting a North Bay Python-related incident, so that they may enforce the Code of Conduct and take quick action toward a resolution. - -A listing of [North Bay Python staff is located here](/about/team), including contact phone numbers. If at all possible, all reports should be made directly to conference chair [Christopher Neugebauer](mailto:chrisjrn@northbaypython.org). \ No newline at end of file +**Note**: Incidents that violate the Code of Conduct are extremely damaging to the community, and they will not be tolerated. The silver lining is that, in many cases, these incidents present a chance for the offenders, and the community at large, to grow, learn, and become better. North Bay Python staff requests that they be your first resource when reporting a North Bay Python-related incident, so that they may enforce the Code of Conduct and take quick action toward a resolution. \ No newline at end of file diff --git a/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_staff.md b/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_staff.md index f979dc2bafb24db0afffb967699189770fb0abfe..3fc4673dc84f8c4a8b83d2751a1fda80f1c2fcdd 100644 --- a/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_staff.md +++ b/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_staff.md @@ -59,6 +59,4 @@ It is very important how we deal with the incident publicly. Our policy is to ma Depending on the incident, the conference chair, or designate, may decide to make one or more public announcements. If necessary, this will be done with a short announcement either during the plenary and/or through other channels. No one other than the conference chair or someone delegated authority from the conference chair should make any announcements. No personal information about either party will be disclosed as part of this process. -If some attendees were angered by the incident, it is best to apologize to them that the incident occurred to begin with. If there are residual hard feelings, suggest to them to write an email to the conference chair or to the event coordinator. It will be dealt with accordingly. - -A listing of [North Bay Python staff is located here](/about/team), including contact phone numbers. If at all possible, all reports should be made directly to conference chair [Christopher Neugebauer](mailto:chrisjrn@northbaypython.org). \ No newline at end of file +If some attendees were angered by the incident, it is best to apologize to them that the incident occurred to begin with. If there are residual hard feelings, suggest to them to write an email to the conference chair or to the event coordinator. It will be dealt with accordingly. \ No newline at end of file diff --git a/pinaxcon/templates/static_pages/news.html b/pinaxcon/templates/static_pages/news.html index c242da5e3add0e5c5bd18b11781e44a779885d0e..03f2f485d2840b6e2e13addc55154d0097fab037 100644 --- a/pinaxcon/templates/static_pages/news.html +++ b/pinaxcon/templates/static_pages/news.html @@ -10,6 +10,15 @@ {% block content %} + +

North Bay Python is here!

+ +

Wednesday, November 29, 2017—The inaugural North Bay Python officially kicks off this Saturday, December 2nd at 10am Pacific Time. We are expecting gloriously California winter weather with a mixture of clouds, sunshine, and brisk temperatures.

+ +

Speakers and attendees are traveling from the UK, Mexico, and all around the United States to participate, with most coming from the West Coast. Attendees will enjoy 20 sessions, 2 keynotes, a smattering of official and unofficial side events including a pre-event social, a speaker training, and a PyLadies lunch. A full listing of events and sessions can be found on our website.

+ +

We hope those that aren't able to join us this year can participate next year–dates to be announced–and will enjoy the video recordings that we'll be posting to YouTube and the Internet Archive.

+

Introducing Guides and the Attendee Wiki

@@ -65,7 +74,7 @@
  • T-shirts can be ordered until Tuesday, November 7.
    • -

    Can't afford a ticket? Please email spam@northbaypython.org. We'll enthusiastically waive ticket fees for people who ask.

    +

    Can't afford a ticket? Please email hello@northbaypython.org. We'll enthusiastically waive ticket fees for people who ask.

    Need to get approval from your manager to attend North Bay Python 2017? We've outlined the business case to make it clear that North Bay Python is a wise investment.

    @@ -103,7 +112,7 @@
  • Pay our bills. Recommend a sponsor or throw your support behind this not-for-profit volunteer-run event as an individual donor.
    • -

    Have other thoughts or ideas? Please reach out to spam@northbaypython.org.

    +

    Have other thoughts or ideas? Please reach out to hello@northbaypython.org.

    Thank you for helping to make North Bay Python excellent. This is a volunteer-run conference running under the auspices of Software Freedom Conservancy, a 501(c)(3) nonprofit, and none of this is possible without our advisors, our community partners, our sponsors, and you.

    diff --git a/pinaxcon/templates/static_pages/program/events.html b/pinaxcon/templates/static_pages/program/events.html index f354ed64f24eb0b2d1018d940bdaeb6edd735173..da33d09d904c45ee6e9c9c78835fe4124ba7ac3a 100644 --- a/pinaxcon/templates/static_pages/program/events.html +++ b/pinaxcon/templates/static_pages/program/events.html @@ -25,7 +25,7 @@

    We are running a free speaker training the day before the conference. Everyone is invited to attend, but seating is limited so people who are accepted to speak at the conference are given priority.

    -

    You must register to attend. Due to the location, the training is only open to people age 21 and older.

    +

    You must register to attend. Due to the location, the training is only open to people age 21 and older.

    The Blue Room
    Jamison's Roaring Donkey
    @@ -51,8 +51,8 @@

    PyLadies Lunch (Wiki)
    December 2, 2017 @ 12pm

    -

    Come hear some awesome talks and then have lunch with your favorite women or non-binary programmers and their friends!

    +

    Come hear some awesome talks and then have lunch with your favorite women and non-binary programmers and their friends!

    -

    It's free to join and lunch is on us, but space is limited so you must register to attend.

    +

    It's free to join and lunch is on us, but space is limited so you must register to attend.

    {% endblock %} diff --git a/pinaxcon/templates/static_pages/sponsors/donate.html b/pinaxcon/templates/static_pages/sponsors/donate.html index ee4de4909ccee6a9f103a3b1932404007639ce7e..fb85b61a86392f30125c69206282a07a072fa122 100644 --- a/pinaxcon/templates/static_pages/sponsors/donate.html +++ b/pinaxcon/templates/static_pages/sponsors/donate.html @@ -46,7 +46,7 @@

    Other donation methods

    -

    We can accept donations through other means, including wire transfer. To enquire, please e-mail spam@northbaypython.org.

    +

    We can accept donations through other means, including wire transfer. To enquire, please e-mail hello@northbaypython.org.

    {% endblock %}