summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-06-02Merge remote-tracking branch 'upstream/master'Steve Piercy
2017-06-02Add cookiecutter step for master branch upon release of new branchSteve Piercy
2017-06-02Merge pull request #3071 from stevepiercy/masterSteve Piercy
2017-06-02mid-release cycle will be the death of meSteve Piercy
2017-06-02append ` --checkout master` to cookie cutter commandSteve Piercy
2017-06-02Move docs update to Prepare new release branchSteve Piercy
2017-06-01use shortcut for github URL; update RELEASING.txtSteve Piercy
2017-06-01Merge pull request #3067 from stevepiercy/masterSteve Piercy
2017-06-01use the version for the mid-release cycleSteve Piercy
2017-06-01clarify badges for releasingSteve Piercy
2017-05-25fix more style issues per CRcewing
2017-05-25fix code indentation and unify style for all code blocks, per CRcewing
2017-05-24updated documentation showing the pyramid_tm.explicit_manager being setChris Morales
2017-05-24Merge pull request #3062 from fangpenlin/add-contributorSteve Piercy
2017-05-24Add myself in the contributors listFang-Pen Lin
2017-05-23finish polishing the advanced configuration doc per code reviewcewing
2017-05-23fixes per code review, Thanks @stevepiercy.cewing
2017-05-23updated the emphasis in the tutorial docs for the definingmodels.rstChris Morales
2017-05-23Merge branch 'master' into pyramid_tm_3052Chris Morales
2017-05-23updated references for the models that have references for the config.settingsChris Morales
2017-05-23Merge pull request #3061 from Pylons/render-last-exceptionBert JW Regeer
2017-05-23Make coverage happy againBert JW Regeer
2017-05-23When invoking an exception view, push the new threadlocalsBert JW Regeer
2017-05-23allow the execution policy to perform a last-ditch effort to render an except...Michael Merickel
2017-05-23Merge branch 'master' of https://github.com/Pylons/pyramidChris Morales
2017-05-23Merge branch 'master' of https://github.com/Pylons/pyramid into pyramid_tm_3052Chris Morales
2017-05-23pyramid_tm.explicit_manager set in the configuration.Chris Morales
2017-05-22add change noteSteve Piercy
2017-05-22Merge pull request #3055 from fangpenlin/fix.2548Steve Piercy
2017-05-22Also replace script tags appear everywhereFang-Pen Lin
2017-05-22Updating wording in the advanced features doc to make it more accessiblecewing
2017-05-22Fix #2548, add SRI has for script tagsFang-Pen Lin
2017-05-22add changelog for #3054Michael Merickel
2017-05-22Merge pull request #3054 from fangpenlin/feature.closest-predicate-match-erro...Michael Merickel
2017-05-22Load difflib on-demand so that it won’t take message proactivelyFang-Pen Lin
2017-05-22Fix #1603, add closest predicate name in error messageFang-Pen Lin
2017-05-22Add test for closest predicate error messageFang-Pen Lin
2017-05-22simplify the section comparing pyramid with other web frameworkscewing
2017-05-22move more esoteric framework features into a separate file to remove complexi...cewing
2017-05-22Merge branch 'master' into issue.2614cewing
2017-05-22updates to narrative docs introduction, fixing for clarity and concisioncewing
2017-05-17Merge pull request #3045 from stevepiercy/masterSteve Piercy
2017-05-17adjust emphasize-lines rangeSteve Piercy
2017-05-17remove bad path from python executableSteve Piercy
2017-05-12Merge pull request #3039 from stevepiercy/change-to-localhostSteve Piercy
2017-05-12Merge branch 'master' into change-to-localhostSteve Piercy
2017-05-12resolve conflictsSteve Piercy
2017-05-12update narrative docs to align with source codeSteve Piercy
2017-05-12Merge pull request #3036 from stevepiercy/masterSteve Piercy
2017-05-12Merge remote-tracking branch 'upstream/master'Steve Piercy
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-26 04:20:41 +0000