summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-04-04Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-04-04Merge pull request #523 from oddshocks/masterChris McDonough
2012-04-02removed strange text that showed upDavid Gay
2012-04-02Merge branch 'master' of github.com:oddshocks/pyramidDavid Gay
2012-04-02addressed #327David Gay
2012-04-02addressed #327David Gay
2012-04-01Merge pull request #521 from ppaez/sql-wiki-authorizationCarlos de la Guardia
2012-04-01Improve Authorization on SQL tutorialPatricio Paez
2012-04-01More simplification to the Authorization chapterPatricio Paez
2012-04-01Improved Adding Authorization in SQL wiki tutorialPatricio Paez
2012-03-31Merge pull request #513 from ppaez/issue-510Carlos de la Guardia
2012-03-30- As of this release, the ``request_method`` predicate, when used, will alsoChris McDonough
2012-03-30note that this is a forward portChris McDonough
2012-03-30forward-port security fix from 1.3 branchChris McDonough
2012-03-30- When no authentication policy was configured, a call toChris McDonough
2012-03-29bad ideaChris McDonough
2012-03-29Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-29move changes to history on master (master is now 1.4dev)Chris McDonough
2012-03-29Merge pull request #518 from wwitzel3/ww/contribChris McDonough
2012-03-29update version markersChris McDonough
2012-03-29Merge branch 'wwitzel3-json-api'Chris McDonough
2012-03-29- Coverage and docs updates for custom JSON class.Chris McDonough
2012-03-28signed contributors agreementWayne Witzel III
2012-03-28JSON-API rework and Object.__json__ supportWayne Witzel III
2012-03-28intermediate commitMichael Merickel
2012-03-28Merge pull request #515 from stevepiercy/contributorsChris McDonough
2012-03-27signed contributors agreementSteve Piercy
2012-03-27Merge branch 'fix.512'Chris McDonough
2012-03-27add change noteChris McDonough
2012-03-26use a dollar sign instead of an underChris McDonough
2012-03-26add a test for an asset spec with a module dirChris McDonough
2012-03-26Mark line with yellow in SQL wiki - issue #510Patricio Paez
2012-03-26speculative fix for issue #512Chris McDonough
2012-03-25fix tests under py33Chris McDonough
2012-03-22Merge branch '1.3-branch'Chris McDonough
2012-03-22- Add ``REMOTE_ADDR`` to the ``prequest`` WSGI environ dict for benefit ofChris McDonough
2012-03-21Merge branch '1.3-branch'Chris McDonough
2012-03-21flesh out system valuesChris McDonough
2012-03-21prep for 1.3Chris McDonough
2012-03-20updateChris McDonough
2012-03-20Merge branch '1.3-branch'Chris McDonough
2012-03-20- The fix for issue https://github.com/Pylons/pyramid/issues/461 (which madeChris McDonough
2012-03-19windowsChris McDonough
2012-03-19wordingChris McDonough
2012-03-19use the correct messageChris McDonough
2012-03-19show the effect of a server restart under reload; explain that template chang...Chris McDonough
2012-03-19provide instructions about how to change the port, warn against changing the ...Chris McDonough
2012-03-19explain where things might go in reality and explain gt example Windows conve...Chris McDonough
2012-03-18warn about project names that shadow stdlib names, change UNIX prompt to gtChris McDonough
2012-03-18explainChris McDonough