RedHatTraining/pyramid.git

Steve Piercy

2018-10-05 086198b5db7dcb86c2b4edbc5d3610dcade0332a

refs
author	Steve Piercy <web@stevepiercy.com>
	Friday, October 5, 2018 11:33 +0200
committer	GitHub <noreply@github.com>
	Friday, October 5, 2018 11:33 +0200
commit	086198b5db7dcb86c2b4edbc5d3610dcade0332a
tree	1af84e37e9ad7bdb445786a0345822dcdfd851f0 tree \| zip \| gz
parent	2fa1e218ea6b9a6d5c3f8193ea27d0fc44b8964a view \| diff f6becd23966248fb7fc4db218258be4364902f8f view \| diff

Merge branch 'master' into one_cc

3 files added

50 files modified

	.github/ISSUE_TEMPLATE/bug_report.md	31 ●●●●● diff \| view \| raw \| blame \| history
	.github/ISSUE_TEMPLATE/documentation.md	29 ●●●●● diff \| view \| raw \| blame \| history
	.github/ISSUE_TEMPLATE/feature_request.md	24 ●●●●● diff \| view \| raw \| blame \| history
	CHANGES.rst	39 ●●●●● diff \| view \| raw \| blame \| history
	CONTRIBUTORS.txt	1 ●●●●● diff \| view \| raw \| blame \| history
	COPYRIGHT.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	HACKING.txt	88 ●●●●● diff \| view \| raw \| blame \| history
	MANIFEST.in	2 ●●●●● diff \| view \| raw \| blame \| history
	TODO.txt	7 ●●●●● diff \| view \| raw \| blame \| history
	contributing.md	32 ●●●●● diff \| view \| raw \| blame \| history
	docs/api/config.rst	1 ●●●●● diff \| view \| raw \| blame \| history
	docs/api/request.rst	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/api/session.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/conf.py	9 ●●●●● diff \| view \| raw \| blame \| history
	docs/glossary.rst	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/index.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/advconfig.rst	1 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/introduction.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/project.rst	24 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/sessions.rst	77 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/subrequest.rst	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/testing.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/databases.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/forms.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/functional_testing.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/jinja2.rst	2 ●●●●● 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/request_response.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/routing.rst	2 ●●●●● 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/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/wiki/installation.rst	30 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/tests.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/definingviews.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/installation.rst	30 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/tests.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/typographical-conventions.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/factories.py	20 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/interfaces.py	8 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/renderers.py	10 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/security.py	28 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/session.py	59 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_config/test_factories.py	60 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_renderers.py	14 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_security.py	7 ●●●●● diff \| view \| raw \| blame \| history
	setup.py	4 ●●●●● diff \| view \| raw \| blame \| history