parent: 51b2e8 | patch | commitdiff
Chris McDonough
2011-01-06 be72c66a284aa2584f7a960cdf198cb0ec664477
refs
author Chris McDonough <chrism@plope.com>
Thursday, January 6, 2011 06:52 +0100
committer Chris McDonough <chrism@plope.com>
Thursday, January 6, 2011 06:52 +0100
commitbe72c66a284aa2584f7a960cdf198cb0ec664477
tree b4b90e2ea8b67d8dae9ce18b21bb15f44b86763f tree | zip | gz
parent 51b2e8cf88a6451e974103c0c2cb7bba29e58b7f view | diff
be3d6f9b1bc55a5c20b04d36a0724f1ec092d169 view | diff 
Merge branch 'master' of github.com:Pylons/pyramid
27 files deleted
8 files copied
90 files added
44 files modified
1 files renamed
3430 ■■■■■ changed files
docs/tutorials/wiki/authorization.rst 6 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/basiclayout.rst 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/definingmodels.rst 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/definingviews.rst 20 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/distributing.rst 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/installation.rst 74 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/static/footerbg.png diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/static/headerbg.png diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/static/ie6.css 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/static/logo.png diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/static/middlebg.png diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/static/pylons.css 47 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/static/pyramid.png diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/static/style.css 109 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/static/transparent.gif diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt 77 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt 73 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt 109 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt 80 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/static/footerbg.png diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/static/headerbg.png diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/static/ie6.css 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/static/logo.png diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/static/middlebg.png diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/static/pylons.css 47 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/static/pyramid.png diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/static/transparent.gif diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt 31 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/static/footerbg.png diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/static/headerbg.png diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/static/ie6.css 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/static/logo.png diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/static/middlebg.png diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/static/pylons.css 47 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/static/pyramid.png diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/static/transparent.gif diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt 109 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/static/footerbg.png diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/static/headerbg.png diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/static/ie6.css 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/static/logo.png diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/static/middlebg.png diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/static/pylons.css 47 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/static/pyramid.png diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/static/style.css 109 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/static/transparent.gif diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/templates/edit.pt 71 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt 109 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/templates/view.pt 74 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/authorization.rst 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/definingviews.rst 28 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/distributing.rst 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/installation.rst 32 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/static/footerbg.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/static/headerbg.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/static/ie6.css 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/static/logo.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/static/middlebg.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/static/pylons.css 47 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/static/pyramid.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/static/style.css 109 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/static/transparent.gif diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/templates/edit.pt 78 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/templates/login.pt 73 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt 31 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/templates/view.pt 78 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/static/footerbg.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/static/headerbg.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/static/ie6.css 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/static/logo.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/static/middlebg.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/static/pylons.css 47 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/static/pyramid.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/static/transparent.gif diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt 31 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/static/footerbg.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/static/headerbg.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/static/ie6.css 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/static/logo.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/static/middlebg.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/static/pylons.css 47 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/static/pyramid.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/static/transparent.gif diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt 31 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/static/footerbg.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/static/headerbg.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/static/ie6.css 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/static/logo.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/static/middlebg.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/static/pylons.css 47 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/static/pyramid.png diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/static/style.css 109 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/static/transparent.gif diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt 71 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt 31 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/templates/view.pt 71 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/alchemy/+package+/static/footerbg.png diff | view | raw | blame | history
pyramid/paster_templates/alchemy/+package+/static/headerbg.png diff | view | raw | blame | history
pyramid/paster_templates/alchemy/+package+/static/ie6.css 8 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/alchemy/+package+/static/logo.png diff | view | raw | blame | history
pyramid/paster_templates/alchemy/+package+/static/middlebg.png diff | view | raw | blame | history
pyramid/paster_templates/alchemy/+package+/static/pylons.css 47 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/alchemy/+package+/static/pyramid.png diff | view | raw | blame | history
pyramid/paster_templates/alchemy/+package+/static/transparent.gif diff | view | raw | blame | history
pyramid/paster_templates/alchemy/+package+/templates/model.pt 85 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl 18 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/alchemy/+package+/templates/root.pt 83 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl 16 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/pylons_basic/+package+/static/footerbg.png diff | view | raw | blame | history
pyramid/paster_templates/pylons_basic/+package+/static/headerbg.png diff | view | raw | blame | history
pyramid/paster_templates/pylons_basic/+package+/static/ie6.css 8 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/pylons_basic/+package+/static/logo.png diff | view | raw | blame | history
pyramid/paster_templates/pylons_basic/+package+/static/middlebg.png diff | view | raw | blame | history
pyramid/paster_templates/pylons_basic/+package+/static/pylons.css 47 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/pylons_basic/+package+/static/pyramid.png diff | view | raw | blame | history
pyramid/paster_templates/pylons_basic/+package+/static/transparent.gif diff | view | raw | blame | history
pyramid/paster_templates/pylons_basic/+package+/templates/mytemplate.mako 79 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/pylons_basic/+package+/templates/mytemplate.mako_tmpl 12 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/pylons_minimal/+package+/static/footerbg.png diff | view | raw | blame | history
pyramid/paster_templates/pylons_minimal/+package+/static/headerbg.png diff | view | raw | blame | history
pyramid/paster_templates/pylons_minimal/+package+/static/ie6.css 8 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/pylons_minimal/+package+/static/logo.png diff | view | raw | blame | history
pyramid/paster_templates/pylons_minimal/+package+/static/middlebg.png diff | view | raw | blame | history
pyramid/paster_templates/pylons_minimal/+package+/static/pylons.css 47 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/pylons_minimal/+package+/static/pyramid.png diff | view | raw | blame | history
pyramid/paster_templates/pylons_minimal/+package+/static/transparent.gif diff | view | raw | blame | history
pyramid/paster_templates/pylons_minimal/+package+/templates/mytemplate.mako 79 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/pylons_minimal/+package+/templates/mytemplate.mako_tmpl 12 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/pylons_sqla/+package+/static/footerbg.png diff | view | raw | blame | history
pyramid/paster_templates/pylons_sqla/+package+/static/headerbg.png diff | view | raw | blame | history
pyramid/paster_templates/pylons_sqla/+package+/static/ie6.css 8 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/pylons_sqla/+package+/static/logo.png diff | view | raw | blame | history
pyramid/paster_templates/pylons_sqla/+package+/static/middlebg.png diff | view | raw | blame | history
pyramid/paster_templates/pylons_sqla/+package+/static/pylons.css 47 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/pylons_sqla/+package+/static/pyramid.png diff | view | raw | blame | history
pyramid/paster_templates/pylons_sqla/+package+/static/transparent.gif diff | view | raw | blame | history
pyramid/paster_templates/pylons_sqla/+package+/templates/mytemplate.mako 81 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/pylons_sqla/+package+/templates/mytemplate.mako_tmpl 14 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/routesalchemy/+package+/static/footerbg.png diff | view | raw | blame | history
pyramid/paster_templates/routesalchemy/+package+/static/headerbg.png diff | view | raw | blame | history
pyramid/paster_templates/routesalchemy/+package+/static/ie6.css 8 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/routesalchemy/+package+/static/logo.png diff | view | raw | blame | history
pyramid/paster_templates/routesalchemy/+package+/static/middlebg.png diff | view | raw | blame | history
pyramid/paster_templates/routesalchemy/+package+/static/pylons.css 47 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/routesalchemy/+package+/static/pyramid.png diff | view | raw | blame | history
pyramid/paster_templates/routesalchemy/+package+/static/transparent.gif diff | view | raw | blame | history
pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt 79 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl 12 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/starter/+package+/static/pylons.css 2 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl 12 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/starter_zcml/+package+/static/footerbg.png diff | view | raw | blame | history
pyramid/paster_templates/starter_zcml/+package+/static/headerbg.png diff | view | raw | blame | history
pyramid/paster_templates/starter_zcml/+package+/static/ie6.css 8 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/starter_zcml/+package+/static/logo.png diff | view | raw | blame | history
pyramid/paster_templates/starter_zcml/+package+/static/middlebg.png diff | view | raw | blame | history
pyramid/paster_templates/starter_zcml/+package+/static/pylons.css 47 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/starter_zcml/+package+/static/pyramid.png diff | view | raw | blame | history
pyramid/paster_templates/starter_zcml/+package+/static/transparent.gif diff | view | raw | blame | history
pyramid/paster_templates/starter_zcml/+package+/templates/mytemplate.pt 79 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/starter_zcml/+package+/templates/mytemplate.pt_tmpl 12 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/zodb/+package+/static/footerbg.png diff | view | raw | blame | history
pyramid/paster_templates/zodb/+package+/static/headerbg.png diff | view | raw | blame | history
pyramid/paster_templates/zodb/+package+/static/ie6.css 8 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/zodb/+package+/static/logo.png diff | view | raw | blame | history
pyramid/paster_templates/zodb/+package+/static/middlebg.png diff | view | raw | blame | history
pyramid/paster_templates/zodb/+package+/static/pylons.css 47 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/zodb/+package+/static/pyramid.png diff | view | raw | blame | history
pyramid/paster_templates/zodb/+package+/static/transparent.gif diff | view | raw | blame | history
pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt 79 ●●●●● diff | view | raw | blame | history
pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl 12 ●●●●● diff | view | raw | blame | history