summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-09-07Merge branch 'bertjwregeer-feature/split_renderers_from_pyramid'Chris McDonough
2013-09-07Merge branch 'feature/split_renderers_from_pyramid' of github.com:bertjwregee...Chris McDonough
2013-09-07Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-09-06Merge pull request #1112 from dhellmann/bug/namespace-packagesChris McDonough
2013-09-06Merge pull request #1115 from bertjwregeer/docs/remove_init_sqlalchemyMichael Merickel
2013-09-06Update line numbers as appropriateBert JW Regeer
2013-09-06Add small note showing example usage of MyModelBert JW Regeer
2013-09-06removed MyModel.__init__ from the scaffoldssergey.volobuev
2013-09-06changed the explanation of the (now missing) __init__ methodsergey.volobuev
2013-09-06removed __init__ methods from SQLAlchemy models in the documentation because ...sergey.volobuev
2013-09-06Merge branch 'master' into feature/split_chameleon_from_pyramidBert JW Regeer
2013-09-06Remove un-used Dummies: DummyFactory/DummyRendererInfoBert JW Regeer
2013-09-06Add pragma: nocover due to Py3x/Py2x differencesBert JW Regeer
2013-09-06Remove _registerRenderer function from testsBert JW Regeer
2013-09-06Remove useless function that was used only for ChameleonBert JW Regeer
2013-09-06Add test to verify renders don't add response to RequestBert JW Regeer
2013-09-06Update package_name() to work with namespace pkgsDoug Hellmann
2013-09-05Fix tests on Python 3.xBert JW Regeer
2013-09-05Fix DummyRequest so that response is created each timeBert JW Regeer
2013-09-06Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-09-06shorten test output in travisChris McDonough
2013-09-05Merge branch 'master' into feature/split_chameleon_from_pyramidBert JW Regeer
2013-09-05s/view execution machinery/generating a response/Michael Merickel
2013-09-05Remove unnecessary try/finallyBert JW Regeer
2013-09-05Re-enable two tests using JSON renderer instead of ChameleonBert JW Regeer
2013-09-05resolve conflicts, reword change entry a bitChris McDonough
2013-09-05Merge branch 'fix.remove-deprecated-request-attrs'Chris McDonough
2013-09-05Fix remaining tests/remove last traces of ChameleonBert JW Regeer
2013-09-05Remove chameleon templates from fixtureappBert JW Regeer
2013-09-05Remove Chameleon templates from viewdecoratorappBert JW Regeer
2013-09-05Remove Chameleon templatesBert JW Regeer
2013-09-05update HACKINGChris McDonough
2013-09-05Replace .txt renderer with JSONBert JW Regeer
2013-09-05remove the deprecated request.response_* attributesMichael Merickel
2013-09-05update render() to preserve the original response objectMichael Merickel
2013-09-04Remove TestTemplateRenderFactory which is Chameleon onlyBert JW Regeer
2013-09-04Remove Chameleon only fixtures files.Bert JW Regeer
2013-09-04Remove Chameleon specific renderer testsBert JW Regeer
2013-09-04Comment out tests that require ChameleonBert JW Regeer
2013-09-04Remove Chameleon specific support in i18nBert JW Regeer
2013-09-04Remove fixes sub-packageBert JW Regeer
2013-09-04Remove bfg fixers script from entry pointsBert JW Regeer
2013-09-04Remove traces of Chameleon from tests/fixersBert JW Regeer
2013-09-04Remove chameleon from default renderers listBert JW Regeer
2013-09-04Remove Chameleon specific interfacesBert JW Regeer
2013-09-04Remove chameleon filesBert JW Regeer
2013-09-04Remove the Chameleon renderer from renderers.pyBert JW Regeer
2013-09-04Remove chameleon as a dependency in setup.pyBert JW Regeer
2013-09-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-09-03Remove last references to makoBert JW Regeer