summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-11-09update changelog from #1376Michael Merickel
2014-11-09Merge pull request #1376 from invisibleroads/patch-3Michael Merickel
Allow hyphens in project name
2014-11-09Merge pull request #1442 from stevepiercy/masterSteve Piercy
minor rewrapping, grammar fixes to QT docs
2014-11-09- add missing "has"Steve Piercy
2014-11-09- rewrapSteve Piercy
- add missing clause in last paragraph
2014-11-09Merge pull request #1438 from stevepiercy/masterSteve Piercy
- add Translation Context term to Glossary to allow Sphinx to build docs...
2014-11-09- add Translation Context term to Glossary to allow Sphinx to build docs, in ↵Steve Piercy
reference to a recent update in the docstrings to the package translationstring https://github.com/Pylons/translationstring/blame/master/translationstring/__init__.py#L50
2014-11-07Merge pull request #1437 from bertjwregeer/update.exceptionsTres Seaver
Update documentation for HTTP exceptions (Remove WebDAV only)
2014-11-06Update documentation for exceptionsBert JW Regeer
2014-11-04fix squashed docstring on set_request_propertyMichael Merickel
fixes #1436
2014-10-20Merge pull request #1337 from Pylons/feature.root-packageTres Seaver
add config.root_package attribute
2014-10-20reference more pull requests in the change logMichael Merickel
2014-10-20add config.root_package attributeMichael Merickel
2014-10-14Merge branch 'pull.1430'Michael Merickel
2014-10-14fix comment on hello viewMichael Merickel
2014-10-14Merge pull request #1429 from jaymartin7/patch-2Michael Merickel
typo fix
2014-10-14typo fixJay Martin
2014-10-14Merge pull request #1429 from jaymartin7/patch-2Michael Merickel
typo fix
2014-10-14fix route name in commentsJay Martin
2014-10-14typo fixJay Martin
2014-10-08Merge pull request #1425 from deisner/masterChris McDonough
Minor edits to Templating With jinja2
2014-10-08Minor edits to Templating With jinja2David Eisner
* Fix grammar, order of operations in step 1. * Remove Analysis section reference to pyramid.includes in functional tests, which is no longer accurate.
2014-10-07Merge pull request #1424 from stevepiercy/masterSteve Piercy
Cherry pick 1.5 branch onto master
2014-10-07Update functional_testing.rstDavid Eisner
Wrap long line.
2014-10-07Update functional_testing.rstdeisner
Make it clear that the tests.py file in the functional_testing directory is the one to edit. Also, warn about a potential "gotcha": if the tests.py file is executable, it will be silently ignored. (I ran into this problem while going through the tutorial. This can happen if the file is being edited on a network file share from a different OS, for example.).
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-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-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-07-31Minimize changes to increase merge likelihoodRoy Hyunjin Han
2014-07-28Merge branch 'feature-cachebust'Chris McDonough
2014-07-28add versionadded notesChris McDonough
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-07 07:41:57 +0000