updated content missing from renamed repo.

2 files changed, 36 insertions, 33 deletions

diff --git a/app/views/pages/about-us/news/2012/security-bingo/en.haml b/app/views/pages/about-us/news/2012/security-bingo/en.haml
index 344ee35..134b205 100644
--- a/app/views/pages/about-us/news/2012/security-bingo/en.haml
+++ b/app/views/pages/about-us/news/2012/security-bingo/en.haml
@@ -1,6 +1,7 @@
 - @title = "Let's play security bingo!"
 - @author = "Elijah"
 - @posted_at = "2012-08-28"
+- @more = true
 - @preview = capture_haml do
   :textile
     To be honest, this is might be the least satisfying game of bingo ever--but let's play anyway. The rules are simple: draw a grid, label the columns for different platforms, and label the rows for important communication toolsets. In each cell, put the name of an open source software package with reasonable security properties. If this exercise doesn't make you break down in tears, then you have won.
@@ -9,8 +10,8 @@
   :sass
     table.table
       border: 1px solid #ccc
-      background: white
       td
+        background: white
         width: 12.5%
         font-size: 0.9em
         border-right: 1px solid #ccc
@@ -39,15 +40,15 @@
     %tr
       %td.section{:rowspan => 3} Messages
       %td Short Message
-      %td{:colspan => 3} Pidgin, Gajim, OTR
-      %td SecureChat
-      %td Gibberbot, Beem, TextSecure
-      %td Cryptocat
+      %td{:colspan => 3} #{link 'Pidgin' => 'http://pidgin.im'}, #{link 'Gajim' => 'http://gajim.org'}, #{link 'OTR' => 'http://www.cypherpunks.ca/otr/'}
+      %td #{link 'ChatSecure' => 'https://chatsecure.org/'}
+      %td #{link 'Gibberbot' => 'https://guardianproject.info/apps/gibber/'}, #{link 'Beem' => 'http://beem-project.com'}, #{link 'TextSecure' => 'https://github.com/WhisperSystems/TextSecure'}
+      %td #{link 'Cryptocat' => 'https://crypto.cat'}
     %tr
       %td Long Message
