parent: c0070c | patch | commitdiff
Chris McDonough
2015-03-11 b58909676c28080c320fdb4861b7a49f5728a3aa
refs
author Chris McDonough <chrism@plope.com>
Wednesday, March 11, 2015 17:41 +0100
committer Chris McDonough <chrism@plope.com>
Wednesday, March 11, 2015 17:41 +0100
commitb58909676c28080c320fdb4861b7a49f5728a3aa
tree 87d4da217a1609f2229fcda73acdde34e8532944 tree | zip | gz
parent c0070c95eeb39186c7c2ea0dea6b972c5782f185 view | diff
8ebde50fdc7322e82b96ad103ab168b92ca2b74a view | diff 
fix merge conflicts after merging master to fix.view-lookup branch; do the merge to see diffs more clearly
3 files deleted
2 files added
58 files modified
1832 ■■■■■ changed files
.gitignore 4 ●●●●● diff | view | raw | blame | history
.travis.yml 4 ●●●●● diff | view | raw | blame | history
CHANGES.txt 74 ●●●●● diff | view | raw | blame | history
CONTRIBUTORS.txt 6 ●●●●● diff | view | raw | blame | history
HACKING.txt 2 ●●●●● diff | view | raw | blame | history
docs/api/config.rst 5 ●●●●● diff | view | raw | blame | history
docs/api/interfaces.rst 3 ●●●●● diff | view | raw | blame | history
docs/api/request.rst 1 ●●●●● diff | view | raw | blame | history
docs/api/static.rst 6 ●●●●● diff | view | raw | blame | history
docs/glossary.rst 3 ●●●●● diff | view | raw | blame | history
docs/narr/assets.rst 15 ●●●●● diff | view | raw | blame | history
docs/narr/extconfig.rst 104 ●●●●● diff | view | raw | blame | history
docs/narr/hooks.rst 9 ●●●●● 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 113 ●●●●● diff | view | raw | blame | history
pyramid/config/__init__.py 102 ●●●●● diff | view | raw | blame | history
pyramid/config/adapters.py 2 ●●●●● diff | view | raw | blame | history
pyramid/config/assets.py 26 ●●●●● diff | view | raw | blame | history
pyramid/config/factories.py 22 ●●●●● diff | view | raw | blame | history
pyramid/config/routes.py 25 ●●●●● diff | view | raw | blame | history
pyramid/config/util.py 3 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 39 ●●●●● diff | view | raw | blame | history
pyramid/i18n.py 8 ●●●●● diff | view | raw | blame | history
pyramid/interfaces.py 33 ●●●●● diff | view | raw | blame | history
pyramid/path.py 10 ●●●●● diff | view | raw | blame | history
pyramid/renderers.py 88 ●●●●● diff | view | raw | blame | history
pyramid/request.py 26 ●●●●● diff | view | raw | blame | history
pyramid/router.py 5 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/tests.py 4 ●●●●● diff | view | raw | blame | history
pyramid/scripting.py 8 ●●●●● diff | view | raw | blame | history
pyramid/scripts/pcreate.py 12 ●●●●● diff | view | raw | blame | history
pyramid/scripts/pserve.py 21 ●●●●● diff | view | raw | blame | history
pyramid/session.py 4 ●●●●● diff | view | raw | blame | history
pyramid/static.py 73 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_compat.py 26 ●●●●● 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_factories.py 19 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_init.py 67 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_util.py 7 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_views.py 42 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_path.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_renderers.py 57 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_request.py 47 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_router.py 16 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripting.py 16 ●●●●● 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_pcreate.py 11 ●●●●● 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_static.py 16 ●●●●● 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 254 ●●●●● 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 102 ●●●●● diff | view | raw | blame | history
setup.cfg 3 ●●●●● diff | view | raw | blame | history
tox.ini 73 ●●●●● diff | view | raw | blame | history