Merge branch 'release/0.1.2'

marvinthepa · Apr 24, 2011 · fb48656 · fb48656
2 parents 2de3c18 + bc90149
commit fb48656
Show file tree

Hide file tree

Showing 10 changed files with 414 additions and 361 deletions.
diff --git a/README.md b/README.md
@@ -38,10 +38,11 @@ vaguely like this:
 
 ## Contributors
 
- * David Byrne <david.r.byrne@gmail.com>
- * Alan Malloy
- * Anthony Grimes
- * Carin Meier
+ * David Byrne (dbyrne)
+ * Alan Malloy (amalloy)
+ * Anthony Grimes (raynes)
+ * Carin Meier (cmeier)
+ * Clint Harrison
 
 Problem sources:
 

diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject foreclojure "0.1.1"
+(defproject foreclojure "0.1.2"
   :description "4clojure - a website for lisp beginners"
   :dependencies [[org.clojure/clojure "1.2.1"]
                  [org.clojure/clojure-contrib "1.2.0"]

diff --git a/resources/public/css/style.css b/resources/public/css/style.css
@@ -66,6 +66,10 @@ a.novisited {color: #00e;}
   border-right: 2px solid white;
 }
 
+.contributor {
+  color: #458B00;
+  font-weight: bold;
+}
 
 #login {
   border-right: 2px solid white;

diff --git a/src/foreclojure/core.clj b/src/foreclojure/core.clj
@@ -1,7 +1,7 @@
 (ns foreclojure.core
   (:use compojure.core
         [foreclojure static problems login register
-         users config social]
+         users config social version]
         ring.adapter.jetty
         somnium.congomongo
         [ring.middleware.reload :only [wrap-reload]])
@@ -30,6 +30,7 @@
   users-routes
   static-routes
   social-routes
+  version-routes
   (route/resources "/")
   (route/not-found "Page not found"))