-      %td{:colspan => 3} (Thunderbird + Enigmail)
+      %td{:colspan => 3} (#{link 'Thunderbird' => 'https://www.mozilla.org/en-US/thunderbird'} + #{link 'Enigmail' => 'http://enigmail.mozdev.org/'})
       %td
-      %td (K-9 + AGP)
+      %td (#{link 'K-9' => 'https://code.google.com/p/k9mail/'} + #{link 'AGP' => 'http://www.thialfihar.org/projects/apg/'})
       %td
     -# %tr
       %td Social Networking
@@ -61,33 +62,33 @@
     %tr
       %td.section{:rowspan => 5} Files
       %td Storage
-      %td DiskCryptor
+      %td #{link 'DiskCryptor' => 'http://diskcryptor.net'}
       %td
       %td EncFS, DMCrypt
       %td
-      %td (AOSP, LUKS Manager, Cryptonite)
-      %td SafeWith.me
+      %td (#{link 'AOSP' => 'http://source.android.com/'}, #{link 'Cryptonite' => 'https://code.google.com/p/cryptonite/'})
+      %td #{link 'SafeWith.me' => 'https://SafeWith.me'}
     %tr
       %td Backup
-      %td Duplicati
+      %td #{link 'Duplicati' => 'http://duplicati.com/'}
       %td
-      %td Déjà Dup
+      %td #{link 'Déjà Dup' => 'https://launchpad.net/deja-dup'}
       %td
-      %td FlashBack
+      %td #{link 'FlashBack' => 'http://www.whispersys.com/flashback.html'}
       %td
     %tr
       %td Synchronization
-      %td{:colspan => 3} (Syncany, git-annex)
+      %td{:colspan => 3} (#{link 'Syncany' => 'http://www.syncany.org/'}, #{link 'git-annex' => 'http://git-annex.branchable.com/assistant/'})
       %td
       %td
       %td
     %tr
       %td Data Wipe
+      %td #{link 'Eraser' => 'http://eraser.heidi.ie/'}, #{link 'BleachBit' => 'http://bleachbit.sourceforge.net/'}, #{link 'DBAN' => 'http://www.dban.org/'}
+      %td #{link 'DBAN' => 'http://www.dban.org/'}
+      %td #{link 'BleachBit' => 'http://bleachbit.sourceforge.net/'}, #{link 'DBAN' => 'http://www.dban.org/'}, wipe
       %td
-      %td
-      %td wipe
-      %td
-      %td InTheClear
+      %td #{link 'InTheClear' => 'https://github.com/SaferMobile/InTheClear'}
       %td N/A
     -# %tr
       %td Collaboration
@@ -101,15 +102,15 @@
     %tr
       %td.section{:rowspan => 3} Audio/Video
       %td Direct Calling
-      %td{:colspan => 3} (Jitsi)
+      %td{:colspan => 3} (#{link 'Jitsi' => 'https://jitsi.org/'})
       %td
-      %td RedPhone, CSimpleSip
+      %td #{link 'RedPhone' => 'https://github.com/WhisperSystems/RedPhone'}, #{link 'CSimpleSip' => 'https://code.google.com/p/csipsimple/'}
       %td
     %tr
       %td Conference
-      %td{:colspan => 3} (Mumble)
+      %td{:colspan => 3} (#{link 'Mumble' => 'http://mumble.sourceforge.net/'})
       %td
-      %td (Mumble)
+      %td (#{link 'Mumble' => 'http://mumble.sourceforge.net/'})
       %td
     %tr
       %td Capture & Reporting
@@ -117,32 +118,32 @@
       %td
       %td
       %td
-      %td ObscuraCam
+      %td #{link 'ObscuraCam' => 'https://guardianproject.info/apps/obscuracam/'}
       %td
   %tbody
     %tr
       %td.section{:rowspan => 2} Network
       %td Availability
-      %td{:colspan => 5} Commotion
+      %td{:colspan => 5} #{link 'Commotion' => 'http://commotionwireless.net/'}
       %td N/A
     %tr
       %td Confidentiality & Anonymity
-      %td{:colspan => 5} Tor, (OpenVPN)
+      %td{:colspan => 5} #{link 'Tor' => 'https://torproject.org'}, (#{link 'OpenVPN' => 'http://openvpn.net'})
       %td N/A
   %tbody
     %tr
       %td.section{:rowspan => 3} Identity
       %td Passwords
-      %td{:colspan => 3} KeePassX
+      %td{:colspan => 3} #{link 'KeePassX' => 'http://www.keepassx.org/'}
       %td
-      %td KeePassDroid
+      %td #{link 'KeePassDroid' => 'http://www.keepassdroid.com/'}
       %td
     %tr
       %td Validation
-      %td{:colspan => 6} (OpenPGP, OTR)
+      %td{:colspan => 6} (OpenPGP, #{link 'OTR' => 'http://www.cypherpunks.ca/otr/'})
     %tr
       %td Authentication
-      %td{:colspan => 6} Mozilla Persona, WebID
+      %td{:colspan => 6} #{link 'Mozilla Persona' => 'https://login.persona.org/'}, #{link 'WebID' => 'http://www.w3.org/2005/Incubator/webid/spec/'}
   -# %tbody
     %tr
       %td.section{:rowspan => 2} Anti-intrusion
@@ -185,14 +186,14 @@
 
   I put cells in parenthesis whenever I felt that the cell contents were egregiously doubtful. This could be for any number of reasons:
 
-  * *Not ready*: Some software shows promise, but there is not really any code that is ready to be used. For example, Syncany and git-annex.
-  * *Security problems*: Some software has notable security problems. Mumble, for example, only supports variable bit-rate encoding and is thus not suited to prevent eavesdropping by a skilled adversary.
-  * *Hostile to users*: Much of the available software exemplifies a painful user experience. For example, Jitsi, OpenVPN, or OpenPGP.
+  # *Not ready*: Some software shows promise, but there is not really any code that is ready to be used. For example, Syncany and git-annex.
+  # *Security problems*: Some software has notable security problems. Mumble, for example, only supports variable bit-rate encoding and is thus not suited to prevent eavesdropping by a skilled adversary.
+  # *Hostile to users*: Much of the available software exemplifies a painful user experience. For example, Jitsi, OpenVPN, or OpenPGP.
 
   What is missing might be more revealing than what is listed. These toolsets are entirely absent from my 'security bingo' game card:
 
   * *Social Networking:* When I excluded software that I think is unfeasible (SecureShare) or has no security (Diaspora, etc), then you end up with zero projects.
-  * *Document Collaboration:* I have high hopes an encrypted etherpad, but so far no one has started work on it.
+  * *Document Collaboration:* I have high hopes for an encrypted etherpad, but so far no one has started work on it.
   * *Photos/Vidoes & Galleries:* Nothing I have heard of.
   * *Events & Scheduling:* Nothing I have heard of.
   * *Tasks & Planning:* Nothing I have heard of.
diff --git a/app/views/pages/about-us/partners/en.haml b/app/views/pages/about-us/partners/en.haml
index 06a4efa..15446c0 100644
--- a/app/views/pages/about-us/partners/en.haml
+++ b/app/views/pages/about-us/partners/en.haml
@@ -1,5 +1,7 @@
 %p <b><a href="https://www.calyxinstitute.org/">Calyx Institute</a></b> is a research, education and legal support group devoted to researching and implementing privacy technology and tools to promote free speech, free expression, civic engagement and privacy rights on the Internet. Calyx plans to be an early adopter of the #{link 'LEAP platform' => 'platform'}.
 
+%p <b><a href="http://dyne.org">Dyne.org</a></b> is a nonprofit network of hackers committed to development of free and open source software. Our international network works to support broad access to technology and knowledge with practices, tools and narratives for community empowerment.
+
 %p <b><a href="http://f2c.rfa.org/">Freedom2Connect</a></b> program is designed to ensure secure communication tools exist for millions of individuals whose online interactions are being monitored or obstructed by repressive governments. Through support of research, development, and implementation of globally-accessible secure communications, freedom2connect champions the goals of Article 19 of the Universal Declaration of Human Rights.
 
 %p <b><a href="http://giip.org">Global Information Internship Program</a></b> (GIIP) is an educational and service-learning program at the University of California, Santa Cruz. GIIP is creating a new generation of “info-savvy” advocates who use information technology to promote civic participation and social justice. Since 1998, hundreds of GIIP undergraduate student interns have worked to democratize globalization, support world peace, raise environmental awareness, and promote gender equity by upgrading the informational capacity of non-governmental organizations (NGOs) and community groups around the world. GIIP will work with LEAP to conduct usability studies of LEAP software in various contexts around the world.