Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
2 parents 3f7539a + 9e13b8a commit a492b3d03ad0389e8417304d1efe0533de9e4792 @dbyrne dbyrne committed Apr 22, 2011
Showing with 1,057 additions and 114 deletions.
  1. +1 −0 .gitignore
  2. +7 −0 config.clj
  3. BIN keystore
  4. +3 −1 project.clj
  5. +539 −0 resources/public/css/demo_table.css
  6. +35 −19 resources/public/{ → css}/style.css
  7. BIN resources/public/favicon.ico
  8. BIN resources/public/{ → images}/PoweredMongoDBbeige50.png
  9. BIN resources/public/images/Sorting icons.psd
  10. BIN resources/public/images/back_disabled.jpg
  11. BIN resources/public/images/back_enabled.jpg
  12. BIN resources/public/{ → images}/checkmark.png
  13. BIN resources/public/{ → images}/empty-sq.png
  14. BIN resources/public/images/favicon.ico
  15. BIN resources/public/images/forward_disabled.jpg
  16. BIN resources/public/images/forward_enabled.jpg
  17. BIN resources/public/{ → images}/login.png
  18. BIN resources/public/{ → images}/logo.png
  19. BIN resources/public/{ → images}/register.png
  20. BIN resources/public/{ → images}/run.png
  21. BIN resources/public/images/sort_asc.png
  22. BIN resources/public/images/sort_asc_disabled.png
  23. BIN resources/public/images/sort_both.png
  24. BIN resources/public/images/sort_desc.png
  25. BIN resources/public/images/sort_desc_disabled.png
  26. +24 −0 resources/public/script/foreclojure.js
  27. +16 −0 resources/public/script/jquery-1.5.2.min.js
  28. +143 −0 resources/public/script/jquery.dataTables.min.js
  29. +7 −0 src/foreclojure/config.clj
  30. +14 −6 src/foreclojure/core.clj
  31. +69 −7 src/foreclojure/data_set.clj
  32. +111 −10 src/foreclojure/login.clj
  33. +14 −9 src/foreclojure/problems.clj
  34. +24 −28 src/foreclojure/register.clj
  35. +2 −12 src/foreclojure/static.clj
  36. +5 −3 src/foreclojure/users.clj
  37. +43 −19 src/foreclojure/utils.clj
View
@@ -7,3 +7,4 @@ pom.xml
*~
*#
.cake
+.DS_Store
View
@@ -0,0 +1,7 @@
+{:wrap-reload false
+ :db-host "localhost"
+ :db-user nil
+ :db-pwd nil
+ :host "smtp.googlemail.com"
+ :user "team@4clojure.com"
+ :pass ""}
View
BIN keystore
Binary file not shown.
View
@@ -10,7 +10,9 @@
[org.jasypt/jasypt "1.7"]
[amalloy/utils "[0.3.7,)"]
[clj-github "1.0.0-SNAPSHOT"]
- [ring "0.3.7"]]
+ [ring "0.3.7"]
+ [clj-config "0.1.0"]
+ [org.apache.commons/commons-email "1.2"]]
:dev-dependencies [[lein-ring "0.4.0"]
[swank-clojure "1.2.1"]]
:main foreclojure.core
Oops, something went wrong.

0 comments on commit a492b3d

Please sign in to comment.