parent: ff0da7 | patch | commitdiff
Michael Merickel
2016-12-10 1fde5f47b8b6208a25e951c6d3887cc73cc3696e
refs
author Michael Merickel <michael@merickel.org>
Saturday, December 10, 2016 07:01 +0100
committer Michael Merickel <michael@merickel.org>
Saturday, December 10, 2016 07:01 +0100
commit1fde5f47b8b6208a25e951c6d3887cc73cc3696e
tree 1975f4d89d0422aaabd09b9bf94ac0da93534f8d tree | zip | gz
parent ff0da73a8922b5e82c676715078c7b9e60a6a1da view | diff
2d45def603f038a8533eb9790640982012c0be30 view | diff 
Merge branch 'master' into pserve-watch-files
1 files deleted
6 files added
39 files modified
1 files renamed
2711 ■■■■■ changed files
CHANGES.txt 12 ●●●●● diff | view | raw | blame | history
CONTRIBUTORS.txt 2 ●●●●● diff | view | raw | blame | history
HACKING.txt 4 ●●●●● diff | view | raw | blame | history
RELEASING.txt 4 ●●●●● diff | view | raw | blame | history
docs/api/i18n.rst 1 ●●●●● diff | view | raw | blame | history
docs/conf.py 13 ●●●●● diff | view | raw | blame | history
docs/conventions.rst 107 ●●●●● diff | view | raw | blame | history
docs/index.rst 7 ●●●●● diff | view | raw | blame | history
docs/latexindex.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/install.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/introduction.rst 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour.rst 4 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/requirements.rst 6 ●●●●● diff | view | raw | blame | history
docs/style-guide.rst 1258 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/authorization.rst 41 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/definingviews.rst 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/installation.rst 6 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/setup.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/security.py 17 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/views.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/setup.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/security.py 17 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/tests.py 11 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/views.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/installation.rst 6 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/scripts/initializedb.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/tests/test_functional.py 12 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/tests/test_initdb.py 20 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/tests/test_security.py 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/tests/test_user_model.py 67 ●●●●● diff | view | raw | blame | history
docs/typographical-conventions.rst 338 ●●●●● diff | view | raw | blame | history
docs/whatsnew-1.7.rst 2 ●●●●● diff | view | raw | blame | history
pyramid/asset.py 2 ●●●●● diff | view | raw | blame | history
pyramid/config/predicates.py 303 ●●●●● diff | view | raw | blame | history
pyramid/config/routes.py 10 ●●●●● diff | view | raw | blame | history
pyramid/config/security.py 2 ●●●●● diff | view | raw | blame | history
pyramid/config/tweens.py 2 ●●●●● diff | view | raw | blame | history
pyramid/config/util.py 15 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 6 ●●●●● diff | view | raw | blame | history
pyramid/httpexceptions.py 2 ●●●●● diff | view | raw | blame | history
pyramid/predicates.py 300 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_util.py 11 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_views.py 4 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_httpexceptions.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_predicates.py 22 ●●●●● diff | view | raw | blame | history
pyramid/util.py 15 ●●●●● diff | view | raw | blame | history
setup.py 21 ●●●●● diff | view | raw | blame | history