summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-05-03gardenChris McDonough
2012-05-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-05-03reuse default logic between json and jsonpChris McDonough
2012-05-03use the same default logic for jsonp as for jsonChris McDonough
2012-05-03Merge pull request #595 from vipera/masterMichael Merickel
Added name to CONTRIBUTORS.txt
2012-05-03Updated contributors fileMarin Rukavina
2012-05-03Merge branch 'mmerickel-feature.json-api'Chris McDonough
2012-05-03allow __json__ and custom adapters to accept request argChris McDonough
2012-05-03Merge branch 'master' into feature.json-apiMichael Merickel
2012-05-02gardenChris McDonough
2012-05-02Merge branch 'vipera-master'Chris McDonough
2012-05-02add a change noteChris McDonough
2012-05-02simplify testsChris McDonough
2012-05-02Merge https://github.com/vipera/pyramid into vipera-masterChris McDonough
2012-05-02Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-05-02Updated tests for static files and made static.py raise all HTTP exceptionsMarin Rukavina
2012-05-02Fixed up the tests and returned HTTPMovedPermanentlyMarin Rukavina
2012-05-01Merge remote-tracking branch 'Pylons/master'Marin Rukavina
2012-04-30Merge pull request #592 from danjacka/masterChris McDonough
Change the example script's description string to match the console_script's name: show_settings
2012-05-01Change the example script's description string to match the console_script's ↵Dan Jacka
name: show_settings
2012-04-29Merge pull request #591 from danjacka/masterChris McDonough
Documentation fix
2012-04-30Separator between name and value in --header option to prequest is ':', not '='Dan Jacka
2012-04-29Merge pull request #590 from ppaez/docsPatricio Paez
Normalize 'Make a project' on both wiki tutorials
2012-04-29Normalize 'Make a project' on both wiki tutorialsPatricio Paez
2012-04-28Merge pull request #589 from stevepiercy/masterChris McDonough
expand glossary term for scaffold
2012-04-28expand glossary term for scaffoldSteve Piercy
2012-04-28Merge pull request #588 from stevepiercy/masterChris McDonough
Link the first usage of "scaffold" to its definition in the glossary.
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
Little fix in docs
2012-04-27Update docs/narr/urldispatch.rstVlAleVas
2012-04-26Merge pull request #505 from muellert/masterMichael Merickel
code to implement the suggestion in issue #504
2012-04-21Merge pull request #582 from ralphbean/masterChris McDonough
Use the new Pyramid trove classifiers for the scaffolds.
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
Change alchemy scaffold README to match the console_scripts setup.
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
(this time for sure)
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
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-29 21:12:37 +0000