parent: 0d37d8 | patch | commitdiff
Chris McDonough
2013-08-20 70dbf740b5b3500edbcc4b2dff376f43e6250d79
refs
author Chris McDonough <chrism@plope.com>
Tuesday, August 20, 2013 16:15 +0200
committer Chris McDonough <chrism@plope.com>
Tuesday, August 20, 2013 16:15 +0200
commit70dbf740b5b3500edbcc4b2dff376f43e6250d79
tree 4bd5335585247a0cc8154149a6c6765fabf10075 tree | zip | gz
parent 0d37d81949bc82de1bd9c1193f282909f9576c3a view | diff
e64e71523d70261b551ba41f13f389ebf1324f1b view | diff 
Merge branch 'master' of github.com:Pylons/pyramid
93 files added
64 files modified
4082 ■■■■■ changed files
CHANGES.txt 48 ●●●●● diff | view | raw | blame | history
CONTRIBUTORS.txt 8 ●●●●● diff | view | raw | blame | history
HACKING.txt 42 ●●●●● diff | view | raw | blame | history
TODO.txt 3 ●●●●● diff | view | raw | blame | history
docs/_themes @ a181b8 2 ●●●●● diff | view | raw | blame | history
docs/authorintro.rst 2 ●●●●● diff | view | raw | blame | history
docs/conf.py 29 ●●●●● diff | view | raw | blame | history
docs/copyright.rst 2 ●●●●● diff | view | raw | blame | history
docs/designdefense.rst 5 ●●●●● diff | view | raw | blame | history
docs/glossary.rst 4 ●●●●● diff | view | raw | blame | history
docs/index.rst 102 ●●●●● diff | view | raw | blame | history
docs/latexindex.rst 16 ●●●●● diff | view | raw | blame | history
docs/narr/MyProject/myproject/templates/mytemplate.pt 4 ●●●●● diff | view | raw | blame | history
docs/narr/commandline.rst 6 ●●●●● diff | view | raw | blame | history
docs/narr/events.rst 6 ●●●●● diff | view | raw | blame | history
docs/narr/extconfig.rst 4 ●●●●● diff | view | raw | blame | history
docs/narr/hooks.rst 4 ●●●●● diff | view | raw | blame | history
docs/narr/install.rst 348 ●●●●● diff | view | raw | blame | history
docs/narr/project.rst 6 ●●●●● diff | view | raw | blame | history
docs/narr/sessions.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/templates.rst 4 ●●●●● diff | view | raw | blame | history
docs/narr/viewconfig.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/webob.rst 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour.rst 860 ●●●●● diff | view | raw | blame | history
docs/quick_tour/awesome/CHANGES.txt 4 ●●●●● diff | view | raw | blame | history
docs/quick_tour/awesome/MANIFEST.in 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour/awesome/README.txt 4 ●●●●● diff | view | raw | blame | history
docs/quick_tour/awesome/awesome/__init__.py 23 ●●●●● diff | view | raw | blame | history
docs/quick_tour/awesome/awesome/locale/awesome.pot 21 ●●●●● diff | view | raw | blame | history
docs/quick_tour/awesome/awesome/locale/de/LC_MESSAGES/awesome.mo diff | view | raw | blame | history
docs/quick_tour/awesome/awesome/locale/de/LC_MESSAGES/awesome.po 21 ●●●●● diff | view | raw | blame | history
docs/quick_tour/awesome/awesome/locale/fr/LC_MESSAGES/awesome.mo diff | view | raw | blame | history
docs/quick_tour/awesome/awesome/locale/fr/LC_MESSAGES/awesome.po 21 ●●●●● diff | view | raw | blame | history
docs/quick_tour/awesome/awesome/models.py 8 ●●●●● diff | view | raw | blame | history
docs/quick_tour/awesome/awesome/static/favicon.ico diff | view | raw | blame | history
docs/quick_tour/awesome/awesome/static/logo.png diff | view | raw | blame | history
docs/quick_tour/awesome/awesome/static/pylons.css 73 ●●●●● diff | view | raw | blame | history
docs/quick_tour/awesome/awesome/templates/mytemplate.jinja2 87 ●●●●● diff | view | raw | blame | history
docs/quick_tour/awesome/awesome/tests.py 21 ●●●●● diff | view | raw | blame | history
docs/quick_tour/awesome/awesome/views.py 6 ●●●●● diff | view | raw | blame | history
docs/quick_tour/awesome/development.ini 49 ●●●●● diff | view | raw | blame | history
docs/quick_tour/awesome/message-extraction.ini 3 ●●●●● diff | view | raw | blame | history
docs/quick_tour/awesome/setup.cfg 28 ●●●●● diff | view | raw | blame | history
docs/quick_tour/awesome/setup.py 36 ●●●●● diff | view | raw | blame | history
docs/quick_tour/hello_world/app.py 16 ●●●●● diff | view | raw | blame | history
docs/quick_tour/jinja2/app.py 11 ●●●●● diff | view | raw | blame | history
docs/quick_tour/jinja2/hello_world.jinja2 8 ●●●●● diff | view | raw | blame | history
docs/quick_tour/jinja2/views.py 8 ●●●●● diff | view | raw | blame | history
docs/quick_tour/json/app.py 15 ●●●●● diff | view | raw | blame | history
docs/quick_tour/json/hello_world.jinja2 10 ●●●●● diff | view | raw | blame | history
docs/quick_tour/json/hello_world.pt 17 ●●●●● diff | view | raw | blame | history
docs/quick_tour/json/views.py 13 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/CHANGES.txt 4 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/MANIFEST.in 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/README.txt 4 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/development.ini 54 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/hello_world/__init__.py 34 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/hello_world/init.py 34 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/hello_world/locale/de/LC_MESSAGES/hello_world.mo diff | view | raw | blame | history
docs/quick_tour/package/hello_world/locale/de/LC_MESSAGES/hello_world.po 21 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/hello_world/locale/fr/LC_MESSAGES/hello_world.mo diff | view | raw | blame | history
docs/quick_tour/package/hello_world/locale/fr/LC_MESSAGES/hello_world.po 21 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/hello_world/locale/hello_world.pot 21 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/hello_world/models.py 8 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/hello_world/static/favicon.ico diff | view | raw | blame | history
docs/quick_tour/package/hello_world/static/logo.png diff | view | raw | blame | history
docs/quick_tour/package/hello_world/static/pylons.css 73 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/hello_world/templates/mytemplate.jinja2 90 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/hello_world/tests.py 20 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/hello_world/views.py 22 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/message-extraction.ini 3 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/setup.cfg 28 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/setup.py 41 ●●●●● diff | view | raw | blame | history
docs/quick_tour/requests/app.py 24 ●●●●● diff | view | raw | blame | history
docs/quick_tour/routing/app.py 12 ●●●●● diff | view | raw | blame | history
docs/quick_tour/routing/views.py 10 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/CHANGES.txt 4 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/MANIFEST.in 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/README.txt 14 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/development.ini 71 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/production.ini 62 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/setup.cfg 27 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/setup.py 44 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo.sqlite diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/__init__.py 20 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/models.py 29 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/scripts/__init__.py 1 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/scripts/initializedb.py 37 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/static/favicon.ico diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/static/footerbg.png diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/static/headerbg.png diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/static/ie6.css 8 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/static/middlebg.png diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/static/pylons.css 372 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/static/pyramid-small.png diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/static/pyramid.png diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/static/transparent.gif diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/templates/mytemplate.pt 76 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/tests.py 33 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/views.py 37 ●●●●● diff | view | raw | blame | history
docs/quick_tour/static_assets/app.py 14 ●●●●● diff | view | raw | blame | history
docs/quick_tour/static_assets/hello_world.jinja2 10 ●●●●● diff | view | raw | blame | history
docs/quick_tour/static_assets/hello_world.pt 16 ●●●●● diff | view | raw | blame | history
docs/quick_tour/static_assets/static/app.css 4 ●●●●● diff | view | raw | blame | history
docs/quick_tour/static_assets/views.py 6 ●●●●● diff | view | raw | blame | history
docs/quick_tour/templating/app.py 10 ●●●●● diff | view | raw | blame | history
docs/quick_tour/templating/hello_world.pt 9 ●●●●● diff | view | raw | blame | history
docs/quick_tour/templating/views.py 8 ●●●●● diff | view | raw | blame | history
docs/quick_tour/view_classes/app.py 13 ●●●●● diff | view | raw | blame | history
docs/quick_tour/view_classes/delete.jinja2 9 ●●●●● diff | view | raw | blame | history
docs/quick_tour/view_classes/edit.jinja2 9 ●●●●● diff | view | raw | blame | history
docs/quick_tour/view_classes/hello.jinja2 17 ●●●●● diff | view | raw | blame | history
docs/quick_tour/view_classes/views.py 32 ●●●●● diff | view | raw | blame | history
docs/quick_tour/views/app.py 13 ●●●●● diff | view | raw | blame | history
docs/quick_tour/views/views.py 29 ●●●●● diff | view | raw | blame | history
docs/tutorials/bfg/index.rst 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/modwsgi/index.rst 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/installation.rst 6 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/templates/mytemplate.pt 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt 4 ●●●●● diff | view | raw | blame | history
docs/whatsnew-1.5.rst 9 ●●●●● diff | view | raw | blame | history
hacking-tox.ini 25 ●●●●● diff | view | raw | blame | history
pyramid/authentication.py 41 ●●●●● diff | view | raw | blame | history
pyramid/config/__init__.py 2 ●●●●● diff | view | raw | blame | history
pyramid/decorator.py 4 ●●●●● diff | view | raw | blame | history
pyramid/events.py 4 ●●●●● diff | view | raw | blame | history
pyramid/httpexceptions.py 1 ●●●●● diff | view | raw | blame | history
pyramid/i18n.py 17 ●●●●● diff | view | raw | blame | history
pyramid/interfaces.py 8 ●●●●● diff | view | raw | blame | history
pyramid/mako_templating.py 18 ●●●●● diff | view | raw | blame | history
pyramid/path.py 2 ●●●●● diff | view | raw | blame | history
pyramid/request.py 8 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl 4 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/copydir.py 8 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl 4 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt 4 ●●●●● diff | view | raw | blame | history
pyramid/scripts/pserve.py 11 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_authentication.py 45 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_init.py 11 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_i18n.py 64 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_integration.py 10 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_mako_templating.py 15 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scaffolds/fixture_scaffold/+package+/templates/mytemplate.pt_tmpl 4 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scaffolds/test_copydir.py 47 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripts/test_pdistreport.py 1 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_url.py 46 ●●●●● diff | view | raw | blame | history
pyramid/url.py 22 ●●●●● diff | view | raw | blame | history
pyramid/util.py 16 ●●●●● diff | view | raw | blame | history
setup.py 3 ●●●●● diff | view | raw | blame | history