summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-11-13forward port from 1.3 branchChris McDonough
2012-11-13Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-11-12removed doc-update from changelogMichael Merickel
2012-11-12Merge branch 'fix.516' of rob0t7/pyramid into pull.720Michael Merickel
2012-11-12Added changes to the CHANGES log.Robert Jackiewicz
2012-11-12Modified the hooks documentation to currently describe how to access the cont...Robert Jackiewicz
2012-11-12Move pyramid.config.views.viewdefaults -> pyramid.util.viewdefaultsChris McDonough
2012-11-11Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-11-11- Be more tolerant of potential error conditions in ``match_param`` andChris McDonough
2012-11-05Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-11-04visually aid the decorator= examplePhilip Jenvey
2012-11-04update changelog, close #627Michael Merickel
2012-11-04Merge branch 'pull.627'Michael Merickel
2012-11-04reversed the ordering of decorator arg to add_viewMichael Merickel
2012-11-04Merge branch 'tupleofdecorators' of xrotwang/pyramid into pull.627Michael Merickel
2012-11-04Added explanations to docstring.rforkel
2012-11-04Added support for passing multiple decorators to add_view.rforkel
2012-11-04gardenChris McDonough
2012-11-04- Allow a ``_depth`` argument to ``pyramid.view.view_config``, which willChris McDonough
2012-11-04Merge branch 'fix.695'Chris McDonough
2012-11-04reword docsChris McDonough
2012-11-04Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-11-04fix tests to use sha512 to avoid emitting warningsMichael Merickel
2012-11-04emit a warning if a user is using the default hashalg to AuthTktMichael Merickel
2012-11-04Merge branch 'master' into fix.695Michael Merickel
2012-11-04gardenMichael Merickel
2012-11-04merged SHA512AuthTktAuthenticationPolicy into AuthTktAuthenticationPolicyMichael Merickel
2012-11-04Merge branch 'iElectric-feature.sha512_auth'Chris McDonough
2012-11-04fix docs, upgrade tutorials, add change note, deprecate using zope.deprecatio...Chris McDonough
2012-11-04Merge branch 'feature.sha512_auth' of git://github.com/iElectric/pyramid into...Chris McDonough
2012-11-04- In uncommon cases, the ``pyramid_excview_tween_factory`` might haveChris McDonough
2012-11-03- Move ``TopologicalSorter`` from ``pyramid.config.util`` to ``pyramid.util``,Chris McDonough
2012-11-03why is this file hereChris McDonough
2012-11-02garden; fixes #702Chris McDonough
2012-11-02Merge branch 'wylee-master'Chris McDonough
2012-11-02dont use a separate request factory; instead just assign ResponseClass attr o...Chris McDonough
2012-11-02Merge branch 'master' of git://github.com/wylee/pyramid into wylee-masterChris McDonough
2012-11-02gardenChris McDonough
2012-11-02- In the past if a renderer returned ``None``, the body of the resultingChris McDonough
2012-11-02Merge branch '1.4-branch'Chris McDonough
2012-11-02resolve merge conflictChris McDonough
2012-11-02gardenChris McDonough
2012-11-02gardenChris McDonough
2012-11-02- Do not allow the userid returned from the ``authenticated_userid`` or theChris McDonough
2012-11-02explain csrf token stealing potentialityChris McDonough
2012-11-02Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-11-02typoCarlos de la Guardia
2012-10-30Merge branch '1.4-branch'Chris McDonough
2012-10-30Merge pull request #711 from Pylons/fix.auth-policy-noticeChris McDonough
2012-10-30updated authentication policy api documentationMichael Merickel