Merge pull request #112 from fusion94/master-110

Added some items to About page

app/views/pages/about.html.erb

@@ -8,44 +8,57 @@
 			<img class="aboutlogo" src="/assets/kandanlogo.png" height="125" width="125">
  	</h1>
 
-	<h3>Version 1.0</h3>
+	<h3>Version 1.0 (<%= AppName::REVISION %>)</h3>
 
 	<h3>Description</h3>
 
 	<p>Kandan is an Open Source alternative to HipChat.</p>
 
 	<p>What is Kandan? Kandan is a private chat service for your company or team. You can invite colleagues to share ideas and files in a persistent group chat room or rooms.</p>
 
-	<p>Unlike HipChat or other alternatives, Kandan is completely Open Source and can be hosted internally or externally by your organization or by a third party.</p>
+	<p>Unlike HipChat or other alternatives, Kandan is completely Open Source and can be hosted internally or externally by your organization or by a third party. </p>
 
 	<h3>Background</h3>
 
 	<p>Kandan was originally developed by <a href="http://cloudfuji.com/">Cloudfuji</a> and they started development on it back on March 6th of 2012. Development went pretty fast and furious until about June 4th of 2012. After that there wasn’t another commit to the repository until some pull requests came in during the month of January of 2013.</p>
 
-	<p>In talking with the team at Cloudfuji both <a href="http://jamesrgifford.com/">James Gifford</a> and <a href="http://fusion94.org">Tony Guntharp</a> agreed to take over maintenance of the project.</p>
+	<p>In February of 2013 control of the project was transfered to the current development team.</p>
 
-	<h3>Features</h3>
-		<ul>
-			<li>Easy deploy to CloudFoundry, Heroku, dotCloud, etc.</li>
-			<li>Unlimited channels</li>
-			<li>Embed formats for images and youtube videos with requests for others (twitter, facebook, g+, etc.)</li>
-			<li>/me command</li>
-			<li>Highly extensible plugin format</li>
-		</ul>
+	<ul>
+	<li><a href="https://github.com/fusion94">Tony Guntharp</a></li>
+	<li><a href="https://github.com/jrgifford">James Gifford</a></li>
+	<li><a href="https://github.com/gabceb">Gabriel Cebrian</a></li>
+	<li><a href="https://github.com/donthorp">Don Thorp</a></li>
+	<li><a href="https://github.com/SpencerCooley">Spencer Cooley</a></li>
+	<li><a href="https://github.com/kucharo">Greg Kucharo</a></li>
+	</ul>
 
-	<h3>Get Involved</h3>
-
 	<p>Since Kandan is a fully open-source app, we would appreciate if you dive in and start adding features, fixing bugs (what bugs?), and cleaning up the code.</p>
 
+	<p>But before you jump right in there there are a few caveats.</p>
+
+	<p>If you’re going to contribute code then you’re going to have to sign our <a href="http://www.clahub.com/agreements/kandanapp/kandan">Contributor License Agreement</a> (hereafter referred to as CLA) which is modeled after the one that <a href="http://nodejs.org/">NodeJS</a> uses.</p>
+
+	<p>A CLA is a legal document in which you state you are entitled to contribute the code/documentation/translation to the project you’re contributing to and are willing to have it used in distributions and derivative works. This means that should there be any kind of legal issue in the future as to the origins and ownership of any particular piece of code, then that project has the necessary forms on file from the contributor(s) saying they were permitted to make this contribution.</p>
+
+	<p>The CLA also ensures that once you have provided a contribution, you cannot try to withdraw permission for its use at a later date. People and companies can therefore use that software, confident that they will not be asked to stop using pieces of the code at a later date.</p>
+
+	<p>Please also take the time to read these two wiki pages in regards to contributing.</p>
+
+	<ul>
+	<li><a href="https://github.com/kandanapp/kandan/wiki/How-to-Contribute-Code">How to Contribute Code</a></li>
+	<li><a href="https://github.com/kandanapp/kandan/wiki/How-to-Contribute-Issues">How to Contribute Issues</a></li>
+	</ul>
+
 	<p>Make sure you check out these resources as well.</p>
 
 	<ul>
-		<li><a href="https://github.com/kandanapp/kandan/issues">GitHub Issues Tracker</a></li>
-		<li><a href="https://twitter.com/kandanapp">@kandanapp</a> on Twitter</li>
-		<li><a href="http://kandan-demo.kandanapp.com">Kandan Demo</a> (Yes we eat our own DogFood)</li>
+	<li>GitHub <a href="https://github.com/kandanapp/kandan/issues">Issues Tracker</a></li>
+	<li>Twitter <a href="https://twitter.com/kandanapp">@kandanapp</a></li>
+	<li><a href="http://kandan-demo.kandanapp.com/">Kandan Demo</a> (Yes we eat our own DogFood)</li>
 	</ul>
 
 	<h3>Contact Us</h3>
 	<p>If you find any security issues please submit an <a href="https://github.com/kandanapp/kandan/issues">Issue</a> or <a href="mailto:admin@kandanapp.com">email us</a>.</p>
-
+	<br><br>
 </div>

config/initializers/git_revision.rb

@@ -0,0 +1,3 @@
+module AppName
+  REVISION = `git log --pretty=format:'%h' -n 1`
+end