summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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-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
2015-08-24document +dot+ for dotfiles in scaffoldsAlexandre Conrad
2015-08-10Merge pull request #1871 from stevepiercy/masterSteve Piercy
Fix minor typo
2015-08-10Fix minor typoIsmail
2015-08-03base64 encode cookie valuesBert JW Regeer
This way they are valid according to the RFC, and newer versions of WebOb won't complain.
2015-08-03Fix Pyramid against WebOb >=1.5.0Bert JW Regeer
Due to changes in WebOb we may no longer create a Response() object with an invalid status (i.e. 'None None'). For the top-level HTTPException if it is not correctly overriden in child classes then we now use '520 Unknown Error'. While not an official RFC error, this has been used by Microsoft's Azure as well as CloudFlare to signify an error that doesn't have a more appropriate error message.
2015-07-29Add a bandaid; provide correct rationale of using easy_install over pip, for nowChris McDonough
2015-07-29Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-07-22Merge pull request #1861 from davidjb/patch-2Steve Piercy
Use correct cache argument in cache busting doco
2015-07-23Use correct cache argument in cache busting docoDavid Beitey
Minor correction; it's ``cache_max_age`` rather than ``max_cache_age``.
2015-07-15fix for #1846, incorrect pointers to nonexistent webob propertiesChris McDonough
2015-06-23Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-06-18Merge pull request #1852 from stevepiercy/masterSteve Piercy
rst numbering syntax
2015-06-18rst numbering syntaxSteve Piercy
2015-06-18Merge pull request #1847 from stevepiercy/masterSteve Piercy
combine extra credit sections
2015-06-18combine extra credit sectionsSteve Piercy
2015-06-11Merge pull request #1842 from stevepiercy/masterSteve Piercy
Update authorization.rst - cherrypick from 1.5
2015-06-11Update authorization.rstorangieboot
Removed extra colons
2015-06-10Merge pull request #1838 from jenner/contibutor-for-1837Michael Merickel
added appropriate contributors and changes entries
2015-06-11added appropriate contributors and changes entriesIgor Stroh
2015-06-10Merge pull request #1837 from jenner/pcreate-check-existing-namesMichael Merickel
handle conflicting project names gracefully, fixes: #1357
2015-06-11use input_ from p.compat, renamed optionIgor Stroh
- Use pyramid.compat.input_ instead of manually checking for python version and chosing the appropriate input/raw_input function - Renamed--force-conflicting-name option to --ignore-conflicting-name - Display invalid scaffold names in a sorted manner