From c16e2133d8c1b9505752e2c8f4e2b4d0e1248909 Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Wed, 27 Feb 2019 14:58:51 +0100 Subject: update .md --- site/content/pages/about/index.md | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'site/content/pages/about/index.md') diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md index e2025bf2..f9c6f83a 100644 --- a/site/content/pages/about/index.md +++ b/site/content/pages/about/index.md @@ -1,8 +1,8 @@ ------------ status: published -title: MegaPixels Credits -desc: MegaPixels Project Team Credits +title: About MegaPixels +desc: About MegaPixels slug: credits published: 2018-12-04 updated: 2018-12-04 @@ -10,10 +10,20 @@ authors: Adam Harvey ------------ -# Credits +# About MegaPixels -- 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 +MegaPixels aims to answers 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 answers 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. + ++ Years: 2002-2004 ++ Datasets Analyzed: 325 ++ Author: Adam Harvey ++ Development: Jules LaPlace ++ Research Assistance: Berit Gilma + +![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. + +![Adam Harvey](assets/jules-laplace.jpg) **Jules LaPlace** is an American technologist and artist also based in Berlin. He was previously the CTO for a NYC digital agency and currently works at VFRAME, developing computer vision for human rights groups, and as a freelance technologists for artists. + +**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. \ No newline at end of file -- cgit v1.2.3-70-g09d2 From c33406d4da0f03a986db62b0d6b75c5a70114abe Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 28 Feb 2019 17:29:16 +0100 Subject: sidebar on about pages --- megapixels/app/site/parser.py | 12 +++++++----- site/assets/css/css.css | 4 ++++ site/content/pages/about/credits.md | 11 +++++++++++ site/content/pages/about/disclaimer.md | 11 +++++++++++ site/content/pages/about/index.md | 24 +++++++++++++++++++----- site/content/pages/about/press.md | 11 +++++++++++ site/content/pages/about/privacy.md | 10 ++++++++++ site/content/pages/about/terms.md | 12 +++++++++++- site/public/about/credits/index.html | 10 +++++++++- site/public/about/disclaimer/index.html | 10 +++++++++- site/public/about/index.html | 15 ++++++++++++--- site/public/about/press/index.html | 10 +++++++++- site/public/about/privacy/index.html | 11 +++++++++-- site/public/about/terms/index.html | 12 ++++++++++-- 14 files changed, 142 insertions(+), 21 deletions(-) (limited to 'site/content/pages/about/index.md') diff --git a/megapixels/app/site/parser.py b/megapixels/app/site/parser.py index 9e904e00..b8bbf289 100644 --- a/megapixels/app/site/parser.py +++ b/megapixels/app/site/parser.py @@ -43,17 +43,19 @@ def parse_markdown(metadata, sections, s3_path, skip_h1=False): footnotes.append(section) elif ignoring: continue - elif '### Statistics' in section: + elif '### statistics' in section.lower() or '### sidebar' in section.lower(): if len(current_group): groups.append(format_section(current_group, s3_path)) current_group = [] - current_group.append(section) + if 'sidebar' not in section.lower(): + current_group.append(section) in_stats = True - elif in_stats and not section.strip().startswith('## '): + elif in_stats and not section.strip().startswith('## ') and 'end sidebar' not in section.lower(): current_group.append(section) - elif in_stats and section.strip().startswith('## '): + elif in_stats and section.strip().startswith('## ') or 'end sidebar' in section.lower(): current_group = [format_section(current_group, s3_path, 'right-sidebar', tag='div')] - current_group.append(section) + if 'end sidebar' not in section.lower(): + current_group.append(section) in_stats = False elif section.strip().startswith('```'): groups.append(format_section(current_group, s3_path)) diff --git a/site/assets/css/css.css b/site/assets/css/css.css index d710b3a8..ee99e13e 100644 --- a/site/assets/css/css.css +++ b/site/assets/css/css.css @@ -265,6 +265,10 @@ p { margin-bottom: 10px; color: #aaa; } +.right-sidebar ul:first-child a { + text-decoration: none; + border-bottom: 1px solid; +} /* lists */ diff --git a/site/content/pages/about/credits.md b/site/content/pages/about/credits.md index 2d16155c..3cd0b05b 100644 --- a/site/content/pages/about/credits.md +++ b/site/content/pages/about/credits.md @@ -12,6 +12,17 @@ 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 diff --git a/site/content/pages/about/disclaimer.md b/site/content/pages/about/disclaimer.md index 64ce9f21..27cf6760 100644 --- a/site/content/pages/about/disclaimer.md +++ b/site/content/pages/about/disclaimer.md @@ -12,6 +12,17 @@ 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/) + +## End Sidebar + Last updated: December 04, 2018 The information contained on MegaPixels.cc website (the "Service") is for academic and artistic purposes only. diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md index f9c6f83a..d3f5874d 100644 --- a/site/content/pages/about/index.md +++ b/site/content/pages/about/index.md @@ -12,18 +12,32 @@ authors: Adam Harvey # About MegaPixels -MegaPixels aims to answers 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. +### Sidebar -MegaPixels aims to answers 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. +- [Press](/about/press/) +- [Credits](/about/credits/) +- [Disclaimer](/about/disclaimer/) +- [Terms and Conditions](/about/terms/) +- [Privacy Policy](/about/privacy/) -+ Years: 2002-2004 ++ Years: 2002-2019 + Datasets Analyzed: 325 + Author: Adam Harvey + Development: Jules LaPlace + Research Assistance: Berit Gilma -![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. +## End Sidebar -![Adam Harvey](assets/jules-laplace.jpg) **Jules LaPlace** is an American technologist and artist also based in Berlin. He was previously the CTO for a NYC digital agency and currently works at VFRAME, developing computer vision for human rights groups, and as a freelance technologists for artists. +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. + +![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. + +![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. **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. \ No newline at end of file diff --git a/site/content/pages/about/press.md b/site/content/pages/about/press.md index 2e3fa9a7..0e3124d0 100644 --- a/site/content/pages/about/press.md +++ b/site/content/pages/about/press.md @@ -13,6 +13,17 @@ 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/) + +## End Sidebar + ![alt text](assets/test.jpg) - Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent diff --git a/site/content/pages/about/privacy.md b/site/content/pages/about/privacy.md index 17d1b707..9685a189 100644 --- a/site/content/pages/about/privacy.md +++ b/site/content/pages/about/privacy.md @@ -12,6 +12,16 @@ 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: diff --git a/site/content/pages/about/terms.md b/site/content/pages/about/terms.md index 3735ff08..6ad03bc1 100644 --- a/site/content/pages/about/terms.md +++ b/site/content/pages/about/terms.md @@ -11,8 +11,18 @@ authors: Adam Harvey ------------ -Terms and Conditions ("Terms") +# Terms and Conditions ("Terms") +### Sidebar + +- [About](/about/) +- [Press](/about/press/) +- [Credits](/about/credits/) +- [Disclaimer](/about/disclaimer/) +- [Terms and Conditions](/about/terms/) +- [Privacy Policy](/about/privacy/) + +## End Sidebar Last updated: December 04, 2018 diff --git a/site/public/about/credits/index.html b/site/public/about/credits/index.html index fecc6c7b..6e4f06c1 100644 --- a/site/public/about/credits/index.html +++ b/site/public/about/credits/index.html @@ -28,7 +28,15 @@

