Michael Merickel
2016-04-13 231a531fe62b82cd354dd64f5a1ffbab6df14a77
refs
author Michael Merickel <michael@merickel.org>
Wednesday, April 13, 2016 04:09 +0200
committer Michael Merickel <michael@merickel.org>
Wednesday, April 13, 2016 04:09 +0200
commit231a531fe62b82cd354dd64f5a1ffbab6df14a77
tree d7fd2961735f8a5293885d9623abb42c5fcd7f80 tree | zip | gz
parent 769da1215a0287f4161e58f36d8d4b7650154202 view | diff
b1527e793bc101327050370c17e1be698f7192ff view | diff
Merge branch 'master' into feature/require-csrf
17 files deleted
37 files added
159 files modified
4866 ■■■■■ changed files
.travis.yml 2 ●●●●● diff | view | raw | blame | history
CHANGES.txt 20 ●●●●● diff | view | raw | blame | history
docs/api/events.rst 2 ●●●●● diff | view | raw | blame | history
docs/api/interfaces.rst 3 ●●●●● diff | view | raw | blame | history
docs/conf.py 3 ●●●● diff | view | raw | blame | history
docs/conventions.rst 4 ●●●● diff | view | raw | blame | history
docs/glossary.rst 34 ●●●● diff | view | raw | blame | history
docs/narr/MyProject/README.txt 11 ●●●●● diff | view | raw | blame | history
docs/narr/MyProject/development.ini 4 ●●●● diff | view | raw | blame | history
docs/narr/MyProject/myproject/static/theme.min.css 1 ●●●● diff | view | raw | blame | history
docs/narr/MyProject/myproject/templates/mytemplate.pt 6 ●●●● diff | view | raw | blame | history
docs/narr/MyProject/myproject/tests.py 2 ●●● diff | view | raw | blame | history
docs/narr/MyProject/production.ini 4 ●●●● diff | view | raw | blame | history
docs/narr/MyProject/setup.py 21 ●●●●● diff | view | raw | blame | history
docs/narr/commandline.rst 116 ●●●●● diff | view | raw | blame | history
docs/narr/extending.rst 4 ●●●● diff | view | raw | blame | history
docs/narr/i18n.rst 37 ●●●● diff | view | raw | blame | history
docs/narr/install.rst 393 ●●●● diff | view | raw | blame | history
docs/narr/introduction.rst 15 ●●●● diff | view | raw | blame | history
docs/narr/project.rst 178 ●●●●● diff | view | raw | blame | history
docs/narr/router.rst 25 ●●●●● diff | view | raw | blame | history
docs/narr/testing.rst 47 ●●●●● diff | view | raw | blame | history
docs/narr/upgrading.rst 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour.rst 168 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/README.txt 2 ●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/static/theme.min.css 1 ●●●● diff | view | raw | blame | history
docs/quick_tutorial/authentication.rst 4 ●●● diff | view | raw | blame | history
docs/quick_tutorial/authorization.rst 4 ●●● diff | view | raw | blame | history
docs/quick_tutorial/conf.py 281 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/databases.rst 6 ●●●● diff | view | raw | blame | history
docs/quick_tutorial/debugtoolbar.rst 7 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/forms.rst 2 ●●● diff | view | raw | blame | history
docs/quick_tutorial/functional_testing.rst 4 ●●●● diff | view | raw | blame | history
docs/quick_tutorial/hello_world.rst 2 ●●● diff | view | raw | blame | history
docs/quick_tutorial/ini.rst 2 ●●● diff | view | raw | blame | history
docs/quick_tutorial/jinja2.rst 4 ●●●● diff | view | raw | blame | history
docs/quick_tutorial/json.rst 2 ●●● diff | view | raw | blame | history
docs/quick_tutorial/logging.rst 2 ●●● diff | view | raw | blame | history
docs/quick_tutorial/more_view_classes.rst 2 ●●● diff | view | raw | blame | history
docs/quick_tutorial/package.rst 38 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/request_response.rst 2 ●●● diff | view | raw | blame | history
docs/quick_tutorial/requirements.rst 137 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/routing.rst 2 ●●● diff | view | raw | blame | history
docs/quick_tutorial/scaffolds.rst 11 ●●●● diff | view | raw | blame | history
docs/quick_tutorial/sessions.rst 2 ●●● diff | view | raw | blame | history
docs/quick_tutorial/static_assets.rst 2 ●●● diff | view | raw | blame | history
docs/quick_tutorial/templating.rst 2 ●●● diff | view | raw | blame | history
docs/quick_tutorial/tutorial_approach.rst 2 ●●● diff | view | raw | blame | history
docs/quick_tutorial/unit_testing.rst 4 ●●●● diff | view | raw | blame | history
docs/quick_tutorial/view_classes.rst 2 ●●● diff | view | raw | blame | history
docs/quick_tutorial/views.rst 2 ●●● diff | view | raw | blame | history
docs/tutorials/modwsgi/index.rst 29 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/authorization.rst 40 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/background.rst 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/basiclayout.rst 33 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/definingmodels.rst 9 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/definingviews.rst 39 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/design.rst 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/distributing.rst 19 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/index.rst 1 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/installation.rst 321 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/CHANGES.txt 3 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/README.txt 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/development.ini 8 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/production.ini 6 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/setup.py 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/models.py 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/static/theme.min.css 1 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/tests.py 124 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/views.py 33 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/README.txt 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/development.ini 8 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/production.ini 6 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/setup.py 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/models.py 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/static/theme.min.css 1 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/tests.py 1 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/CHANGES.txt 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/MANIFEST.in 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/README.txt 12 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/development.ini 65 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/production.ini 60 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/setup.py 53 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/tutorial/__init__.py 18 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/tutorial/models.py 14 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/tutorial/static/pyramid-16x16.png diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/tutorial/static/pyramid.png diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/tutorial/static/theme.css 154 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/tutorial/templates/mytemplate.pt 67 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/tutorial/tests.py 17 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/tutorial/views.py 7 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/CHANGES.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/README.txt 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/development.ini 8 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/production.ini 6 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/setup.py 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/models.py 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/static/theme.min.css 1 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/tests.py 44 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/CHANGES.txt 3 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/README.txt 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/development.ini 8 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/production.ini 6 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/setup.py 22 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/__init__.py 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/models.py 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/static/theme.min.css 1 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/tests.py 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/views.py 33 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/CHANGES.txt 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/README.txt 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/development.ini 8 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/production.ini 6 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/setup.py 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/models.py 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/static/theme.min.css 1 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/tests.py 127 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/tests.rst 46 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/authorization.rst 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/background.rst 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/basiclayout.rst 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/definingmodels.rst 101 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/definingviews.rst 6 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/design.rst 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/distributing.rst 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/installation.rst 265 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authentication/README.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authentication/development.ini 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authentication/production.ini 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authentication/setup.py 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authentication/tutorial/static/theme.min.css 1 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authentication/tutorial/tests.py 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/README.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/development.ini 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/production.ini 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/setup.py 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/static/theme.min.css 1 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/tests.py 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/README.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/development.ini 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/production.ini 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/setup.py 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/static/theme.min.css 1 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/templates/layout.jinja2 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.jinja2 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/tests.py 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/CHANGES.txt 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/MANIFEST.in 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/README.txt 14 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/development.ini 71 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/production.ini 60 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/setup.py 55 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/__init__.py 12 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/models/__init__.py 73 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/models/meta.py 16 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/models/mymodel.py 18 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/routes.py 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/scripts/__init__.py 1 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/scripts/initializedb.py 45 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/static/pyramid-16x16.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/static/pyramid.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/static/theme.css 154 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/templates/404.jinja2 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/templates/layout.jinja2 66 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/templates/mytemplate.jinja2 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/tests.py 65 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/views/__init__.py diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/views/default.py 33 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/views/notfound.py 7 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/README.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/development.ini 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/production.ini 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/setup.py 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/static/theme.min.css 1 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/templates/layout.jinja2 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.jinja2 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/tests.py 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/README.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/development.ini 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/production.ini 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/setup.py 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/static/theme.min.css 1 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/tests/test_functional.py 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/README.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/development.ini 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/production.ini 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/setup.py 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/static/theme.min.css 1 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/tests.py 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/tests.rst 16 ●●●●● diff | view | raw | blame | history
pyramid/events.py 24 ●●●●● diff | view | raw | blame | history
pyramid/interfaces.py 8 ●●●●● diff | view | raw | blame | history
pyramid/router.py 15 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/static/theme.min.css 1 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/README.txt_tmpl 2 ●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/setup.py_tmpl 21 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/static/theme.min.css 1 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/tests.py_tmpl 12 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/README.txt_tmpl 11 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/setup.py_tmpl 21 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/static/theme.css 8 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/static/theme.min.css 1 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/README.txt_tmpl 11 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/setup.py_tmpl 21 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_events.py 35 ●●●● diff | view | raw | blame | history
pyramid/tests/test_router.py 4 ●●●● diff | view | raw | blame | history
setup.py 48 ●●●● diff | view | raw | blame | history
tox.ini 11 ●●●● diff | view | raw | blame | history