Permalink
Browse files

Merge branch 'release/1.0.0' into develop

  • Loading branch information...
2 parents a952593 + cec6723 commit 53d9e6568c4b5d598d0afa7874ffb20aee135f9d @amalloy amalloy committed May 20, 2011
Showing with 8 additions and 4 deletions.
  1. +3 −2 config.clj
  2. +1 −1 project.clj
  3. +4 −1 src/foreclojure/utils.clj
View
@@ -4,6 +4,7 @@
:db-pwd nil
:host "smtp.googlemail.com"
:user "team@4clojure.com"
- :problem-submission false
+ :problem-submission true
:advanced-user-count 50
- :pass ""}
+ :pass ""
+ :golfing-active true}
View
@@ -1,4 +1,4 @@
-(defproject foreclojure "0.3.1"
+(defproject foreclojure "1.0.0"
:description "4clojure - a website for lisp beginners"
:dependencies [[clojure "1.2.1"]
[clojure-contrib "1.2.0"]
@@ -156,7 +156,10 @@
(when user
[:div#lower-menu
[:span
- (link-to "/login/update" "Account Settings")]
+ (link-to "/login/update" "Account Settings")]
+ (when (:golfing-active config)
+ [:span ; deserves its own page, but just make it discoverable for now
+ (link-to "/login/update" "Leagues")])
(when (approver? user)
[:span
(link-to "/problems/unapproved" "View Unapproved Problems")])

0 comments on commit 53d9e65

Please sign in to comment.