summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-11-20Sync views.py on SQL wiki tutorial with the scaffoldPatricio Paez
- Explain the added lines in the Basic Layout chapter. - The user is told to remove the added lines in the Defining Views chapter, there was no need to fix any emphasized lines. - Sync the file in the other sections even if it is not shown, for consistency.
2012-11-20More sync on ZODB wiki tutorialPatricio Paez
- literalinclude should refer to the file in the corresponding section - Remove extra lines
2012-11-20Merge branch 'feature.response-gardenpath'Chris McDonough
2012-11-20- Small microspeed enhancement which anticipates that aChris McDonough
``pyramid.response.Response`` object is likely to be returned from a view. Some code is shortcut if the class of the object returned by a view is this class. A similar microoptimization was done to ``pyramid.request.Request.is_response``.
2012-11-19Sync some ZODB wiki tutorial files with the scaffoldPatricio Paez
- Files that are not referred to in a literalinclude in the tutorial docs - setup.py and development.ini appear in a literalinclude but no lines are emphasized and there is no impact.
2012-11-19Sync some SQL wiki tutorial files with the scaffoldPatricio Paez
- Files that are not referred to in a literalinclude in the tutorial docs - setup.py appears in literalinclude, but no lines are added or removed so no impact. Fixed docutils order in the requires list.
2012-11-18Merge branch 'sontek-add_contributors'Chris McDonough
2012-11-18fix merge conflictChris McDonough
2012-11-18- A failure when trying to locate the attribute ``__text__`` on route and viewChris McDonough
predicates existed when the ``debug_routematch`` setting was true or when the ``pviews`` command was used. See https://github.com/Pylons/pyramid/pull/727 Closes #727.
2012-11-14Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-11-14Added myself to contributorsJohn Anderson
2012-11-14Don't use a global mutable and updated the doc string to include optionsJohn Anderson
2012-11-14Merge branch '1.4-branch'Chris McDonough
2012-11-14prep for releaseChris McDonough
2012-11-14update for releaseChris McDonough
2012-11-14rearrange deck chairsChris McDonough
2012-11-14make an assertion in this testChris McDonough
2012-11-14Merge branch 'fix_commands' of git://github.com/sontek/pyramid into ↵Chris McDonough
sontek-fix_commands
2012-11-14remove duplicate whatsnew entry (forward port from 1.3 branchChris McDonough
2012-11-14ref #725; indicate how to join the result of render_view_to_iterableChris McDonough
2012-11-14Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-11-13indicate render_view returns a bytestring (see #725)Michael Merickel
2012-11-13updated changelogMichael Merickel
2012-11-13Merge branch 'pull.725' which closes #721Michael Merickel
2012-11-13simplfied change as response.app_iter must contain bytes per pep 3333Michael Merickel
2012-11-13Merge branch 'master' of avolkov/pyramid into pull.725Michael Merickel
2012-11-13My fix for Issue #721. Made view.py - render_view to convert iterable inputAlex Volkov
into bytestring and joing it with bytestring.
2012-11-13Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
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 ↵Robert Jackiewicz
context in a forbidden view.
2012-11-12Move pyramid.config.views.viewdefaults -> pyramid.util.viewdefaultsChris McDonough
Move pyramid.config.util.ActionInfo -> pyramid.util.ActionInfo Move pyramid.config.util.action_method -> pyramid.util.action_method This is in support of not requiring substance d and other like systems to import from within pyramid.config (even though these functions and classes are still not officially documented APIs). Backwards compatibility imports have been left in place.
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
``physical_path`` predicate implementations; instead of raising an exception, return False.
2012-11-05adding transaction module requirement to zodb wiki docsericrasmussen
2012-11-05add transaction dependency to zodb scaffoldericrasmussen
2012-11-05Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-11-05added the ability to pass options to get_app for use with stringJohn Anderson
interpolation in the config
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
permit limited compisition reuse of the decorator by other software that wants to provide custom decorators that are much like view_config. Closes #637.