summaryrefslogtreecommitdiff
AgeCommit message (Collapse)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 ↵Chris McDonough
in-the-wild code they're not totally confused); we'll remove it later
2012-08-16Merge branch 'feature.instance-properties' of ↵Chris McDonough
git://github.com/mmerickel/pyramid into mmerickel-feature.instance-properties
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 ↵Chris McDonough
http://stackoverflow.com/a/1015405/209039)
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
directive registers a free-standing permission introspectable into the Pyramid introspection system. Frameworks built atop Pyramid can thus use the the ``permissions`` introspectable category data to build a comprehensive list of permissions supported by a running system. Before this method was added, permissions were already registered in this introspectable category as a side effect of naming them in an ``add_view`` call, this method just makes it possible to arrange for a permission to be put into the ``permissions`` introspectable category without naming it along with an associated view. Here's an example of usage of ``add_permission``:: config = Configurator() config.add_permission('view')
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
and decorators as well as add_route is now named "**predicates" rather than "**other_predicates". - Fix bug in add_view and add_route where pvals was not a copy of other_predicates (caused discriminators to not match up when computed elsewhere). - Various formatting nits fixed. - add_notfound_view and add_forbidden_view now accept **predicates. - view_config, notfound_view_config, forbidden_view_config, and view_defaults now accept **predicates. Their implementations were changed to avoid repetition.
2012-08-15Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-14Merge pull request #659 from khink/masterChris McDonough
Typo in doc
2012-08-14Typo pwteens -> ptweensKees Hink
2012-08-11Merge pull request #656 from kroman0/patch-1Chris McDonough
signed contributors agreement
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
This reverts commit 918d54da858ae754eaaf82c351ddaee55bf19d99.
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
now documented), resolve deferred discriminators in introspectable.register so that a directive can depend on a deferred discriminator, put head-adding code in predicate instead of in add_view itself
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 ↵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
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-26 09:47:03 +0000