summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-09-06Merge pull request #1112 from dhellmann/bug/namespace-packagesChris McDonough
Update package_name() to work with namespace pkgs
2013-09-06Merge pull request #1115 from bertjwregeer/docs/remove_init_sqlalchemyMichael Merickel
Docs: remove init sqlalchemy
2013-09-06Update line numbers as appropriateBert JW Regeer
Removing __init__ moved some code around, update the line numbers as appropriate so that the right sections of code get highlighted.
2013-09-06Add small note showing example usage of MyModelBert JW Regeer
2013-09-06removed MyModel.__init__ from the scaffoldssergey.volobuev
2013-09-06changed the explanation of the (now missing) __init__ methodsergey.volobuev
2013-09-06removed __init__ methods from SQLAlchemy models in the documentation because ↵sergey.volobuev
the latter generates a default constructor
2013-09-06Update package_name() to work with namespace pkgsDoug Hellmann
The logic in pyramid.path.package_name() should take into account the fact that namespace packages created by setuptools do not have __init__.py[c] files, and so they have no __file__ attribute. This resolves an issue with WSME (https://bugs.launchpad.net/wsme/+bug/1221201) Change-Id: I39bc32a9c38fa11c4cef22a041077ed9001091be
2013-09-06Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-09-06shorten test output in travisChris McDonough
2013-09-05s/view execution machinery/generating a response/Michael Merickel
2013-09-05resolve conflicts, reword change entry a bitChris McDonough
2013-09-05Merge branch 'fix.remove-deprecated-request-attrs'Chris McDonough
2013-09-05update HACKINGChris McDonough
2013-09-05remove the deprecated request.response_* attributesMichael Merickel
2013-09-05update render() to preserve the original response objectMichael Merickel
2013-09-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-09-02Merge pull request #1106 from westurner/patch-1Chris McDonough
DOC: Update quick_tour.rst: Typo: with -> which
2013-09-02DOC: Update quick_tour.rst: Typo: with -> whichWes Turner
2013-09-02move docs section to a more appropriate placeChris McDonough
2013-09-02Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-30Merge branch '1.5-branch'Chris McDonough
2013-08-30prep for 1.5a1Chris McDonough
2013-08-30mention quickstartChris McDonough
2013-08-30unnecessaryChris McDonough
2013-08-30squash console output during test runsChris McDonough
2013-08-30update whatsnewChris McDonough
2013-08-30move 1.4 stuff to HISTORY.txtChris McDonough
2013-08-30Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-30dammit, typoChris McDonough
2013-08-30fix httpok docstringChris McDonough
2013-08-30fix docstringsChris McDonough
2013-08-30add HTTPSuccessful base class, allowing HTTPOk to be caught independently; ↵Chris McDonough
closes #986
2013-08-30allow exception view registrations for HTTPException to override default ↵Chris McDonough
exception view; closes #985
2013-08-30unused codeChris McDonough
2013-08-30Merge branch 'feature.hybridurlgen'Chris McDonough
2013-08-29get rid of remainder_name on route, and just default to passing traverse; ↵Chris McDonough
add route_remainder_name argument to resource_url
2013-08-29fix the regex used by get_remainder_name, add tests for get_remainder_nameChris McDonough
2013-08-29fix nameChris McDonough
2013-08-29point at docs sectionChris McDonough
2013-08-29documentation for hybrid url generationChris McDonough
2013-08-29resource_url coverageChris McDonough
2013-08-29first cut at hybrid url generation; still needs tests for resource_url logicChris McDonough
2013-08-29Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-29make local_name an attribute of Request, move logic from get_localizer into ↵Chris McDonough
Request.localizer, fix docs; closes #1099
2013-08-29- When the ``pyramid.reload_templates`` setting was true, and a ChameleonChris McDonough
template was reloaded, and the renderer specification named a macro (e.g. ``foo#macroname.pt``), renderings of the template after the template was reloaded due to a file change would produce the entire template body instead of just a rendering of the macro. See https://github.com/Pylons/pyramid/issues/1013. Closes #1013
2013-08-28Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-28Merge branch 'wutali-escaped_double_braces'Chris McDonough
2013-08-28Permit escaping of double braces in scaffolds, see #862Chris McDonough
2013-08-28- The ``route_url`` and ``route_path`` APIs no longer quote ``/``Chris McDonough
to ``%2F`` when a replacement value contains a ``/``. This was pointless, as WSGI servers always unquote the slash anyway, and Pyramid never sees the quoted value.