summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-08-25gardenChris McDonough
2012-08-25return value from subscriber (even though technically nothing can rely on it)Chris McDonough
2012-08-25Subscriber predicates:Chris McDonough
2012-08-24Merge branch 'wwitzel3-ww/621'Chris McDonough
2012-08-24gardenChris McDonough
2012-08-24Merge branch 'ww/621' of git://github.com/wwitzel3/pyramid into wwitzel3-ww/621Chris McDonough
2012-08-23sorting differences made this test fail every so often on py33Chris McDonough
2012-08-23Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-23updated CHANGES with accept-header bug fixMichael Merickel
2012-08-23fixed an incompatibility with accept header test in py3Michael Merickel
2012-08-23Merge branch 'accept_header' of lmctv/pyramid into pull.620Michael Merickel
2012-08-23added cookie session changes to CHANGES.txtMichael Merickel
2012-08-23Merge branch 'master' of ianjosephwilson/pyramid into pull.617Michael Merickel
2012-08-23exposed the serve_forever line to the helloworld narrativeMichael Merickel
2012-08-23Merge branch 'master' of https://github.com/virhilo/pyramid into pull.650Michael Merickel
2012-08-23Merge pull request #664 from ronnix/patch-2Michael Merickel
2012-08-23Fixed typo in docs/narr/views.rstRonan Amicel
2012-08-22gardenBlaise Laflamme
2012-08-22fixed bug with mixing up asset spec and absolute uri in mako template inherit...Blaise Laflamme
2012-08-19- Undo effects of merging pull #661 because tests wont pass on windowsChris McDonough
2012-08-19Garden.Chris McDonough
2012-08-19Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-19Merge pull request #661 from k-j-kleist/masterChris McDonough
2012-08-19add option "--stop-daemon" only if appropriateKarl Johan Kleist
2012-08-16Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-16Merge branch 'mmerickel-feature.instance-properties'Chris McDonough
2012-08-16readd set_request_property to docs (just so when people run across it in in-t...Chris McDonough
2012-08-16Merge branch 'feature.instance-properties' of git://github.com/mmerickel/pyra...Chris McDonough
2012-08-16Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-16docs-deprecated set_request_propertyMichael Merickel
2012-08-16use undefer instead of pulling the oxcart by handChris McDonough
2012-08-16- Use nicer spelling for generating a bound method (thanks to Raydeo and http...Chris McDonough
2012-08-16fixed method binding in py3Michael Merickel
2012-08-16Merge branch 'master' into feature.instance-propertiesMichael Merickel
2012-08-15- An ``add_permission`` directive method was added to the Configurator. ThisChris McDonough
2012-08-15Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-15note whitespace rules, explain setup.py devChris McDonough
2012-08-15Merge branch 'fix.viewconfigotherpredicates'Chris McDonough
2012-08-15- Anonymous predicate keyword list for all add-view-ish methodsChris McDonough
2012-08-15Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-14Merge pull request #659 from khink/masterChris McDonough
2012-08-14Typo pwteens -> ptweensKees Hink
2012-08-11Merge pull request #656 from kroman0/patch-1Chris McDonough
2012-08-11signed contributors agreementRoman Kozlovskyi
2012-08-11get heading levels rightChris McDonough
2012-08-10Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-10new fix for mako adjust_uriBlaise Laflamme
2012-08-09manually revert back to adjusted instead of uri in mako template lookupBlaise Laflamme
2012-08-09Merge branch 'master' of github.com:Pylons/pyramidBlaise Laflamme
2012-08-09Revert "should return the uri and not the adjusted uri if not in collection"Blaise Laflamme