summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-04-28Merge pull request #589 from stevepiercy/masterChris McDonough
2012-04-28expand glossary term for scaffoldSteve Piercy
2012-04-28Merge pull request #588 from stevepiercy/masterChris McDonough
2012-04-28Link the first usage of "scaffold" to its definition in the glossary.Steve Piercy
2012-04-27Updated static_view to raise HTTP exceptions instead of returningMarin Rukavina
2012-04-27fix exampleChris McDonough
2012-04-27Merge branch 'lambacck-master'Chris McDonough
2012-04-27gardenChris McDonough
2012-04-27Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-04-27Don't add a ? to url if query string is empty.Christopher Lambacher
2012-04-27Merge pull request #584 from VlAleVas/patch-1Chris McDonough
2012-04-27Update docs/narr/urldispatch.rstVlAleVas
2012-04-26Merge pull request #505 from muellert/masterMichael Merickel
2012-04-21Merge pull request #582 from ralphbean/masterChris McDonough
2012-04-21Use the new Pyramid trove classifiers for the scaffolds.Ralph Bean
2012-04-21make virtualenv, nose, and coverage testing extras rather than test requirementsChris McDonough
2012-04-20Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-04-19Merge pull request #540 from ralphbean/alchemy-fixesChris McDonough
2012-04-19Change alchemy scaffold README to match the console_scripts setup.Ralph Bean
2012-04-19squash another reference to dotted nameChris McDonough
2012-04-19take out 'or dotted python name'Chris McDonough
2012-04-18test checkin for automating shiningpanda build from github post-receive url (...Chris McDonough
2012-04-18test checkin for automating shiningpanda build from github post-receive urlChris McDonough
2012-04-18try to fix windows test failureChris McDonough
2012-04-18break docs stuff out of testing to hopefully appease shiningpandaChris McDonough
2012-04-18Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-04-18gardenMichael Merickel
2012-04-18reverted back to using a component registry during json encodingMichael Merickel
2012-04-17Merge pull request #537 from hynek/masterMichael Merickel
2012-04-17Add @ to examples of forbidden_view_config & notfound_view_configHynek Schlawack
2012-04-17Merge pull request #533 from ppaez/paulos-listPatricio Paez
2012-04-17Merge branch 'mmerickel-feature.json-api'Chris McDonough
2012-04-17default_encode->_default_encode, dumps->_dumps, massage docsChris McDonough
2012-04-16docs for json defaultsMichael Merickel
2012-04-16fixed coverage, removed json encoderMichael Merickel
2012-04-16removed the component registry from json rendererMichael Merickel
2012-04-16first cut at removing ObjectJSONEncoderMichael Merickel
2012-04-16Normalize and update the last sectionPatricio Paez
2012-04-16Merge pull request #535 from lambacck/masterChris McDonough
2012-04-16Fix a typo in contributors file.Christopher Lambacher
2012-04-16Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-04-16gardenChris McDonough
2012-04-16replaced pylons with pyramid trove classifierMichael Merickel
2012-04-13Simplify the introductionPatricio Paez
2012-04-13gardenMichael Merickel
2012-04-13gardenMichael Merickel
2012-04-13Merge pull request #532 from ppaez/typosChris McDonough
2012-04-13Fixed wsgi.org URLPatricio Paez
2012-04-12set_request_method works with methods and moar coverageMichael Merickel
2012-04-12TyposPatricio Paez