Changeset - 328a9724161c
[Not reviewed]
Merge
0 3 0
Bradley Kuhn (bkuhn) - 8 years ago 2014-07-30 17:10:51
bkuhn@ebb.org
Merge upstream change w/ my change to donate page
2 files changed with 13 insertions and 19 deletions:
0 comments (0 inline, 0 general)
www/conservancy/static/about/eval-committee/index.html
Show inline comments
...
 
@@ -104,31 +104,32 @@ dynamic interoperability of Free Software languages.</p>
 
<h2>Mike Linksvayer</h2>
 

	
 
<p>Mike Linksvayer serves on the boards of AcaWiki and OpenHatch, and is
 
chair of the Open Definition Advisory Council. From 2003 to 2012 he served
 
as CTO and VP of Creative Commons, where he is now a Senior Fellow. In 2000
 
he co-founded Bitzi, an early open content/open data mass collaboration
 
platform.</p>
 

	
 
<h2>Martin Michlmayr</h2>
 

	
 
<p>Martin Michlmayr has been involved in various free and open source
 
software projects for well over 15 years.  He acted as the leader of the
 
Debian project for two years and currently serves on the board of the Open
 
Source Initiative (OSI).  Martin works for HP as an Open Source Community
 
Expert.  In this role, he facilitates open source activities both
 
Debian project for two years, served on the board of the Open Source
 
Initiative (OSI) for six years and currently serves on the board of
 
Software Freedom Conservancy.  Martin works for HP as an Open Source
 
Community Expert.  In this role, he facilitates open source activities both
 
internally within HP as well as externally within the broader open source
 
community.  Martin holds Master degrees in Philosophy, Psychology and
 
Software Engineering, and earned a PhD from the University of
 
Cambridge.</p>
 
community.  Martin earned a PhD from the University of Cambridge and he
 
received an O'Reilly Open Source Award in 2013 for his contributions to the
 
open source community.</p>
 

	
 
<h2>Evan Prodromou</h2>
 

	
 
<p>Evan Prodromou is the lead developer of pump.io and founder of E14N Inc.
 
He has previously worked on Free Software for web services like MediaWiki
 
and StatusNet.</p>
 

	
 
<h2>Karen Sandler</h2>
 
<a id="karen"></a>
 

	
 
<p>Karen M. Sandler is Executive Director of Conservancy. She was previously
 
the Executive Director of the GNOME Foundation. In partnership with the GNOME
www/conservancy/templates/frontpage.html
Show inline comments
...
 
@@ -78,38 +78,31 @@
 
<hr/>
 
<p class="date">{{ press_releases.2.pub_date|date:"F j, Y" }}</p>
 
<h3><a href="{{ press_releases.2.get_absolute_url }}">{{ press_releases.2.headline|safe }}</a></h3>
 
{{ press_releases.2.summary|safe }}
 
{% if press_releases.2.body %}<p><span class="continued"><a href="{{ press_releases.2.get_absolute_url }}">Read More...</a></span></p>{% endif %}
 
{% endif %}
 
{% endif %}
 
</div>
 
{% endif %}
 
{% endif %}
 
<p><span class="continued"><a href="/news/">Conservancy News Archive&hellip;</a></span></p>
 
{% if blog.0.is_recent %}
 
<h2><a href="/feeds/blog/" class="feedlink"><img src="/img/feed-icon-14x14.png" alt="[RSS]"/></a> <a href="/blog/">Conservancy Blog</a></h2>
 
<div class="shaded">
 
<h2><a href="/feeds/blog/" class="feedlink"><img src="/img/feed-icon-14x14.png" alt="[RSS]"/></a> <a href="/blog/">Conservancy Blog</a></h2>
 
<h3><a href="{{ blog.0.get_absolute_url }}">{{ blog.0.headline|safe }}</a></h3>
 
<p class="date">Posted by {{ blog.0.author.formal_name }}
 
on {{ blog.0.pub_date|date:"F j, Y" }}</p>
 
<p class="date">Posted by {{ blog.0.author.formal_name }} on {{ blog.0.pub_date|date:"F j, Y" }}</p>
 
{{ blog.0.summary|safe }}
 
<p><span class="continued"><a href="{{ blog.0.get_absolute_url }}">Read More
 
      from {{ blog.0.author.casual_name }} on this&hellip;</a></span></p>
 
</div>
 
{% endif %}
 

	
 
<p><span class="continued"><a href="{{ blog.0.get_absolute_url }}">Read More from {{ blog.0.author.casual_name }} on this&hellip;</a></span></p>
 
{% if blog.1.is_recent %}
 
<div class="shaded">
 
<hr/>
 
<h3><a href="{{ blog.1.get_absolute_url }}">{{ blog.1.headline|safe }}</a></h3>
 
<p class="date">Posted by {{ blog.1.author.formal_name }}
 
on {{ blog.1.pub_date|date:"F j, Y" }}</p>
 
<p class="date">Posted by {{ blog.1.author.formal_name }} on {{ blog.1.pub_date|date:"F j, Y" }}</p>
 
{{ blog.1.summary|safe }}
 
<p><span class="continued"><a href="{{ blog.0.get_absolute_url }}">Read More
 
      from {{ blog.1.author.casual_name }} on this&hellip;</a></span></p>
 
<p><span class="continued"><a href="{{ blog.0.get_absolute_url }}">Read More from {{ blog.1.author.casual_name }} on this&hellip;</a></span></p>
 
{% endif %}
 
</div>
 
{% endif %}
 
<p><span class="continued"><a href="/blog/">Conservancy Blog Archive&hellip;</a></span></p>
 
</div>
 
</div>
 
{% endblock %}
0 comments (0 inline, 0 general)