From 9ed185d3143b821a7ccb66632bf961780a887a14 Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Mon, 14 Aug 2017 17:55:42 -0700 Subject: [PATCH 1/5] no emoji were used in the creation of this website --- pinaxcon/templates/static_pages/about/colophon.html | 1 - 1 file changed, 1 deletion(-) diff --git a/pinaxcon/templates/static_pages/about/colophon.html b/pinaxcon/templates/static_pages/about/colophon.html index 8b7069a..797ec52 100644 --- a/pinaxcon/templates/static_pages/about/colophon.html +++ b/pinaxcon/templates/static_pages/about/colophon.html @@ -44,7 +44,6 @@
  • Symposion is used for the call for proposals and session scheduling.
  • Registrasion is used for ticket sales.
  • Inkscape is used to create most of our graphics.
    • -
  • Twitter Emoji is used in many of our graphics. {% endblock %} \ No newline at end of file From 3539b2dbfb62fa069b0f1fea2937b1371dba0be1 Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Mon, 14 Aug 2017 18:16:27 -0700 Subject: [PATCH 2/5] photo attribution --- pinaxcon/templates/static_pages/about/colophon.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pinaxcon/templates/static_pages/about/colophon.html b/pinaxcon/templates/static_pages/about/colophon.html index 797ec52..b072c35 100644 --- a/pinaxcon/templates/static_pages/about/colophon.html +++ b/pinaxcon/templates/static_pages/about/colophon.html @@ -24,8 +24,10 @@

    Photography

    - -

    describe/credit photos used on the home page and other pages, perhaps list event photographer information ...maybe Next Day Video?

    +

    Python

    From bca3a5f4eca9c744883a1af908ef486b061023c4 Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Mon, 14 Aug 2017 18:24:38 -0700 Subject: [PATCH 3/5] proper attribution for terms and conditions* --- pinaxcon/templates/static_pages/about/colophon.html | 2 +- pinaxcon/templates/static_pages/terms_and_conditions.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pinaxcon/templates/static_pages/about/colophon.html b/pinaxcon/templates/static_pages/about/colophon.html index b072c35..00d5a29 100644 --- a/pinaxcon/templates/static_pages/about/colophon.html +++ b/pinaxcon/templates/static_pages/about/colophon.html @@ -35,7 +35,7 @@

    Terms and Conditions

    -

    Our Terms and Conditions were forked from the Linux Australia Event Terms and Conditions under the GNU General Public License 3.0. Our Photography and Audio Video Recording policy is adapted from the Evergreen policy, itself adapted from the AdaCamp policy under a Creative Commons Attribution Share Alike 4.0 International license.

    +

    Our Terms and Conditions were forked from the Linux Australia Event Terms and Conditions under the Creative Commons Attribution Share Alike 3.0 Australia license. Our Photography and Audio Video Recording policy is adapted from the Evergreen policy, itself adapted from the AdaCamp policy under a Creative Commons Attribution Share Alike 4.0 International license.

    Web Application

    diff --git a/pinaxcon/templates/static_pages/terms_and_conditions.md b/pinaxcon/templates/static_pages/terms_and_conditions.md index bb27737..6672d8a 100644 --- a/pinaxcon/templates/static_pages/terms_and_conditions.md +++ b/pinaxcon/templates/static_pages/terms_and_conditions.md @@ -1,4 +1,4 @@ -These Terms and Conditions apply to all attendees who have registered for North Bay Python. +These Terms and Conditions apply to all attendees who have registered for North Bay Python. This doucment was forked from the [Linux Australia Event Terms and Conditions](https://github.com/linuxaustralia/constitution_and_policies/blob/master/terms_and_conditions.md "Linux Australia Event Terms and Conditions Template") under the [Creative Commons Attribution Share Alike 3.0 Australia](https://creativecommons.org/licenses/by-sa/3.0/au/ "Creative Commons Attribution Share Alike 3.0 Australia License") license. Registration ------------ From ce809fa4848ae7a6f85d6b3315f479c04974a895 Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Mon, 14 Aug 2017 18:26:57 -0700 Subject: [PATCH 4/5] missed a word, oops --- pinaxcon/templates/static_pages/about/colophon.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pinaxcon/templates/static_pages/about/colophon.html b/pinaxcon/templates/static_pages/about/colophon.html index 00d5a29..4da0439 100644 --- a/pinaxcon/templates/static_pages/about/colophon.html +++ b/pinaxcon/templates/static_pages/about/colophon.html @@ -25,8 +25,8 @@

    Photography

    Python

    From 8cec1025080afb2f15e697e98efa65287f48a282 Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Mon, 14 Aug 2017 18:27:36 -0700 Subject: [PATCH 5/5] omg my editorial fu is growing weak --- pinaxcon/templates/static_pages/about/colophon.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pinaxcon/templates/static_pages/about/colophon.html b/pinaxcon/templates/static_pages/about/colophon.html index 4da0439..81868f7 100644 --- a/pinaxcon/templates/static_pages/about/colophon.html +++ b/pinaxcon/templates/static_pages/about/colophon.html @@ -25,8 +25,8 @@

    Photography

    Python