parent: 8f4fcc | patch | commitdiff
Chris McDonough
2012-11-21 c6a575052ae14e515c288e77a452440030c1cdcd
refs
author Chris McDonough <chrism@plope.com>
Wednesday, November 21, 2012 04:47 +0100
committer Chris McDonough <chrism@plope.com>
Wednesday, November 21, 2012 04:47 +0100
commitc6a575052ae14e515c288e77a452440030c1cdcd
tree 7bf6dc6f2b929e5a206aae6d751b0cda5d96aefd tree | zip | gz
parent 8f4fcc47c9405f20cfed3a40931f12534b3b7193 view | diff
b5e4443dd28f3d4ed6e767e06d658838575d159e view | diff 
Merge branch 'master' into sontek-fix_commands
56 files modified
821 ■■■■■ changed files
CHANGES.txt 66 ●●●●● diff | view | raw | blame | history
CONTRIBUTORS.txt 2 ●●●●● diff | view | raw | blame | history
docs/conf.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/basiclayout.rst 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/development.ini 28 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/production.ini 17 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/setup.py 7 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt 6 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/development.ini 30 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/production.ini 17 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/development.ini 28 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/production.ini 17 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt 6 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/development.ini 28 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/production.ini 17 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/setup.py 7 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt 6 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/development.ini 30 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/production.ini 17 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/setup.py 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt 6 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/basiclayout.rst 6 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/README.txt 13 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/development.ini 20 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/setup.py 9 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/README.txt 13 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/development.ini 20 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/production.ini 12 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/setup.py 6 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/views.py 25 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/README.txt 13 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/development.ini 20 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/setup.py 6 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/views.py 25 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/README.txt 13 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/development.ini 20 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/setup.py 7 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/views.py 13 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/README.txt 13 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/development.ini 20 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/setup.py 6 ●●●●● diff | view | raw | blame | history
docs/whatsnew-1.4.rst 41 ●●●●● diff | view | raw | blame | history
pyramid/config/util.py 8 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 78 ●●●●● diff | view | raw | blame | history
pyramid/request.py 2 ●●●●● diff | view | raw | blame | history
pyramid/router.py 2 ●●●●● diff | view | raw | blame | history
pyramid/scripts/pviews.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_views.py 23 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_request.py 7 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_router.py 17 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripts/test_pviews.py 2 ●●●●● diff | view | raw | blame | history
setup.py 2 ●●●●● diff | view | raw | blame | history