summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-08-03test standalone default predicates; make protocol "phash()" and "text()" ↵Chris McDonough
rather than "__phash__()" and "__text__()"
2012-08-03add some testsChris McDonough
2012-08-03first cut at extensible view predicates via config.add_view_predicate; still ↵Chris McDonough
requires testing of predicates themselves
2012-08-03generalize TopologicalSorter out of Tweens class for use elsewhereChris McDonough
2012-08-02Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-02closes #643Chris McDonough
2012-07-29Merge branch 'feature.predmismatchexc'Chris McDonough
2012-07-29- When there is a predicate mismatch exception (seen when no view matches forChris McDonough
a given request due to predicates not working), the exception now contains a textual description of the predicate which didn't match. - Fixes issue #502 and issue #519.
2012-07-29Merge branch 'master' of git://github.com/adroullier/pyramid into ↵Chris McDonough
adroullier-master
2012-07-29give traverse_predicate a __text__ and add a developer note about __text__Chris McDonough
2012-07-29Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-07-28Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-07-25add logging call to wsgi setupMichael Merickel
2012-07-21Merge pull request #640 from countvajhula/patch-1Chris McDonough
corrected table name tables->pages in wiki tutorial Design page
2012-07-21corrected table name tables->pagesSiddhartha Kasivajhula
2012-07-13- On at least one 64-bit Ubuntu system under Python 3.2, using theChris McDonough
``view_config`` decorator caused a ``RuntimeError: dictionary changed size during iteration`` exception. It no longer does. See https://github.com/Pylons/pyramid/issues/635 for more information. - Fixes issue #635.
2012-07-10gardenChris McDonough
2012-07-10Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-07-10Merge pull request #634 from 2nd/fix.urldispatch-629Michael Merickel
Replacement markers of url dispatcher can contain regex with colons.
2012-07-10Replacement markers of url dispatcher can contain regex with colons.Maxim Avanov
2012-07-05Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-07-04Merge pull request #632 from sjuxax/masterBlaise Laflamme
Include instructions for recursive submodule checkout of Sphinx themes.
2012-07-04Include instructions for recursive submodule checkout of Sphinx themes.Jeff Cook
2012-06-26Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-06-24Send notifications to pyramid-checkins.Tres Seaver
Note that we rely on the default settings (failures always send, success sends only on change.).
2012-06-24Un-comment the PyPy 'allow_failures' bit.Tres Seaver
We need an explanation for why the PyPy tests fail under travis-ci.
2012-06-24Try newly-enabled travis-ci.Tres Seaver
See http://travis-ci.org/#\!/Pylons/pyramid
2012-06-19point at pyramid_beaker docs rather than its github pageChris McDonough
2012-06-19Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-06-19fixed typosBlaise Laflamme
2012-06-19fixed typosBlaise Laflamme
2012-06-19added docs and changes for using defs in mako rendererBlaise Laflamme
2012-06-19renamed path for asset in regexBlaise Laflamme
2012-06-19removed .makodef, use tuple value if defname in renderer (bw compat), ↵Blaise Laflamme
changed format for package:some/template#defname.mako
2012-06-19added removed tuple for bw compatBlaise Laflamme
2012-06-19added a new makodef renderer to call a def inside a mako template, fixed ↵Blaise Laflamme
tests and removed old tuple way of calling def. Based on zzzeek example of client/server templating.
2012-06-19added namespace testBlaise Laflamme
2012-06-17Merge branch 'sjuxax-master'Chris McDonough
2012-06-17merge contributorsChris McDonough
2012-06-17Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-06-17CONTRIBUTORS: Add self / accept contribution termsJeff Cook
2012-06-17docs: Add view callable example to section on rendering_val.Jeff Cook
2012-06-14Merge pull request #616 from msabramo/testingChris McDonough
Add py33 to tox and add .travis.yml for Travis CI
2012-06-14Remove blank line from .travis.ymlMarc Abramowitz
2012-06-14Add "Marc Abramowitz" to CONTRIBUTORS.txtMarc Abramowitz
2012-06-14Add .travis.yml for Travis CI (http://travis-ci.org/)Marc Abramowitz
2012-06-13Add "py33" to tox.iniMarc Abramowitz
2012-06-13Merge pull request #610 from fabianbuechler/patch-1Chris McDonough
Fixed errors in URL dispatch docs in "Using a Route Prefix to Compose Applications" section
2012-06-12docs reference setup_logging instead of fileConfigMichael Merickel
2012-06-11consolidateChris McDonough