summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-11-07minor grammar, fix .rst markup, rewrap to 79 columnsSteve Piercy
2015-11-06Merge pull request #2093 from stevepiercy/masterSteve Piercy
fix versionadded paragraph
2015-11-06minor grammar, fix .rst markup, insert versionchanged directive, rewrap to ↵Steve Piercy
79 columns
2015-11-06Merge pull request #2091 from stevepiercy/masterSteve Piercy
minor grammar, fix .rst markup, insert versionchanged directive, rewr…
2015-11-06minor grammar, fix .rst markup, insert versionchanged directive, rewrap to ↵Steve Piercy
79 columns
2015-11-06Merge pull request #2088 from stevepiercy/masterSteve Piercy
minor grammar, fix .rst markup, add emphasize lines for diff, rewrap …
2015-11-06minor grammar, fix .rst markup, add emphasize lines for diff, rewrap to 79 ↵Steve Piercy
columns
2015-11-05reorder, remove redundant statements, reduce verbosity, update headings, rewrapSteve Piercy
2015-11-05Merge pull request #2083 from stevepiercy/masterSteve Piercy
minor grammar, fix .rst markup, rewrap to 79 columns
2015-11-05minor grammar, fix .rst markup, rewrap to 79 columnsSteve Piercy
2015-11-05Merge pull request #2082 from naoko/wiki2-totorial-basiclayoutMichael Merickel
literalinclude line number was off for Base object
2015-11-05literalinclude line number was off for Base objectNaoko Reeves
2015-11-04Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-11-04Merge pull request #2080 from stevepiercy/masterSteve Piercy
add missing period
2015-11-04add missing periodSteve Piercy
(cherry picked from commit c7b1bff)
2015-11-04Merge pull request #2076 from stevepiercy/masterSteve Piercy
update tb_introspector.png, minor grammar, fix .rst markup, rewrap to…
2015-11-04update tb_introspector.png, minor grammar, fix .rst markup, rewrap to 79 columnsSteve Piercy
2015-11-03Merge pull request #2072 from stevepiercy/masterSteve Piercy
minor grammar, fix .rst markup, rewrap to 79 columns
2015-11-03minor grammar, fix .rst markup, rewrap to 79 columnsSteve Piercy
2015-11-03Include CHANGES entry for converting time related parameters of ↵RamiC
AuthTktCookieHelper and CookieSession
2015-11-03Convert AuthTktCookieHelper time related parameters to int when applicableRamiC
2015-11-02Merge pull request #2068 from stevepiercy/masterSteve Piercy
- remove deprecated section in docs (Closes #2067)
2015-11-02- remove deprecated section in docs (Closes #2067)Steve Piercy
- minor grammar, rewrap to 79 columns
2015-11-01fix add_route_predicate docs to reference add_routeMichael Merickel
2015-10-31Merge pull request #2064 from stevepiercy/masterSteve Piercy
minor grammar, rewrap to 79 columns
2015-10-31minor grammar, rewrap to 79 columnsSteve Piercy
2015-10-31Convert max_age argument to int when applicableRamiC
2015-10-30Merge pull request #2061 from stevepiercy/masterSteve Piercy
add linenos and emphasize-lines to code examples
2015-10-30add linenos and emphasize-lines to code examplesSteve Piercy
2015-10-29add a note about userid security issues from #2060Michael Merickel
2015-10-29Remove a leaked line from a local testRamiC
2015-10-29Remove unnecessary codeRamiC
2015-10-29Convert reissue_time argument to int values when applicableRamiC
2015-10-29Merge pull request #2056 from stevepiercy/masterSteve Piercy
add Git Branches section
2015-10-29- add Git Branches per ↵Steve Piercy
https://github.com/Pylons/pyramid/pull/2050#issuecomment-151978555 - add links to resources of Coding Style and Standards and Git Workflow - fix git clone command
2015-10-28Merge pull request #2051 from stevepiercy/masterSteve Piercy
minor grammar, rewrap 79 columns, some .rst syntax fixes, add a heade…
2015-10-28minor grammar, rewrap 79 columns, some .rst syntax fixes, add a header and ↵Steve Piercy
index entry
2015-10-28Convert timeout argument to int values when applicableRamiC
2015-10-28avoid spamming by outputting state only once when a file changesMichael Merickel
2015-10-27Restore link target used by 'whatsnew-1.3.rst'.Tres Seaver
Should fix Jenkins breakage.
2015-10-27pserve: track files with SyntaxError and skip reloadDomen Kožar
2015-10-27Merge pull request #2041 from stevepiercy/masterSteve Piercy
minor grammar, rewrap 79 columns, some .rst syntax fixes
2015-10-27Merge remote-tracking branch 'upstream/master'Steve Piercy
2015-10-27minor grammar, rewrap 79 columns, some .rst syntax fixesSteve Piercy
2015-10-26Merge pull request #2040 from silenius/masterSteve Piercy
.txt -> json
2015-10-26.txt -> jsonJulien Cigar
2015-10-26Merge pull request #2037 from stevepiercy/masterSteve Piercy
minor grammar, rewrap 79 columns, some .rst syntax fixes
2015-10-26minor grammar, rewrap 79 columns, some .rst syntax fixesSteve Piercy
2015-10-25Merge pull request #2034 from stevepiercy/masterSteve Piercy
minor grammar, rewrap 79 columns, some .rst syntax fixes
2015-10-25minor grammar, rewrap 79 columns, some .rst syntax fixesSteve Piercy