summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-04-12Merge pull request #531 from veeti/patch-1Carlos de la Guardia
Fix a typo in the documentation
2012-04-13Fix a typo in the documentationVeeti Paananen
2012-04-11spellingMichael Merickel
2012-04-11Merge branch 'mmerickel.feature-instance-properties'Chris McDonough
2012-04-11readmeChris McDonough
2012-04-11Merge branch 'feature.instance-properties' of ↵Chris McDonough
https://github.com/mmerickel/pyramid into mmerickel.feature-instance-properties
2012-04-11Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-04-11request properties are now added in bulkMichael Merickel
2012-04-10changed to classmethodMichael Merickel
2012-04-10tests for bulk property creationMichael Merickel
2012-04-10refactored set_property to support multiple properties in the same subclassMichael Merickel
2012-04-10enable warning badge on master docsMichael Merickel
2012-04-10poke rtdChris McDonough
2012-04-10test checkin for rtdChris McDonough
2012-04-08Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-04-08Merge pull request #525 from ppaez/zodb-tutorialChris McDonough
Zodb tutorial updates
2012-04-08Final detailsPatricio Paez
- Normalize the Seeing our changes section - Changed import to recommended style
2012-04-08Normalize Authorization in both tutorials 4Patricio Paez
- Sync content of Add login and logout views, Add the login.pt template, Return a logged_in flag, Add a logout link sections - Normalize sections of views.py
2012-04-08Normalize Authorization in both tutorials 3Patricio Paez
- Sync content in Adding Authentication and Authorization policies, Add permission declarations sections - Added mising permission=view in SQL tutorial - Moved __init__.py listing to Seeing our changes
2012-04-07Normalize Authorization in both tutorials 2Patricio Paez
- Sync content of Add users and groups, and Add an ACL. - Added yellow highlight to listings in Seeing our changes, added models.py
2012-04-07Ordered sections as per the summaryPatricio Paez
2012-04-07Normalize Authorization in both tutorials 1Patricio Paez
- Sync the content of the introduction and the Viewing the Application in a Browser sections - Sync the section structure
2012-04-06Merge pull request #524 from ppaez/sql-wiki-authorizationCarlos de la Guardia
Sql wiki authorization
2012-04-06Added first level sections, fixed route in the summaryPatricio Paez
2012-04-06Improve Authorization in the SQL tutorialPatricio Paez
- Made the section headers more explicit and rearranged them in a group for access control and another for login/logout - Split the summary in the two groups - Added missing section Add routes for /login and /logout - Clarify some sections
2012-04-05noteChris McDonough
2012-04-04Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-04-04Merge pull request #523 from oddshocks/masterChris McDonough
Addressed #327
2012-04-02removed strange text that showed upDavid Gay
2012-04-02Merge branch 'master' of github.com:oddshocks/pyramidDavid Gay
Conflicts: docs/narr/views.rst
2012-04-02addressed #327David Gay
2012-04-02addressed #327David Gay
2012-04-01Merge pull request #521 from ppaez/sql-wiki-authorizationCarlos de la Guardia
Improvements to the SQL wiki authorization chapter
2012-04-01Improve Authorization on SQL tutorialPatricio Paez
- Simplified the authentication policy callback section - Use full path for files in Seeing Our Changes - Fixed a typo
2012-04-01More simplification to the Authorization chapterPatricio Paez
- Clarify the Adding A Root Factory section, include a related modification to __init__.py - Added Add routes for /login and /logout section - Added yellow higlighting in various listings - Consolidate all the Seeing our changes at the end - Use a 'do, then explain' pattern
2012-04-01Improved Adding Authorization in SQL wiki tutorialPatricio Paez
- Removed unneeded logged_in assignment - Moved up text to the corresponding section - Normalize references to view callables - Simplify text in Add permission declarations
2012-03-31Merge pull request #513 from ppaez/issue-510Carlos de la Guardia
Mark line with yellow in SQL wiki - issue #510
2012-03-30- As of this release, the ``request_method`` predicate, when used, will alsoChris McDonough
imply that ``HEAD`` is implied when you use ``GET``. For example, using ``@view_config(request_method='GET')`` is equivalent to using ``@view_config(request_method='HEAD')``. Using ``@view_config(request_method=('GET', 'POST')`` is equivalent to using ``@view_config(request_method=('GET', 'HEAD', 'POST')``. This is because HEAD is a variant of GET that omits the body, and WebOb has special support to return an empty body when a HEAD is used.
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
``pyramid.security.effective_principals`` would unconditionally return the empty list. This was incorrect, it should have unconditionally returned ``[Everyone]``, and now does.
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
signed contributors agreement
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
- Fork point: master now represents a future 1.4 release.
2012-03-28signed contributors agreementWayne Witzel III
2012-03-28JSON-API rework and Object.__json__ supportWayne Witzel III