summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-12-06Merge pull request #2851 from Pylons/revert-2847-issue-2656Bert JW Regeer
Revert "Changed 'host' and 'port' configuration to a new 'listen' style that …"
2016-12-06Revert "Changed 'host' and 'port' configuration to a new 'listen' style that ↵Bert JW Regeer
…"
2016-12-06Changed wiki tutorial to showcase passwrd hashing with bcrypt. Relates to #2204Martin
2016-12-06Merge pull request #2847 from mfrlin/issue-2656Steve Piercy
Changed 'host' and 'port' configuration to a new 'listen' style that …
2016-12-06Added changes for #2656Martin
2016-12-06Signed CONTRIBUTORS.txtMartin
2016-12-06Merge remote-tracking branch 'upstream/master' into issue-2656Martin
2016-12-06Merge pull request #2848 from miohtama/fix/sphinx-1.5Steve Piercy
Fix docs for Sphinx 1.5
2016-12-06Fix pep8 error on config/util.pyMikko Ohtamaa
2016-12-06Another Sphinx 1.5 configuraition file change.Mikko Ohtamaa
2016-12-06Fix docs for Sphinx 1.5Mikko Ohtamaa
2016-12-06fixing no new line at the end of fileMartin
2016-12-06Changed 'host' and 'port' configuration to a new 'listen' style that is now ↵Martin
supported by waitress server.
2016-12-05move predicates into top-level package instead of inside configMichael Merickel
this better mirrors the view derivers design where the config package uses implementations from the pyramid namespace
2016-11-28Merge pull request #2843 from stevepiercy/style-guideSteve Piercy
restore Typographical Conventions, an edited and condensed version of…
2016-11-28fix warning about duplicate nameSteve Piercy
2016-11-28restore Typographical Conventions, an edited and condensed version of the ↵Steve Piercy
Style Guide
2016-11-28Merge pull request #2840 from stevepiercy/masterSteve Piercy
add 3.6 support to documentation
2016-11-27fix nocover statements, should be "no cover"Michael Merickel
2016-11-26Merge pull request #2841 from mmerickel/py33-warning-onlyMichael Merickel
only warn about py33, do not error
2016-11-26only warn about py33, do not errorMichael Merickel
this is squashed by pip unfortunately but it's better than a hard error
2016-11-26add 3.6 support to documentationSteve Piercy
- See #2835
2016-11-26Merge pull request #2839 from stevepiercy/style-guideSteve Piercy
Add change note; minor updates to style guide
2016-11-26add change noteSteve Piercy
2016-11-26minor gardeningSteve Piercy
2016-11-25eat dog food: use " not ` for headingsSteve Piercy
2016-11-25Merge pull request #2837 from stevepiercy/style-guideSteve Piercy
Add more sections to the Style Guide
2016-11-25add sphinx extensionsSteve Piercy
2016-11-25add cross-referencingSteve Piercy
2016-11-25add toctreeSteve Piercy
2016-11-25add glossarySteve Piercy
2016-11-25add feature versioning, seealsoSteve Piercy
2016-11-25replace description with metaSteve Piercy
- add parsed-literals
2016-11-25Merge pull request #2836 from stevepiercy/style-guideSteve Piercy
add todo Sphinx extension for todo blocks
2016-11-25add todo Sphinx extension for todo blocksSteve Piercy
- add lists, tables, danger, todo, comments
2016-11-24Merge pull request #2833 from stevepiercy/style-guideSteve Piercy
more style guide updates
2016-11-24comment out autodoc of TranslationString to get docs to build on Travis-CISteve Piercy
https://travis-ci.org/Pylons/pyramid/jobs/178536008#L406
2016-11-24improve links sectionSteve Piercy
- add rendering of headings for testing - add topic directive - dedent displaying code - add italics, strong - add Pytyon modules, classes, methods, functions - add tables heading (WIP) - add API documenation (WIP)
2016-11-23clarify commentMichael Merickel
fixes #2831
2016-11-22improve include sectionSteve Piercy
- start work on inline and block reST sections
2016-11-21remove the deprecated IContextURLMichael Merickel
2016-11-21document globbingMichael Merickel
2016-11-21support asset specs in watch_files and variable interpolationMichael Merickel
2016-11-21Merge pull request #2829 from stevepiercy/style-guideSteve Piercy
add literalinclude options
2016-11-21add literalinclude optionsSteve Piercy
2016-11-21Merge pull request #2828 from stevepiercy/style-guideSteve Piercy
More style guide updates
2016-11-21add code block optionsSteve Piercy
- add literal includes - add displaying long commands - add sphinx to intersphinx - garden
2016-11-21add changelog for #2827Michael Merickel
2016-11-21support a [pserve] config section with a list of files to watchMichael Merickel
fixes #2732
2016-11-20add syntax highlightingSteve Piercy