summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-03-19Merge branch 'fix.798' of wosc/pyramid into pull.922Michael Merickel
2013-03-19Merge pull request #923 from thesteve0/masterChris McDonough
Update to the wiki2 tutorial installation steps
2013-03-19fixed the syntax for exporting the VENVSteven Citron-Pousty
2013-03-19More explanation around pcreateSteven Citron-Pousty
Not sure how much to explain there but it needed some more explanation. Perhaps we could link to a doc about pcreate?
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
the 2 tests that use these files now generate them on the fly, this should work on non-linux systems
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, ↵Wolfgang Schnerring
generate URLs using the current protocol.
2013-03-19Merge pull request #920 from msabramo/accept-testsMichael Merickel
Add some tests for how content types and HTTP "Accept" header handling behave.
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
that should be lower-case
2013-03-17Merge pull request #916 from tshepang/patch-1Michael Merickel
grammar
2013-03-17that should be lower-caseTshepang Lekhonkhobe
2013-03-17grammarTshepang Lekhonkhobe
2013-03-16Merge pull request #915 from kamalgill/masterMichael Merickel
Fix typo in docstring
2013-03-16Fix typo in docstring.Kamal Gill
2013-03-16Merge pull request #913 from tshepang/rstTres Seaver
improve description; fix spelling
2013-03-16improve description; fix spellingTshepang Lekhonkhobe
2013-03-13Merge pull request #910 from tshepang/venvChris McDonough
consistency: use $VENV whenever virtualenv binaries are used
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
traversal wiki tutorial docs updates
2013-03-12Merge pull request #874 from tshepang/paragraphMichael Merickel
improve paragraph
2013-03-12Merge pull request #871 from tshepang/repetitionMichael Merickel
remove info that was given in the preceding paragraph
2013-03-12Merge pull request #841 from tshepang/patch-1Michael Merickel
remove questionable sentence
2013-03-12Merge pull request #896 from tshepang/consistencyMichael Merickel
consistency fixes
2013-03-12Merge pull request #872 from tshepang/virtualenvMichael Merickel
virtualenv refers both to the tool and the concept
2013-03-12Merge pull request #885 from tshepang/hyperlinksMichael Merickel
fix/update hyperlinks
2013-03-12we want to keep the reference aliveTshepang Lekhonkhobe
2013-03-12Merge pull request #890 from tshepang/miscMichael Merickel
miscellaneous doc improvements
2013-03-12Merge pull request #888 from tshepang/fixesMichael Merickel
miscellaneous doc fixes
2013-03-12fix whitespace issue... remove tabsTshepang Lekhonkhobe
2013-03-12Merge pull request #906 from tshepang/patch-2Michael Merickel
capitalize
2013-03-12Merge pull request #907 from tshepang/patch-3Michael Merickel
capitalize
2013-03-12Merge pull request #908 from tshepang/use-refMichael Merickel
use a Sphinx ref instead of raw url
2013-03-12use a Sphinx ref instead of raw urlTshepang Lekhonkhobe
Other than reducing ugliness, when building the doc with Python 3, the target is a Python 3 version of the class; same applies to Python 2.
2013-03-12capitalizeTshepang Lekhonkhobe
2013-03-12capitalizeTshepang Lekhonkhobe
2013-03-12fix markupTshepang Lekhonkhobe
2013-03-11Merge pull request #905 from tshepang/patch-2Tres Seaver
a warning is overkill
2013-03-12a warning is overkillTshepang Lekhonkhobe
2013-03-10Merge pull request #903 from tshepang/patch-4Tres Seaver
capitalize