summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-02-16Merge pull request #1245 from ztane/patch-2Tres Seaver
Fix pserve --reload on Py3 (the simple solution)
2014-02-16Fix pserve --reload on Py3 (the simple solution)Antti Haapala
This is the simpler fix for `pserve --reload` (so please pull either https://github.com/Pylons/pyramid/pull/1244 or this). Basically with some project setups the reloader thread is guaranteed to crash on Python 3 as the main thread is importing modules in the other thread.
2014-02-10Merge pull request #1241 from stevepiercy/masterSteve Piercy
Garden Sphinx directives
2014-02-10- Garden PR #1121Steve Piercy
2014-02-10Merge pull request #1240 from stevepiercy/masterSteve Piercy
- Update list of session packages
2014-02-10- Update list of session packagesSteve Piercy
- Update Quick Tour section on sessions - Closes PR #1150
2014-02-09Merge pull request #1239 from stevepiercy/masterSteve Piercy
Clean up PR #1163
2014-02-09- Clean up PR #1163Steve Piercy
2014-02-09Specified installation instructions for pyramid_chameleonHari haran
2014-02-09Merge pull request #1238 from stevepiercy/masterSteve Piercy
- Add more git submodule instructions
2014-02-09- Add more git submodule instructionsSteve Piercy
- Add steps to fork and clone Pyramid to GitHub repo, then clone user GitHub repo to local machine.
2014-02-09Apply change from #1221 manually.Tres Seaver
Avoid the unintentional slight in OPs commit message.
2014-02-09Merge pull request #1236 from stevepiercy/masterSteve Piercy
Allow 1.5b docs to be built in Sphinx
2014-02-09- correct error when building docs in Sphinx:Steve Piercy
Warning, treated as error: ~/projects/pyramid/pyramid/docs/api/i18n.rst:6: WARNING: error while formatting arguments for pyramid.i18n.TranslationStringFactory: 'function' object has no attribute '__bases__'
2014-02-09add docs/_themesSteve Piercy
2014-02-08prep for 1.5b1Chris McDonough
2014-02-08nose-selecttests is not py3 compat, so we cant really rely on it in testing ↵Chris McDonough
requirements
2014-02-08- We no longer eagerly clear ``request.exception`` and ``request.exc_info`` inChris McDonough
the exception view tween. This makes it possible to inspect exception information within a finished callback. See https://github.com/Pylons/pyramid/issues/1223. Closes #1223.
2014-02-08Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-02-06rst syntaxMichael Merickel
2014-01-28prep for 1.5a4 releaseChris McDonough
2014-01-28add scaffolding changes to whatsnewChris McDonough
2014-01-28Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-01-28Merge pull request #1231 from danjacka/patch-1Blaise Laflamme
Wee typo fix
2014-01-29Wee typo fixDan Jacka
2014-01-28Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-01-23Merge pull request #1228 from amitvmane/patch-2Steve Piercy
Update CONTRIBUTORS.txt
2014-01-23Update CONTRIBUTORS.txtamitvmane
Added as a contributor.
2014-01-23Merge pull request #1227 from amitvmane/patch-1Steve Piercy
Thank you!
2014-01-23Update project.rstamitvmane
Updated text as per feedback from Michael M. Thanks.
2014-01-23Update project.rstamitvmane
Document fix for issue 1226
2014-01-22- Fix a memory leak when the configurator's ``set_request_property`` method wasChris McDonough
used or when the configurator's ``add_request_method`` method was used with the ``property=True`` attribute. See https://github.com/Pylons/pyramid/issues/1212 . Closes #1212
2014-01-21Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-01-19update narrative docs about iterable decorator argumentMichael Merickel
2014-01-03updated changesBlaise Laflamme
2014-01-03modified MyProject srcBlaise Laflamme
2014-01-03updated myproject docsBlaise Laflamme
2014-01-03changed project image refsBlaise Laflamme
2014-01-03updated version in scaffoldsBlaise Laflamme
2014-01-03fixed starter template package refBlaise Laflamme
2014-01-03fixed zodb template package refBlaise Laflamme
2014-01-03fixed package refBlaise Laflamme
2014-01-03changed alchemy templateBlaise Laflamme
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