Commits on Aug 19, 2012
  1. @mcdonc
  2. @mcdonc

    Garden.

    mcdonc committed Aug 19, 2012
  3. @mcdonc
  4. @mcdonc

    Merge pull request #661 from k-j-kleist/master

    add optparse option "--stop-daemon" only if appropriate
    mcdonc committed Aug 19, 2012
  5. @k-j-kleist
Commits on Aug 17, 2012
  1. @mcdonc
Commits on Aug 16, 2012
  1. @mcdonc
  2. @mcdonc

    readd set_request_property to docs (just so when people run across it…

    … in in-the-wild code they're not totally confused); we'll remove it later
    mcdonc committed Aug 16, 2012
  3. @mcdonc

    Merge branch 'feature.instance-properties' of git://github.com/mmeric…

    …kel/pyramid into mmerickel-feature.instance-properties
    mcdonc committed Aug 16, 2012
  4. @mcdonc
  5. @mmerickel
  6. @mcdonc
  7. @mcdonc
  8. @mmerickel

    fixed method binding in py3

    mmerickel committed Aug 16, 2012
  9. @mmerickel
  10. @mcdonc

    - An ``add_permission`` directive method was added to the Configurato…

    …r. This
    
      directive registers a free-standing permission introspectable into the
      Pyramid introspection system.  Frameworks built atop Pyramid can thus use
      the the ``permissions`` introspectable category data to build a
      comprehensive list of permissions supported by a running system.  Before
      this method was added, permissions were already registered in this
      introspectable category as a side effect of naming them in an ``add_view``
      call, this method just makes it possible to arrange for a permission to be
      put into the ``permissions`` introspectable category without naming it
      along with an associated view.  Here's an example of usage of
      ``add_permission``::
    
          config = Configurator()
          config.add_permission('view')
    mcdonc committed Aug 15, 2012
Commits on Aug 15, 2012
  1. @mcdonc
  2. @mcdonc
  3. @mcdonc
  4. @mcdonc

    - Anonymous predicate keyword list for all add-view-ish methods

      and decorators as well as add_route is now named "**predicates" rather than
      "**other_predicates".
    
    - Fix bug in add_view and add_route where pvals was not a copy of
      other_predicates (caused discriminators to not match up when computed
      elsewhere).
    
    - Various formatting nits fixed.
    
    - add_notfound_view and add_forbidden_view now accept **predicates.
    
    - view_config, notfound_view_config, forbidden_view_config, and
      view_defaults now accept **predicates.  Their implementations
      were changed to avoid repetition.
    mcdonc committed Aug 15, 2012
  5. @mcdonc
Commits on Aug 14, 2012
  1. @mcdonc

    Merge pull request #659 from khink/master

    Typo in doc
    mcdonc committed Aug 14, 2012
  2. @khink

    Typo pwteens -> ptweens

    khink committed Aug 14, 2012
Commits on Aug 11, 2012
  1. @mcdonc

    Merge pull request #656 from kroman0/patch-1

    signed contributors agreement
    mcdonc committed Aug 11, 2012
  2. @kroman0

    signed contributors agreement

    kroman0 committed Aug 11, 2012
  3. @mcdonc

    get heading levels right

    mcdonc committed Aug 11, 2012
  4. @mcdonc
Commits on Aug 10, 2012
  1. @blaflamme

    new fix for mako adjust_uri

    blaflamme committed Aug 10, 2012
  2. @blaflamme
  3. @blaflamme
  4. @blaflamme

    Revert "should return the uri and not the adjusted uri if not in coll…

    …ection"
    
    This reverts commit 918d54d.
    blaflamme committed Aug 9, 2012
  5. @mcdonc
  6. @blaflamme
Commits on Aug 7, 2012
  1. @mcdonc
  2. @mcdonc

    note conflict behavior change

    mcdonc committed Aug 7, 2012