summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-12-29adjust tests to work w/ latest merge and changesRob Miller
2010-12-29Merge remote branch 'refs/remotes/upstream/viewderiver' into ra_view_decorationRob Miller
Conflicts: CHANGES.txt pyramid/config.py
2010-12-29factor deriver from mapperChris McDonough
2010-12-29Merge branch 'master' into viewderiverChris McDonough
2010-12-29fix from mikeChris McDonough
2010-12-29typoChris McDonough
2010-12-29- The (weak) "Converting a CMF Application to Pyramid" tutorial has beenChris McDonough
removed from the tutorials section. It was moved to the ``pyramid_tutorials`` Github repository.
2010-12-29gardenChris McDonough
2010-12-29git title rightChris McDonough
2010-12-29resource->assetChris McDonough
2010-12-29fix misleading exampleChris McDonough
2010-12-28Enforce that _action_decorator must be a classmethodRob Miller
2010-12-28change ``MyView`` to ``MyHandler``, since it's a handler we're mockingRob Miller
2010-12-28record handler _action_decorator classmethod supportRob Miller
2010-12-28Added support for an _action_decorator classmethod on handler classes.Rob Miller
2010-12-28Recorded description of last change and added self to contributors list.Rob Miller
2010-12-28add decorator argument to add_view method to support auto-wrapping view ↵Rob Miller
callables with a decorator at view registration time
2010-12-28Merge branch 'master' into viewderiverChris McDonough
2010-12-28Merge branch 'mgedmin-master'Chris McDonough
2010-12-29Whitespace bigotry.Marius Gedminas
2010-12-29Merge branch 'master' of git://github.com/Pylons/pyramidMarius Gedminas
2010-12-29Markup fix.Marius Gedminas
2010-12-28Merge branch 'mgedmin-master'Chris McDonough
2010-12-29Fix quoting.Marius Gedminas
2010-12-29Added missing :meth:.Marius Gedminas
2010-12-29Show the method signatures of pop_flash/peek_flash.Marius Gedminas
The narrative referred to popping messages from a particular queue, but the code examples didn't show how to indicate which queue you were interested in, leaving the reader a bit confused.
2010-12-29"one or more has" -> "one or more have".Marius Gedminas
Sounds more natural to me, and Googling for "one or more: singular or plural" seems to agree.
2010-12-29Rephrase sentence with no verb.Marius Gedminas
2010-12-29Typo: cam -> can.Marius Gedminas
2010-12-28- The ``proutes`` command tried too hard to resolve the view for printing,Chris McDonough
resulting in exceptions when an exceptional root factory was encountered. Instead of trying to resolve the view, if it cannot, it will now just print ``<unknown>``.
2010-12-28back to developmentChris McDonough
2010-12-27include handler, translationdir, and localenegotiator zcml references in PDFChris McDonough
2010-12-27Prep for 1.0a8.Chris McDonough
2010-12-27Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2010-12-27- Add ``paster proute`` command which displays a summary of the routingChris McDonough
table. See the narrative documentation section within the "URL Dispatch" chapter entitled "Displaying All Application Routes". - Added narrative documentation section within the "URL Dispatch" chapter entitled "Displaying All Application Routes" (for ``paster proutes`` command).
2010-12-27sign myself awayCasey Duncan
2010-12-27wordingChris McDonough
2010-12-27remove inappropriate use of begin/endChris McDonough
2010-12-27remove unnecessary use of begin/endChris McDonough
2010-12-27wordingChris McDonough
2010-12-27- Reconcile "extending an existing application" chapter with existence ofChris McDonough
"advanced configuration" chapter.
2010-12-26wordingChris McDonough
2010-12-26wordingChris McDonough
2010-12-26explain relative asset specChris McDonough
2010-12-26wordingChris McDonough
2010-12-26wordingChris McDonough
2010-12-26- Merge "Static Assets" chapter into the "Assets" chapter.Chris McDonough
2010-12-26reorder chapterChris McDonough
2010-12-26remove unused importChris McDonough
2010-12-26Merge branch 'master' of github.com:Pylons/pyramidChris McDonough