summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-09-08checkpoint for removing bfg.routesChris McDonough
2012-09-01Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-30Merge pull request #675 from ronnix/patch-3Chris McDonough
Fixed broken link in docs/narr/testing.rst
2012-08-30Fixed broken link in docs/narr/testing.rstRonan Amicel
Fixed link to "Dive into Python" (previous mirror is down).
2012-08-29add newness markersChris McDonough
2012-08-29remove experimental namesChris McDonough
2012-08-29forgot a fixture fileChris McDonough
2012-08-29wordingChris McDonough
2012-08-29Merge branch 'feature.macrorenderers'Chris McDonough
2012-08-29add docs about chameleon zpt macro featureChris McDonough
2012-08-29Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-29gardenChris McDonough
2012-08-29add renderer and template to values passed to template during renderingChris McDonough
2012-08-29add a testChris McDonough
2012-08-29rough cut at supporting 'packagename:dirname/template#macroname.pt' renderer ↵Chris McDonough
style, ala mako renderer
2012-08-26- Forward-port from 1.3 branch: when registering multiple views with anChris McDonough
``accept`` predicate in a Pyramid application runing under Python 3, you might have received a ``TypeError: unorderable types: function() < function()`` exception.
2012-08-25_get_predlist -> get_predlistChris McDonough
2012-08-25indent like a manChris McDonough
2012-08-25rantChris McDonough
2012-08-25subscribers registered for more than one interface receive all objects, ↵Chris McDonough
which is fucking stupid, but true
2012-08-25gardenChris McDonough
2012-08-25return value from subscriber (even though technically nothing can rely on it)Chris McDonough
2012-08-25Subscriber predicates:Chris McDonough
- Add ``add_subscriber_predicate`` method to Configurator. - Allow ``add_subscriber`` and ``subscriber`` venusian decorator to accept ``**predicates`` arguments. - Document subscriber predicate feature. - Share more code between view, route, and subscriber related method wrt predicates.
2012-08-24Merge branch 'wwitzel3-ww/621'Chris McDonough
2012-08-24gardenChris McDonough
2012-08-24Merge branch 'ww/621' of git://github.com/wwitzel3/pyramid into wwitzel3-ww/621Chris McDonough
2012-08-23sorting differences made this test fail every so often on py33Chris McDonough
2012-08-23Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-23updated CHANGES with accept-header bug fixMichael Merickel
2012-08-23fixed an incompatibility with accept header test in py3Michael Merickel
2012-08-23Merge branch 'accept_header' of lmctv/pyramid into pull.620Michael Merickel
Conflicts: CONTRIBUTORS.txt pyramid/config/views.py Updated the pull request to fix incompatibilities from changes to Pyramid's predicate machinery.
2012-08-23added cookie session changes to CHANGES.txtMichael Merickel
2012-08-23Merge branch 'master' of ianjosephwilson/pyramid into pull.617Michael Merickel
Conflicts: CONTRIBUTORS.txt
2012-08-23exposed the serve_forever line to the helloworld narrativeMichael Merickel
2012-08-23Merge branch 'master' of https://github.com/virhilo/pyramid into pull.650Michael Merickel
2012-08-23Merge pull request #664 from ronnix/patch-2Michael Merickel
Fixed typo in docs/narr/views.rst
2012-08-23Fixed typo in docs/narr/views.rstRonan Amicel
2012-08-22gardenBlaise Laflamme
2012-08-22fixed bug with mixing up asset spec and absolute uri in mako template ↵Blaise Laflamme
inheritance
2012-08-19- Undo effects of merging pull #661 because tests wont pass on windowsChris McDonough
https://github.com/Pylons/pyramid/pull/661
2012-08-19Garden.Chris McDonough
2012-08-19Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-08-19Merge pull request #661 from k-j-kleist/masterChris McDonough
add optparse option "--stop-daemon" only if appropriate
2012-08-19add option "--stop-daemon" only if appropriateKarl Johan Kleist
2012-08-16Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
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
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-28 22:53:58 +0000