summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-10-13Merge branch '1.4-branch'Chris McDonough
2012-10-13Merge branch 'master' into 1.4-branchChris McDonough
2012-10-13Merge branch 'mmerickel-feature.multi-predicates' into 1.4-branchChris McDonough
2012-10-13add docs and changelog noteChris McDonough
2012-10-13Merge pull request #704 from knzm/1.4-branch-fix-docMichael Merickel
Fix typo and markup in docs/whatsnew-1.4.rst
2012-10-13added tests for header predicate and standardized the text propertyMichael Merickel
2012-10-13updated request_param and match_param to use as_sorted_tupleMichael Merickel
2012-10-13collapsed request_param text to match the match_param text formatMichael Merickel
2012-10-13allow request_param predicate to accept a tuple of constraintsMichael Merickel
2012-10-13fix typo and markupNozomu Kaneko
2012-10-12Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-10-12Fix indentationChris McDonough
2012-10-08Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-10-07- The Configurator ``testing_securitypolicy`` method now returns the policyChris McDonough
object it creates. - The Configurator ``testing_securitypolicy`` method accepts two new arguments: ``remember_result`` and ``forget_result``. If supplied, these values influence the result of the policy's ``remember`` and ``forget`` methods, respectively. - The DummySecurityPolicy created by ``testing_securitypolicy`` now sets a ``forgotten`` value on the policy (the value ``True``) when its ``forget`` method is called. - The DummySecurityPolicy created by ``testing_securitypolicy`` now sets a ``remembered`` value on the policy, which is the value of the ``principal`` argument it's called with when its ``remember`` method is called.
2012-10-05remove unintended commitChris McDonough
2012-10-05gardenChris McDonough
2012-10-05Merge branch 'fix.templatemacroreg'Chris McDonough
2012-10-05Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-10-05fix caching of template registrations that reference macrosChris McDonough
2012-10-04Merge pull request #701 from Sapphire64/1.4-branchChris McDonough
Updated links to documentation and copyrights year
2012-10-04Updated links to documentation and copyrights yearAnton Vlasenko
2012-10-02Merge pull request #699 from davidjb/masterChris McDonough
Clarify documentation for pyramid.session.check_csrf_token function
2012-10-03Clarify documentation for pyramid.session.check_csrf_token functionDavid\ Beitey
2012-09-30s/either//Chris McDonough
2012-09-30An attempt at better behavior when reload cannot restart the controlled ↵Chris McDonough
application, see issue #681
2012-09-30Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-09-30- 1.4a ``pyramid.scripting.prepare`` behaved differently than 1.3 seriesChris McDonough
function of same name. In particular, if passed a request, it would not set the ``registry`` attribute of the request like 1.3 did. A symptom would be that passing a request to ``pyramid.paster.bootstrap`` (which uses the function) that did not have a ``registry`` attribute could assume that the registry would be attached to the request by Pyramid. This assumption could be made in 1.3, but not in 1.4. The assumption can now be made in 1.4 too (a registry is attached to a request passed to bootstrap or prepare).
2012-09-28Remove duplicate wordCarlos de la Guardia
2012-09-27Merge branch '1.4-branch'Chris McDonough
2012-09-27prep for 1.4a2Chris McDonough
2012-09-22Merge branch '1.4-branch'Chris McDonough
2012-09-22- Add ``Base.metadata.bind = engine`` to alchemy template, so that tablesChris McDonough
defined imperatively will work. - update wiki2 SQLA tutorial with the changes required after inserting ``Base.metadata.bind = engine`` into the alchemy scaffold.
2012-09-22Merge branch '1.4-branch'Chris McDonough
2012-09-22mirror john's change for chameleon, better changelog messageChris McDonough
2012-09-22gardenChris McDonough
2012-09-22Merge branch 'master' into 1.4-branchChris McDonough
2012-09-22Merge branch 'sontek-allow-hyphens'Chris McDonough
2012-09-22Filenames like app:foo-bar.mako should be valid.John Anderson
2012-09-21note potential 1.5 removals and remove dead codeChris McDonough
2012-09-19Merge branch 'master' into 1.4-branchChris McDonough
2012-09-19remove dead codeChris McDonough
2012-09-19gardenChris McDonough
2012-09-19Merge branch 'master' into 1.4-branchChris McDonough
2012-09-19A ``check_csrf`` view predicate was added. For example, you can now doChris McDonough
``config.add_view(someview, check_csrf=True)``. When the predicate is checked, if the ``csrf_token`` value in ``request.params`` matches the csrf token in the request's session, the view will be permitted to execute. Otherwise, it will not be permitted to execute.
2012-09-19gardenChris McDonough
2012-09-19Merge branch 'master' into 1.4-branchChris McDonough
2012-09-19Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-09-19add check_csrf convenience functionChris McDonough
2012-09-18mention set_request_property's doc-deprecation up above as well, makePhilip Jenvey
add_request_method more prominent
2012-09-17Merge branch 'oddshocks-pretty-css' into 1.4-branchChris McDonough
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-03 09:31:34 +0000