summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2011-05-05added note about constructor argument for same purpose, for uniformitycguardia
2011-05-05removed meth indicator, which caused parentheses to show beside the name of t...cguardia
2011-05-05removed meth indicator, which was showing on the rendered docscguardia
2011-05-05Merge pull request #184 from mmerickel/fix_auth_tutorialCarlos de la Guardia
2011-05-05Fixed some line numbers in the docs.Michael Merickel
2011-05-05Fixed a bug in the wiki2/auth tutorial.Michael Merickel
2011-05-04note pviewsChris McDonough
2011-05-04Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2011-05-04Merge pull request #182 from cguardia/masterChris McDonough
2011-05-04Merge pull request #181 from dairiki/masterCarlos de la Guardia
2011-05-04changed __doc__ to __text__ in dummy custom predicatecguardia
2011-05-04Revert "test adding theme as a submodule"cguardia
2011-05-04Revert "fixed makefile to update theme submodule correctly"cguardia
2011-05-04Revert "added requirement file to test rtd integration"cguardia
2011-05-04Revert "changed requirements file to test rtd integration"cguardia
2011-05-04Merge branch 'master' of https://github.com/Pylons/pyramidcguardia
2011-05-04code refactoring for showing route->view relationship more correctly; tests a...cguardia
2011-05-04Documentation typo fixGeoffrey T. Dairiki
2011-04-27- Passing an ``environ`` dictionary to the ``__call__`` method of aChris McDonough
2011-04-27- Previously, ``pyramid.request.Request`` inherited fromChris McDonough
2011-04-27pulled in mcdoncs changescguardia
2011-04-27Merge branch 'cguardia-master' into pviewsChris McDonough
2011-04-27use __doc__ instead of __text__ to represent predicate output; inject bfg.rou...Chris McDonough
2011-04-27removed line that will never be executedcguardia
2011-04-27use __doc__ instead of __text__ for predicate descriptioncguardia
2011-04-27Merge branch 'master' of https://github.com/Pylons/pyramidcguardia
2011-04-25Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2011-04-25spell it out entirelyChris McDonough
2011-04-25added to contibutor listcguardia
2011-04-25Merge branch 'master' of https://github.com/Pylons/pyramidcguardia
2011-04-25revert a5702cd8: oops, it undoes timing attack protectionPhilip Jenvey
2011-04-24refactorPhilip Jenvey
2011-04-24resistance is futile, assimilating (not built by aliens)Philip Jenvey
2011-04-25Merge branch 'master' of https://github.com/Pylons/pyramidcguardia
2011-04-24finished paster views command and 100% test coveragecguardia
2011-04-24Merge branch 'ppaez-zodb-tutorial-test-reorg'Chris McDonough
2011-04-24Merge branch 'zodb-tutorial-test-reorg' of https://github.com/ppaez/pyramid i...Chris McDonough
2011-04-24Merge branch 'jdnavarro-master'Chris McDonough
2011-04-24Merge branch 'master' of https://github.com/jdnavarro/pyramid into jdnavarro-...Chris McDonough
2011-04-24fix rendering issueChris McDonough
2011-04-23BFG -> PyramidDanny Navarro
2011-04-22Merge branch 'kstrauser-master'Chris McDonough
2011-04-22fix merge conflictsChris McDonough
2011-04-22reference an issueChris McDonough
2011-04-22test coverageChris McDonough
2011-04-22Merge branch 'mmerickel-disambiguate_add_route'Chris McDonough
2011-04-22- Make sure deprecation warnings aren't raised when tests are run.Chris McDonough
2011-04-22Merge branch 'disambiguate_add_route' of https://github.com/mmerickel/pyramid...Chris McDonough
2011-04-22Updated static tests to pass using the add_route deprecations.Michael Merickel
2011-04-22version bumpChris McDonough