Permalink
Commits on Dec 10, 2012
  1. prep for 1.4b2

    mcdonc committed Dec 10, 2012
  2. Merge pull request #736 from msabramo/docs-tutorials-wiki2-tweaks

    A bunch of minor tweaks to the wiki2 tutorial in docs/tutorials/wiki2
    mcdonc committed Dec 10, 2012
  3. Merge pull request #738 from ppaez/pep8_scaffolds

    Improve pep8 compliance of scaffolds
    mcdonc committed Dec 10, 2012
Commits on Dec 7, 2012
  1. add changenote

    mcdonc committed Dec 7, 2012
  2. Merge branch '1.4-branch'

    mcdonc committed Dec 7, 2012
  3. Merge pull request #739 from mmerickel/fix.view-config-depth

    _depth argument to view_config is now relative to view_config
    mcdonc committed Dec 7, 2012
Commits on Dec 6, 2012
  1. _depth argument to view_config is now relative to view_config

    This hides an implementation detail that view_config is at least 1 level away
    from user code.
    mmerickel committed Dec 6, 2012
Commits on Dec 3, 2012
  1. Sync tests.py and views.py in SQL wiki tutorial

    - No line references to update
    ppaez committed Dec 3, 2012
Commits on Dec 2, 2012
  1. Sync models.py in SQL wiki tutorial

    - Update lines and emphasized-lines
    
    - No line numbers if only a single line
    ppaez committed Dec 2, 2012
  2. Sync __init__.py in SQL wiki tutorial

    - Update lines and emphasized-lines
    
    - No line numbers if only a single line
    ppaez committed Dec 2, 2012
  3. unused import

    mcdonc committed Dec 2, 2012
Commits on Dec 1, 2012
  1. Update line references

    - In the Basic Layout and Authorization chapters
      of the ZODB wiki tutorial
    ppaez committed Dec 1, 2012
Commits on Nov 30, 2012
  1. tutorials/wiki2/definingviews.rst: Change example error page from

    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.
    Marc Abramowitz committed Nov 30, 2012
  2. Sync MyProject files with the starter scaffold

    - Line numbers are mentioned only in the
      Creating a Pyramid Project chapter; those
      that are affected were updated.
    ppaez committed Nov 30, 2012
  3. make scaffolds pep8 compliant

    Conflicts:
    	pyramid/scaffolds/alchemy/+package+/views.py_tmpl
    	pyramid/scaffolds/alchemy/setup.py_tmpl
    
    Solved the two conflicts
    gawel committed with ppaez Dec 26, 2011
Commits on Nov 29, 2012
  1. Merge pull request #734 from slinkp/master

    Fix broken link to contributor docs on front page
    mcdonc committed Nov 29, 2012
  2. Fix broken link to contributor docs

    Paul Winkler committed Nov 29, 2012
Commits on Nov 28, 2012
  1. Merge pull request #716 from ericrasmussen/scaffolds.requiresfix

    add transaction dependency to zodb scaffold
    mcdonc committed Nov 28, 2012
  2. Merge pull request #732 from ppaez/transaction-dependency

    Transaction dependency in ZODB tutorial
    mcdonc committed Nov 28, 2012
Commits on Nov 22, 2012
  1. typos

    mcdonc committed Nov 22, 2012
  2. more appeasement

    mcdonc committed Nov 22, 2012
  3. appeasement

    mcdonc committed Nov 22, 2012
  4. prep for 1.4b1

    mcdonc committed Nov 22, 2012
  5. prep for release

    mcdonc committed Nov 22, 2012
  6. document new introspectable attrs

    mcdonc committed Nov 22, 2012