| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2013-01-01 | Merge branch 'tshepang-issue746' | Chris McDonough | |
| 2013-01-01 | fix rationale and typo | Chris McDonough | |
| 2013-01-01 | Merge branch 'issue746' of git://github.com/tshepang/pyramid into ↵ | Chris McDonough | |
| tshepang-issue746 | |||
| 2013-01-01 | Merge branch 'master' of github.com:Pylons/pyramid | Chris McDonough | |
| 2013-01-01 | fix #746: explain why a dev package is installed | Tshepang Lekhonkhobe | |
| 2013-01-01 | Small fix for RST misfire. | Paul Everitt | |
| 2013-01-01 | Merge pull request #752 from tshepang/master | Chris McDonough | |
| give virtualenv directory a more generic name | |||
| 2013-01-01 | give 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-01 | Merge pull request #751 from tshepang/master | Chris McDonough | |
| "usernames" is a more correct term | |||
| 2013-01-01 | "usernames" is a more correct term | Tshepang Lekhonkhobe | |
| 2012-12-31 | Merge pull request #750 from tshepang/master | Chris McDonough | |
| fix typo | |||
| 2013-01-01 | typo | Tshepang Lekhonkhobe | |
| 2012-12-28 | Merge pull request #748 from tshepang/master | Chris McDonough | |
| fix typo | |||
| 2012-12-29 | typo | Tshepang Lekhonkhobe | |
| 2012-12-22 | Merge pull request #745 from reinout/patch-1 | Carlos de la Guardia | |
| Typo pakage => package fixed | |||
| 2012-12-22 | Typo pakage => package | Reinout van Rees | |
| 2012-12-18 | prep for 1.4 | Chris McDonough | |
| 2012-12-18 | garden | Chris McDonough | |
| 2012-12-18 | Merge branch 'master' of github.com:Pylons/pyramid | Chris McDonough | |
| 2012-12-17 | Merge pull request #741 from ppaez/zodb-tutorial-fixes | Chris McDonough | |
| Fix functional tests in the ZODB tutorial | |||
| 2012-12-13 | Improvements to the ZODB tutorial Tests chapter | Patricio Paez | |
| - Standardize with the SQL tutorial | |||
| 2012-12-13 | Make ZODB tutorial functional tests pass | Patricio Paez | |
| - Synchronize with the changes in pyramid_zodbdbconn in commit 64b0c468d4ae320d720d03d0cbc8e9a0b0e42f1f | |||
| 2012-12-10 | Merge branch '1.4-branch' | Chris McDonough | |
| 2012-12-10 | prep for 1.4b3 | Chris McDonough | |
| 2012-12-10 | Merge branch '1.4-branch' | Chris McDonough | |
| 2012-12-10 | prep for 1.4b2 | Chris McDonough | |
| 2012-12-10 | Merge branch 'master' of github.com:Pylons/pyramid | Chris McDonough | |
| 2012-12-10 | Merge pull request #736 from msabramo/docs-tutorials-wiki2-tweaks | Chris McDonough | |
| A bunch of minor tweaks to the wiki2 tutorial in docs/tutorials/wiki2 | |||
| 2012-12-10 | Merge pull request #738 from ppaez/pep8_scaffolds | Chris McDonough | |
| Improve pep8 compliance of scaffolds | |||
| 2012-12-06 | add changenote | Chris McDonough | |
| 2012-12-06 | make _backframes work like _depth (but still leave undocumented) | Chris McDonough | |
| 2012-12-06 | note custom_predicates deprecation | Chris McDonough | |
| 2012-12-06 | Merge branch '1.4-branch' | Chris McDonough | |
| 2012-12-06 | Merge branch '1.4-branch' of github.com:Pylons/pyramid into 1.4-branch | Chris McDonough | |
| 2012-12-06 | Merge pull request #739 from mmerickel/fix.view-config-depth | Chris 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_config | Michael Merickel | |
| This hides an implementation detail that view_config is at least 1 level away from user code. | |||
| 2012-12-02 | Sync tests.py and views.py in SQL wiki tutorial | Patricio Paez | |
| - No line references to update | |||
| 2012-12-02 | Sync initializedb.py in SQL wiki tutorial | Patricio Paez | |
| 2012-12-01 | Sync models.py in SQL wiki tutorial | Patricio Paez | |
| - Update lines and emphasized-lines - No line numbers if only a single line | |||
| 2012-12-01 | Sync __init__.py in SQL wiki tutorial | Patricio Paez | |
| - Update lines and emphasized-lines - No line numbers if only a single line | |||
| 2012-12-01 | unused import | Chris McDonough | |
| 2012-12-01 | Merge branch 'master' of github.com:Pylons/pyramid | Chris McDonough | |
| 2012-12-01 | Sync setup.py in SQL wiki tutorial | Patricio Paez | |
| 2012-12-01 | Update line references | Patricio Paez | |
| - In the Basic Layout and Authorization chapters of the ZODB wiki tutorial | |||
| 2012-12-01 | Sync ZODB tutorial source files with the scaffold | Patricio Paez | |
| 2012-11-30 | tutorials/wiki2/definingviews.rst: Change example error page from | Marc 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-30 | A bunch of minor tweaks to the wiki2 tutorial in docs/tutorials/wiki2 | Marc Abramowitz | |
| 2012-11-29 | Sync MyProject files with the starter scaffold | Patricio Paez | |
| - Line numbers are mentioned only in the Creating a Pyramid Project chapter; those that are affected were updated. | |||
| 2012-11-29 | make scaffolds pep8 compliant | Gael Pasgrimaud | |
| Conflicts: pyramid/scaffolds/alchemy/+package+/views.py_tmpl pyramid/scaffolds/alchemy/setup.py_tmpl Solved the two conflicts | |||
| 2012-11-29 | Merge pull request #734 from slinkp/master | Chris McDonough | |
| Fix broken link to contributor docs on front page | |||
