summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-03-19Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
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
2013-03-12Merge pull request #896 from tshepang/consistencyMichael Merickel
2013-03-12Merge pull request #872 from tshepang/virtualenvMichael Merickel
2013-03-12Merge pull request #885 from tshepang/hyperlinksMichael Merickel
2013-03-12we want to keep the reference aliveTshepang Lekhonkhobe
2013-03-12Merge pull request #890 from tshepang/miscMichael Merickel
2013-03-12Merge pull request #888 from tshepang/fixesMichael Merickel
2013-03-12fix whitespace issue... remove tabsTshepang Lekhonkhobe
2013-03-12Merge pull request #906 from tshepang/patch-2Michael Merickel
2013-03-12Merge pull request #907 from tshepang/patch-3Michael Merickel
2013-03-12Merge pull request #908 from tshepang/use-refMichael Merickel
2013-03-12use a Sphinx ref instead of raw urlTshepang Lekhonkhobe
2013-03-12capitalizeTshepang Lekhonkhobe
2013-03-12capitalizeTshepang Lekhonkhobe
2013-03-12fix markupTshepang Lekhonkhobe
2013-03-11Merge pull request #905 from tshepang/patch-2Tres Seaver
2013-03-12a warning is overkillTshepang Lekhonkhobe
2013-03-10Merge pull request #903 from tshepang/patch-4Tres Seaver
2013-03-10Merge pull request #902 from tshepang/patch-3Tres Seaver
2013-03-10Merge pull request #899 from tshepang/patch-2Tres Seaver
2013-03-10capitalizeTshepang Lekhonkhobe
2013-03-10change awkward sentenceTshepang Lekhonkhobe
2013-03-09grammarTshepang Lekhonkhobe
2013-03-09consistencyTshepang Lekhonkhobe
2013-03-09capitalize; add term roleTshepang Lekhonkhobe