summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-20Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-19remove mention of unused http status codeMichael Merickel
2013-08-19explainChris McDonough
2013-08-19Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-18Merge pull request #1102 from stevepiercy/masterChris McDonough
no HTML smartypants!
2013-08-18no HTML smartypants!Steve Piercy
Fix https://github.com/Pylons/pyramid/issues/669
2013-08-17Merge branch 'adroullier-master'Chris McDonough
2013-08-17Merge branch 'master' of github.com:adroullier/pyramid into adroullier-masterChris McDonough
2013-08-17Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-17Merge pull request #1100 from tomster/nose-selecttestsChris McDonough
include nose-selecttests
2013-08-17include and mention the `nose-selecttests ↵Tom Lazar
<https://pypi.python.org/pypi/nose-selecttests/>`_ plugin
2013-08-17adjust the checkout path to the new value set above in a previous commitTom Lazar
2013-08-17provide the tox url when mentioning it first.Tom Lazar
2013-08-17Merge branch 'witsch-508-localizer-on-request'Chris McDonough
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-17copy_dir() recursive overwrite test updatesadroullier
2013-08-17copy_dir() recursive overwrite fixadroullier
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