summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2012-11-29Fix broken link to contributor docsPaul Winkler
2012-11-27Merge pull request #716 from ericrasmussen/scaffolds.requiresfixChris McDonough
add transaction dependency to zodb scaffold
2012-11-27Merge pull request #732 from ppaez/transaction-dependencyChris McDonough
Transaction dependency in ZODB tutorial
2012-11-22typosChris McDonough
2012-11-22Sync the tutorial docs for the transaction dependencyPatricio Paez
2012-11-22more appeasementChris McDonough
2012-11-22appeasementChris McDonough
2012-11-21prep for 1.4b1Chris McDonough
2012-11-21prep for releaseChris McDonough
2012-11-21document new introspectable attrsChris McDonough
2012-11-21missed adding this fileChris McDonough
2012-11-21Merge branch 'feature.eventonly'Chris McDonough
2012-11-21fix for py3Chris McDonough
2012-11-21add an integration test for the eventonly behaviorChris McDonough
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-02 02:49:24 +0000