parent: ffca4e | patch | commitdiff
Carlos de la Guardia
2011-06-06 a5713863a80a493a1485057609578b907d04c770
refs
author Carlos de la Guardia <cguardia@yahoo.com>
Monday, June 6, 2011 19:03 +0200
committer Carlos de la Guardia <cguardia@yahoo.com>
Monday, June 6, 2011 19:03 +0200
commita5713863a80a493a1485057609578b907d04c770
tree e2230d20775d9fa80ea8dafa06910b65cb6859d5 tree | zip | gz
parent ffca4ef5eba01234433bc4d6029dee719ab261d0 view | diff
703e3677dc42518cb80626650aaf62e7db17812a view | diff 
Merge branch 'master' of github.com:Pylons/pyramid
1 files added
29 files modified
569 ■■■■■ changed files
CHANGES.txt 13 ●●●●● diff | view | raw | blame | history
CONTRIBUTORS.txt 2 ●●●●● diff | view | raw | blame | history
docs/api/authentication.rst 2 ●●●●● diff | view | raw | blame | history
docs/designdefense.rst 61 ●●●●● diff | view | raw | blame | history
docs/glossary.rst 18 ●●●●● diff | view | raw | blame | history
docs/narr/hybrid.rst 46 ●●●●● diff | view | raw | blame | history
docs/narr/project.rst 14 ●●●●● diff | view | raw | blame | history
docs/narr/renderers.rst 29 ●●●●● diff | view | raw | blame | history
docs/narr/resources.rst 16 ●●●●● diff | view | raw | blame | history
docs/narr/traversal.rst 30 ●●●●● diff | view | raw | blame | history
docs/narr/viewconfig.rst 24 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/authorization.rst 24 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/__init__.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/__init__.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/tests.py 10 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/__init__.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/tests.rst 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/authorization.rst 81 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/installation.rst 2 ●●●●● diff | view | raw | blame | history
docs/whatsnew-1.1.rst 13 ●●●●● diff | view | raw | blame | history
pyramid/authentication.py 44 ●●●●● diff | view | raw | blame | history
pyramid/mako_templating.py 2 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/__init__.py_tmpl 4 ●●●●● diff | view | raw | blame | history
pyramid/settings.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/fixtures/nonminimal.mak 1 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_authentication.py 98 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_mako_templating.py 5 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_urldispatch.py 4 ●●●●● diff | view | raw | blame | history
pyramid/urldispatch.py 6 ●●●●● diff | view | raw | blame | history