summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-08-19add option "--stop-daemon" only if appropriateKarl Johan Kleist
2012-08-16Merge branch 'mmerickel-feature.instance-properties'Chris McDonough
2012-08-16readd set_request_property to docs (just so when people run across it in in-t...Chris McDonough
2012-08-16Merge branch 'feature.instance-properties' of git://github.com/mmerickel/pyra...Chris McDonough
2012-08-16Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-16docs-deprecated set_request_propertyMichael Merickel
2012-08-16use undefer instead of pulling the oxcart by handChris McDonough
2012-08-16- Use nicer spelling for generating a bound method (thanks to Raydeo and http...Chris McDonough
2012-08-16fixed method binding in py3Michael Merickel
2012-08-16Merge branch 'master' into feature.instance-propertiesMichael Merickel
2012-08-15- An ``add_permission`` directive method was added to the Configurator. ThisChris McDonough
2012-08-15Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-15note whitespace rules, explain setup.py devChris McDonough
2012-08-15Merge branch 'fix.viewconfigotherpredicates'Chris McDonough
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