summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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
2012-03-08Merge pull request #463 from dbaty/patch-1Chris McDonough
2012-03-06Fixed typo: key (k) and value (v) were inverted.Damien Baty
2012-03-06corrected bugfix #461 - tests explicitly for instancemethods nowhlv
2012-03-06fixed issue #461dev
2012-03-05Merge branch '1.3-branch'Chris McDonough
2012-03-05Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-05Merge pull request #459 from philip-peterson/patch-1Chris McDonough
2012-03-05Fixed some spelling errorsphilip-peterson
2012-03-05add_traverserChris McDonough
2012-03-04use pylons-discuss as email address in setup.py tooChris McDonough
2012-03-04point people at pylons-discuss rather than pylons-develChris McDonough
2012-03-04garden titles of indexChris McDonough
2012-03-04backslash is an escape character in RSTChris McDonough
2012-03-03untangle impacts of python 3 compatChris McDonough
2012-03-02Merge branch '1.3-branch'Chris McDonough
2012-03-02Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-02Merge pull request #458 from mjpieters/contributor-agreementChris McDonough
2012-03-02Merge pull request #457 from mjpieters/doccorrectionsChris McDonough
2012-03-02Correct section name in pshell example.Martijn Pieters
2012-03-02Sign the contributor agreement.Martijn Pieters
2012-03-02Correct minor grammatical error.Martijn Pieters
2012-03-02Merge pull request #455 from rspivak/ae6d08b96d3a366f979719c05926dc5292d904d3Chris McDonough
2012-03-02Remove some confusion about finished callbacks.Ruslan Spivak