summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-17Merge branch '508-localizer-on-request' of github.com:witsch/pyramid into ↵Chris McDonough
witsch-508-localizer-on-request
2013-08-17done :)Andreas Zeidler
2013-08-17clean up test namesAndreas Zeidler
2013-08-17don't use the default locale when testing custom localizerAndreas Zeidler
also, use an object as a dummy localizer for better readability
2013-08-17remove test that explicitly sets a registry on the requestAndreas Zeidler
outside tests the router puts the registry on the request, but in tests it sometimes needs to exist as well. however, it doesn't make sense to test something that's only done in tests anyway
2013-08-17test a custom localizerAndreas Zeidler
2013-08-17test the default localizerAndreas Zeidler
2013-08-17remove duplicate of `Test_get_locale_name.test_name_on_request`Andreas Zeidler
2013-08-17add ``localizer`` property to the request (refs #508)Andreas Zeidler
2013-08-17Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-16updated sphinx themeBlaise Laflamme
2013-08-16updated sphinx themeBlaise Laflamme
2013-08-16Merge pull request #1095 from stevepiercy/masterMichael Merickel
One more "The Pyramid Web Application Development Framework" to "The Pyr...
2013-08-16recommend easy_install until we don'tMichael Merickel
2013-08-16add info how to run the tests using pytest (http://pytest.org/)Andreas Zeidler
2013-08-16Merge pull request #1096 from tomster/hacking-with-toxChris McDonough
add custom tox config that creates a development environment
2013-08-16add custom tox config that creates a development environmentTom Lazar
2013-08-16One more "The Pyramid Web Application Development Framework" to "The Pyramid ↵Steve Piercy
Web Framework" change
2013-08-16Merge branch 'stevepiercy-master'Chris McDonough
2013-08-16Merge branch 'master' of github.com:stevepiercy/pyramid into stevepiercy-masterChris McDonough
2013-08-16Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-16Another crack at the note for venv optionsSteve Piercy
2013-08-16remove --no-site-packages and add usage noteSteve Piercy
2013-08-16Merge pull request #1084 from stevepiercy/masterMichael Merickel
Clean up directions for install Python 2 and 3 and Python extensions on ...
2013-08-16restore earlier fixes on latexindexSteve Piercy
don't make up funny words and use explicit 32- or 64-bit phrase
2013-08-16unused importsChris McDonough
2013-08-16unused importChris McDonough
2013-08-16rename teststaticappbase to staticappbase so non-nose testrunner (e.g. ↵Chris McDonough
pytest testrunner) wont pick it up as a test, tear down the global registries in a new teardown to avoid globals pollution seen when running under py.test testrunner
2013-08-16remove dead codeChris McDonough
2013-08-16Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-16undoing bash highlighting to just text. bash prepends a $ which makes ↵Steve Piercy
copy/paste of commands annoying, and for Windows with \ in the path, it is an escape character and does weird colorization.
2013-08-16merge changes from kusut PR#1085 and stevepiercy PR#1084Steve Piercy
wrap to 79 columns remove duplicate link of Windows extensions at top of file to prevent early clickage
2013-08-16and fix 79 colsSteve Piercy
2013-08-16Sphinx: WAAAAAAH! Just shut up and duplicate the link already.Steve Piercy
2013-08-16Clean up directions for install Python 2 and 3 and Python extensions on ↵Steve Piercy
Windows, per feedback from Windows guinea pigs at SFPython Hack Night.
2013-08-15prefer the functionish printPhilip Jenvey
2013-08-15Merge pull request #1091 from tshepang/diffMichael Merickel
remove extraneous space
2013-08-15Merge pull request #1090 from andresmrm/patch-2Michael Merickel
ZODB now supports Python3.
2013-08-16remove extraneous spaceTshepang Lekhonkhobe
2013-08-15ZODB now supports Python3.Andrés Martano
2013-08-15Merge pull request #1089 from tshepang/diffSteve Piercy
fix misplaced symbol
2013-08-15fix misplaced symbolTshepang Lekhonkhobe
2013-08-15Merge pull request #1088 from tshepang/diffSteve Piercy
fix some rST issues Looks good. Thank you!
2013-08-15fix some rST issuesTshepang Lekhonkhobe
2013-08-15Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-15cleanup cherrypy runnerMichael Merickel
2013-08-15Merge pull request #1086 from tomster/fix.issue718Chris McDonough
Make ``pserve.cherrypy_server_runner`` Python 3 compatible.
2013-08-15Merge pull request #1085 from kusut/patch-1Michael Merickel
Update install.rst
2013-08-15Make ``pserve.cherrypy_server_runner`` Python 3 compatible.Tom Lazar
Closes https://github.com/Pylons/pyramid/issues/718
2013-08-15sign the contribution agreement...Andreas Zeidler