summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-01-03added new assetsBlaise Laflamme
2014-01-03removed alchemy assetsBlaise Laflamme
2014-01-03changed zodb templateBlaise Laflamme
2014-01-03added new assetsBlaise Laflamme
2014-01-03removed zodb assetsBlaise Laflamme
2014-01-03changed starter templateBlaise Laflamme
2014-01-03added new assetsBlaise Laflamme
2014-01-03removed starter assetsBlaise Laflamme
2013-12-30grammar fixesSteve Piercy
2013-12-20Merge pull request #1210 from bertjwregeer/feature.depend-on-webobTres Seaver
Depend on webob 1.3.1
2013-12-19typosMichael Merickel
2013-12-13Update CHANGESBert JW Regeer
2013-12-13Depend on 1.3.1 of WebObBert JW Regeer
2013-12-12put change note in the right release sectionChris McDonough
2013-12-12Merge branch 'wichert-jsonp-syntax'Chris McDonough
2013-12-12add url to issueChris McDonough
2013-12-12Merge branch 'jsonp-syntax' of github.com:wichert/pyramid into ↵Chris McDonough
wichert-jsonp-syntax
2013-12-12Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-12-12Merge pull request #1206 from MatthewWilkes/masterChris McDonough
Update pluralize docs now lingua1.7 is out
2013-12-11Merge pull request #1208 from whiteroses/masterSteve Piercy
Fix a typo.
2013-12-12Fix a typo.Ira
2013-12-10Expand on docstringMatthew Wilkes
2013-12-10Use new pluralize calling convention recognised by Lingua 1.7Matthew Wilkes
2013-12-10prep for 1.5a3Chris McDonough
2013-12-10add note about non-bw-compat between SignedCookieSessionFactory and ↵Chris McDonough
UnencryptedCookieSessionFactory. Ref #1200.
2013-12-10Fix JSONP syntax errorWichert Akkerman
2013-12-10use CookieProfile from webob in authentication module, add support for new ↵Chris McDonough
domain attribute on dummy request, depend on webob 1.3 or better
2013-12-07use a single serializer instead of serialize/deserialize in session.py, use ↵Chris McDonough
SignedSerializer from (yet to be released) webob 1.3 instead of local logic in session.py
2013-12-05Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-11-27appease travisChris McDonough
2013-11-27revert my reversionChris McDonough
2013-11-27Merge branch 'fix.pshell-ipython'Chris McDonough
2013-11-27change the behavior of parse_url_overrides and resource_url to not quote a ↵Chris McDonough
_query/query argument supplied as a string and document in changelog
2013-11-27Merge branch 'feature.custom-query-strings'Chris McDonough
2013-11-27coverageChris McDonough
2013-11-24Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-11-20improve grammar and remove slangSteve Piercy
2013-11-20Fixed typo - removed 'hair'.Ole Morten Halvorsen
2013-11-18update whatsnew in 1.5Chris McDonough
2013-11-18remove liesChris McDonough
2013-11-18Merge branch 'master' into 1.5-branchChris McDonough
2013-11-18Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-11-18Merge branch '1.5-branch' of github.com:Pylons/pyramid into 1.5-branchChris McDonough
2013-11-17Merge pull request #1195 from ztane/masterMichael Merickel
Should return the simple_tween here, not the handler.
2013-11-17Should return the simple_tween here, not the handler.Antti Haapala
2013-11-16Merge pull request #1193 from ztane/masterSteve Piercy
Indentation fixes
2013-11-17Fixed indentation issuesAntti Haapala
2013-11-17Removed extra indentation from some examples (:linenos: should be indented ↵Antti Haapala
with the same indentation as the rest of the code block)
2013-11-16Merge branch 'ztane-master'Chris McDonough
2013-11-1680 charsChris McDonough