parent: 3c2475 | patch | commitdiff
Chris McDonough
2012-11-05 8c30a3d9c2437e661eac6f23315837fccb4741ea
refs
author Chris McDonough <chrism@plope.com>
Monday, November 5, 2012 22:03 +0100
committer Chris McDonough <chrism@plope.com>
Monday, November 5, 2012 22:03 +0100
commit8c30a3d9c2437e661eac6f23315837fccb4741ea
tree 308b4cbdea04bc582450a57e583e4e93d9ec5d72 tree | zip | gz
parent 3c247503042c94b792a6b1a5701fdba7c832b99c view | diff
ee0e41d020d3cc9f43a958a53528166e5d2293f7 view | diff 
Merge branch 'master' of github.com:Pylons/pyramid
1 files deleted
39 files modified
1677 ■■■■■ changed files
CHANGES.txt 71 ●●●●● diff | view | raw | blame | history
TODO.txt 15 ●●●●● diff | view | raw | blame | history
docs/api/authentication.rst 10 ●●●●● diff | view | raw | blame | history
docs/narr/renderers.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/security.rst 8 ●●●●● diff | view | raw | blame | history
docs/narr/sessions.rst 13 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/authorization.rst 16 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/__init__.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/__init__.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/authorization.rst 16 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/__init__.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/__init__.py 2 ●●●●● diff | view | raw | blame | history
pyramid/__init__.py 6 ●●●●● diff | view | raw | blame | history
pyramid/authentication.py 281 ●●●●● diff | view | raw | blame | history
pyramid/config/util.py 152 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 51 ●●●●● diff | view | raw | blame | history
pyramid/exceptions.py 18 ●●●●● diff | view | raw | blame | history
pyramid/renderers.py 12 ●●●●● diff | view | raw | blame | history
pyramid/request.py 2 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/copydir.py 2 ●●●●● diff | view | raw | blame | history
pyramid/security.py 14 ●●●●● diff | view | raw | blame | history
pyramid/tests/pkgs/conflictapp/__init__.py 3 ●●●●● diff | view | raw | blame | history
pyramid/tests/pkgs/defpermbugapp/__init__.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/pkgs/forbiddenapp/__init__.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/pkgs/forbiddenview/__init__.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/pkgs/permbugapp/__init__.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_authentication.py 160 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_init.py:TestConfigurator_add_directive diff | view | raw | blame | history
pyramid/tests/test_config/test_tweens.py 4 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_util.py 268 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_views.py 22 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_exceptions.py 12 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_renderers.py 12 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_request.py 6 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_security.py 28 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_util.py 257 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_view.py 15 ●●●●● diff | view | raw | blame | history
pyramid/tweens.py 5 ●●●●● diff | view | raw | blame | history
pyramid/util.py 165 ●●●●● diff | view | raw | blame | history
pyramid/view.py 11 ●●●●● diff | view | raw | blame | history