<?xml version="1.0" encoding="UTF-8"?>
<commits type="array">
  <commit>
    <parents type="array">
      <parent>
        <id>98ea66810666d071fc68612718bf13be3872104c</id>
      </parent>
      <parent>
        <id>b4be1cba3ede01adae2e873de61d29665f25bc4d</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/a1a10b501fce7ae4d87bb8b236d23384c7929c13</url>
    <id>a1a10b501fce7ae4d87bb8b236d23384c7929c13</id>
    <committed-date>2009-04-21T06:00:45-07:00</committed-date>
    <authored-date>2009-04-21T06:00:45-07:00</authored-date>
    <message>Merge branch 'master' of git@github.com:joshuaclayton/fuzzy-monster

Conflicts:
	app/views/forums/_recordset.html.erb</message>
    <tree>b60b98c34e1287c0256a6796b6f6ecfa60df8008</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>553999bf969bbc131c0c842de731c7f954181e58</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/98ea66810666d071fc68612718bf13be3872104c</url>
    <id>98ea66810666d071fc68612718bf13be3872104c</id>
    <committed-date>2009-04-21T05:59:35-07:00</committed-date>
    <authored-date>2009-04-21T05:59:35-07:00</authored-date>
    <message>Added forum stuff</message>
    <tree>bfcb5536cbfbe7b7394350d343ca3d4d6496614a</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>dd7a0751752aa3547d74c770ac16234746c8a7ed</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/b4be1cba3ede01adae2e873de61d29665f25bc4d</url>
    <id>b4be1cba3ede01adae2e873de61d29665f25bc4d</id>
    <committed-date>2008-12-08T20:54:10-08:00</committed-date>
    <authored-date>2008-12-08T20:54:10-08:00</authored-date>
    <message>Added factory_girl defs.</message>
    <tree>b60b98c34e1287c0256a6796b6f6ecfa60df8008</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>631cc5ddabba7267b513eb5f4a36084a8522e4ed</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/dd7a0751752aa3547d74c770ac16234746c8a7ed</url>
    <id>dd7a0751752aa3547d74c770ac16234746c8a7ed</id>
    <committed-date>2008-11-30T19:05:08-08:00</committed-date>
    <authored-date>2008-11-30T19:05:08-08:00</authored-date>
    <message>Updated models to be more modular, updated model factory and a basic post specs</message>
    <tree>47d963ddda3df7d0ff4b513980599439075b41fe</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>c48b80c9dd679eee88ab1a1ef676d6f3a8b22d2a</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/631cc5ddabba7267b513eb5f4a36084a8522e4ed</url>
    <id>631cc5ddabba7267b513eb5f4a36084a8522e4ed</id>
    <committed-date>2008-11-24T18:32:34-08:00</committed-date>
    <authored-date>2008-11-24T18:32:34-08:00</authored-date>
    <message>Initial upgrade to Rails 2.2</message>
    <tree>49872dd28d66cae8ca2ddf9a3503590ed08ff317</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>553999bf969bbc131c0c842de731c7f954181e58</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/c48b80c9dd679eee88ab1a1ef676d6f3a8b22d2a</url>
    <id>c48b80c9dd679eee88ab1a1ef676d6f3a8b22d2a</id>
    <committed-date>2008-11-24T18:24:27-08:00</committed-date>
    <authored-date>2008-11-24T18:24:27-08:00</authored-date>
    <message>Added ability for admin users to reorder forums</message>
    <tree>9771224350e6f7dee0e517409531cb35a1fb72f4</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>280c5b11dfbc50369377cf59aa9e5cb4cb28a7e5</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/553999bf969bbc131c0c842de731c7f954181e58</url>
    <id>553999bf969bbc131c0c842de731c7f954181e58</id>
    <committed-date>2008-11-16T20:06:02-08:00</committed-date>
    <authored-date>2008-11-16T20:06:02-08:00</authored-date>
    <message>Added permissions checking within controller when trying to post</message>
    <tree>eefffc3c692b562ea8e2844cca43e467302108b4</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d40a38a5779c41adfe25330910690eafb518b8c9</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/280c5b11dfbc50369377cf59aa9e5cb4cb28a7e5</url>
    <id>280c5b11dfbc50369377cf59aa9e5cb4cb28a7e5</id>
    <committed-date>2008-11-10T15:41:11-08:00</committed-date>
    <authored-date>2008-11-10T15:41:11-08:00</authored-date>
    <message>Added time zone support</message>
    <tree>305f12b75efc680d68863ee33db527981451b982</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>cb7220754ac454f9dbe55b6f9fa1a0aaf09cf20d</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/d40a38a5779c41adfe25330910690eafb518b8c9</url>
    <id>d40a38a5779c41adfe25330910690eafb518b8c9</id>
    <committed-date>2008-11-10T15:13:42-08:00</committed-date>
    <authored-date>2008-11-10T15:13:42-08:00</authored-date>
    <message>Renamed readme</message>
    <tree>5f64a4c0322d1dfbc8194f52a2da47a70921c82c</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>1375b7ba2523e98bd809fc3989cfbb9ff7362acd</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/cb7220754ac454f9dbe55b6f9fa1a0aaf09cf20d</url>
    <id>cb7220754ac454f9dbe55b6f9fa1a0aaf09cf20d</id>
    <committed-date>2008-11-09T07:09:31-08:00</committed-date>
    <authored-date>2008-11-09T07:09:31-08:00</authored-date>
    <message>Added check to determine if topic can be replied to</message>
    <tree>fe69a1cb74253d99dcb6dd27ad294b7acdc4e6aa</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d07cb3813aae6f6e91a3fbabb923e85a02b40852</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/1375b7ba2523e98bd809fc3989cfbb9ff7362acd</url>
    <id>1375b7ba2523e98bd809fc3989cfbb9ff7362acd</id>
    <committed-date>2008-11-09T06:55:45-08:00</committed-date>
    <authored-date>2008-11-09T06:55:45-08:00</authored-date>
    <message>Updated view a bit more, cleaned up posts view</message>
    <tree>c634174554c5fe0367cc599ab362de4d6963ef45</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d54a3d2a0b1826000638a5e84ec00536451f3138</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/d07cb3813aae6f6e91a3fbabb923e85a02b40852</url>
    <id>d07cb3813aae6f6e91a3fbabb923e85a02b40852</id>
    <committed-date>2008-11-08T20:11:36-08:00</committed-date>
    <authored-date>2008-11-08T20:11:36-08:00</authored-date>
    <message>Checkin with a few style tweeks</message>
    <tree>d9b0c64e31212209da729fc39bedc77824ee0dad</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>e87f9b1adf5c72fe271acbd06de7d3edcdc55358</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/d54a3d2a0b1826000638a5e84ec00536451f3138</url>
    <id>d54a3d2a0b1826000638a5e84ec00536451f3138</id>
    <committed-date>2008-11-07T23:35:23-08:00</committed-date>
    <authored-date>2008-11-07T23:35:23-08:00</authored-date>
    <message>Moved reply form to bottom of page</message>
    <tree>0dd58f4ec27692440822e115b5794a4eec52aefb</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>684dd3aa23d4084d1aff7c4d96d923fba008f585</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/e87f9b1adf5c72fe271acbd06de7d3edcdc55358</url>
    <id>e87f9b1adf5c72fe271acbd06de7d3edcdc55358</id>
    <committed-date>2008-11-05T09:39:15-08:00</committed-date>
    <authored-date>2008-11-05T09:39:15-08:00</authored-date>
    <message>Updated FPT with proper concat/capture usage and added ability to respond to posts.</message>
    <tree>0ca8283b922e973bef058eb5887008521f994992</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>a785d69b110df46fe95f61e4a1af1905b93ea7cd</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/684dd3aa23d4084d1aff7c4d96d923fba008f585</url>
    <id>684dd3aa23d4084d1aff7c4d96d923fba008f585</id>
    <committed-date>2008-11-04T14:07:47-08:00</committed-date>
    <authored-date>2008-11-04T14:07:47-08:00</authored-date>
    <message>Initial topic stuff (incomplete)</message>
    <tree>6d435721655c958fcd9593db70a73a93f43f930c</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>897a02528c1e5dadd1e854b5bad945011eacbe49</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/a785d69b110df46fe95f61e4a1af1905b93ea7cd</url>
    <id>a785d69b110df46fe95f61e4a1af1905b93ea7cd</id>
    <committed-date>2008-11-04T09:28:17-08:00</committed-date>
    <authored-date>2008-11-04T09:28:17-08:00</authored-date>
    <message>Cleaned up topics a bit, and added some really simple styles</message>
    <tree>e4a72a482c7ce63be21ea18600a861f7ba1a8c8f</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>4f0f618432d797d85eb51be3628b550435c2b675</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/897a02528c1e5dadd1e854b5bad945011eacbe49</url>
    <id>897a02528c1e5dadd1e854b5bad945011eacbe49</id>
    <committed-date>2008-11-03T14:24:07-08:00</committed-date>
    <authored-date>2008-11-03T14:24:07-08:00</authored-date>
    <message>Added initial topics</message>
    <tree>0c80ae69aa3fc919dd8412040967b155bd96038e</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>8770f77af1b300bf8493cc8177975805725eb111</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/4f0f618432d797d85eb51be3628b550435c2b675</url>
    <id>4f0f618432d797d85eb51be3628b550435c2b675</id>
    <committed-date>2008-10-31T14:24:31-07:00</committed-date>
    <authored-date>2008-10-31T14:24:31-07:00</authored-date>
    <message>Added presenters, permissions and presenter specs</message>
    <tree>52d08e486a5a221afc6d825a49f0eb9e5ba114f1</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>787fa88db4423ebb21c8d8a19e47bb851b98a6c1</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/8770f77af1b300bf8493cc8177975805725eb111</url>
    <id>8770f77af1b300bf8493cc8177975805725eb111</id>
    <committed-date>2008-10-31T12:53:42-07:00</committed-date>
    <authored-date>2008-10-31T12:53:42-07:00</authored-date>
    <message>Added specs and initial Forum CRUD.</message>
    <tree>5b59b078f43fcb1b4643a7203acaf3b4541fe604</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>270184e8e7550e73c058af552b7532a9249487c9</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/787fa88db4423ebb21c8d8a19e47bb851b98a6c1</url>
    <id>787fa88db4423ebb21c8d8a19e47bb851b98a6c1</id>
    <committed-date>2008-10-31T09:32:17-07:00</committed-date>
    <authored-date>2008-10-31T09:32:17-07:00</authored-date>
    <message>Added FPT, inital &quot;real&quot; views, and seed data for an administrator account</message>
    <tree>29220e72e391a3de6d38664f5d4edfc6f47afe48</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>cd7c48af3fa0d37f167c50e7fff0332833c13321</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/270184e8e7550e73c058af552b7532a9249487c9</url>
    <id>270184e8e7550e73c058af552b7532a9249487c9</id>
    <committed-date>2008-10-30T16:32:32-07:00</committed-date>
    <authored-date>2008-10-30T16:32:32-07:00</authored-date>
    <message>Added MHS Auth and simple application layout</message>
    <tree>5edab89ce117e5b2998421101f3e8747509518b5</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>ee7e379e1fb67ba93b0135d281d162d07a7730c4</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/cd7c48af3fa0d37f167c50e7fff0332833c13321</url>
    <id>cd7c48af3fa0d37f167c50e7fff0332833c13321</id>
    <committed-date>2008-10-30T14:37:36-07:00</committed-date>
    <authored-date>2008-10-30T14:37:36-07:00</authored-date>
    <message>Added common plugins</message>
    <tree>f3f15a18be54725180a2f97a223cd50c6ac83b7b</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>591dd810c3ec09cf3a9010f78995215fca30d79e</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/ee7e379e1fb67ba93b0135d281d162d07a7730c4</url>
    <id>ee7e379e1fb67ba93b0135d281d162d07a7730c4</id>
    <committed-date>2008-10-30T14:20:16-07:00</committed-date>
    <authored-date>2008-10-30T14:20:16-07:00</authored-date>
    <message>Rspec initial</message>
    <tree>7faf87286eaf1c113c3ccc61330ed623baba91e7</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array"/>
    <author>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </author>
    <url>http://github.com/joshuaclayton/fuzzy-monster/commit/591dd810c3ec09cf3a9010f78995215fca30d79e</url>
    <id>591dd810c3ec09cf3a9010f78995215fca30d79e</id>
    <committed-date>2008-10-30T09:46:59-07:00</committed-date>
    <authored-date>2008-10-30T09:46:59-07:00</authored-date>
    <message>Initial commit</message>
    <tree>1f09469995e5b8d3412b7b8b0198f6332638c069</tree>
    <committer>
      <name>Joshua Clayton</name>
      <email>jclayton@fusionary.com</email>
    </committer>
  </commit>
</commits>
