diff options
| -rw-r--r-- | site/assets/css/css.css | 5 | ||||
| -rw-r--r-- | site/content/pages/about/disclaimer.md | 10 | ||||
| -rw-r--r-- | site/content/pages/about/index.md | 18 | ||||
| -rw-r--r-- | site/content/pages/about/press.md | 10 | ||||
| -rw-r--r-- | site/content/pages/about/privacy.md | 10 | ||||
| -rw-r--r-- | site/content/pages/about/research.md | 16 | ||||
| -rw-r--r-- | site/content/pages/about/terms.md | 10 | ||||
| -rw-r--r-- | site/includes/about_navigation.html | 1 | ||||
| -rw-r--r-- | site/public/about/disclaimer/index.html | 7 | ||||
| -rw-r--r-- | site/public/about/index.html | 13 | ||||
| -rw-r--r-- | site/public/about/press/index.html | 7 | ||||
| -rw-r--r-- | site/public/about/privacy/index.html | 7 | ||||
| -rw-r--r-- | site/public/about/research/index.html | 1 | ||||
| -rw-r--r-- | site/public/about/terms/index.html | 7 | ||||
| -rw-r--r-- | todo.md | 15 |
15 files changed, 74 insertions, 63 deletions
diff --git a/site/assets/css/css.css b/site/assets/css/css.css index 6c049436..47106dd9 100644 --- a/site/assets/css/css.css +++ b/site/assets/css/css.css @@ -838,6 +838,11 @@ page-specific formatting color: #aaa; } +.content-about .about-menu ul li a.current { + border-bottom: 1px solid #ddd; + color: #ddd; +} + /* footnotes */ diff --git a/site/content/pages/about/disclaimer.md b/site/content/pages/about/disclaimer.md index 00f7ba92..97edc461 100644 --- a/site/content/pages/about/disclaimer.md +++ b/site/content/pages/about/disclaimer.md @@ -13,7 +13,15 @@ authors: Adam Harvey # Disclaimer -{% include 'about_navigation.html' %} +<section class="about-menu"> +<ul> +<li><a href="/about/">About</a></li> +<li><a href="/about/press/">Press</a></li> +<li><a class="current" href="/about/disclaimer/">Disclaimer</a></li> +<li><a href="/about/terms/">Terms and Conditions</a></li> +<li><a href="/about/privacy/">Privacy Policy</a></li> +</ul> +</section> ### Sidebar diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md index d2afdbe6..dbf4e1bb 100644 --- a/site/content/pages/about/index.md +++ b/site/content/pages/about/index.md @@ -13,19 +13,27 @@ authors: Adam Harvey # About MegaPixels -{% include 'about_navigation.html' %} +<section class="about-menu"> +<ul> +<li><a class="current" href="/about/">About</a></li> +<li><a href="/about/press/">Press</a></li> +<li><a href="/about/disclaimer/">Disclaimer</a></li> +<li><a href="/about/terms/">Terms and Conditions</a></li> +<li><a href="/about/privacy/">Privacy Policy</a></li> +</ul> +</section> <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> -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. +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 supply chain of biometric data. -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. +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 research reports, visualizations, downloadable statisticds, and interactive tools for searching the datasets. -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. +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 these datasets have played in creating biometric surveillance technologies. ## Team  **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. -**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. +**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 9328f38f..2e6d3423 100644 --- a/site/content/pages/about/press.md +++ b/site/content/pages/about/press.md @@ -13,7 +13,15 @@ authors: Adam Harvey # Press -{% include 'about_navigation.html' %} +<section class="about-menu"> +<ul> +<li><a href="/about/">About</a></li> +<li><a class="current" href="/about/press/">Press</a></li> +<li><a href="/about/disclaimer/">Disclaimer</a></li> +<li><a href="/about/terms/">Terms and Conditions</a></li> +<li><a href="/about/privacy/">Privacy Policy</a></li> +</ul> +</section> (list of press articles and images will go here. maybe setup a macro template to use for thumbnail image + press info?) diff --git a/site/content/pages/about/privacy.md b/site/content/pages/about/privacy.md index a47b74cc..0d908559 100644 --- a/site/content/pages/about/privacy.md +++ b/site/content/pages/about/privacy.md @@ -13,7 +13,15 @@ authors: Adam Harvey # Privacy Policy -{% include 'about_navigation.html' %} +<section class="about-menu"> +<ul> +<li><a href="/about/">About</a></li> +<li><a href="/about/press/">Press</a></li> +<li><a href="/about/disclaimer/">Disclaimer</a></li> +<li><a href="/about/terms/">Terms and Conditions</a></li> +<li><a class="current" href="/about/privacy/">Privacy Policy</a></li> +</ul> +</section> A summary of our privacy policy is as follows: diff --git a/site/content/pages/about/research.md b/site/content/pages/about/research.md deleted file mode 100644 index 8f001cc9..00000000 --- a/site/content/pages/about/research.md +++ /dev/null @@ -1,16 +0,0 @@ ------------- - -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 - -{% include 'about_navigation.html' %}
\ No newline at end of file diff --git a/site/content/pages/about/terms.md b/site/content/pages/about/terms.md index 38d43735..3217e366 100644 --- a/site/content/pages/about/terms.md +++ b/site/content/pages/about/terms.md @@ -14,7 +14,15 @@ authors: Adam Harvey # Terms and Conditions ("Terms") -{% include 'about_navigation.html' %} +<section class="about-menu"> +<ul> +<li><a href="/about/">About</a></li> +<li><a href="/about/press/">Press</a></li> +<li><a href="/about/disclaimer/">Disclaimer</a></li> +<li><a class="current" href="/about/terms/">Terms and Conditions</a></li> +<li><a href="/about/privacy/">Privacy Policy</a></li> +</ul> +</section> (FPO: this is only example text) diff --git a/site/includes/about_navigation.html b/site/includes/about_navigation.html index f82b77b7..df9f8a11 100644 --- a/site/includes/about_navigation.html +++ b/site/includes/about_navigation.html @@ -2,7 +2,6 @@ <ul> <li><a href="/about/">About</a></li> <li><a href="/about/press/">Press</a></li> -<li><a href="/about/research/">Research Methodology</a></li> <li><a href="/about/disclaimer/">Disclaimer</a></li> <li><a href="/about/terms/">Terms and Conditions</a></li> <li><a href="/about/privacy/">Privacy Policy</a></li> diff --git a/site/public/about/disclaimer/index.html b/site/public/about/disclaimer/index.html index b897cc34..abbffef6 100644 --- a/site/public/about/disclaimer/index.html +++ b/site/public/about/disclaimer/index.html @@ -27,16 +27,15 @@ <div class="content content-about"> <section><h1>Disclaimer</h1> -</section><section class="about-menu"> +<section class="about-menu"> <ul> <li><a href="/about/">About</a></li> <li><a href="/about/press/">Press</a></li> -<li><a href="/about/research/">Research Methodology</a></li> -<li><a href="/about/disclaimer/">Disclaimer</a></li> +<li><a class="current" href="/about/disclaimer/">Disclaimer</a></li> <li><a href="/about/terms/">Terms and Conditions</a></li> <li><a href="/about/privacy/">Privacy Policy</a></li> </ul> -</section><section><p>Last updated: December 04, 2018</p> +</section></section><section><p>Last updated: December 04, 2018</p> <p>The information contained on MegaPixels.cc website (the "Service") is for academic and artistic purposes only.</p> <p>MegaPixels.cc assumes no responsibility for errors or omissions in the contents on the Service.</p> <p>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.</p> diff --git a/site/public/about/index.html b/site/public/about/index.html index 0811169c..3cb791be 100644 --- a/site/public/about/index.html +++ b/site/public/about/index.html @@ -27,21 +27,20 @@ <div class="content content-about"> <section><h1>About MegaPixels</h1> -</section><section class="about-menu"> +<section class="about-menu"> <ul> -<li><a href="/about/">About</a></li> +<li><a class="current" href="/about/">About</a></li> <li><a href="/about/press/">Press</a></li> -<li><a href="/about/research/">Research Methodology</a></li> <li><a href="/about/disclaimer/">Disclaimer</a></li> <li><a href="/about/terms/">Terms and Conditions</a></li> <li><a href="/about/privacy/">Privacy Policy</a></li> </ul> -</section><section><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><p>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.</p> -<p>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.</p> -<p>This project is produced in partnership with <a href="https://mozilla.org">Mozilla</a> 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.</p> +</section><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><p>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 supply chain of biometric data.</p> +<p>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 research reports, visualizations, downloadable statisticds, and interactive tools for searching the datasets.</p> +<p>This project is produced in partnership with <a href="https://mozilla.org">Mozilla</a> who has provided the funding to research the datasets, build the site, and develop tools to help you understand the role these datasets have played in creating biometric surveillance technologies.</p> <h2>Team</h2> </section><section class='images'><div class='sideimage'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/adam-harvey.jpg' alt='Adam Harvey'><div><p><strong>Adam Harvey</strong> 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.</p> -</div></div></section><section class='images'><div class='sideimage'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/jules-laplace.jpg' alt='Jules LaPlace'><div><p><strong>Jules LaPlace</strong> 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.</p> +</div></div></section><section class='images'><div class='sideimage'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/jule s-laplace.jpg' alt='Jules LaPlace'><div><p><strong>Jules LaPlace</strong> 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.</p> </div></div></section> </div> diff --git a/site/public/about/press/index.html b/site/public/about/press/index.html index 9bbe5f92..930fece4 100644 --- a/site/public/about/press/index.html +++ b/site/public/about/press/index.html @@ -27,16 +27,15 @@ <div class="content content-about"> <section><h1>Press</h1> -</section><section class="about-menu"> +<section class="about-menu"> <ul> <li><a href="/about/">About</a></li> -<li><a href="/about/press/">Press</a></li> -<li><a href="/about/research/">Research Methodology</a></li> +<li><a class="current" href="/about/press/">Press</a></li> <li><a href="/about/disclaimer/">Disclaimer</a></li> <li><a href="/about/terms/">Terms and Conditions</a></li> <li><a href="/about/privacy/">Privacy Policy</a></li> </ul> -</section><section><p>(list of press articles and images will go here. maybe setup a macro template to use for thumbnail image + press info?)</p> +</section><p>(list of press articles and images will go here. maybe setup a macro template to use for thumbnail image + press info?)</p> <ul> <li>Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent <a href="https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset">https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset</a></li> </ul> diff --git a/site/public/about/privacy/index.html b/site/public/about/privacy/index.html index a719bfbd..12e78bae 100644 --- a/site/public/about/privacy/index.html +++ b/site/public/about/privacy/index.html @@ -27,16 +27,15 @@ <div class="content content-about"> <section><h1>Privacy Policy</h1> -</section><section class="about-menu"> +<section class="about-menu"> <ul> <li><a href="/about/">About</a></li> <li><a href="/about/press/">Press</a></li> -<li><a href="/about/research/">Research Methodology</a></li> <li><a href="/about/disclaimer/">Disclaimer</a></li> <li><a href="/about/terms/">Terms and Conditions</a></li> -<li><a href="/about/privacy/">Privacy Policy</a></li> +<li><a class="current" href="/about/privacy/">Privacy Policy</a></li> </ul> -</section><section><p>A summary of our privacy policy is as follows:</p> +</section><p>A summary of our privacy policy is as follows:</p> <p>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.</p> <p>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.</p> <p>A more complete legal version is below:</p> diff --git a/site/public/about/research/index.html b/site/public/about/research/index.html index f04ec0ac..5ad30e20 100644 --- a/site/public/about/research/index.html +++ b/site/public/about/research/index.html @@ -31,7 +31,6 @@ <ul> <li><a href="/about/">About</a></li> <li><a href="/about/press/">Press</a></li> -<li><a href="/about/research/">Research Methodology</a></li> <li><a href="/about/disclaimer/">Disclaimer</a></li> <li><a href="/about/terms/">Terms and Conditions</a></li> <li><a href="/about/privacy/">Privacy Policy</a></li> diff --git a/site/public/about/terms/index.html b/site/public/about/terms/index.html index 4fc64320..072b9b88 100644 --- a/site/public/about/terms/index.html +++ b/site/public/about/terms/index.html @@ -27,16 +27,15 @@ <div class="content content-about"> <section><h1>Terms and Conditions ("Terms")</h1> -</section><section class="about-menu"> +<section class="about-menu"> <ul> <li><a href="/about/">About</a></li> <li><a href="/about/press/">Press</a></li> -<li><a href="/about/research/">Research Methodology</a></li> <li><a href="/about/disclaimer/">Disclaimer</a></li> -<li><a href="/about/terms/">Terms and Conditions</a></li> +<li><a class="current" href="/about/terms/">Terms and Conditions</a></li> <li><a href="/about/privacy/">Privacy Policy</a></li> </ul> -</section><section><p>(FPO: this is only example text)</p> +</section><p>(FPO: this is only example text)</p> <p>Last updated: December 04, 2018</p> <p>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").</p> <p>Your access to and use of the Service is conditioned on your acceptance of and compliance with these Terms.</p> @@ -16,11 +16,7 @@ - AH: Try creating another google doc to manually review each citation and send to FT to maybe help with review - AH: finalize text for map include, beta disclaimer -- JL/AH: add graph showing distribtion by country -- JL/AH: add graph/number display showing distribution by sector (edu, gov, com) -- JL: possible to fade in background header graphic? - JL: add download (button) and search option for CSV? or link to github -- JL: make sortable by name? year (if added to metadata)? maybe group by year (like VCAT) - JL: remove pointer rollover on tabulators - JL: change PDF url to only show domain (ie https:/arxiv.org/12345/ --> arxiv.org) - JL: check footnotes (it shows an 'a' next to the numbers on bottom. is this right?) @@ -28,21 +24,14 @@ ## About -- AH: layout still feels awkward, fixing -- AH: update text and images -- AH/JL: update layout, css tweaks +- AH: update bio images - JL: add underline/active state to the subnavigation - awaiting Mozilla response for their text ## Research -- AH: create example page -- AH: CSS tweaks for Research index page -- AH: CSS tweaks for Research post page +- on hold until closer to FT launch date -## Design - -- AH: logo vector ## Datasets for FT Launch: |