Commits

Commits on Aug 24, 2012

Merge branch 'wwitzel3-ww/621'
mcdonc
committedAug 24, 2012
garden
mcdonc
committedAug 24, 2012
Merge branch 'ww/621' of git:https://github.com/wwitzel3/pyramid into wwitzel3-ww/621
mcdonc
committedAug 24, 2012

Commits on Aug 23, 2012

sorting differences made this test fail every so often on py33
mcdonc
committedAug 23, 2012
Merge branch 'master' of github.com:Pylons/pyramid
mcdonc
committedAug 23, 2012
updated CHANGES with accept-header bug fix
mmerickel
committedAug 23, 2012
fixed an incompatibility with accept header test in py3
mmerickel
committedAug 23, 2012
Merge branch 'accept_header' of lmctv/pyramid into pull.620
mmerickel
committedAug 23, 2012
added cookie session changes to CHANGES.txt
mmerickel
committedAug 23, 2012
Merge branch 'master' of ianjosephwilson/pyramid into pull.617
mmerickel
committedAug 23, 2012
exposed the serve_forever line to the helloworld narrative
mmerickel
committedAug 23, 2012
Merge branch 'master' of https://github.com/virhilo/pyramid into pull.650
mmerickel
committedAug 23, 2012
Merge pull request Pylons#664 from ronnix/patch-2
mmerickel
committedAug 23, 2012
Fixed typo in docs/narr/views.rst
ronnix
committedAug 23, 2012

Commits on Aug 22, 2012

garden
blaflamme
committedAug 22, 2012
fixed bug with mixing up asset spec and absolute uri in mako template inheritance
blaflamme
committedAug 22, 2012

Commits on Aug 19, 2012

- Undo effects of merging pull Pylons#661 because tests wont pass on windows
mcdonc
committedAug 19, 2012
Garden.
mcdonc
committedAug 19, 2012
Merge branch 'master' of github.com:Pylons/pyramid
mcdonc
committedAug 19, 2012
Merge pull request Pylons#661 from k-j-kleist/master
mcdonc
committedAug 19, 2012
add option "--stop-daemon" only if appropriate
k-j-kleist
committedAug 19, 2012

Commits on Aug 17, 2012

Merge branch 'master' of github.com:Pylons/pyramid
mcdonc
committedAug 17, 2012

Commits on Aug 16, 2012

Merge branch 'mmerickel-feature.instance-properties'
mcdonc
committedAug 16, 2012
readd set_request_property to docs (just so when people run across it in in-the-wild code they're not totally confused); we'll remove it later
mcdonc
committedAug 16, 2012
Merge branch 'feature.instance-properties' of git:https://github.com/mmerickel/pyramid into mmerickel-feature.instance-properties
mcdonc
committedAug 16, 2012
Merge branch 'master' of github.com:Pylons/pyramid
mcdonc
committedAug 16, 2012
docs-deprecated set_request_property
mmerickel
committedAug 16, 2012
use undefer instead of pulling the oxcart by hand
mcdonc
committedAug 16, 2012
- Use nicer spelling for generating a bound method (thanks to Raydeo and https://stackoverflow.com/a/1015405/209039 )
mcdonc
committedAug 16, 2012
fixed method binding in py3
mmerickel
committedAug 16, 2012
Merge branch 'master' into feature.instance-properties
mmerickel
committedAug 16, 2012
- An add_permission directive method was added to the Configurator. This
mcdonc
committedAug 16, 2012

Commits on Aug 15, 2012

Merge branch 'master' of github.com:Pylons/pyramid
mcdonc
committedAug 15, 2012
note whitespace rules, explain setup.py dev
mcdonc
committedAug 15, 2012
Merge branch 'fix.viewconfigotherpredicates'
mcdonc
committedAug 15, 2012