summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-08-06gardenMichael Merickel
2012-08-06Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-06Merge branch 'feature.metaviewpredicates'Chris McDonough
2012-08-06add docs for third-party view predicatesChris McDonough
2012-08-06fix under py3Chris McDonough
2012-08-06coverageChris McDonough
2012-08-05add coverage, get rid of test that doesnt belong hereChris McDonough
2012-08-05use a predicate list for routes, introduce the concept of deferred ↵Chris McDonough
discriminators, change conflict resolution to deal with deferred discriminators, make predicates take a config argument, get rid of legacy make_predicates function
2012-08-04Merge pull request #651 from dhaaker/docfixBlaise Laflamme
Minor edits wiki tutorial, thanks dhaaker
2012-08-04add quotes for clarityDaniel Haaker
2012-08-04fix two minor typos in docsDaniel Haaker
2012-08-04unhose triplequote rendering in emacsChris McDonough
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-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-03first cut at extensible view predicates via config.add_view_predicate; still ↵Chris McDonough
requires testing of predicates themselves
2012-08-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-03Merge branch 'wwitzel3-ww/doc-changes'Chris McDonough
2012-08-03no period required hereChris McDonough
2012-08-03Merge branch 'ww/doc-changes' of git://github.com/wwitzel3/pyramid into ↵Chris McDonough
wwitzel3-ww/doc-changes
2012-08-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-03Removing easy_install and demoing lines from index example. firstapp has ↵Wayne Witzel III
installation chapter links and having peopel using pyramid outside a virtualenv is a bad idea
2012-08-03Merge pull request #642 from wwitzel3/ww/doc-changesChris McDonough
Adding helpful link on firstapp page.
2012-08-03Adding helpful link to installing chapter from first appWayne Witzel III
2012-08-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-03added entry to changes.txt for mako fixBlaise Laflamme
2012-08-03generalize TopologicalSorter out of Tweens class for use elsewhereChris McDonough
2012-08-03added test for adjusted uri in mako templatesBlaise Laflamme
2012-08-02Merge branch 'refs/heads/master' into fix.mako-606Blaise Laflamme
2012-08-02Merge branch 'master' of github.com:Pylons/pyramidChris 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-29fixed mako bug #606 for inheritance and includesBlaise Laflamme
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-30 07:50:29 +0000