summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-08-15- Anonymous predicate keyword list for all add-view-ish methodsChris McDonough
2012-08-15Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-14Merge pull request #659 from khink/masterChris McDonough
2012-08-14Typo pwteens -> ptweensKees Hink
2012-08-11Merge pull request #656 from kroman0/patch-1Chris McDonough
2012-08-11signed contributors agreementRoman Kozlovskyi
2012-08-11get heading levels rightChris McDonough
2012-08-10Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-10new fix for mako adjust_uriBlaise Laflamme
2012-08-09manually revert back to adjusted instead of uri in mako template lookupBlaise Laflamme
2012-08-09Merge branch 'master' of github.com:Pylons/pyramidBlaise Laflamme
2012-08-09Revert "should return the uri and not the adjusted uri if not in collection"Blaise Laflamme
2012-08-09Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-09should return the uri and not the adjusted uri if not in collectionBlaise Laflamme
2012-08-07Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-07note conflict behavior changeChris McDonough
2012-08-06move stuff from config.util to registry so it can be a set of API (which are ...Chris McDonough
2012-08-06Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-06Merge branch 'master' of github.com:Pylons/pyramidTres Seaver
2012-08-06Normalize interface conformance tests.Tres Seaver
2012-08-06Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-06add as-of-version notesChris McDonough
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 discrimina...Chris McDonough
2012-08-04Merge pull request #651 from dhaaker/docfixBlaise Laflamme
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()" rath...Chris McDonough
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
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 wwitz...Chris McDonough
2012-08-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-03Removing easy_install and demoing lines from index example. firstapp has inst...Wayne Witzel III
2012-08-03Merge pull request #642 from wwitzel3/ww/doc-changesChris McDonough
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