Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Documentation: Update on Expert Labs
  • Loading branch information
ginatrapani committed Apr 28, 2012
1 parent 6537b2a commit dd3d2f2
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 21 deletions.
2 changes: 1 addition & 1 deletion docs/source/contact.rst
Expand Up @@ -31,7 +31,7 @@ You can also find ThinkUp community members on various channels across the web:

* On Twitter, follow `@thinkupapp <http://twitter.com/thinkupapp>`_
* Like `ThinkUp's Facebook Page <http://facebook.com/thinkupapp>`_
* Read and comment on `Expert Labs' blog <http://expertlabs.org>`_
* Follow the `ThinkUp blog <http://blog.thinkupapp.com>`_

Live Community Conference Call and Podcast
------------------------------------------
Expand Down
37 changes: 20 additions & 17 deletions docs/source/core.rst
@@ -1,35 +1,38 @@
Development Team
================

ThinkUp development is funded by `Expert Labs <http://expertlabs.org>`_, a non-profit startup that helps government
be more effective by tapping in to the power of social networks.
A core development team, in collaboration with community members, develops ThinkUp.

Expert Labs
-----------
Core Team
---------

**Gina Trapani** started building ThinkUp in the summer of 2009 as a personal weekend project. Today, she is a
Project Director at Expert Labs, leading application development.
**Gina Trapani** started building ThinkUp in the summer of 2009 as a personal weekend project. She served as Project
Director at ThinkUp's incubator, `Expert Labs <http://expertlabs.org>`_, from February of 2010 until March of 2012.
Today, she is the cofounder of the ThinkUp company, leading application development.

* `ginatrapani on GitHub <https://github.com/ginatrapani>`_
* `@ginatrapani on Twitter <https://twitter.com/ginatrapani>`_
* `+Gina Trapani on Google+ <https://plus.google.com/113612142759476883204>`_

**Mark Wilkie** joined Expert Labs in May of 2010 as a lead developer and application architect. `See Mark's ThinkUp
contributions <https://github.com/ginatrapani/ThinkUp/commits/master?author=mwilkie>`_.

* `mwilkie on GitHub <https://github.com/mwilkie>`_
* `@mwilkie on Twitter <https://twitter.com/mwilkie>`_

**Anil Dash** founded Expert Labs in January of 2010, and is responsible for ThinkUp's look and feel. `See Anil's ThinkUp
contributions <https://github.com/ginatrapani/ThinkUp/commits/master?author=anildash>`_.
**Anil Dash** founded ThinkUp's incubator, `Expert Labs <http://expertlabs.org>`_, and cofounded the ThinkUp company
with Gina Trapani. He is responsible for ThinkUp's look and feel. `See Anil's
ThinkUp contributions <https://github.com/ginatrapani/ThinkUp/commits/master?author=anildash>`_.

* `anildash on GitHub <https://github.com/anildash>`_
* `@anildash on Twitter <https://twitter.com/anildash>`_
* `+Anil Dash on Google+ <https://plus.google.com/103012564142649561853/>`_
* `Anil Dash on Facebook <https://www.facebook.com/anil.dash>`_

**Andy Baio** joined Expert Labs in November of 2010, and is responsible for data analysis and visualization.
`See Andy's ThinkUp contributions <https://github.com/ginatrapani/ThinkUp/commits/master?author=waxpancake>`_.
**Mark Wilkie** worked on ThinkUp through Expert Labs from May of 2010 until March 2012 as a lead developer and
application architect. `See Mark's ThinkUp
contributions <https://github.com/ginatrapani/ThinkUp/commits/master?author=mwilkie>`_.

* `mwilkie on GitHub <https://github.com/mwilkie>`_
* `@mwilkie on Twitter <https://twitter.com/mwilkie>`_

**Andy Baio** worked on ThinkUp through Expert Labs from November of 2010 until March 2012, responsible for data
analysis and visualization. Now he advises the ThinkUp company. `See Andy's ThinkUp
contributions <https://github.com/ginatrapani/ThinkUp/commits/master?author=waxpancake>`_.

* `waxpancake on GitHub <https://github.com/waxpancake>`_
* `@waxpancake on Twitter <https://twitter.com/waxpancake>`_
Expand All @@ -42,7 +45,7 @@ At ThinkUp, our goal is to create the most inclusive and innovative open source
`how our community and culture is our best feature
<http://smarterware.org/7819/my-codeconf-talk-your-community-is-your-best-feature>`_.

The Expert Labs team works with a growing community of volunteer and third-party contributors, some of whom are
The core team works with a growing community of volunteer and third-party contributors, some of whom are
paid by their employer or through open source programs.

`See ThinkUp's full list of contributors <https://github.com/ginatrapani/ThinkUp/contributors>`_.
6 changes: 3 additions & 3 deletions docs/source/intro.rst
Expand Up @@ -14,9 +14,9 @@ retweets, friends, followers and links on social networks like Twitter and Faceb
social activity in a database that YOU control, making it easy to search, sort, analyze, publish and display activity
from your network. All you need is a web server that can run a PHP application.

`Gina Trapani <http://ginatrapani.org>`_ began building ThinkUp as a personal project in 2009. Today, ThinkUp
development is led by `Expert Labs <http://expertlabs.org>`_, a non-profit startup that helps government be more
effective by tapping in to the power of social networks.
`Gina Trapani <http://ginatrapani.org>`_ began building ThinkUp as a personal project in 2009. From 2010 until 2012,
`Expert Labs <http://expertlabs.org>`_ incubated ThinkUp. Today development is led by ThinkUp LLC, a company founded
by Anil Dash and Gina Trapani.

ThinkUp's source code is licensed under the `GNU General Public License <http://www.gnu.org/licenses/gpl.html>`_ and
is available on `GitHub <http://github.com/ginatrapani/ThinkUp>`_.
Expand Down

0 comments on commit dd3d2f2

Please sign in to comment.