summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-01-29 13:36:07 -0500
committerChris McDonough <chrism@plope.com>2012-01-29 13:36:07 -0500
commitbfe8046689b9f9b4273df773a43be19080958193 (patch)
tree1fa043841e64fb861919febbcdfb94ea05fe1f4c /CHANGES.txt
parent76363823a22a709a15b6895430b4eece67da3b39 (diff)
parent71c94c0ae7a36dab1b39585907d8a0c24d377c90 (diff)
downloadpyramid-bfe8046689b9f9b4273df773a43be19080958193.tar.gz
pyramid-bfe8046689b9f9b4273df773a43be19080958193.tar.bz2
pyramid-bfe8046689b9f9b4273df773a43be19080958193.zip
Merge branch '1.3-branch'
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt32
1 files changed, 30 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index ba90c3bad..2a8515d01 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,25 @@
-Unreleased
-==========
+Next release
+============
+
+Features
+--------
+
+- More informative error message when a ``config.include`` cannot find an
+ ``includeme``. See https://github.com/Pylons/pyramid/pull/392.
+
+Bug Fixes
+---------
+
+- The process will now restart when ``pserve`` is used with the ``--reload``
+ flag when the ``development.ini`` file (or any other .ini file in use) is
+ changed. See https://github.com/Pylons/pyramid/issues/377 and
+ https://github.com/Pylons/pyramid/pull/411
+
+- The ``prequest`` script would fail when used against URLs which did not
+ return HTML or text. See https://github.com/Pylons/pyramid/issues/381
+
+1.3a6 (2012-01-20)
+==================
Features
--------
@@ -21,6 +41,14 @@ Bug Fixes
a different view that had the same predicate arguments. See
https://github.com/Pylons/pyramid/pull/404 for more information.
+- When using a dotted name for a ``view`` argument to
+ ``Configurator.add_view`` that pointed to a class with a ``view_defaults``
+ decorator, the view defaults would not be applied. See
+ https://github.com/Pylons/pyramid/issues/396 .
+
+- Static URL paths were URL-quoted twice. See
+ https://github.com/Pylons/pyramid/issues/407 .
+
1.3a5 (2012-01-09)
==================