summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-03-21slightly re-organiseTshepang Lekhonkhobe
2013-03-20Merge pull request #927 from stevepiercy/masterTres Seaver
2013-03-20Merge commit '2ca9bde9d2862655ddee276cd14a375e6a5adec6'Steve Piercy
2013-03-20Make installation explicit and discrete, combining suggestions from @thesteve...Steve Piercy
2013-03-20Add special section for Mac OS X users.Steve Piercy
2013-03-20Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-03-20Merge pull request #926 from stevepiercy/masterChris McDonough
2013-03-19Fix whitespace in CHANGES.txt to permit build.Steve Piercy
2013-03-19Merge pull request #925 from tshepang/patch-1Chris McDonough
2013-03-19Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-03-19Merge branch 'fix.831'Michael Merickel
2013-03-19update CHANGES.txtMichael Merickel
2013-03-19enhance the docstring on include_ip in auth tkt to explain compatabilityMichael Merickel
2013-03-19Merge branch 'bugfix/ipv6_compat' of bertjwregeer/pyramid into fix.831Michael Merickel
2013-03-19some improvements/fixes to a paragraphTshepang Lekhonkhobe
2013-03-19Merge branch 'pull.922'Michael Merickel
2013-03-19Merge branch 'fix.798' of wosc/pyramid into pull.922Michael Merickel
2013-03-19Merge pull request #923 from thesteve0/masterChris McDonough
2013-03-19fixed the syntax for exporting the VENVSteven Citron-Pousty
2013-03-19Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-03-19More explanation around pcreateSteven Citron-Pousty
2013-03-19Merge branch 'fix.highorderchars-in-tests'Michael Merickel
2013-03-19remove files with higher order characters from the repo and fix testsMichael Merickel
2013-03-19Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-03-19Fixes #798: Allow a protocol-relative URL to be passed to add_static_view, ge...Wolfgang Schnerring
2013-03-19Merge pull request #920 from msabramo/accept-testsMichael Merickel
2013-03-19add test to ensure unrelated views are not invoked after PredicateMismatchMichael Merickel
2013-03-19Merge branch 'pull.786'Michael Merickel
2013-03-19Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-03-19Merge branch 'master' of latteier/pyramid into pull.786Michael Merickel
2013-03-18Merge branch 'feature.callable-acl'Michael Merickel
2013-03-18reorder some imports to be alphabeticalMichael Merickel
2013-03-18support acl as a callableMichael Merickel
2013-03-18add failing test for callable aclMichael Merickel
2013-03-18Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-03-17Merge pull request #919 from tshepang/patch-3Michael Merickel
2013-03-17Merge pull request #916 from tshepang/patch-1Michael Merickel
2013-03-17that should be lower-caseTshepang Lekhonkhobe
2013-03-17grammarTshepang Lekhonkhobe
2013-03-16Merge pull request #915 from kamalgill/masterMichael Merickel
2013-03-16Fix typo in docstring.Kamal Gill
2013-03-16Merge pull request #913 from tshepang/rstTres Seaver
2013-03-16improve description; fix spellingTshepang Lekhonkhobe
2013-03-13Merge pull request #910 from tshepang/venvChris McDonough
2013-03-13typoTshepang Lekhonkhobe
2013-03-13consistency: use $VENV whenever virtualenv binaries are usedTshepang Lekhonkhobe
2013-03-12Merge pull request #893 from stevepiercy/masterMichael Merickel
2013-03-12Merge pull request #874 from tshepang/paragraphMichael Merickel
2013-03-12Merge pull request #871 from tshepang/repetitionMichael Merickel
2013-03-12Merge pull request #841 from tshepang/patch-1Michael Merickel