parent: 53e00a | patch | commitdiff
Chris McDonough
2013-09-20 faf334d94e8c7450962b6b0d18fe57cefd43f04a
refs
author Chris McDonough <chrism@plope.com>
Friday, September 20, 2013 20:10 +0200
committer Chris McDonough <chrism@plope.com>
Friday, September 20, 2013 20:10 +0200
commitfaf334d94e8c7450962b6b0d18fe57cefd43f04a
tree bac12a41585561e84b914ede37bcd83a62764fb9 tree | zip | gz
parent 53e00ae36d969e8f8794549d66f9b1c6b92e0c60 view | diff
4d2fc0bbc58bc1948c73b2fcb3e0e1bdeee7a5d6 view | diff 
Merge branch 'master' into 1.5-branch
29 files deleted
1 files added
100 files modified
5367 ■■■■■ changed files
.travis.yml 2 ●●●●● diff | view | raw | blame | history
CHANGES.txt 123 ●●●●● diff | view | raw | blame | history
CONTRIBUTORS.txt 2 ●●●●● diff | view | raw | blame | history
HACKING.txt 8 ●●●●● diff | view | raw | blame | history
TODO.txt 21 ●●●●● diff | view | raw | blame | history
docs/api/config.rst 4 ●●●●● diff | view | raw | blame | history
docs/api/request.rst 24 ●●●●● diff | view | raw | blame | history
docs/api/view.rst 6 ●●●●● diff | view | raw | blame | history
docs/designdefense.rst 62 ●●●●● diff | view | raw | blame | history
docs/glossary.rst 7 ●●●●● diff | view | raw | blame | history
docs/index.rst 4 ●●●●● diff | view | raw | blame | history
docs/latexindex.rst 1 ●●●●● diff | view | raw | blame | history
docs/narr/MyProject/myproject/__init__.py 1 ●●●●● diff | view | raw | blame | history
docs/narr/MyProject/setup.py 1 ●●●●● diff | view | raw | blame | history
docs/narr/advconfig.rst 1 ●●●●● diff | view | raw | blame | history
docs/narr/assets.rst 20 ●●●●● diff | view | raw | blame | history
docs/narr/hooks.rst 76 ●●●●● diff | view | raw | blame | history
docs/narr/introspector.rst 12 ●●●●● diff | view | raw | blame | history
docs/narr/project.rst 17 ●●●●● diff | view | raw | blame | history
docs/narr/renderers.rst 274 ●●●●● diff | view | raw | blame | history
docs/narr/subrequest.rst 6 ●●●●● diff | view | raw | blame | history
docs/narr/templates.rst 436 ●●●●● diff | view | raw | blame | history
docs/narr/urldispatch.rst 7 ●●●●● diff | view | raw | blame | history
docs/quick_tour.rst 9 ●●●●● diff | view | raw | blame | history
docs/tutorials/bfg/index.rst 204 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/basiclayout.rst 9 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/definingviews.rst 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/setup.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/__init__.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/setup.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/setup.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/__init__.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/setup.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/__init__.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/setup.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/__init__.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/tests.rst 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/authorization.rst 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/basiclayout.rst 30 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/definingmodels.rst 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/definingviews.rst 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/setup.py 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/__init__.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/models.py 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/setup.py 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/models.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/setup.py 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/__init__.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/models.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/setup.py 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/__init__.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/models.py 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/setup.py 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/__init__.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/models.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/tests.rst 4 ●●●●● diff | view | raw | blame | history
docs/whatsnew-1.0.rst 6 ●●●●● diff | view | raw | blame | history
docs/whatsnew-1.1.rst 9 ●●●●● diff | view | raw | blame | history
pyramid/chameleon_text.py 37 ●●●●● diff | view | raw | blame | history
pyramid/chameleon_zpt.py 49 ●●●●● diff | view | raw | blame | history
pyramid/compat.py 2 ●●●●● diff | view | raw | blame | history
pyramid/config/__init__.py 45 ●●●●● diff | view | raw | blame | history
pyramid/config/adapters.py 10 ●●●●● diff | view | raw | blame | history
pyramid/config/factories.py 8 ●●●●● diff | view | raw | blame | history
pyramid/config/i18n.py 18 ●●●●● diff | view | raw | blame | history
pyramid/config/rendering.py 61 ●●●●● diff | view | raw | blame | history
pyramid/config/routes.py 173 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 39 ●●●●● diff | view | raw | blame | history
pyramid/events.py 11 ●●●●● diff | view | raw | blame | history
pyramid/fixers/__init__.py 1 ●●●●● diff | view | raw | blame | history
pyramid/fixers/fix_bfg_imports.py 220 ●●●●● diff | view | raw | blame | history
pyramid/interfaces.py 22 ●●●●● diff | view | raw | blame | history
pyramid/mako_templating.py 252 ●●●●● diff | view | raw | blame | history
pyramid/path.py 6 ●●●●● diff | view | raw | blame | history
pyramid/renderers.py 197 ●●●●● diff | view | raw | blame | history
pyramid/request.py 171 ●●●●● diff | view | raw | blame | history
pyramid/router.py 9 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/__init__.py 1 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/models.py 4 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/setup.py_tmpl 5 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/__init__.py 1 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/setup.py_tmpl 1 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/__init__.py 1 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/setup.py_tmpl 5 ●●●●● diff | view | raw | blame | history
pyramid/testing.py 22 ●●●●● diff | view | raw | blame | history
pyramid/tests/fixtures/components.mak 3 ●●●●● diff | view | raw | blame | history
pyramid/tests/fixtures/hello .world.mako 3 ●●●●● diff | view | raw | blame | history
pyramid/tests/fixtures/hello_inherit_pkg.mak 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/fixtures/hellocompo.mak 3 ●●●●● diff | view | raw | blame | history
pyramid/tests/fixtures/helloinherit.mak 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/fixtures/helloworld.mak 3 ●●●●● diff | view | raw | blame | history
pyramid/tests/fixtures/helloworld.mako 3 ●●●●● diff | view | raw | blame | history
pyramid/tests/fixtures/layout.mak 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/fixtures/minimal.pt 3 ●●●●● diff | view | raw | blame | history
pyramid/tests/fixtures/nonminimal.mak 1 ●●●●● diff | view | raw | blame | history
pyramid/tests/fixtures/pp.pt 3 ●●●●● diff | view | raw | blame | history
pyramid/tests/fixtures/withmacro.pt 7 ●●●●● diff | view | raw | blame | history
pyramid/tests/pkgs/fixtureapp/subpackage/templates/bar.pt 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/pkgs/fixtureapp/templates/fixture.pt 6 ●●●●● diff | view | raw | blame | history
pyramid/tests/pkgs/rendererscanapp/__init__.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/pkgs/rendererscanapp/one.pt 4 ●●●●● diff | view | raw | blame | history
pyramid/tests/pkgs/rendererscanapp/two/__init__.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/pkgs/rendererscanapp/two/two.pt 4 ●●●●● diff | view | raw | blame | history
pyramid/tests/pkgs/viewdecoratorapp/views/templates/foo.pt 3 ●●●●● diff | view | raw | blame | history
pyramid/tests/pkgs/viewdecoratorapp/views/views.py 4 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_chameleon_text.py 145 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_chameleon_zpt.py 175 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/files/minimal.pt 3 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/files/minimal.txt 1 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/pkgs/asset/subpackage/templates/bar.pt 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/pkgs/asset/templates/fixture.pt 6 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_factories.py 105 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_i18n.py 18 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_init.py 293 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_rendering.py 31 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_routes.py 6 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_util.py 14 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_views.py 195 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_integration.py 14 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_mako_templating.py 655 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_path.py 16 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_renderers.py 491 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_request.py 157 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_traversal.py 15 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_view.py 63 ●●●●● diff | view | raw | blame | history
pyramid/traversal.py 7 ●●●●● diff | view | raw | blame | history
pyramid/view.py 49 ●●●●● diff | view | raw | blame | history
setup.py 3 ●●●●● diff | view | raw | blame | history