summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-03-13minor update to request processing diagramSteve Piercy
2016-01-03Merge branch 'master' into feature/configurable-view-deriverBert JW Regeer
2016-01-03copy whatsnew-1.6 from 1.6-branchMichael Merickel
2016-01-03fix grammar on whatsnew document titlesMichael Merickel
2016-01-03add a note about serving cache busted assetsMichael Merickel
2016-01-02Merge pull request #2208 from stevepiercy/masterSteve Piercy
Python 3.4 compatibility
2016-01-02- minor grammar in "problems", rewrap to 79 columnsSteve Piercy
2015-12-30Merge pull request #2201 from stevepiercy/masterSteve Piercy
- minor grammar in "problems", rewrap to 79 columns
2015-12-30- minor grammar in "problems", rewrap to 79 columnsSteve Piercy
2015-12-26Merge pull request #2200 from stevepiercy/masterSteve Piercy
Update glossary.rst
2015-12-26Update glossary.rstBastien
fixed typo (cherry picked from commit 0a5c9a2)
2015-12-23Merge pull request #2193 from stevepiercy/masterSteve Piercy
- Add Python compatibility to history, hacking, releasing
2015-12-23- Add Python compatibility to history, hacking, releasingSteve Piercy
- Use 1.X for version number
2015-12-23Merge pull request #2191 from stevepiercy/masterSteve Piercy
add p* scripts output for --help
2015-12-23Add documentation of command line programs/p* scriptsSteve Piercy
2015-12-23Merge branch 'master' of https://github.com/Pylons/pyramidSteve Piercy
2015-12-23Merge pull request #2 from kpinc/patch-2Steve Piercy
Update prequest.py
2015-12-23Merge pull request #1 from kpinc/patch-1Steve Piercy
Expound. Punctuation.
2015-12-22Update prequest.pykpinc
2015-12-22Expound. Punctuation.kpinc
2015-12-21remove :cwd: argument from programoutput rst directive so that travis will passSteve Piercy
2015-12-21attempt to get travis to pass on programoutput rst directiveSteve Piercy
2015-12-21- add p* scriptsSteve Piercy
- add links to p* scripts - add a blank line to keep indices and labels better visually related to the subsequent heading
2015-12-20add sphinxcontrib-programoutput configuration to render command line outputSteve Piercy
2015-12-19update changelog for #2189Michael Merickel
2015-12-19Merge pull request #2189 from mmerickel/deprecate-pseve-user-groupMichael Merickel
deprecate pserve --user and --group options
2015-12-18deprecate pserve --user and --group optionsMichael Merickel
This completes the deprecation of all process management options from pserve.
2015-12-17Merge pull request #2187 from mmerickel/fix/asset-abspathMichael Merickel
ensure IAssetDescriptor.abspath always returns an abspath
2015-12-17add changelog for #2187Michael Merickel
2015-12-17ensure IAssetDescriptor.abspath always returns an abspathMichael Merickel
fixes #2184
2015-12-17Merge pull request #2171 from mmerickel/feature/add-cache-busterMichael Merickel
config.add cache buster
2015-12-17update changelog for #2171Michael Merickel
2015-12-17grammar updates from stevepiercyMichael Merickel
2015-12-17Merge pull request #2185 from stevepiercy/masterSteve Piercy
progress through "Pyramid Uses a ZCA Registry"
2015-12-17progress through "Pyramid Uses a ZCA Registry"Steve Piercy
- minor grammar, wrap 79 columns
2015-12-16update docs to support explicit asset overridesMichael Merickel
2015-12-16defer prevent check until registerMichael Merickel
2015-12-16use default irc templateMichael Merickel
2015-12-16test travis irc notificationsMichael Merickel
2015-12-14Merge pull request #2178 from srisankethu/patch-1Michael Merickel
Update url.py
2015-12-14Merge pull request #2179 from srisankethu/patch-2Michael Merickel
Update CONTRIBUTORS.txt
2015-12-14Merge pull request #2180 from stevepiercy/masterSteve Piercy
- Remove broken integration test example from testing and source file…
2015-12-14- Remove broken integration test example from testing and source file, per #2172Steve Piercy
- Update functional test with explicit instructions and to sync with actual starter scaffold
2015-12-14new default behavior matches virtual specs, old behavior hidden behind ↵Michael Merickel
explicit=True
2015-12-12Update CONTRIBUTORS.txtSri Sanketh Uppalapati
2015-12-12Update url.pySri Sanketh Uppalapati
2015-12-12Update url.pySri Sanketh Uppalapati
2015-12-12Update url.pySri Sanketh Uppalapati
2015-12-12Update url.pySri Sanketh Uppalapati
2015-12-11Merge pull request #2173 from stevepiercy/masterSteve Piercy
add developing and contributing section