summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-09-29Merge pull request #1396 from kpinc/doc_configMichael Merickel
Doc config
2014-09-29Merge pull request #1395 from kpinc/doc_loggingMichael Merickel
Some improvements to the paste.translogger related docs.
2014-09-26Merge pull request #1418 from jaymartin7/patch-1Steve Piercy
Update ini.rst
2014-09-26Update ini.rstJay Martin
grammar tweak (former discussion:https://github.com/Pylons/pyramid/pull/1413#issuecomment-56891441)
2014-09-21Merge pull request #1416 from stevepiercy/masterSteve Piercy
Update hello_world.rst
2014-09-21Update hello_world.rstJay Martin
2014-09-21Merge pull request #1414 from stevepiercy/masterSteve Piercy
Correct missing word.
2014-09-21Correct missing word.Omid Raha
2014-09-17fix typoSteve Piercy
Re: https://github.com/Pylons/pyramid/pull/1411/files
2014-09-10Merge pull request #1409 from bertjwregeer/patch-1Michael Merickel
Change helloworld to myapp
2014-09-10Change helloworld to myappBert JW Regeer
Fix a typo in the documentation. Closes #1408
2014-09-10Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-09-05Remove unnecessary call to get_current_registry in NullRendererHelpergoodwillcoding
2014-08-17Merge pull request #1404 from stevepiercy/masterSteve Piercy
- add missing step for tox setup
2014-08-17- add missing step for tox setupSteve Piercy
2014-08-17Merge pull request #1403 from frewsxcv/patch-1Philip Jenvey
Enable automated testing with PyPy 3
2014-08-17Enable automated testing with PyPy 3Corey Farwell
2014-08-14Merge pull request #1400 from tisdall/doc_updateMichael Merickel
remove unnecessary use of `get_current_registry()`
2014-08-14remove unnecessary use of `get_current_registry()`Tim Tisdall
- We have a request object, so get the current registry properly through it. - make use of the built-in `aslist` function for parsing the result
2014-08-13some tweaks to the usage of userid in the docsMichael Merickel
2014-08-12Docs: Switched first 2 paragraphs of security overview.Karl O. Pinc
2014-08-12Docs: Add resource tree into security overview.Karl O. Pinc
2014-08-12Docs: Include the concept of credentials in the high level security overview.Karl O. Pinc
2014-08-12Docs: Make "userid" link to the glossary term.Karl O. Pinc
2014-08-12Security: Change "principal" argument in security.remember() to "userid".Karl O. Pinc
Make the change througout the authentication policies, etc. as well.
2014-08-12Docs: Make clear that a userid need not be a principal.Karl O. Pinc
2014-08-12Docs: Introduce the concept of "userid" into the glossary.Karl O. Pinc
2014-08-10Some improvements to the paste.translogger related docs.Karl O. Pinc
Synchronizes with Waitress docs.
2014-08-08Add index entries for .ini files vis settings.Karl O. Pinc
2014-08-08Link to logging configuration in the Startup chapter.Karl O. Pinc
The Startup chapter describes the application's .ini file. The Logging chapter describes how to configure logging with the .ini file.
2014-08-08Link to .ini file description in configuration chapter.Karl O. Pinc
The Startup chapter describes a Pyramid application's .ini file. This is now a seealso in the Configuration chapter.
2014-08-06Merge branch 'master' into feature.override-asset-with-absolute-pathMichael Merickel
2014-07-31Minimize changes to increase merge likelihoodRoy Hyunjin Han
2014-07-30Fix a few tests that assume response_callbacks was a listDobes Vandermeer
2014-07-29Use a deque for the request finished / response callbacks.Dobes Vandermeer
2014-07-29Use None for the default value of the callbacks list.Dobes Vandermeer
2014-07-28Merge branch 'feature-cachebust'Chris McDonough
2014-07-28add versionadded notesChris McDonough
2014-07-28Mo' features, mo' problems.Chris Rossi
2014-07-28Add test_scaffold_with_hyphen_in_project_nameRoy Hyunjin Han
2014-07-24cachebuster -> cachebustChris Rossi
2014-07-23Add a test case for a response callback adding a response callback when it ↵Dobes Vandermeer
is the only callback.
2014-07-22Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-07-22Make sure any sequence type works with _query.Chris Rossi
2014-07-22Forgot to update interface docs earlier.Chris Rossi
2014-07-22fix URLSteve Piercy
Schema does not change when only host is overridden.
2014-07-21Update change log.Chris Rossi
2014-07-21Fix tests on py26.Chris Rossi
2014-07-21Add 'prevent_cachebuster' setting.Chris Rossi
2014-07-18Take mcdonc's advice. This should be easier for users to understand.Chris Rossi