summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-03-14remove confusing output related to issue #481Chris McDonough
2012-03-13Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-13Merge pull request #483 from audreyr/masterChris McDonough
2012-03-13Wording improvements to Defining Views section of tutorial.Audrey Roy
2012-03-13Wording improvements to Defining Views section of tutorial.Audrey Roy
2012-03-13Merge pull request #480 from ppaez/typosChris McDonough
2012-03-13TyposPatricio Paez
2012-03-13Merge pull request #478 from shentonfreude/shentonfreude/bug.sqltut-test-popu...Chris McDonough
2012-03-13Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-13Merge pull request #479 from ppaez/wiki-documentationChris McDonough
2012-03-13Merge remote-tracking branch 'upstream/master' into shentonfreude/bug.sqltut-...Chris Shenton
2012-03-13Show modification to scripts/populate.py to accept memory DB URIChris Shenton
2012-03-13Improved the Authorization chapterPatricio Paez
2012-03-13Sync section titles with the summaryPatricio Paez
2012-03-13Improved the Authorization chapterPatricio Paez
2012-03-13Merge pull request #474 from ppaez/wiki-documentationmichr
2012-03-12Merge pull request #475 from audreyr/masterMichael Merickel
2012-03-12Merge branch 'dianaclarke-master'Chris McDonough
2012-03-12py3 compatChris McDonough
2012-03-12Merge branch 'master' of https://github.com/dianaclarke/pyramid into dianacla...Chris McDonough
2012-03-12Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-12Merge remote-tracking branch 'upstream/master'Audrey Roy
2012-03-12The import also has changed and needs to be edited by the user, so I highligh...Audrey Roy
2012-03-12Clarify two steps in the SQL wiki tutorialPatricio Paez
2012-03-12Merge pull request #473 from audreyr/masterCarlos de la Guardia
2012-03-12More clarification, telling the user to open specified files.Audrey Roy
2012-03-12Merge pull request #472 from audreyr/masterBlaise Laflamme
2012-03-12Clarified which files to open/edit. Highlighted the lines to be edited in mod...Audrey Roy
2012-03-12monkey patch atexit, since it seems to be gernerating this error in samedianaclarke
2012-03-12Merge pull request #471 from ppaez/wiki-documentationCarlos de la Guardia
2012-03-12Merge pull request #470 from audreyr/masterCarlos de la Guardia
2012-03-12More concise views.py section.Audrey Roy
2012-03-12test the contents of the pid file in the exception casesdianaclarke
2012-03-12Added links to Starting the ApplicationPatricio Paez
2012-03-12Merge pull request #468 from ppaez/wiki-documentationChris McDonough
2012-03-12working on removing: # pragma: no cover from pservediana
2012-03-12Added the Design chapter on both wiki tutorialsPatricio Paez
2012-03-12Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-12Merge pull request #467 from rpatterson/masterMichael Merickel
2012-03-12Use the warnings.catch_warnings context manager in more places.Ross Patterson
2012-03-12Switch to the warnings.catch_warnings context manager for testing.Ross Patterson
2012-03-11Merge branch '1.3-branch'Chris McDonough
2012-03-11- ``config.add_view(<aninstancemethod>)`` raised AttributeError involvingChris McDonough
2012-03-11Merge branch 'master' of https://github.com/hlv42/pyramid into hlv42-masterChris McDonough
2012-03-11Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-11Merge pull request #466 from liangsun/masterChris McDonough
2012-03-11only selfChris McDonough
2012-03-11Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-11view class methods were missing self parameter.Carlos de la Guardia
2012-03-09To make the dummy csrf token has the same length as a real one.Liang Sun