Merge branch 'master' of github.com:adamhrv/megapixels_dev

8 files changed, 17 insertions, 31 deletions

diff --git a/site/content/pages/about/disclaimer.md b/site/content/pages/about/disclaimer.md
index c0baad71..00f7ba92 100644
--- a/site/content/pages/about/disclaimer.md
+++ b/site/content/pages/about/disclaimer.md
@@ -13,11 +13,7 @@ authors: Adam Harvey
 
 # Disclaimer
 
-- [About](/about/)
-- [Press](/about/press/)
-- [Disclaimer](/about/disclaimer/)
-- [Terms and Conditions](/about/terms/)
-- [Privacy Policy](/about/privacy/)
+{% include 'about_navigation.html' %}
 
 ### Sidebar
 
diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md
index ccb6ed0d..d2afdbe6 100644
--- a/site/content/pages/about/index.md
+++ b/site/content/pages/about/index.md
@@ -15,26 +15,17 @@ authors: Adam Harvey
 
 {% include 'about_navigation.html' %}
 
-MegaPixels is an art and research project by Adam Harvey about the origins and ethics of facial analysis datasets. Where do they come from? Who's included? Who created it and for what reason?
+<p><div style="font-size:20px;line-height:36px">Ever since government agencies began developing face recognition in the early 1960's, datasets of face images have always been central to the development and evaluation of their algorithms. Today, these datasets no longer originate in labs, but instead from family photos albums posted on Flickr, CCTV cameras on college campuses, livestreams at cafes, search engine queries for celebrities, or <a href="https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset">videos on YouTube</a>. </div></p>
 
-MegaPixels sets out to answer to these questions and reveal the stories behind the millions of images used to train, evaluate, and power the facial recognition surveillance algorithms used today. MegaPixels is authored by Adam Harvey, developed in collaboration with Jules LaPlace, and produced in partnership with Mozilla.
+While these datasets include many public figures, politicans, athletes, and actors, they also include many non-public figures including digital activists, students, and pedestrians. Some images are used with creative commons licenses, but others were taken in unconstrained scenarios without anyone's awareness or consent. During the last year hundreds of these datasets have been collected to understand how they contribute to a global data supply chain powering surveillance.
 
-MegaPixels sets out to answer to these questions and reveal the stories behind the millions of images used to train, evaluate, and power the facial recognition surveillance algorithms used today. MegaPixels is authored by Adam Harvey, developed in collaboration with Jules LaPlace, and produced in partnership with Mozilla.
+MegaPixels is art and research by <a href="https://ahprojects.com">Adam Harvey</a> about publicly available facial recognition datasets that aims to unravel the stories behind these datasets. During 2019 this site, coded by Jules, LaPlace, will publish reserach reports, visualizations, tools for searching the datasets, and statistics about each datset for others to download. 
 
-Notes
+This project is produced in partnership with [Mozilla](https://mozilla.org) who has provided the funding to research the datasets, build the site, and develop tools to help you understand the role that these datasets have played in creating surveillance technologies. 
 
-- critical but informative
-- not anti-dataset
-- pro-sharing, pro-public dataset
-- w/o data
-- not generally anti-researcher, their parent organization should have checks in place to prevent dubious dataset collection methods
-- 
 
+## Team
 
-![sideimage:Adam Harvey](assets/adam-harvey.jpg) **Adam Harvey** is an American artist and researcher based in Berlin. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for countersurveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups), the recipient of 2 PrototypeFund awards, and is currently a researcher in residence at Karlsruhe HfG studying artifical intelligence and datasets.
+![sideimage:Adam Harvey](assets/adam-harvey.jpg) **Adam Harvey** is Berlin-based American artist and researcher. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for countersurveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups), the recipient of 2 PrototypeFund awards, and a researcher in residence at Karlsruhe HfG.
 
-![sideimage:Jules LaPlace](assets/jules-laplace.jpg)**Jules LaPlace** is an American artist and technologist also based in Berlin. He was previously the CTO of a NYC digital agency and currently works at VFRAME, developing computer vision for human rights groups, and building creative software for artists.
-
-## Partnership 
-
-MegaPixels is produced in partnership with **Mozilla**, a free software community founded in 1998 by members of Netscape. The Mozilla community uses, develops, spreads and supports Mozilla products, thereby promoting exclusively free software and open standards, with only minor exceptions. The community is supported institutionally by the not-for-profit Mozilla Foundation and its tax-paying subsidiary, the Mozilla Corporation.
+![sideimage:Jules LaPlace](assets/jules-laplace.jpg)**Jules LaPlace** is an American creative technologist also based in Berlin. He was previously the CTO of a digital agency in NYC and now also works at VFRAME, developing computer vision for human rights groups. Jules also builds creative software for artists and musicians.
diff --git a/site/content/pages/about/press.md b/site/content/pages/about/press.md
index abd4d823..9328f38f 100644
--- a/site/content/pages/about/press.md
+++ b/site/content/pages/about/press.md
@@ -2,7 +2,7 @@
 
 status: published
 title: MegaPixels Press and News
