parent: 5c4318 | patch | commitdiff
Chris McDonough
2014-01-22 dec681201ec50c261bde022ea09d24f09e3588bd
refs
author Chris McDonough <chrism@plope.com>
Wednesday, January 22, 2014 05:22 +0100
committer Chris McDonough <chrism@plope.com>
Wednesday, January 22, 2014 05:22 +0100
commitdec681201ec50c261bde022ea09d24f09e3588bd
tree b3717a84ca3c3001072ef2e4ab759a4574a7324f tree | zip | gz
parent 5c4318abe647b65869ac6dbb5b57cf1088712061 view | diff
df6065fb1c3724649ac6e75cfcabc273ef6fd0d9 view | diff 
Merge branch 'master' of github.com:Pylons/pyramid
30 files deleted
13 files added
25 files modified
2958 ■■■■■ changed files
CHANGES.txt 115 ●●●●● diff | view | raw | blame | history
docs/narr/MyProject/development.ini 22 ●●●●● diff | view | raw | blame | history
docs/narr/MyProject/myproject/static/favicon.ico diff | view | raw | blame | history
docs/narr/MyProject/myproject/static/footerbg.png diff | view | raw | blame | history
docs/narr/MyProject/myproject/static/headerbg.png diff | view | raw | blame | history
docs/narr/MyProject/myproject/static/ie6.css 8 ●●●●● diff | view | raw | blame | history
docs/narr/MyProject/myproject/static/middlebg.png diff | view | raw | blame | history
docs/narr/MyProject/myproject/static/pylons.css 372 ●●●●● diff | view | raw | blame | history
docs/narr/MyProject/myproject/static/pyramid-16x16.png diff | view | raw | blame | history
docs/narr/MyProject/myproject/static/pyramid-small.png diff | view | raw | blame | history
docs/narr/MyProject/myproject/static/pyramid.png diff | view | raw | blame | history
docs/narr/MyProject/myproject/static/theme.css 152 ●●●●● diff | view | raw | blame | history
docs/narr/MyProject/myproject/static/theme.min.css 1 ●●●●● diff | view | raw | blame | history
docs/narr/MyProject/myproject/static/transparent.gif diff | view | raw | blame | history
docs/narr/MyProject/myproject/templates/mytemplate.pt 132 ●●●●● diff | view | raw | blame | history
docs/narr/MyProject/production.ini 16 ●●●●● diff | view | raw | blame | history
docs/narr/MyProject/setup.py 1 ●●●●● diff | view | raw | blame | history
docs/narr/commandline.rst 12 ●●●●● diff | view | raw | blame | history
docs/narr/i18n.rst 6 ●●●●● diff | view | raw | blame | history
docs/narr/project-debug.png diff | view | raw | blame | history
docs/narr/project.png diff | view | raw | blame | history
docs/narr/project.rst 35 ●●●●● diff | view | raw | blame | history
docs/narr/templates.rst 24 ●●●●● diff | view | raw | blame | history
docs/narr/viewconfig.rst 16 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/views.py 5 ●●●●● diff | view | raw | blame | history
pyramid/i18n.py 33 ●●●●● diff | view | raw | blame | history
pyramid/renderers.py 2 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/static/favicon.ico diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/static/footerbg.png diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/static/headerbg.png diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/static/ie6.css 8 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/static/middlebg.png diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/static/pylons.css 372 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/static/pyramid-16x16.png diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/static/pyramid.png diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/static/theme.css 152 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/static/theme.min.css 1 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/static/transparent.gif diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl 129 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/static/favicon.ico diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/static/footerbg.png diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/static/headerbg.png diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/static/ie6.css 8 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/static/middlebg.png diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/static/pylons.css 372 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/static/pyramid-16x16.png diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/static/pyramid.png diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/static/theme.css 152 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/static/theme.min.css 1 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/static/transparent.gif diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl 129 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/static/favicon.ico diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/static/footerbg.png diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/static/headerbg.png diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/static/ie6.css 8 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/static/middlebg.png diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/static/pylons.css 372 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/static/pyramid-16x16.png diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/static/pyramid.png diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/static/theme.css 152 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/static/theme.min.css 1 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/static/transparent.gif diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt 73 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl 66 ●●●●● diff | view | raw | blame | history
pyramid/session.py 4 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_renderers.py 2 ●●●●● diff | view | raw | blame | history
pyramid/url.py 2 ●●●●● diff | view | raw | blame | history
setup.py 2 ●●●●● diff | view | raw | blame | history