summaryrefslogtreecommitdiff
path: root/site/content/pages/about
diff options
context:
space:
mode:
Diffstat (limited to 'site/content/pages/about')
-rw-r--r--site/content/pages/about/assets/mozilla.pngbin0 -> 10997 bytes
-rw-r--r--site/content/pages/about/credits.md30
-rw-r--r--site/content/pages/about/disclaimer.md6
-rw-r--r--site/content/pages/about/index.md30
-rw-r--r--site/content/pages/about/press.md14
-rw-r--r--site/content/pages/about/privacy.md6
-rw-r--r--site/content/pages/about/research.md21
-rw-r--r--site/content/pages/about/terms.md5
8 files changed, 45 insertions, 67 deletions
diff --git a/site/content/pages/about/assets/mozilla.png b/site/content/pages/about/assets/mozilla.png
new file mode 100644
index 00000000..0fd4f115
--- /dev/null
+++ b/site/content/pages/about/assets/mozilla.png
Binary files differ
diff --git a/site/content/pages/about/credits.md b/site/content/pages/about/credits.md
deleted file mode 100644
index 3cd0b05b..00000000
--- a/site/content/pages/about/credits.md
+++ /dev/null
@@ -1,30 +0,0 @@
-------------
-
-status: published
-title: MegaPixels Credits
-desc: MegaPixels Project Team Credits
-slug: credits
-published: 2018-12-04
-updated: 2018-12-04
-authors: Adam Harvey
-
-------------
-
-# Credits
-
-### Sidebar
-
-- [About](/about/)
-- [Press](/about/press/)
-- [Credits](/about/credits/)
-- [Disclaimer](/about/disclaimer/)
-- [Terms and Conditions](/about/terms/)
-- [Privacy Policy](/about/privacy/)
-
-## End Sidebar
-
-- MegaPixels by Adam Harvey
-- Made with support from Mozilla
-- Site developed by Jules Laplace
-- Design and graphics: Adam Harvey
-- Research assistants: Berit Gilma \ No newline at end of file
diff --git a/site/content/pages/about/disclaimer.md b/site/content/pages/about/disclaimer.md
index 27cf6760..c0baad71 100644
--- a/site/content/pages/about/disclaimer.md
+++ b/site/content/pages/about/disclaimer.md
@@ -4,6 +4,7 @@ status: published
title: Disclaimer
desc: MegaPixels Disclaimer
slug: disclaimer
+cssclass: about
published: 2018-12-04
updated: 2018-12-04
authors: Adam Harvey
@@ -12,15 +13,14 @@ authors: Adam Harvey
# Disclaimer
-### Sidebar
-
- [About](/about/)
- [Press](/about/press/)
-- [Credits](/about/credits/)
- [Disclaimer](/about/disclaimer/)
- [Terms and Conditions](/about/terms/)
- [Privacy Policy](/about/privacy/)
+### Sidebar
+
## End Sidebar
Last updated: December 04, 2018
diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md
index 66fac8ae..17302118 100644
--- a/site/content/pages/about/index.md
+++ b/site/content/pages/about/index.md
@@ -3,37 +3,29 @@
status: published
title: About MegaPixels
desc: About MegaPixels
-slug: credits
+slug: about
+cssclass: about
published: 2018-12-04
updated: 2018-12-04
authors: Adam Harvey
------------
-# About MegaPixels
+# About This Project
-### Sidebar
+{% include 'about_navigation.html' %}
-- [Press](/about/press/)
-- [Credits](/about/credits/)
-- [Disclaimer](/about/disclaimer/)
-- [Terms and Conditions](/about/terms/)
-- [Privacy Policy](/about/privacy/)
+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?
-+ Years: 2002-2019
-+ Datasets Analyzed: 325
-+ Author: Adam Harvey
-+ Development: Jules LaPlace
-+ Research Assistance: Berit Gilma
+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.
-## End Sidebar
+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 aims 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 aims 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.
![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: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.
+![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
-**Mozilla** is 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.
+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.
diff --git a/site/content/pages/about/press.md b/site/content/pages/about/press.md
index 0e3124d0..1c80d020 100644
--- a/site/content/pages/about/press.md
+++ b/site/content/pages/about/press.md
@@ -4,29 +4,25 @@ status: published
title: MegaPixels Press and News
desc: MegaPixels in The News
slug: press
+cssclass: about
published: 2018-12-04
updated: 2018-12-04
authors: Adam Harvey
------------
-
# Press
-### Sidebar
-
- [About](/about/)
- [Press](/about/press/)
-- [Credits](/about/credits/)
- [Disclaimer](/about/disclaimer/)
- [Terms and Conditions](/about/terms/)
- [Privacy Policy](/about/privacy/)
+### Sidebar
+
## End Sidebar
-![alt text](assets/test.jpg)
+(list of press articles and images will go here)
-- 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>
-- 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>
-- 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>
-lfw \ No newline at end of file
+- 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/about/privacy.md b/site/content/pages/about/privacy.md
index 9685a189..43db5032 100644
--- a/site/content/pages/about/privacy.md
+++ b/site/content/pages/about/privacy.md
@@ -4,6 +4,7 @@ status: published
title: Privacy Policy
desc: MegaPixels Privacy Policy
slug: privacy-policy
+cssclass: about
published: 2018-12-04
updated: 2018-12-04
authors: Adam Harvey
@@ -12,17 +13,12 @@ authors: Adam Harvey
# Privacy Policy
-### Sidebar
-
- [About](/about/)
- [Press](/about/press/)
-- [Credits](/about/credits/)
- [Disclaimer](/about/disclaimer/)
- [Terms and Conditions](/about/terms/)
- [Privacy Policy](/about/privacy/)
-## End Sidebar
-
A summary of our privacy policy is as follows:
The MegaPixels site does not use any analytics programs or collect any data besides the necessary IP address of your connection, which are deleted every 30 days and used only for security and to prevent misuse.
diff --git a/site/content/pages/about/research.md b/site/content/pages/about/research.md
new file mode 100644
index 00000000..71dedcf0
--- /dev/null
+++ b/site/content/pages/about/research.md
@@ -0,0 +1,21 @@
+------------
+
+status: published
+title: About MegaPixels Research Methodologies
+desc: About MegaPixels Research Methodologies
+slug: resewarch
+cssclass: about
+published: 2018-12-04
+updated: 2018-12-04
+authors: Adam Harvey
+
+------------
+
+# Research Methodologies
+
+- [About](/about/)
+- [Press](/about/press/)
+- [Research Methodology](/about/research/)
+- [Disclaimer](/about/disclaimer/)
+- [Terms and Conditions](/about/terms/)
+- [Privacy Policy](/about/privacy/)
diff --git a/site/content/pages/about/terms.md b/site/content/pages/about/terms.md
index 6ad03bc1..aa298421 100644
--- a/site/content/pages/about/terms.md
+++ b/site/content/pages/about/terms.md
@@ -4,6 +4,7 @@ status: published
title: Terms of Use
desc: MegaPixels Terms of Use and Privacy Policy
slug: terms
+cssclass: about
published: 2018-12-04
updated: 2018-12-04
authors: Adam Harvey
@@ -18,14 +19,16 @@ authors: Adam Harvey
- [About](/about/)
- [Press](/about/press/)
- [Credits](/about/credits/)
+- [Research Methodology](/about/research/)
- [Disclaimer](/about/disclaimer/)
- [Terms and Conditions](/about/terms/)
- [Privacy Policy](/about/privacy/)
## End Sidebar
-Last updated: December 04, 2018
+(FPO: this is only example text)
+Last updated: December 04, 2018
Please read these Terms and Conditions ("Terms", "Terms and Conditions") carefully before using the MegaPixels website (the "Service") operated by megapixels.cc ("us", "we", or "our").