parent: 3aeb79 | patch | commitdiff
Chris McDonough
2012-09-14 a9f5e705bb331098946eef774857511a02e4f498
refs
author Chris McDonough <chrism@plope.com>
Friday, September 14, 2012 00:12 +0200
committer Chris McDonough <chrism@plope.com>
Friday, September 14, 2012 00:12 +0200
commita9f5e705bb331098946eef774857511a02e4f498
tree 35eee0505157215b5286203d7424a2d8cce39af7 tree | zip | gz
parent 3aeb794d49655e7cd81b7d553f0da275b0cde3a9 view | diff
9ff3b26dcb8ab9e846356d64a18f1ec10440e02e view | diff 
Merge branch 'master' of github.com:Pylons/pyramid
4 files deleted
1 files added
45 files modified
2381 ■■■■■ changed files
CHANGES.txt 112 ●●●●● diff | view | raw | blame | history
TODO.txt 56 ●●●●● diff | view | raw | blame | history
docs/api.rst 2 ●●●●● diff | view | raw | blame | history
docs/api/chameleon_text.rst 31 ●●●●● diff | view | raw | blame | history
docs/api/chameleon_zpt.rst 28 ●●●●● diff | view | raw | blame | history
docs/api/config.rst 2 ●●●●● diff | view | raw | blame | history
docs/api/settings.rst 2 ●●●●● diff | view | raw | blame | history
docs/changes.rst 2 ●●●●● diff | view | raw | blame | history
docs/index.rst 1 ●●●●● diff | view | raw | blame | history
docs/latexindex.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/advconfig.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/templates.rst 30 ●●●●● diff | view | raw | blame | history
docs/narr/testing.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/upgrading.rst 232 ●●●●● diff | view | raw | blame | history
docs/tutorials/modwsgi/index.rst 22 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/views.py 10 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/views.py 10 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/views.py 10 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/views.py 16 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/views.py 16 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/views.py 16 ●●●●● diff | view | raw | blame | history
pyramid/chameleon_text.py 94 ●●●●● diff | view | raw | blame | history
pyramid/chameleon_zpt.py 91 ●●●●● diff | view | raw | blame | history
pyramid/config/factories.py 21 ●●●●● diff | view | raw | blame | history
pyramid/configuration.py 60 ●●●●● diff | view | raw | blame | history
pyramid/paster.py 10 ●●●●● diff | view | raw | blame | history
pyramid/request.py 9 ●●●●● diff | view | raw | blame | history
pyramid/router.py 16 ●●●●● diff | view | raw | blame | history
pyramid/scripting.py 7 ●●●●● diff | view | raw | blame | history
pyramid/settings.py 26 ●●●●● diff | view | raw | blame | history
pyramid/testing.py 376 ●●●●● diff | view | raw | blame | history
pyramid/tests/fixtures/withmacro.pt 3 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_chameleon_text.py 112 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_chameleon_zpt.py 125 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_factories.py 67 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_settings.py 9 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_configuration.py 31 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_path.py 6 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_renderers.py 14 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_request.py 12 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_router.py 36 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripting.py 81 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_settings.py 26 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_testing.py 289 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_traversal.py 172 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_util.py 14 ●●●●● diff | view | raw | blame | history
pyramid/traversal.py 28 ●●●●● diff | view | raw | blame | history
pyramid/util.py 7 ●●●●● diff | view | raw | blame | history
setup.py 2 ●●●●● diff | view | raw | blame | history
tox.ini 33 ●●●●● diff | view | raw | blame | history