summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-10-02get rid of note that appears to be explained in the next paraChris McDonough
2013-10-02Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-10-02Merge pull request #1138 from kpinc/doc_sessionChris McDonough
Docs: sessions.rst: Explain example.
2013-10-02Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-10-02Merge branch 'fix.none-value-in-query-string'Chris McDonough
2013-10-02 render the qs such that when provided with None as a value, it will render ↵Chris McDonough
the key plus the equal sign
2013-10-02Merge pull request #1137 from kpinc/doc_renderChris McDonough
Doc render
2013-10-02Docs: project.rst: Fix markup failure just introduced.Karl O. Pinc
2013-10-02Docs: Make statements more concreate regards renderers getting data from ↵Karl O. Pinc
dictionaries.
2013-10-02fix merge conflictChris McDonough
2013-10-02Merge remote-tracking branch 'upstream/master' into doc_renderKarl O. Pinc
Doing something to make the pull request have the right stuff.
2013-10-02Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-10-02Docs: sessions.rst: Sessions only work when the client cooperates.Karl O. Pinc
2013-10-02- Removed mention of ``pyramid_beaker`` from docs. Beaker is no longerChris McDonough
maintained. Point people at ``pyramid_redis_sessions`` instead.
2013-10-02Docs: sessions.rst: Explain example.Karl O. Pinc
2013-10-02Docs: renderers.rst: Explain typical renderer usage.Karl O. Pinc
2013-10-02Docs: project.rst: Emphasize key takeaway; use dicts to supply values to ↵Karl O. Pinc
templates.
2013-10-02Docs: project.rst: Eliminate reduncency and better explain renderer.Karl O. Pinc
2013-10-01- Fix the ``principals_allowed_by_permission`` method ofChris McDonough
``ACLAuthorizationPolicy`` so it anticipates a callable ``__acl__`` on resources. Previously it did not try to call the ``__acl__`` if it was callable.
2013-10-01- Fix the ``pcreate`` script so that when the target directory name ends with aChris McDonough
slash it does not produce a non-working project directory structure. Previously saying ``pcreate -s starter /foo/bar/`` produced different output than saying ``pcreate -s starter /foo/bar``. The former did not work properly.
2013-10-01remove unused filesChris McDonough
2013-10-01Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-10-01Add commaSteve Piercy
2013-09-30Merge pull request #1136 from kpinc/qualify_assetsChris McDonough
Qualify assets
2013-10-01Docs: project.rst: Make the sentence more better.Karl O. Pinc
2013-10-01Docs: project.rst: Note that asset specs must be fully qualifed when moving ↵Karl O. Pinc
views into a sub-package.
2013-10-01Docs: project.rst: Match parenthesis & fix punctuation.Karl O. Pinc
2013-09-30Merge pull request #1135 from kpinc/contributorsMichael Merickel
Contributors
2013-09-30CONTRIBUTORS: Add Karl O. Pinc.Karl O. Pinc
2013-09-28Used a parsed-literal to pin the version number on easy_install.Paul Everitt
2013-09-28Used a parsed-literal to pin the version number on easy_install.Paul Everitt
2013-09-28Add versioning to branch masterSteve Piercy
2013-09-28Merge pull request #1133 from mgedmin/patch-1Michael Merickel
OCD: add back missing )
2013-09-28OCD: add back missing )Marius Gedminas
2013-09-28Merge branch 'pull.1132'Michael Merickel
2013-09-28minor tweaks to languageMichael Merickel
2013-09-27Add note about C extensionsBert JW Regeer
There was some confusion regarding the output of easy_install pyramid when the Python header files were not installed, these errors are harmless however adding a simple note would have stopped a lot of frustration.
2013-09-27support a None value in query string parametersMichael Merickel
2013-09-27Docs: Make clear that installation is into the virtual enviornment.Karl O. Pinc
2013-09-26Quick Tour: shorten the setup part and point to Quick Tutorial Requirements ↵Paul Everitt
for more explanation. Cross link each Quick Tour section with its Quick Tutorial match.
2013-09-25Get pyramid_chameleon added to the quick tutorial, plus some other fixes for ↵Paul Everitt
Python 3.
2013-09-25Add some more of the up-front packages.Paul Everitt
2013-09-25Oops, need a $VENV path to easy_installPaul Everitt
2013-09-25Quick Tutorial: Improve the setup instructions (adapted from Steve Piercy's ↵Paul Everitt
work), particularly for Windows. Change all the steps to use $VENV/bin prefixes on commands (don't presume that they have done source env/bin/activate).
2013-09-24Merge branch 'docs.quicktutorial'Paul Everitt
2013-09-24add mention of PEP 453Steve Piercy
2013-09-24Change python version to 3.3Steve Piercy
2013-09-24Added a note to CHANGES.txt, push the quick tutorial.Paul Everitt
2013-09-24Update Requirements sectionSteve Piercy
2013-09-24Merge branch 'master' of https://github.com/Pylons/pyramidPaul Everitt