parent: 141f90 | patch | commitdiff
Chris McDonough
2011-08-24 82a155592a31c71081a3d9eb63e4ed1230de67d4
refs
author Chris McDonough <chrism@plope.com>
Wednesday, August 24, 2011 05:54 +0200
committer Chris McDonough <chrism@plope.com>
Wednesday, August 24, 2011 05:54 +0200
commit82a155592a31c71081a3d9eb63e4ed1230de67d4
tree fd18695a784380ca7f53dd57753d77de4dcb377b tree | zip | gz
parent 141f90581ce667ff12db8ef9ccd8a6e59d07ef73 view | diff
a8a9435e00a528cb13677e5b38415601a0cc3f8b view | diff 
Merge branch 'feature.configphases'
1 files deleted
3 files added
15 files modified
679 ■■■■■ changed files
CHANGES.txt 27 ●●●●● diff | view | raw | blame | history
docs/whatsnew-1.2.rst 40 ●●●●● diff | view | raw | blame | history
pyramid/config/__init__.py 19 ●●●●● diff | view | raw | blame | history
pyramid/config/adapters.py 5 ●●●●● diff | view | raw | blame | history
pyramid/config/assets.py 1 ●●●●● diff | view | raw | blame | history
pyramid/config/factories.py 7 ●●●●● diff | view | raw | blame | history
pyramid/config/rendering.py 14 ●●●●● diff | view | raw | blame | history
pyramid/config/routes.py 70 ●●●●● diff | view | raw | blame | history
pyramid/config/security.py 40 ●●●●● diff | view | raw | blame | history
pyramid/config/tweens.py 14 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 54 ●●●●● diff | view | raw | blame | history
pyramid/interfaces.py 10 ●●●●● diff | view | raw | blame | history
pyramid/tests/ccbugapp/__init__.py 16 ●●●●● diff | view | raw | blame | history
pyramid/tests/ccbugapp/views.py 10 ●●●●● diff | view | raw | blame | history
pyramid/tests/conflictapp/__init__.py 23 ●●●●● diff | view | raw | blame | history
pyramid/tests/conflictapp/included.py 8 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_init.py 172 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_security.py 84 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_integration.py 65 ●●●●● diff | view | raw | blame | history