summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-05-16Merge pull request #1345 from kpinc/doc_templatesMichael Merickel
2014-05-16Docs: narr/templates.rst: Doc default extensions of each template system.Karl O. Pinc
2014-05-13Merge pull request #1341 from bertjwregeer/fix.typoMichael Merickel
2014-05-13Update hooks.rstsynthomat
2014-05-12Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-05-07Merge branch 'master' of https://github.com/ftravers/pyramid into pull.1325Michael Merickel
2014-05-06Added required notes to changes/contributors file.Fenton Travers
2014-05-05Merge pull request #1322 from Pylons/fix.setUp-relative-packageMichael Merickel
2014-05-05modify p.testing.setUp() to configure the package relative to callerMichael Merickel
2014-05-05Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-05-05fix merge conflictsChris McDonough
2014-05-05Merge pull request #1335 from flibustenet/patch-3Michael Merickel
2014-05-05modify changes wrt logging config strippingChris McDonough
2014-05-05Merge branch 'redundant_totuorial_logging_config'Chris McDonough
2014-05-05Merge branch 'master' into redundant_totuorial_logging_configChris McDonough
2014-05-05Order of response_callback in the docstringflibustenet
2014-05-03Merge pull request #1333 from stevepiercy/masterSteve Piercy
2014-05-03- add a referenceSteve Piercy
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-25added line numbers to generic log formatterJohn Kraal
2014-04-24Replaced non-ascii copyright character with HTML equivalent.Fenton Travers
2014-04-24The copyright symbol causes this error:Fenton Travers
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