parent: 8e615c | patch | commitdiff
Chris McDonough
2011-12-16 63f7a19b58738b8fe5fbe82f362825fa53ddc0d2
refs
author Chris McDonough <chrism@plope.com>
Friday, December 16, 2011 03:36 +0100
committer Chris McDonough <chrism@plope.com>
Friday, December 16, 2011 03:36 +0100
commit63f7a19b58738b8fe5fbe82f362825fa53ddc0d2
tree ae76a8285e901994ba62802b639802d2de2e0b0e tree | zip | gz
parent 8e615c4f433c4df9b694c6452f793ed4763434ff view | diff
61838b76639d6dcf9facd549841a2ed0d07ea012 view | diff 
Merge branch '1.3-branch'
4 files added
25 files modified
1203 ■■■■■ changed files
CHANGES.txt 42 ●●●●● diff | view | raw | blame | history
TODO.txt 1 ●●●●● diff | view | raw | blame | history
docs/api.rst 1 ●●●●● diff | view | raw | blame | history
docs/api/scaffolds.rst 13 ●●●●● diff | view | raw | blame | history
docs/conf.py 7 ●●●●● diff | view | raw | blame | history
docs/index.rst 6 ●●●●● diff | view | raw | blame | history
docs/narr/commandline.rst 296 ●●●●● diff | view | raw | blame | history
docs/narr/hooks.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/scaffolding.rst 171 ●●●●● diff | view | raw | blame | history
docs/whatsnew-1.3.rst 26 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/__init__.py 15 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/copydir.py 2 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/template.py 35 ●●●●● diff | view | raw | blame | history
pyramid/scripts/pcreate.py 24 ●●●●● diff | view | raw | blame | history
pyramid/scripts/prequest.py 150 ●●●●● diff | view | raw | blame | history
pyramid/scripts/proutes.py 31 ●●●●● diff | view | raw | blame | history
pyramid/scripts/pserve.py 19 ●●●●● diff | view | raw | blame | history
pyramid/scripts/pshell.py 40 ●●●●● diff | view | raw | blame | history
pyramid/scripts/ptweens.py 40 ●●●●● diff | view | raw | blame | history
pyramid/scripts/pviews.py 34 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scaffolds/test_template.py 30 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripts/test_pcreate.py 18 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripts/test_prequest.py 141 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripts/test_proutes.py 16 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripts/test_pserve.py 4 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripts/test_pshell.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripts/test_ptweens.py 8 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripts/test_pviews.py 26 ●●●●● diff | view | raw | blame | history
setup.py 3 ●●●●● diff | view | raw | blame | history