summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-01-01Merge branch 'tshepang-issue746'Chris McDonough
2013-01-01fix rationale and typoChris McDonough
2013-01-01Merge branch 'issue746' of git://github.com/tshepang/pyramid into ↵Chris McDonough
tshepang-issue746
2013-01-01Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-01-01fix #746: explain why a dev package is installedTshepang Lekhonkhobe
2013-01-01Small fix for RST misfire.Paul Everitt
2013-01-01Merge pull request #752 from tshepang/masterChris McDonough
give virtualenv directory a more generic name
2013-01-01give virtualenv directory a more generic name, "venv"Tshepang Lekhonkhobe
pros: * Installation instructions uses the same name * The old name assumes user would be using Python 2.6
2013-01-01Merge pull request #751 from tshepang/masterChris McDonough
"usernames" is a more correct term
2013-01-01"usernames" is a more correct termTshepang Lekhonkhobe
2012-12-31Merge pull request #750 from tshepang/masterChris McDonough
fix typo
2013-01-01typoTshepang Lekhonkhobe
2012-12-28Merge pull request #748 from tshepang/masterChris McDonough
fix typo
2012-12-29typoTshepang Lekhonkhobe
2012-12-22Merge pull request #745 from reinout/patch-1Carlos de la Guardia
Typo pakage => package fixed
2012-12-22Typo pakage => packageReinout van Rees
2012-12-18prep for 1.4Chris McDonough
2012-12-18gardenChris McDonough
2012-12-18Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-12-17Merge pull request #741 from ppaez/zodb-tutorial-fixesChris McDonough
Fix functional tests in the ZODB tutorial
2012-12-13Improvements to the ZODB tutorial Tests chapterPatricio Paez
- Standardize with the SQL tutorial
2012-12-13Make ZODB tutorial functional tests passPatricio Paez
- Synchronize with the changes in pyramid_zodbdbconn in commit 64b0c468d4ae320d720d03d0cbc8e9a0b0e42f1f
2012-12-10Merge branch '1.4-branch'Chris McDonough
2012-12-10prep for 1.4b3Chris McDonough
2012-12-10Merge branch '1.4-branch'Chris McDonough
2012-12-10prep for 1.4b2Chris McDonough
2012-12-10Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-12-10Merge pull request #736 from msabramo/docs-tutorials-wiki2-tweaksChris McDonough
A bunch of minor tweaks to the wiki2 tutorial in docs/tutorials/wiki2
2012-12-10Merge pull request #738 from ppaez/pep8_scaffoldsChris McDonough
Improve pep8 compliance of scaffolds
2012-12-06add changenoteChris McDonough
2012-12-06make _backframes work like _depth (but still leave undocumented)Chris McDonough
2012-12-06note custom_predicates deprecationChris McDonough
2012-12-06Merge branch '1.4-branch'Chris McDonough
2012-12-06Merge branch '1.4-branch' of github.com:Pylons/pyramid into 1.4-branchChris McDonough
2012-12-06Merge pull request #739 from mmerickel/fix.view-config-depthChris McDonough
_depth argument to view_config is now relative to view_config
2012-12-06_depth argument to view_config is now relative to view_configMichael Merickel
This hides an implementation detail that view_config is at least 1 level away from user code.
2012-12-02Sync tests.py and views.py in SQL wiki tutorialPatricio Paez
- No line references to update
2012-12-02Sync initializedb.py in SQL wiki tutorialPatricio Paez
2012-12-01Sync models.py in SQL wiki tutorialPatricio Paez
- Update lines and emphasized-lines - No line numbers if only a single line
2012-12-01Sync __init__.py in SQL wiki tutorialPatricio Paez
- Update lines and emphasized-lines - No line numbers if only a single line
2012-12-01unused importChris McDonough
2012-12-01Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-12-01Sync setup.py in SQL wiki tutorialPatricio Paez
2012-12-01Update line referencesPatricio Paez
- In the Basic Layout and Authorization chapters of the ZODB wiki tutorial
2012-12-01Sync ZODB tutorial source files with the scaffoldPatricio Paez
2012-11-30tutorials/wiki2/definingviews.rst: Change example error page fromMarc Abramowitz
http://localhost:6543/add_page to http://localhost:6543/foobar/edit_page For me, the former generates "404 Not Found" (probably because it doesn't match a route) while the latter gives "sqlalchemy.orm.exc.NoResultFound" and the nice traceback from Werkzeug.
2012-11-30A bunch of minor tweaks to the wiki2 tutorial in docs/tutorials/wiki2Marc Abramowitz
2012-11-29Sync MyProject files with the starter scaffoldPatricio Paez
- Line numbers are mentioned only in the Creating a Pyramid Project chapter; those that are affected were updated.
2012-11-29make scaffolds pep8 compliantGael Pasgrimaud
Conflicts: pyramid/scaffolds/alchemy/+package+/views.py_tmpl pyramid/scaffolds/alchemy/setup.py_tmpl Solved the two conflicts
2012-11-29Merge pull request #734 from slinkp/masterChris McDonough
Fix broken link to contributor docs on front page