-desc: MegaPixels in The News
+desc: MegaPixels Press and News
 slug: press
 cssclass: about
 published: 2018-12-04
@@ -15,6 +15,6 @@ authors: Adam Harvey
 
 {% include 'about_navigation.html' %}
 
-(list of press articles and images will go here)
+(list of press articles and images will go here. maybe setup a macro template to use for thumbnail image + press info?)
 
 - Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent <https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset>
\ No newline at end of file
diff --git a/site/content/pages/datasets/brainwash/index.md b/site/content/pages/datasets/brainwash/index.md
index 5fe0da4c..64f7e57d 100644
--- a/site/content/pages/datasets/brainwash/index.md
+++ b/site/content/pages/datasets/brainwash/index.md
@@ -45,11 +45,12 @@ Since it's publication by Stanford in 2015, the Brainwash dataset has appeared i
 
 {% include 'map.html' %}
 
+{% include 'chart.html' %}
+
 {% include 'supplementary_header.html' %}
 
 {% include 'citations.html' %}
 
-{% include 'chart.html' %}
 
 ### Additional Information
 
diff --git a/site/content/pages/datasets/lfw/index.md b/site/content/pages/datasets/lfw/index.md
index 833c6963..cb326f0b 100644
--- a/site/content/pages/datasets/lfw/index.md
+++ b/site/content/pages/datasets/lfw/index.md
@@ -6,11 +6,8 @@ desc: Labeled Faces in The Wild (LFW) is a database of face photographs designed
 subdesc: It includes 13,456 images of 4,432 people's images copied from the Internet during 2002-2004.
 image: assets/background.jpg
 slug: lfw
-<<<<<<< HEAD
 year: 2007
-=======
 color: #ff0000
->>>>>>> e6c50e5550275b8e9d2245201c77c6f9fef7a11a
 published: 2019-2-23
 updated: 2019-2-23
 authors: Adam Harvey
@@ -52,11 +49,12 @@ The *Names and Faces* dataset was the first face recognition dataset created ent
 
 {% include 'map.html' %}
 
+{% include 'chart.html' %}
+
 {% include 'supplementary_header.html' %}
 
 {% include 'citations.html' %}
 
-{% include 'chart.html' %}
 
 ### Commercial Use
 
diff --git a/site/content/pages/research/00_introduction/index.md b/site/content/pages/research/00_introduction/index.md
index 6fec7ab5..9555ca9b 100644
--- a/site/content/pages/research/00_introduction/index.md
+++ b/site/content/pages/research/00_introduction/index.md
@@ -1,6 +1,6 @@
 ------------
 
-status: published
+status: draft
 title: 00: Introduction
 desc: Introduction to Megapixels
 slug: 00_introduction
@@ -26,7 +26,7 @@ Algorithms learn from datasets. And we program algorithms by building datasets.
 Ignore content below these lines
 
 -----
-

+
 
 It was the early 2000s. Face recognition was new and no one seemed sure exactly how well it was going to perform in practice. In theory, face recognition was poised to be a game changer, a force multiplier,  a strategic military advantage, a way to make cities safer and to secure borders. This was the future John Ashcroft demanded with the Total Information Awareness act of the 2003 and that spooks had dreamed of for decades. It was a future that academics at Carnegie Mellon Universtiy and Colorado State University would help build. It was also a future that celebrities would play a significant role in building. And to the surprise of ordinary Internet users like myself and perhaps you, it was a future that millions of Internet users would unwittingly play role in creating. 
 
diff --git a/site/content/pages/research/01_from_1_to_100_pixels/index.md b/site/content/pages/research/01_from_1_to_100_pixels/index.md
index 409dcf02..477bd1a1 100644
--- a/site/content/pages/research/01_from_1_to_100_pixels/index.md
+++ b/site/content/pages/research/01_from_1_to_100_pixels/index.md
@@ -1,6 +1,6 @@
 ------------
 
-status: published
+status: draft
 title: From 1 to 100 Pixels
 desc: High resolution insights from low resolution imagery
 tagline: A breif description of this post, appears in the index page overview
diff --git a/site/content/pages/research/wider_sample.png b/site/content/pages/research/wider_sample.png
deleted file mode 100644
index 214ad6bb..00000000
--- a/site/content/pages/research/wider_sample.png
+++ /dev/null