parent: 5fff45 | patch | commitdiff
Chris McDonough
2015-03-08 8ebde50fdc7322e82b96ad103ab168b92ca2b74a
refs
author Chris McDonough <chrism@plope.com>
Sunday, March 8, 2015 19:44 +0100
committer Chris McDonough <chrism@plope.com>
Sunday, March 8, 2015 19:44 +0100
commit8ebde50fdc7322e82b96ad103ab168b92ca2b74a
tree 3be6e2cae14d7fd3b9951111a9c98c6bb7bfb4de tree | zip | gz
parent 5fff455548067480c820da2f64bc0b9c16a916a0 view | diff
6c1a1c60123d150a41fef3062df9a64b995305c5 view | diff 
Merge branch 'master' of github.com:Pylons/pyramid
3 files deleted
1 files added
29 files modified
581 ■■■■■ changed files
.gitignore 4 ●●●●● diff | view | raw | blame | history
.travis.yml 4 ●●●●● diff | view | raw | blame | history
CHANGES.txt 29 ●●●●● diff | view | raw | blame | history
docs/narr/security.rst 60 ●●●●● diff | view | raw | blame | history
docs/narr/urldispatch.rst 58 ●●●●● diff | view | raw | blame | history
pyramid/compat.py 55 ●●●●● diff | view | raw | blame | history
pyramid/config/assets.py 26 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 3 ●●●●● diff | view | raw | blame | history
pyramid/i18n.py 8 ●●●●● diff | view | raw | blame | history
pyramid/interfaces.py 3 ●●●●● diff | view | raw | blame | history
pyramid/renderers.py 64 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/tests.py 4 ●●●●● diff | view | raw | blame | history
pyramid/scripts/pserve.py 13 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/pkgs/asset/models.py 8 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/pkgs/asset/views.py 22 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_adapters.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_assets.py 48 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_views.py 16 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_path.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_renderers.py 51 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_request.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripts/pystartup.py 1 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripts/pystartup.txt 3 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripts/test_pserve.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripts/test_pshell.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_traversal.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_urldispatch.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_util.py 4 ●●●●● diff | view | raw | blame | history
pyramid/traversal.py 2 ●●●●● diff | view | raw | blame | history
pyramid/urldispatch.py 2 ●●●●● diff | view | raw | blame | history
pyramid/util.py 2 ●●●●● diff | view | raw | blame | history
setup.cfg 3 ●●●●● diff | view | raw | blame | history
tox.ini 74 ●●●●● diff | view | raw | blame | history