parent: bfb71c | patch | commitdiff
Chris McDonough
2011-09-24 4937d9e5280fff849b346dcf6c1833ef6fe95119
refs
author Chris McDonough <chrism@plope.com>
Saturday, September 24, 2011 09:56 +0200
committer Chris McDonough <chrism@plope.com>
Saturday, September 24, 2011 09:56 +0200
commit4937d9e5280fff849b346dcf6c1833ef6fe95119
tree 69fe13b7853a3da419b03a7987e92e43753b65b5 tree | zip | gz
parent bfb71c175bb5de7a0c22599979d269d92f12ed27 view | diff
9a784a4c94946872c493627e4295a26a3e608439 view | diff 
Merge branch 'master' of github.com:Pylons/pyramid
34 files modified
646 ■■■■■ changed files
docs/conf.py 9 ●●●●● diff | view | raw | blame | history
docs/designdefense.rst 4 ●●●●● diff | view | raw | blame | history
docs/index.rst 9 ●●●●● diff | view | raw | blame | history
docs/narr/assets.rst 8 ●●●●● diff | view | raw | blame | history
docs/narr/hooks.rst 16 ●●●●● diff | view | raw | blame | history
docs/narr/i18n.rst 8 ●●●●● diff | view | raw | blame | history
docs/narr/install.rst 4 ●●●●● diff | view | raw | blame | history
docs/narr/logging.rst 4 ●●●●● diff | view | raw | blame | history
docs/narr/muchadoabouttraversal.rst 4 ●●●●● diff | view | raw | blame | history
docs/narr/project.rst 4 ●●●●● diff | view | raw | blame | history
docs/narr/resources.rst 4 ●●●●● diff | view | raw | blame | history
docs/narr/templates.rst 4 ●●●●● diff | view | raw | blame | history
docs/narr/urldispatch.rst 12 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/definingviews.rst 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/definingviews.rst 4 ●●●●● diff | view | raw | blame | history
pyramid/chameleon_text.py 16 ●●●●● diff | view | raw | blame | history
pyramid/chameleon_zpt.py 16 ●●●●● diff | view | raw | blame | history
pyramid/config/__init__.py 19 ●●●●● diff | view | raw | blame | history
pyramid/config/factories.py 20 ●●●●● diff | view | raw | blame | history
pyramid/config/i18n.py 8 ●●●●● diff | view | raw | blame | history
pyramid/config/rendering.py 10 ●●●●● diff | view | raw | blame | history
pyramid/config/routes.py 20 ●●●●● diff | view | raw | blame | history
pyramid/config/security.py 28 ●●●●● diff | view | raw | blame | history
pyramid/config/util.py 2 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 48 ●●●●● diff | view | raw | blame | history
pyramid/events.py 29 ●●●●● diff | view | raw | blame | history
pyramid/interfaces.py 34 ●●●●● diff | view | raw | blame | history
pyramid/paster.py 34 ●●●●● diff | view | raw | blame | history
pyramid/request.py 4 ●●●●● diff | view | raw | blame | history
pyramid/security.py 8 ●●●●● diff | view | raw | blame | history
pyramid/static.py 18 ●●●●● diff | view | raw | blame | history
pyramid/traversal.py 104 ●●●●● diff | view | raw | blame | history
pyramid/url.py 120 ●●●●● diff | view | raw | blame | history
pyramid/view.py 6 ●●●●● diff | view | raw | blame | history