summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-08-24document +dot+ for dotfiles in scaffoldsAlexandre Conrad
2015-08-23Add a RouteFound event which will fire after a route is foundDonald Stufft
2015-08-17Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-08-10Merge pull request #1871 from stevepiercy/masterSteve Piercy
Fix minor typo
2015-08-10Fix minor typoIsmail
2015-08-03base64 encode cookie valuesBert JW Regeer
This way they are valid according to the RFC, and newer versions of WebOb won't complain.
2015-08-03Fix Pyramid against WebOb >=1.5.0Bert JW Regeer
Due to changes in WebOb we may no longer create a Response() object with an invalid status (i.e. 'None None'). For the top-level HTTPException if it is not correctly overriden in child classes then we now use '520 Unknown Error'. While not an official RFC error, this has been used by Microsoft's Azure as well as CloudFlare to signify an error that doesn't have a more appropriate error message.
2015-07-29Add a bandaid; provide correct rationale of using easy_install over pip, for nowChris McDonough
2015-07-29Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-07-22Merge pull request #1861 from davidjb/patch-2Steve Piercy
Use correct cache argument in cache busting doco
2015-07-23Use correct cache argument in cache busting docoDavid Beitey
Minor correction; it's ``cache_max_age`` rather than ``max_cache_age``.
2015-07-15fix for #1846, incorrect pointers to nonexistent webob propertiesChris McDonough
2015-06-23Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-06-18Merge pull request #1852 from stevepiercy/masterSteve Piercy
rst numbering syntax
2015-06-18rst numbering syntaxSteve Piercy
2015-06-18Merge pull request #1847 from stevepiercy/masterSteve Piercy
combine extra credit sections
2015-06-18combine extra credit sectionsSteve Piercy
2015-06-14Merge pull request #1844 from ergo/feature/alchemy-scaffold-updateMichael Merickel
metadata: add proper naming convention to metadata - same as suggeste…
2015-06-13metadata: add proper naming convention to metadata - same as suggested by ↵Marcin Lulek
alembic/sqlalchemy documentation
2015-06-11Merge pull request #1842 from stevepiercy/masterSteve Piercy
Update authorization.rst - cherrypick from 1.5
2015-06-11Update authorization.rstorangieboot
Removed extra colons
2015-06-10Merge pull request #1838 from jenner/contibutor-for-1837Michael Merickel
added appropriate contributors and changes entries
2015-06-11added appropriate contributors and changes entriesIgor Stroh
2015-06-10Merge pull request #1837 from jenner/pcreate-check-existing-namesMichael Merickel
handle conflicting project names gracefully, fixes: #1357
2015-06-11use input_ from p.compat, renamed optionIgor Stroh
- Use pyramid.compat.input_ instead of manually checking for python version and chosing the appropriate input/raw_input function - Renamed--force-conflicting-name option to --ignore-conflicting-name - Display invalid scaffold names in a sorted manner
2015-06-10added py2.6 compatibility, removed test for 'site'Igor Stroh
- Made sure str.format() calls are py2.6 compatible - Removed test_scaffolds/test_init.py#test_pre_site since the check is handled in pcreate script
2015-06-10make sure user input is py2.x/py3 compatibleIgor Stroh
- Use input() in python3 and raw_input in python 2.x - Remoced unused local variables
2015-06-10removed unused exceptionsIgor Stroh
2015-06-10handle conflicting project names gracefully, fixes: #1357Igor Stroh
- Check for importable packages/modules with the same name as the package to be created - Added --force-conflicting-name option to enforce the use of a conflicting package - Added appropriate tests
2015-06-09Merge pull request #1836 from Pylons/fix-1832-masterTres Seaver
Return concrete classes from 'pyramid.httpexceptions.exception_response'
2015-06-09Return concrete classes from 'pyramid.httpexceptions.exception_response'.Tres Seaver
The base classes are not appropriate for 400 and 500 status codes. See: #1832
2015-06-06Merge pull request #1831 from stevepiercy/masterSteve Piercy
cherry pick 1.6-branch to master
2015-06-06cherry pick 1.6-branch to masterSteve Piercy
2015-06-06Merge pull request #1829 from kissgyorgy/masterTres Seaver
More idiomatic Python
2015-06-06More idiomatic codeKiss György
2015-06-05We explicitly pass in the interfaces provided by the request asChris McDonough
request_iface to _call_view; we don't want _call_view to use request.request_iface, because render_view_to_response and friends are pretty much limited to finding views that are not views associated with routes, and the only thing request.request_iface is used for is to find route-based views. The render_view_to_response API is (and always has been) a stepchild API reserved for use of those who actually use traversal. Doing this fixes an infinite recursion bug introduced in Pyramid 1.6a1, and causes the render_view* APIs to behave as they did in 1.5 and previous. We should probably provide some sort of different API that would allow people to find views for routes. Fixes #1643.
2015-06-05Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-06-01Merge pull request #1823 from kilodalton/fixQuickTutorialDatabasesMichael Merickel
Quick Tutorial Database: Logging configs for db script output + fix scoped session warning
2015-06-01added name to contributors listKaren Dalton
2015-06-01add self.config = testing.setUp and testing.tearDown back to WikiViewTests ↵Karen Dalton
as it is a standard pattern for view tests
2015-06-01remove some calls to the testing module and self.config as they are not usedKaren Dalton
2015-06-01Add additional logging configs necessary for db script output and update ↵Karen Dalton
tests.py to fix the 'At least one scoped session' warning
2015-05-31Merge pull request #1817 from stevepiercy/masterSteve Piercy
- update testing and templating remarks
2015-05-31- update testing and templating remarksSteve Piercy
- grammar, punctuation, 79-column rewrapping, case corrections
2015-05-31Merge pull request #1816 from stevepiercy/masterSteve Piercy
move -E from Makefile to tox.ini so that we don't punish manual doc b…
2015-05-31move -E from Makefile to tox.ini so that we don't punish manual doc buildsSteve Piercy
2015-05-31Merge pull request #1815 from stevepiercy/masterSteve Piercy
add -E option to get tox to build docs and pass on jenkins
2015-05-31add -E option to get tox to build docs and pass on jenkinsSteve Piercy
2015-05-30Merge pull request #1814 from kissgyorgy/masterSteve Piercy
Added note on check_csrf view predicate
2015-05-30Added notes on check_csrf view predicate. Also it is an add_view parameter, ↵Kiss György
not add_route.