summaryrefslogtreecommitdiff
AgeCommit message (Expand)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
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
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
2012-10-04Updated links to documentation and copyrights yearAnton Vlasenko
2012-10-02Merge pull request #699 from davidjb/masterChris McDonough
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 appli...Chris McDonough
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
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
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
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
2012-09-17Merge branch 'oddshocks-pretty-css' into 1.4-branchChris McDonough