diff options
| author | Chris McDonough <chrism@plope.com> | 2012-09-22 08:07:07 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-09-22 08:07:07 -0400 |
| commit | 3c05fb076c617fa0c8820344135cfe9e028400a8 (patch) | |
| tree | fe7669a845674848a3c65e32d988ad2527331a67 /CHANGES.txt | |
| parent | 72561a213ccc456738582551e85fab0f0c8d09ab (diff) | |
| parent | 4388d317712be00a1d49cc73ac78407fe6906263 (diff) | |
| download | pyramid-3c05fb076c617fa0c8820344135cfe9e028400a8.tar.gz pyramid-3c05fb076c617fa0c8820344135cfe9e028400a8.tar.bz2 pyramid-3c05fb076c617fa0c8820344135cfe9e028400a8.zip | |
Merge branch '1.4-branch'
Diffstat (limited to 'CHANGES.txt')
| -rw-r--r-- | CHANGES.txt | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 66ac42136..4e6feb68c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,26 @@ Next release ============ +Bug Fixes +--------- + +- When trying to determine Mako defnames and Chameleon macro names in asset + specifications, take into account that the filename may have a hyphen in + it. See https://github.com/Pylons/pyramid/pull/692 + +Features +-------- + +- A new ``pyramid.session.check_csrf_token`` convenience function was added. + +- A ``check_csrf`` view predicate was added. For example, you can now do + ``config.add_view(someview, check_csrf=True)``. When the predicate is + checked, if the ``csrf_token`` value in ``request.params`` matches the CSRF + token in the request's session, the view will be permitted to execute. + Otherwise, it will not be permitted to execute. + +1.4a1 (2012-09-16) +================== Bug Fixes --------- |