Permalink
Browse files

Hardcore merging action.

  • Loading branch information...
2 parents 141faff + 9db0e29 commit ab2015e2be0d74ae7d82fe9e96814b9596dd1f84 @Raynes Raynes committed Dec 25, 2011
Showing with 12 additions and 1 deletion.
  1. +11 −0 history.md
  2. +1 −1 project.clj
View
@@ -1,3 +1,14 @@
+##Changes for 1.2.2
+* Added an argless form of (noir.validation/errors?) that returns all errors
+* Added the ability to define routes with vars
+* Refactored defpage to allow for better errors when a param is passed incorrectly
+* Refactored url-for to be more robust
+* Fixed s3 var being dynamic
+* Fixed an issue with utf-8 routes being encoded incorrectly
+* Moved to ring 1.0.1 and compojure 1.0.0
+ * Fixes issue with no routes being loaded resulting in a 500
+ * Fixes issue with file names containing spaces being unreachable
+
##Changes for 1.2.1
* BREAKING CHANGE: (url-for) now takes a map of params instead of key-value pairs: (url-for foo {:id 2})
* Changed noir.content.pages to noir.content.getting-started
View
@@ -1,7 +1,7 @@
(defproject noir "1.3.0-alpha1"
:description "Noir - a clojure web framework"
:dependencies [[org.clojure/clojure "1.3.0"]
- [compojure "1.0.0-RC2"]
+ [compojure "1.0.0"]
[org.clojure/tools.namespace "0.1.0"]
[clj-json "0.4.3"]
[ring "1.0.1"]

0 comments on commit ab2015e

Please sign in to comment.