summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-10-08Merge pull request #1942 from stevepiercy/masterSteve Piercy
rewrapping, rst heading underlines, minor grammar
2015-10-08rewrapping, rst heading underlines, minor grammarSteve Piercy
2015-10-08rewrapping onlySteve Piercy
2015-10-07Merge pull request #1939 from stevepiercy/masterSteve Piercy
Heading rst syntax, casing
2015-10-07Heading rst syntax, casingSteve Piercy
2015-10-07Merge pull request #1936 from stevepiercy/masterSteve Piercy
add contributing.md
2015-10-07- grammar, rewrappingSteve Piercy
2015-10-07Merge pull request #1932 from stevepiercy/masterSteve Piercy
grammar, wrapping
2015-10-07- grammar, rewrappingSteve Piercy
2015-10-07populate pshell's env_help with docstring of valuesJesse Dhillon
2015-10-06- grammar, rewrappingSteve Piercy
2015-10-06Merge pull request #1928 from bertjwregeer/fix/docsSteve Piercy
Small fixes to the docs
2015-10-06Missing space was causing Sphinx to barfBert JW Regeer
Sphinx was barfing about "Inline literal start-string without end-string.". It barfs no more.
2015-10-06Include the right line number from the .py fileBert JW Regeer
This was including a blank line. This mistake was caught when attempting to build a PDF file using latexpdf due to LaTeX not allowing certain sections to be blank.
2015-10-06Merge pull request #1925 from stevepiercy/masterSteve Piercy
- neutral gender, grammar, rewrapping
2015-10-06- neutral gender, grammar, rewrappingSteve Piercy
2015-10-06Merge pull request #1922 from stevepiercy/masterSteve Piercy
- grammar, wrapping to 79 columns
2015-10-06- grammar, wrapping to 79 columnsSteve Piercy
2015-10-05Merge pull request #1917 from stevepiercy/masterSteve Piercy
grammar, wrapping, update debug toolbar images and text
2015-10-05- grammarSteve Piercy
- heading underlines - update images and text for debug toolbar
2015-10-05- grammarSteve Piercy
- heading underlines - update images and text for debug toolbar
2015-10-04Merge pull request #1916 from stevepiercy/masterSteve Piercy
grammar
2015-10-04grammarSteve Piercy
(cherry picked from commit 961dcb8) (cherry picked from commit eb74c4d)
2015-10-04Merge pull request #1912 from stevepiercy/masterSteve Piercy
grammar, rst heading underline fixes
2015-10-04grammar, rst heading underline fixesSteve Piercy
2015-10-04Merge pull request #1909 from stevepiercy/masterSteve Piercy
grammar
2015-10-04grammarSteve Piercy
2015-10-01Mention Circus as a pserve --daemon replacement. Refs #1554, #1641Mike Naberezny
2015-10-01Merge pull request #1906 from stevepiercy/masterSteve Piercy
wrap to 79 chars
2015-10-01wrap to 79 charsSteve Piercy
2015-10-01Merge pull request #1902 from stevepiercy/masterSteve Piercy
wiki2 documentation precisely matches the scaffolding output
2015-10-01wiki2 documentation precisely matches the scaffolding outputnharringtonwasatch
2015-09-29Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-09-13fix broken testsMichael Merickel
2015-09-13deprecate pserve daemonizationMichael Merickel
2015-09-12Merge pull request #1893 from stevepiercy/masterSteve Piercy
Fix possessive form, from PR by @uralbash
2015-09-12Fix possessive form, from PR by @uralbashSteve Piercy
2015-09-06Added an entry to changelogJohn Anderson
2015-09-06Use entry points for pshellJohn Anderson
2015-09-02Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-09-01Merge pull request #1887 from stevepiercy/masterSteve Piercy
- add pylonswebframework to intersphinx config, sort entries so they …
2015-09-01- add pylonswebframework to intersphinx config, sort entries so they can be ↵Steve Piercy
found (meh! 79 char columns) - replace final pylonshq reference with RTD reference
2015-08-31Merge branch 'pull.1866'Michael Merickel
2015-08-31fix difference between py2 and py3 with base64.b64decodeMichael Merickel
2015-08-31Merge branch 'fixes/cookie_values' of bertjwregeer/pyramid into pull.1866Michael Merickel
2015-08-31update changelogMichael Merickel
2015-08-31Merge branch 'fixes/HTTPMove' of bertjwregeer/pyramid into pull.1865Michael Merickel
2015-08-31Merge pull request #1884 from stevepiercy/masterSteve Piercy
move extra credit question about @forbidden_view_config from authenti…
2015-08-31move extra credit question about @forbidden_view_config from authentication ↵Steve Piercy
to authorization
2015-08-24Merge pull request #1880 from stevepiercy/masterSteve Piercy
document +dot+ for dotfiles in scaffolds