summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-03-16use the 1.3-branch urls for sources in tutorialChris McDonough
2012-03-16add a dev alias for develop-and-install-testing-dependencies and depend on ↵Chris McDonough
nose and coverage in setup.py
2012-03-15Merge branch '1.3-branch'Chris McDonough
2012-03-15remove debug_templates untruths related to issue #491Chris McDonough
2012-03-15Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-15Merge pull request #488 from dianaclarke/pserve-unit-testsChris McDonough
removing another # pragma: no cover
2012-03-15removing another # pragma: no coverDiana Clarke
- test coverage still reports 100% should probably clean up the temp file
2012-03-14Merge pull request #487 from ppaez/improve-docsChris McDonough
Fixed SQL tutorial functional tests for Python 3
2012-03-14Fixed SQL tutorial functional tests for Python 3Patricio Paez
2012-03-14Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-14Merge pull request #486 from ppaez/improve-docsChris McDonough
Removed the application restart step
2012-03-14Removed the application restart stepPatricio Paez
2012-03-14Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-03-14Merge pull request #485 from ppaez/improve-docsChris McDonough
Improve docs
2012-03-14Renamed db populate to initialize in SQL tutorialPatricio Paez
- Replaced populate_tutorial -> initialize_tutorial_db - Renamed populate.py -> initializedb.py - Updated references in the documenation
2012-03-14Merge branch '1.3-branch'Chris McDonough
2012-03-14Changes to support #481.Chris McDonough
- The ``alchemy`` scaffold now shows an informative error message in the browser if the person creating the project forgets to run the initialization script. - The ``alchemy`` scaffold initialization script is now called ``initialize_<projectname>_db`` instead of ``populate_<projectname>``.
2012-03-14Removed populate tests from the SQL wiki tutorialPatricio Paez
- Removed the main() settings parameter in populate.py - Updated the Tests chapter
2012-03-14remove confusing output related to issue #481Chris McDonough
2012-03-14Merge branch 'master' into improve-docsPatricio Paez
2012-03-14Simplify the summary tablePatricio Paez
- Removed the Context column - Swapped Action and View columns
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'