Merge branch 'master' into issue-119

kandanapp · Feb 26, 2013 · d6a3291 · d6a3291
2 parents 25cb0f7 + bf59ed7
commit d6a3291
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/app/views/pages/about.html.erb b/app/views/pages/about.html.erb
@@ -7,7 +7,7 @@
 			<img class="aboutlogo" src="/assets/kandanlogo.png" height="125" width="125">
  	</h1>
 
-	<h3>Version 1.0 (<%= AppName::REVISION %>)</h3>
+	<h3><%= AppName::VERSION %> (<%= AppName::REVISION %>)</h3>
 
 	<h3>Description</h3>
 

diff --git a/config/application.rb b/config/application.rb
@@ -50,7 +50,7 @@ class Application < Rails::Application
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
-    config.assets.precompile += ["lib/admin.js", "admin.css"]
+    config.assets.precompile += ["admin/admin.js", "admin.css"]
 
     # Use SQL instead of Active Record's schema dumper when creating the database.
     # This is necessary if your schema can't be completely dumped by the schema dumper,

diff --git a/config/initializers/git_revision.rb b/config/initializers/git_revision.rb
@@ -1,3 +1,4 @@
 module AppName
+  VERSION = 'Version 1.1'		
   REVISION = `git log --pretty=format:'%h' -n 1`
 end