summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-05-03Merge pull request #1332 from stevepiercy/masterSteve Piercy
2014-05-03- looks like _ are now - in RTDSteve Piercy
2014-05-03Merge pull request #1331 from stevepiercy/masterSteve Piercy
2014-05-03- add cookbook to intersphinx mappingSteve Piercy
2014-05-03Merge pull request #1330 from stevepiercy/masterSteve Piercy
2014-05-03- spellingSteve Piercy
2014-05-01fix #1253Michael Merickel
2014-04-29require ISession.invalidate to leave behind a usable sessionMichael Merickel
2014-04-27Merge pull request #1327 from invisibleroads/patch-1Steve Piercy
2014-04-27Update static.pyRoy Hyunjin Han
2014-04-27Replaced five minutes with one hourRoy Hyunjin Han
2014-04-24Merge pull request #1321 from omidraha/patch-1Steve Piercy
2014-04-24Merge pull request #1323 from bmess/narrative_typoMichael Merickel
2014-04-23Typo found in second Declarative code blockbobby
2014-04-23remove redundant testsMichael Merickel
2014-04-23Merge pull request #1320 from bertjwregeer/feature.raise_valueerror_wsgiMichael Merickel
2014-04-24Improving `X-Vhm-Root` paragraphs.Omid Raha
2014-04-23Remove repeated word.Omid Raha
2014-04-22Update CHANGES for wsgiapp and wsgiapp2Bert JW Regeer
2014-04-22Verify that wrapped is not NoneBert JW Regeer
2014-04-21Merge pull request #1318 from stevepiercy/masterSteve Piercy
2014-04-21Update background section same as quick_tour.rstSteve Piercy
2014-04-20Merge pull request #1313 from goodwillcoding/scaffold_versiongoodwillcoding
2014-04-20add correct handling for dev docs which now points to 'master' docsgoodwillcoding
2014-04-20Merge branch 'pull.1300'Michael Merickel
2014-04-20remove special case for dev branchesMichael Merickel
2014-04-20update the version detection to use better regex matching for versiongoodwillcoding
2014-04-20refine language some more to say 'Pyramid' lessgoodwillcoding
2014-04-20standardize on scaffold over template naminggoodwillcoding
2014-04-20update change me with the scaffold changesgoodwillcoding
2014-04-20Merge branch 'master' of github.com:Pylons/pyramid into scaffold_versiongoodwillcoding
2014-04-20clean up the language to say "Generated by"goodwillcoding
2014-04-20Merge pull request #1309 from omidraha/patch-1Steve Piercy
2014-04-20Remove repeated word.Omid Raha
2014-04-20- Correct 80-column lines specification to 79 to be compliant with PEP8 and c...Steve Piercy
2014-04-19Merge branch 'master' of github.com:Pylons/pyramid into scaffold_versiongoodwillcoding
2014-04-19Move the docs and pyramid version to scaffold template generation andgoodwillcoding
2014-04-18Merge pull request #1306 from bertjwregeer/fix.add_predicates_maybe_dottedMichael Merickel
2014-04-18Add information to CHANGESBert JW Regeer
2014-04-18_add_subscriber should resolve dotted namesBert JW Regeer
2014-04-18Merge pull request #1304 from thapar/patch-2Steve Piercy
2014-04-18Corrected the comment's languagethapar
2014-04-18Typo fix "not"-->"no"thapar
2014-04-17Merge pull request #1303 from flibustenet/patch-2Michael Merickel
2014-04-17More explicit example of set_propertyflibustenet
2014-04-16update the alchemy template to use pyramid version and doc versionMichael R
2014-04-16add pyramid version and pyramid docs branch to the scaffold generationMichael R
2014-04-16minor tweaks based on toolbar changes in 2.xMichael Merickel
2014-04-16Merge pull request #1298 from tylereaves/masterMichael Merickel
2014-04-16Update debugtoolbar.rsttylereaves