summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-03-14remove confusing output related to issue #481Chris McDonough
2012-03-13Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-13Merge pull request #483 from audreyr/masterChris McDonough
Wording improvements to wiki2 tutorial for clarity
2012-03-13Wording improvements to Defining Views section of tutorial.Audrey Roy
2012-03-13Wording improvements to Defining Views section of tutorial.Audrey Roy
2012-03-13Merge pull request #480 from ppaez/typosChris McDonough
Typos
2012-03-13TyposPatricio Paez
2012-03-13Merge pull request #478 from ↵Chris McDonough
shentonfreude/shentonfreude/bug.sqltut-test-populate-settings Shentonfreude/bug.sqltut test populate settings
2012-03-13Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-13Merge pull request #479 from ppaez/wiki-documentationChris McDonough
Adding Authorization chapter of SQL wiki tutorial
2012-03-13Merge remote-tracking branch 'upstream/master' into ↵Chris Shenton
shentonfreude/bug.sqltut-test-populate-settings
2012-03-13Show modification to scripts/populate.py to accept memory DB URIChris Shenton
The text didn't describe editing the populate.py to accept an optional ``settings`` argument, which _callFUT() in tests.py passed in. This is used to specify a memory-backed SQLite DB which we can wipe-n-load during testing. Show how to replace main() in populate.py per our source code to accept this argument, and use it to set the DB URI; it also uses our Page model.
2012-03-13Improved the Authorization chapterPatricio Paez
- Highlighted the added lines in the listings - Simplified 'Viewing the application in a browser' and added link to Starting the application
2012-03-13Sync section titles with the summaryPatricio Paez
2012-03-13Improved the Authorization chapterPatricio Paez
- Added a summary of the steps - Fixed a couple of typos
2012-03-13Merge pull request #474 from ppaez/wiki-documentationmichr
Clarify two steps in the SQL wiki tutorial
2012-03-12Merge pull request #475 from audreyr/masterMichael Merickel
Highlighting another line that the user should edit in the tutorial
2012-03-12Merge branch 'dianaclarke-master'Chris McDonough
2012-03-12py3 compatChris McDonough
2012-03-12Merge branch 'master' of https://github.com/dianaclarke/pyramid into ↵Chris McDonough
dianaclarke-master
2012-03-12Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-12Merge remote-tracking branch 'upstream/master'Audrey Roy
2012-03-12The import also has changed and needs to be edited by the user, so I ↵Audrey Roy
highlighted it.
2012-03-12Clarify two steps in the SQL wiki tutorialPatricio Paez
- Highlight the added or changed lines
2012-03-12Merge pull request #473 from audreyr/masterCarlos de la Guardia
More clarification
2012-03-12More clarification, telling the user to open specified files.Audrey Roy
2012-03-12Merge pull request #472 from audreyr/masterBlaise Laflamme
Clarified instructions in wiki2 tutorial
2012-03-12Clarified which files to open/edit. Highlighted the lines to be edited in ↵Audrey Roy
models.py.
2012-03-12monkey patch atexit, since it seems to be gernerating this error in samedianaclarke
cases (but all the tests still pass) Ran 2083 tests in 8.913s OK Error in atexit._run_exitfuncs: Traceback (most recent call last): File "/usr/lib/python2.6/atexit.py", line 24, in _run_exitfuncs func(*targs, **kargs) File "/mnt/hgfs/workspace/pyramid/pyramid/scripts/pserve.py", line 400, in _remove_pid_file current_pid = os.getpid() AttributeError: 'NoneType' object has no attribute 'getpid'
2012-03-12Merge pull request #471 from ppaez/wiki-documentationCarlos de la Guardia
Added links to 'Starting the Application'
2012-03-12Merge pull request #470 from audreyr/masterCarlos de la Guardia
Revision of __init__.py and views.py sections
2012-03-12More concise views.py section.Audrey Roy
2012-03-12test the contents of the pid file in the exception casesdianaclarke
2012-03-12Added links to Starting the ApplicationPatricio Paez
- Sections 'Viewing the Application in a Browser' in the 'Defining the Domain Model' and 'Defining the Views' chapters now offer a quick link in both wiki tutorials, as suggested by Paulo.
2012-03-12Merge pull request #468 from ppaez/wiki-documentationChris McDonough
Added the Design chapter on both wiki tutorials
2012-03-12working on removing: # pragma: no cover from pservediana
2012-03-12Added the Design chapter on both wiki tutorialsPatricio Paez
2012-03-12Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-12Merge pull request #467 from rpatterson/masterMichael Merickel
Cleanup test `warnings` handling
2012-03-12Use the warnings.catch_warnings context manager in more places.Ross Patterson
Neither 2.7 nor 2.6 with "setup.py test" or "setup.py nosetests" show warnings that don't already appear for origin/master. FYI, under 2.6 with nosetests I see: nose/loader.py:303: DeprecationWarning: registerView
2012-03-12Switch to the warnings.catch_warnings context manager for testing.Ross Patterson
FYI, this test was failing only under 2.7, not 2.6.
2012-03-11Merge branch '1.3-branch'Chris McDonough
2012-03-11- ``config.add_view(<aninstancemethod>)`` raised AttributeError involvingChris McDonough
``__text__``. See https://github.com/Pylons/pyramid/issues/461 Fixes #461.
2012-03-11Merge branch 'master' of https://github.com/hlv42/pyramid into hlv42-masterChris McDonough
2012-03-11Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-11Merge pull request #466 from liangsun/masterChris McDonough
To make the dummy csrf token have the same length as a real one.
2012-03-11only selfChris McDonough
2012-03-11Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-11view class methods were missing self parameter.Carlos de la Guardia
2012-03-09To make the dummy csrf token has the same length as a real one.Liang Sun
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-31 08:16:16 +0000