Credits

-
    +
+
  • MegaPixels by Adam Harvey
  • Made with support from Mozilla
  • Site developed by Jules Laplace
    • diff --git a/site/public/about/disclaimer/index.html b/site/public/about/disclaimer/index.html index a108baa0..b93194fa 100644 --- a/site/public/about/disclaimer/index.html +++ b/site/public/about/disclaimer/index.html @@ -28,7 +28,15 @@

    Disclaimer

    -

    Last updated: December 04, 2018

    +
    +

    Last updated: December 04, 2018

    The information contained on MegaPixels.cc website (the "Service") is for academic and artistic purposes only.

    MegaPixels.cc assumes no responsibility for errors or omissions in the contents on the Service.

    In no event shall MegaPixels.cc be liable for any special, direct, indirect, consequential, or incidental damages or any damages whatsoever, whether in an action of contract, negligence or other tort, arising out of or in connection with the use of the Service or the contents of the Service. MegaPixels.cc reserves the right to make additions, deletions, or modification to the contents on the Service at any time without prior notice.

    diff --git a/site/public/about/index.html b/site/public/about/index.html index 4a5ca926..2a0bc6c3 100644 --- a/site/public/about/index.html +++ b/site/public/about/index.html @@ -28,9 +28,18 @@

    About MegaPixels

    -

    MegaPixels aims to answers 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 answers 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.

    -
    Years
    2002-2004
    Datasets Analyzed
    325
    Author
    Adam Harvey
    Development
    Jules LaPlace
    Research Assistance
    Berit Gilma
    Adam Harvey
    Adam Harvey
    Adam Harvey
    Adam Harvey

    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.

    +
    +
    Years
    2002-2019
    Datasets Analyzed
    325
    Author
    Adam Harvey
    Development
    Jules LaPlace
    Research Assistance
    Berit Gilma

    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.

    +
    Adam Harvey
    Adam Harvey

    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.

    +
    Jules LaPlace
    Jules LaPlace

    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.

    +

    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.

    diff --git a/site/public/about/press/index.html b/site/public/about/press/index.html index a1d9d4f5..d36b6bc6 100644 --- a/site/public/about/press/index.html +++ b/site/public/about/press/index.html @@ -28,7 +28,15 @@

    Press

    -
    alt text
    alt text
      +
    +
    alt text
    alt text
    • 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 diff --git a/site/public/about/privacy/index.html b/site/public/about/privacy/index.html index 92a1b9a8..1b3b9d2f 100644 --- a/site/public/about/privacy/index.html +++ b/site/public/about/privacy/index.html @@ -28,10 +28,17 @@

      Privacy Policy

      -

      A summary of our privacy policy is as follows:

      +
      +

      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.

      The image processing sections of the site do not collect any data whatsoever. All processing takes place in temporary memory (RAM) and then is displayed back to the user over a SSL secured HTTPS connection. It is the sole responsibility of the user whether they discard, by closing the page, or share their analyzed information and any potential consequences that may arise from doing so.

      -

      A more complete legal version is below:

      This is a boilerplate Privacy policy from https://termsfeed.com/

      Needs to be reviewed

      diff --git a/site/public/about/terms/index.html b/site/public/about/terms/index.html index fd17b4d9..8bd6e738 100644 --- a/site/public/about/terms/index.html +++ b/site/public/about/terms/index.html @@ -27,8 +27,16 @@
      -

      Terms and Conditions ("Terms")

      -

      Last updated: December 04, 2018

      +

      Terms and Conditions ("Terms")

      +
      +

      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").

      Your access to and use of the Service is conditioned on your acceptance of and compliance with these Terms.

      By accessing or using the Service you agree to be bound by these Terms. If you disagree with any part of the terms then you may not access the Service.

      -- cgit v1.2.3-70-g09d2 From 18e595bdaf64417622d12fcbe9b5af96ac935ab3 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 28 Feb 2019 17:39:22 +0100 Subject: special case adam/jules sideimages --- megapixels/app/site/parser.py | 9 ++++++--- site/assets/css/css.css | 11 ++++++++++- site/content/pages/about/index.md | 8 +++----- site/public/about/index.html | 6 +++--- 4 files changed, 22 insertions(+), 12 deletions(-) (limited to 'site/content/pages/about/index.md') diff --git a/megapixels/app/site/parser.py b/megapixels/app/site/parser.py index b8bbf289..c17d3b8a 100644 --- a/megapixels/app/site/parser.py +++ b/megapixels/app/site/parser.py @@ -144,7 +144,7 @@ def intro_section(metadata, s3_path): def fix_images(lines, s3_path): """ - do our own tranformation of the markdown around images to handle wide images etc + do our own transformation of the markdown around images to handle wide images etc lines: markdown lines """ real_lines = [] @@ -154,10 +154,13 @@ def fix_images(lines, s3_path): line = line.replace('![', '') alt_text, tail = line.split('](', 1) url, tail = tail.split(')', 1) + tag = '' if ':' in alt_text: - tail, alt_text = alt_text.split(':', 1) + tag, alt_text = alt_text.split(':', 1) img_tag = "{}".format(s3_path + url, alt_text.replace("'", "")) - if len(alt_text): + if 'sideimage' in tag: + line = "
      {}
      {}
      ".format(img_tag, markdown(tail)) + elif len(alt_text): line = "
      {}
      {}
      ".format(img_tag, alt_text) else: line = "
      {}
      ".format(img_tag, alt_text) diff --git a/site/assets/css/css.css b/site/assets/css/css.css index ee99e13e..29833be7 100644 --- a/site/assets/css/css.css +++ b/site/assets/css/css.css @@ -387,7 +387,16 @@ section.fullwidth .image { margin: 10px auto 0 auto; font-family: 'Roboto'; } - +.sideimage { + margin: 10px 0; + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: flex-start; +} +.sideimage img { + margin-right: 10px; +} /* blog index */ .research_index { diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md index d3f5874d..861cfd07 100644 --- a/site/content/pages/about/index.md +++ b/site/content/pages/about/index.md @@ -32,12 +32,10 @@ MegaPixels aims to answer to these questions and reveal the stories behind the m 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. -![Adam Harvey](assets/adam-harvey.jpg) +![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. -**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. -![Jules LaPlace](assets/jules-laplace.jpg) +**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. -**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. -**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. \ No newline at end of file diff --git a/site/public/about/index.html b/site/public/about/index.html index 2a0bc6c3..8583fd96 100644 --- a/site/public/about/index.html +++ b/site/public/about/index.html @@ -37,9 +37,9 @@
    Years
    2002-2019
    Datasets Analyzed
    325
    Author
    Adam Harvey
    Development
    Jules LaPlace
    Research Assistance
    Berit Gilma

    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.

    -
    Adam Harvey
    Adam Harvey

    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.

    -
    Jules LaPlace
    Jules LaPlace

    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.

    -

    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.

    +
    Adam Harvey

    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.

    +
    Jules LaPlace

    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.

    +

    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.

    -- cgit v1.2.3-70-g09d2 From ef90adeb4230ac27c18d3ed9e2cfab000c8689e0 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 28 Feb 2019 18:09:27 +0100 Subject: recreate dataset index --- megapixels/app/site/builder.py | 2 +- site/assets/css/css.css | 13 +++- site/content/pages/about/index.md | 2 - site/content/pages/datasets/index.md | 27 ++++++++ site/content/pages/datasets/lfw/index.md | 2 +- site/public/datasets/index.html | 71 +++++++++++++++++++--- site/public/datasets/lfw/index.html | 2 +- site/public/datasets/vgg_face2/index.html | 2 +- site/public/datasets_v0/index.html | 2 +- site/public/datasets_v0/lfw/index.html | 2 +- .../datasets_v0/lfw/right-to-removal/index.html | 1 - site/public/datasets_v0/vgg_face2/index.html | 2 +- site/public/index.html | 6 ++ site/templates/datasets.html | 9 ++- 14 files changed, 116 insertions(+), 27 deletions(-) create mode 100644 site/content/pages/datasets/index.md (limited to 'site/content/pages/about/index.md') diff --git a/megapixels/app/site/builder.py b/megapixels/app/site/builder.py index 15055110..603d4788 100644 --- a/megapixels/app/site/builder.py +++ b/megapixels/app/site/builder.py @@ -78,7 +78,7 @@ def build_index(key, research_posts, datasets): template = env.get_template("page.html") s3_path = s3.make_s3_path(cfg.S3_SITE_PATH, metadata['path']) content = parser.parse_markdown(metadata, sections, s3_path, skip_h1=False) - content += loader.parse_research_index(research_posts) + content += parser.parse_research_index(research_posts) html = template.render( metadata=metadata, content=content, diff --git a/site/assets/css/css.css b/site/assets/css/css.css index 29833be7..3bd09f23 100644 --- a/site/assets/css/css.css +++ b/site/assets/css/css.css @@ -1,4 +1,4 @@ -* { box-sizing: border-box; outline: 0; } +da* { box-sizing: border-box; outline: 0; } html, body { margin: 0; padding: 0; @@ -396,7 +396,10 @@ section.fullwidth .image { } .sideimage img { margin-right: 10px; + width: 250px; + height: 250px; } + /* blog index */ .research_index { @@ -521,7 +524,8 @@ section.fullwidth .image { text-decoration: none; transition: background-color 0.1s cubic-bezier(0,0,1,1); background: black; - margin: 0 20px 20px 0; + margin: 0 11px 11px 0; + border: 0; } .dataset-list .dataset { width: 220px; @@ -538,6 +542,11 @@ section.fullwidth .image { .dataset-list a:nth-child(3n+3) { background-color: rgba(255, 255, 0, 0.1); } .desktop .dataset-list .dataset:nth-child(3n+3):hover { background-color: rgba(255, 255, 0, 0.2); } +.dataset-list span { + box-shadow: -3px -3px black, 3px -3px black, -3px 3px black, 3px 3px black; + background-color: black; + box-decoration-break: clone; +} /* intro section for datasets */ diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md index 861cfd07..66fac8ae 100644 --- a/site/content/pages/about/index.md +++ b/site/content/pages/about/index.md @@ -37,5 +37,3 @@ MegaPixels aims to answer to these questions and reveal the stories behind the m ![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. **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. - - diff --git a/site/content/pages/datasets/index.md b/site/content/pages/datasets/index.md new file mode 100644 index 00000000..c408fba4 --- /dev/null +++ b/site/content/pages/datasets/index.md @@ -0,0 +1,27 @@ +------------ + +status: published +title: MegaPixels: Datasets +desc: Facial Recognition Datasets +slug: home +published: 2018-12-15 +updated: 2018-12-15 +authors: Adam Harvey +sync: false + +------------ + +# Facial Recognition Datasets + +### Sidebar + ++ Found: 275 datasets ++ Created between: 1993-2018 ++ Smallest dataset: 20 images ++ Largest dataset: 10,000,000 images + ++ Highest resolution faces: 450x500 (Unconstrained College Students) ++ Lowest resolution faces: 16x20 pixels (QMUL SurvFace) + +## End Sidebar + diff --git a/site/content/pages/datasets/lfw/index.md b/site/content/pages/datasets/lfw/index.md index 972fafe2..4161561d 100644 --- a/site/content/pages/datasets/lfw/index.md +++ b/site/content/pages/datasets/lfw/index.md @@ -4,7 +4,7 @@ status: published title: Labeled Faces in The Wild desc: Labeled Faces in The Wild (LFW) is a database of face photographs designed for studying the problem of unconstrained face recognition. subdesc: It includes 13,456 images of 4,432 people’s images copied from the Internet during 2002-2004. -image: assets/lfw_feature.jpg +image: assets/background.jpg caption: A few of the 5,749 people in the Labeled Faces in the Wild Dataset. The most widely used face dataset for benchmarking commercial face recognition algorithms. slug: lfw published: 2019-2-23 diff --git a/site/public/datasets/index.html b/site/public/datasets/index.html index 77c5ab2b..17c938ac 100644 --- a/site/public/datasets/index.html +++ b/site/public/datasets/index.html @@ -29,27 +29,78 @@

    Facial Recognition Datasets

    -

    Regular Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

    -

    Summary

    -
    Found
    275 datasets
    Created between
    1993-2018
    Smallest dataset
    20 images
    Largest dataset
    10,000,000 images
    Highest resolution faces
    450x500 (Unconstrained College Students)
    Lowest resolution faces
    16x20 pixels (QMUL SurvFace)
    +
Found
275 datasets
Created between
1993-2018
Smallest dataset
20 images
Largest dataset
10,000,000 images
Highest resolution faces
450x500 (Unconstrained College Students)
Lowest resolution faces
16x20 pixels (QMUL SurvFace)
-
-

Dataset Portraits

+

- We have prepared detailed studies of some of the more noteworthy datasets. + We have prepared detailed case studies of some of the more noteworthy datasets, including tools to help you learn what is contained in these datasets, and even whether your own face has been used to train these algorithms.

- +
- Labeled Faces in The Wild + Asian Face Age Dataset
- +
- VGG Face2 + Annotated Facial Landmarks in The Wild +
+ + + +
+ Caltech 10K Faces Dataset +
+ + + +
+ Caltech Occluded Faces in The Wild +
+ + + +
+ Facebook +
+ + + +
+ FERET: FacE REcognition +
+ + + +
+ Labeled Face Parts in The Wild +
+ + + +
+ Labeled Faces in The Wild +
+ + + +
+ Unconstrained College Students +
+ + + +
+ VGG Face 2 Dataset +
+ + + +
+ YouTube Celebrities
diff --git a/site/public/datasets/lfw/index.html b/site/public/datasets/lfw/index.html index 08ec8ee3..5b5e58f3 100644 --- a/site/public/datasets/lfw/index.html +++ b/site/public/datasets/lfw/index.html @@ -27,7 +27,7 @@
-
Labeled Faces in The Wild (LFW) is a database of face photographs designed for studying the problem of unconstrained face recognition.
It includes 13,456 images of 4,432 people’s images copied from the Internet during 2002-2004. +
Labeled Faces in The Wild (LFW) is a database of face photographs designed for studying the problem of unconstrained face recognition.
It includes 13,456 images of 4,432 people’s images copied from the Internet during 2002-2004.
A few of the 5,749 people in the Labeled Faces in the Wild Dataset. The most widely used face dataset for benchmarking commercial face recognition algorithms.

Statistics

Years
2002-2004
Images
13,233
Identities
5,749
Origin
Yahoo News Images
Funding
(Possibly, partially CIA)

INSIGHTS

    diff --git a/site/public/datasets/vgg_face2/index.html b/site/public/datasets/vgg_face2/index.html index 08b02cc7..efe6cb84 100644 --- a/site/public/datasets/vgg_face2/index.html +++ b/site/public/datasets/vgg_face2/index.html @@ -28,7 +28,7 @@

    VGG Face 2

    -
    Years
    TBD
    Images
    TBD
    Identities
    TBD
    Origin
    TBD
    Funding
    IARPA
    ...
    ...

    Analysis

    +
    Years
    TBD
    Images
    TBD
    Identities
    TBD
    Origin
    TBD
    Funding
    IARPA
    ...
    ...

    Analysis

    • The VGG Face 2 dataset includes approximately 1,331 actresses, 139 presidents, 16 wives, 3 husbands, 2 snooker player, and 1 guru
    diff --git a/site/public/datasets_v0/index.html b/site/public/datasets_v0/index.html index 71147a64..c2e6617b 100644 --- a/site/public/datasets_v0/index.html +++ b/site/public/datasets_v0/index.html @@ -30,7 +30,7 @@

    Facial Recognition Datasets

    Regular Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

    Summary

    -
    Found
    275 datasets
    Created between
    1993-2018
    Smallest dataset
    20 images
    Largest dataset
    10,000,000 images
    Highest resolution faces
    450x500 (Unconstrained College Students)
    Lowest resolution faces
    16x20 pixels (QMUL SurvFace)
    +
    Found
    275 datasets
    Created between
    1993-2018
    Smallest dataset
    20 images
    Largest dataset
    10,000,000 images
    Highest resolution faces
    450x500 (Unconstrained College Students)
    Lowest resolution faces
    16x20 pixels (QMUL SurvFace)
    diff --git a/site/public/datasets_v0/lfw/index.html b/site/public/datasets_v0/lfw/index.html index b4ee82a3..4ee4799f 100644 --- a/site/public/datasets_v0/lfw/index.html +++ b/site/public/datasets_v0/lfw/index.html @@ -28,7 +28,7 @@

    Labeled Faces in the Wild

    -
    Created
    2007
    Images
    13,233
    People
    5,749
    Created From
    Yahoo News images
    Search available
    Searchable
    Eighteen of the 5,749 people in the Labeled Faces in the Wild Dataset. The most widely used face dataset for benchmarking commercial face recognition algorithms.
    Eighteen of the 5,749 people in the Labeled Faces in the Wild Dataset. The most widely used face dataset for benchmarking commercial face recognition algorithms.

    Intro

    +
    Created
    2007
    Images
    13,233
    People
    5,749
    Created From
    Yahoo News images
    Search available
    Searchable
    Eighteen of the 5,749 people in the Labeled Faces in the Wild Dataset. The most widely used face dataset for benchmarking commercial face recognition algorithms.
    Eighteen of the 5,749 people in the Labeled Faces in the Wild Dataset. The most widely used face dataset for benchmarking commercial face recognition algorithms.

    Intro

    Labeled Faces in The Wild (LFW) is among the most widely used facial recognition training datasets in the world and is the first of its kind to be created entirely from images posted online. The LFW dataset includes 13,233 images of 5,749 people that were collected between 2002-2004. Use the tools below to check if you were included in this dataset or scroll down to read the analysis.

    Three paragraphs describing the LFW dataset in a format that can be easily replicated for the other datasets. Nothing too custom. An analysis of the initial research papers with context relative to all the other dataset papers.

    From George W. Bush to Jamie Lee Curtis: all 5,749 people in the LFW Dataset sorted from most to least images collected.
    From George W. Bush to Jamie Lee Curtis: all 5,749 people in the LFW Dataset sorted from most to least images collected.

    LFW by the Numbers

    diff --git a/site/public/datasets_v0/lfw/right-to-removal/index.html b/site/public/datasets_v0/lfw/right-to-removal/index.html index 5dc269b2..97ce4d05 100644 --- a/site/public/datasets_v0/lfw/right-to-removal/index.html +++ b/site/public/datasets_v0/lfw/right-to-removal/index.html @@ -38,7 +38,6 @@

    The dataset is being used thousands of companies around the world to improve facial recognition software including usage by governments for the purpose of law enforcement, national security, tracking consumers in retail environments, and tracking individuals through public spaces.

    My name as it appears in your dataset is [your name]. Please remove all images from your dataset and inform your newsletter subscribers to likewise update their copies.

    - [your name]

    -
    diff --git a/site/public/datasets_v0/vgg_face2/index.html b/site/public/datasets_v0/vgg_face2/index.html index b7ba5a4c..6a67e7e4 100644 --- a/site/public/datasets_v0/vgg_face2/index.html +++ b/site/public/datasets_v0/vgg_face2/index.html @@ -28,7 +28,7 @@

    VGG Faces2

    -
    Created
    2018
    Images
    3.3M
    People
    9,000
    Created From
    Scraping search engines
    Search available
    [Searchable](#)

    VGG Face2 is the updated version of the VGG Face dataset and now includes over 3.3M face images from over 9K people. The identities were selected by taking the top 500K identities in Google's Knowledge Graph of celebrities and then selecting only the names that yielded enough training images. The dataset was created in the UK but funded by Office of Director of National Intelligence in the United States.

    +
    Created
    2018
    Images
    3.3M
    People
    9,000
    Created From
    Scraping search engines
    Search available
    [Searchable](#)

    VGG Face2 is the updated version of the VGG Face dataset and now includes over 3.3M face images from over 9K people. The identities were selected by taking the top 500K identities in Google's Knowledge Graph of celebrities and then selecting only the names that yielded enough training images. The dataset was created in the UK but funded by Office of Director of National Intelligence in the United States.

    VGG Face2 by the Numbers

    • 1,331 actresses, 139 presidents
      • diff --git a/site/public/index.html b/site/public/index.html index 5038c483..8775f22d 100644 --- a/site/public/index.html +++ b/site/public/index.html @@ -110,6 +110,12 @@
    + +
    + Facebook +
    +     +
    FERET: FacE REcognition diff --git a/site/templates/datasets.html b/site/templates/datasets.html index ba230eee..3456eac8 100644 --- a/site/templates/datasets.html +++ b/site/templates/datasets.html @@ -4,17 +4,16 @@ {{ content }} -
    -

    Dataset Portraits

    +

    - We have prepared detailed studies of some of the more noteworthy datasets. + We have prepared detailed case studies of some of the more noteworthy datasets, including tools to help you learn what is contained in these datasets, and even whether your own face has been used to train these algorithms.

    {% for dataset in datasets %} - +
    - {{ dataset.title }} + {{ dataset.title }}
    {% endfor %} -- cgit v1.2.3-70-g09d2 From e845766d970f4afefc2fc47367c3478413f98ff2 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 28 Feb 2019 18:48:45 +0100 Subject: moz image --- site/assets/css/css.css | 4 ++-- site/content/pages/about/assets/mozilla.png | Bin 0 -> 10997 bytes site/content/pages/about/index.md | 2 +- site/public/about/index.html | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 site/content/pages/about/assets/mozilla.png (limited to 'site/content/pages/about/index.md') diff --git a/site/assets/css/css.css b/site/assets/css/css.css index 2e73f625..ab3bb4a7 100644 --- a/site/assets/css/css.css +++ b/site/assets/css/css.css @@ -404,8 +404,8 @@ section.fullwidth .image { } .sideimage img { margin-right: 10px; - width: 250px; - height: 250px; + width: 200px; + height: 200px; } /* blog index */ 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 Binary files /dev/null and b/site/content/pages/about/assets/mozilla.png differ diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md index 66fac8ae..59f70d7a 100644 --- a/site/content/pages/about/index.md +++ b/site/content/pages/about/index.md @@ -36,4 +36,4 @@ MegaPixels aims to answer to these questions and reveal the stories behind the m ![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. -**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. +![sideimage:Mozilla](assets/mozilla.png) **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. diff --git a/site/public/about/index.html b/site/public/about/index.html index 8583fd96..b7401ee8 100644 --- a/site/public/about/index.html +++ b/site/public/about/index.html @@ -39,8 +39,8 @@

    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.

    Adam Harvey

    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.

    Jules LaPlace

    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.

    -

    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.

    -
    +
Mozilla

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.

+