summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-03-21Merge remote-tracking branch 'upstream/master'Steve Piercy
2013-03-21Clean up:Steve Piercy
2013-03-21Update basiclayout.rst, more deductive concept ordering, singular form of termsPatrick Canfield
2013-03-21Resolve conflict.Tres Seaver
2013-03-21Merge pull request #917 from tshepang/patch-2Tres Seaver
2013-03-21Merge pull request #929 from tshepang/re-orgTres Seaver
2013-03-21update repoze.who to latest symlinkMichael Merickel
2013-03-21Merge pull request #931 from tshepang/sqlaMichael Merickel
2013-03-21Merge pull request #928 from tshepang/revertTres Seaver
2013-03-21four spaces is standardTshepang Lekhonkhobe
2013-03-21use version-agnostic link, to avoid maintenanceTshepang Lekhonkhobe
2013-03-21add hyperlinks for SQLAlchemyTshepang Lekhonkhobe
2013-03-21Merge branch 'pull.930'Michael Merickel
2013-03-21Merge branch 'master' of madjar/pyramid into pull.930Michael Merickel
2013-03-21Update CONTRIBUTORS.txtGeorges Dubus
2013-03-20update CHANGES.txtMichael Merickel
2013-03-20Merge branch 'pull.911'Michael Merickel
2013-03-20add some tests for options within ini filesMichael Merickel
2013-03-21slightly re-organiseTshepang Lekhonkhobe
2013-03-21revert to a better paragraphTshepang 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 branch 'master' of madjar/pyramid into pull.911Michael Merickel
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