summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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.
2013-08-28Added me to the CONTRIBUTERS.txt.Takahiro Fujiwara
2013-08-27Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-27utilize the tuple form of starts/endswithPhilip Jenvey
2013-08-27- Fix an obscure problem when combining a virtual root with a route with aChris McDonough
``*traverse`` in its pattern. Now the traversal path generated in such a configuration will be correct, instead of an element missing a leading slash.
2013-08-27Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-23Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-23Merge pull request #1105 from MatthewWilkes/masterChris McDonough
Fix documentation on using gettext plurals and include examples
2013-08-23Add name to contributorsMatthew Wilkes
2013-08-23Fix documentation on using gettext plurals and include examplesMatthew Wilkes
2013-08-20Merge branch 'feature.external-routes'Chris McDonough
2013-08-20Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-20raise ValueError instead of generating just path when _app_url is provided ↵Chris McDonough
to request.route_url and the route has an external pattern
2013-08-19remove mention of unused http status codeMichael Merickel
2013-08-19allow pregenerator and route_prefix with external routesMichael Merickel
2013-08-19Merge branch 'feature.issue611-external-static-routes' of tomster/pyramid ↵Michael Merickel
into feature.external-routes
2013-08-19Fix indentation.Fabian Neumann
2013-08-19explainChris McDonough
2013-08-19Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-18Merge pull request #1102 from stevepiercy/masterChris McDonough
no HTML smartypants!
2013-08-18no HTML smartypants!Steve Piercy
Fix https://github.com/Pylons/pyramid/issues/669
2013-08-17Merge branch 'adroullier-master'Chris McDonough
2013-08-17Merge branch 'master' of github.com:adroullier/pyramid into adroullier-masterChris McDonough
2013-08-17Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-17reference the static url route featureTom Lazar
2013-08-17typoTom Lazar
2013-08-17Oops, indent one level deeper.Fabian Neumann
2013-08-17Document the external URL feature.Fabian Neumann
2013-08-17Merge pull request #1100 from tomster/nose-selecttestsChris McDonough
include nose-selecttests
2013-08-17include and mention the `nose-selecttests ↵Tom Lazar
<https://pypi.python.org/pypi/nose-selecttests/>`_ plugin
2013-08-17adjust the checkout path to the new value set above in a previous commitTom Lazar
2013-08-17provide the tox url when mentioning it first.Tom Lazar
2013-08-17update changelogTom Lazar
2013-08-17document the behavior for ``route_path``Tom Lazar
2013-08-17if `_app_url` is given it takes precedenceTom Lazar
2013-08-17assemble a custom pregenerator for static external urlsTom Lazar
we split the pattern via urlparse and pass the parts into the pregenerator such that route_url will behave as expected, mainly by assembling an appropriate value for ``_app_url``
2013-08-17Merge branch 'witsch-508-localizer-on-request'Chris McDonough
2013-08-17Merge branch '508-localizer-on-request' of github.com:witsch/pyramid into ↵Chris McDonough
witsch-508-localizer-on-request
2013-08-17done :)Andreas Zeidler
2013-08-17clean up test namesAndreas Zeidler
2013-08-17don't use the default locale when testing custom localizerAndreas Zeidler
also, use an object as a dummy localizer for better readability
2013-08-17remove test that explicitly sets a registry on the requestAndreas Zeidler
outside tests the router puts the registry on the request, but in tests it sometimes needs to exist as well. however, it doesn't make sense to test something that's only done in tests anyway
2013-08-17test a custom localizerAndreas Zeidler