summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-05-22Merge pull request #1716 from stevepiercy/masterSteve Piercy
2015-05-22spelling; correct title tagSteve Piercy
2015-05-22Merge pull request #1711 from stevepiercy/masterSteve Piercy
2015-05-22add missing word; correct title tagSteve Piercy
2015-05-22Merge pull request #1710 from stevepiercy/masterSteve Piercy
2015-05-22add linenos to python codeSteve Piercy
2015-05-21Merge pull request #1705 from stevepiercy/masterSteve Piercy
2015-05-21grammar fixesSteve Piercy
2015-05-21Merge pull request #1704 from stevepiercy/masterSteve Piercy
2015-05-21- correct title tagSteve Piercy
2015-05-20Merge pull request #1699 from stevepiercy/masterSteve Piercy
2015-05-20punctuation fixSteve Piercy
2015-05-20Merge pull request #1695 from stevepiercy/masterSteve Piercy
2015-05-20punctuation fixSteve Piercy
2015-05-20Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-05-20Merge pull request #1694 from stevepiercy/masterSteve Piercy
2015-05-20- grammar/wrappingSteve Piercy
2015-05-20Merge pull request #1689 from stevepiercy/masterSteve Piercy
2015-05-20correct reference to line numbersSteve Piercy
2015-05-20Merge pull request #1686 from stevepiercy/masterSteve Piercy
2015-05-20re-moving unnecessary hyphenation (see what I did there?)Steve Piercy
2015-05-19Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-05-16Merge pull request #1682 from stevepiercy/masterSteve Piercy
2015-05-16- replace image with ASCII tree diagramSteve Piercy
2015-05-16Merge pull request #1681 from stevepiercy/masterSteve Piercy
2015-05-16cherrypick from 1.5Steve Piercy
2015-05-16Merge pull request #1676 from stevepiercy/masterSteve Piercy
2015-05-16grammar fixSteve Piercy
2015-05-16Merge pull request #1673 from stevepiercy/masterSteve Piercy
2015-05-16grammar fixSteve Piercy
2015-05-11Update authorization.rstAreski Belaid
2015-05-08Merge pull request #1665 from stevepiercy/masterSteve Piercy
2015-05-08Fixed minor highlighting mistake.Florian Klemme
2015-05-06Merge pull request #1659 from stevepiercy/masterSteve Piercy
2015-05-06bump and unpin versions. RTD uses Sphinx 1.3.1 now.Steve Piercy
2015-04-30Update logging.rstAreski Belaid
2015-04-30correct view nameSteve Piercy
2015-04-26add pylons_sphinx_latesturl to the docs extrasMichael Merickel
2015-04-26update rtd.txt to just load deps from docs extrasMichael Merickel
2015-04-26allow dots in the jsonp callback and prefix content with a commentMichael Merickel
2015-04-24Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-04-20update development.ini in scaffolds to listen on 127.0.0.1Michael Merickel
2015-04-20Merge pull request #1642 from Taar/alchemy_scaffold_updateMichael Merickel
2015-04-20Adding myself to the contributors listRandy Topliffe
2015-04-20Merge branch 'alchemy_scaffold_update' of Taar/pyramidMichael Merickel
2015-04-20Update CONTRIBUTORS.txtTimur Izhbulatov
2015-04-20rearrange tox.iniMichael Merickel
2015-04-19fix some style issuesMichael Merickel
2015-04-19Merge branch 'configurable-view-deriver' of caseman/pyramid into feature/conf...Michael Merickel
2015-04-19Merge pull request #1627 from bertjwregeer/security/jsonpMichael Merickel