parent: 50efc3 | patch | commitdiff
Chris McDonough
2018-07-02 0c8ca237d1bb1ff0f6e3776a3c868edb040fa791
refs
author Chris McDonough <chrism@plope.com>
Monday, July 2, 2018 19:52 +0200
committer Chris McDonough <chrism@plope.com>
Monday, July 2, 2018 19:52 +0200
commit0c8ca237d1bb1ff0f6e3776a3c868edb040fa791
tree 57498768d48ce74a753dec8f359b5646acf30655 tree | zip | gz
parent 50efc321cb14d76433216783c11b9eb99a7d44c8 view | diff
57a896f103c7378fb285f6594228578a5324d672 view | diff 
Merge branch 'master' of github.com:Pylons/pyramid
68 files modified
699 ■■■■■ changed files
.gitignore 2 ●●●●● diff | view | raw | blame | history
CHANGES.rst 46 ●●●●● diff | view | raw | blame | history
CONTRIBUTORS.txt 10 ●●●●● diff | view | raw | blame | history
HACKING.txt 2 ●●●●● diff | view | raw | blame | history
RELEASING.txt 10 ●●●●● diff | view | raw | blame | history
docs/Makefile 11 ●●●●● diff | view | raw | blame | history
docs/api/httpexceptions.rst 2 ●●●●● diff | view | raw | blame | history
docs/conf.py 76 ●●●●● diff | view | raw | blame | history
docs/make_book 2 ●●●●● diff | view | raw | blame | history
docs/make_pdf 2 ●●●●● diff | view | raw | blame | history
docs/narr/myproject/myproject/templates/layout.jinja2 2 ●●●●● diff | view | raw | blame | history
docs/narr/urldispatch.rst 18 ●●●●● diff | view | raw | blame | history
docs/quick_tour.rst 1 ●●●●● diff | view | raw | blame | history
docs/quick_tour/logging/hello_world/templates/layout.jinja2 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour/package/hello_world/templates/layout.jinja2 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sessions/hello_world/templates/layout.jinja2 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/templates/layout.jinja2 2 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/authentication.rst 4 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/authentication/setup.py 6 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/authorization/setup.py 6 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2 2 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/cookiecutters/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/databases/setup.py 12 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/forms.rst 2 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/forms/setup.py 6 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/json/setup.py 4 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/logging/setup.py 4 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/more_view_classes/setup.py 4 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/requirements.rst 32 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/retail_forms/setup.py 6 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/routing/setup.py 4 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/sessions/setup.py 4 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/static_assets/setup.py 4 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/templating/setup.py 2 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/tutorial_approach.rst 18 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/view_classes/setup.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/tutorial/templates/mytemplate.pt 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/templates/edit.pt 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/templates/login.pt 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/templates/view.pt 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/templates/edit.pt 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/templates/view.pt 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/index.rst 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authentication/tutorial/templates/layout.jinja2 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/templates/layout.jinja2 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/templates/layout.jinja2 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/templates/layout.jinja2 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/templates/layout.jinja2 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/templates/layout.jinja2 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/templates/layout.jinja2 2 ●●●●● diff | view | raw | blame | history
docs/typographical-conventions.rst 24 ●●●●● diff | view | raw | blame | history
pyramid/config/__init__.py 45 ●●●●● diff | view | raw | blame | history
pyramid/config/routes.py 58 ●●●●● diff | view | raw | blame | history
pyramid/httpexceptions.py 52 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/templates/layout.jinja2_tmpl 2 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/templates/layout.jinja2_tmpl 2 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl 2 ●●●●● diff | view | raw | blame | history
pyramid/session.py 31 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_httpexceptions.py 11 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_session.py 7 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_url.py 64 ●●●●● diff | view | raw | blame | history
setup.py 41 ●●●●● diff | view | raw | blame | history