Skip to content
This repository
branch: master

Apr 24, 2014

  1. Michael Merickel

    Merge pull request #1323 from bmess/narrative_typo

    Typo found in second Declarative code block
    authored April 24, 2014
  2. bobby

    Typo found in second Declarative code block

    There were two import statements for Configurator.
    I removed the second import statement in the "__main__" since most of the
    documentation declares all imports on the top of the source.
    
    	modified:   configuration.rst
    authored April 23, 2014
  3. Michael Merickel

    remove redundant tests

    authored April 23, 2014

Apr 23, 2014

  1. Michael Merickel

    Merge pull request #1320 from bertjwregeer/feature.raise_valueerror_wsgi

    Feature: raise ValueError if wrapped is None in wsgiapp/wsgiapp2
    authored April 23, 2014
  2. Bert JW Regeer

    Update CHANGES for wsgiapp and wsgiapp2

    authored April 22, 2014
  3. Bert JW Regeer

    Verify that wrapped is not None

    If wrapped is None we raise a ValueError to let the user know that we
    are unable to continue.
    authored April 22, 2014

Apr 21, 2014

  1. Steve Piercy

    Merge pull request #1318 from stevepiercy/master

    port to master branch - Update background section same as quick_tour.rst
    authored April 21, 2014
  2. Steve Piercy

    Update background section same as quick_tour.rst

    Update text of ``background`` section same as ``sessions`` section of ``quick_tour.rst``
    authored April 21, 2014
  3. goodwillcoding

    Merge pull request #1313 from goodwillcoding/scaffold_version

    Issue: #1300, pyramid versiona and scaffold docs, add correct handling for dev docs which now points to 'master' docs
  4. goodwillcoding

    add correct handling for dev docs which now points to 'master' docs

Apr 20, 2014

  1. Michael Merickel

    Merge branch 'pull.1300'

    authored April 20, 2014
  2. Michael Merickel

    remove special case for dev branches

    the way pyramid's RTD works is that doc changes are rendered
    automatically on each release branch, so dev versions should actually
    point at their parent branch for the most up-to-date docs
    authored April 20, 2014
  3. goodwillcoding

    update the version detection to use better regex matching for version

    and add more test cases
  4. goodwillcoding

    refine language some more to say 'Pyramid' less

  5. goodwillcoding

    standardize on scaffold over template naming

  6. goodwillcoding

    update change me with the scaffold changes

  7. goodwillcoding

    Merge branch 'master' of github.com:Pylons/pyramid into scaffold_version

  8. goodwillcoding

    clean up the language to say "Generated by"

  9. Steve Piercy

    Merge pull request #1309 from omidraha/patch-1

    Correct question to adapt to the the text.
    authored April 20, 2014
  10. Omid Raha

    Remove repeated word.

    Remove repeated `operations` word.
    authored April 20, 2014 stevepiercy committed April 20, 2014
  11. Steve Piercy

    - Correct 80-column lines specification to 79 to be compliant with PE…

    …P8 and consistent with doc to which this line refers.
    authored April 20, 2014
  12. goodwillcoding

    Merge branch 'master' of github.com:Pylons/pyramid into scaffold_version

  13. goodwillcoding

    Move the docs and pyramid version to scaffold template generation and

    out of the views.
    Add pyramid docs version to all the .ini file scaffolds
    Update alchemy, zodb, and starter to have respective names

Apr 18, 2014

  1. Michael Merickel

    Merge pull request #1306 from bertjwregeer/fix.add_predicates_maybe_d…

    …otted
    
    Fix: add predicates maybe dotted
    authored April 18, 2014
  2. Bert JW Regeer

    Add information to CHANGES

    authored April 18, 2014
  3. Bert JW Regeer

    _add_subscriber should resolve dotted names

    authored April 18, 2014
  4. Steve Piercy

    Merge pull request #1304 from thapar/patch-2

    Typo fix "not more"-->"no longer"
    authored April 18, 2014
  5. thapar

    Corrected the comment's language

    authored April 18, 2014
  6. thapar

    Typo fix "not"-->"no"

    authored April 18, 2014

Apr 17, 2014

  1. Michael Merickel

    Merge pull request #1303 from flibustenet/patch-2

    More explicit example of set_property
    authored April 17, 2014
  2. flibustenet

    More explicit example of set_property

    cleanup callback has a "request" parameter (and not "_")
    cleanup callback know (since 1.5) if an exception occurred or not (to commit or rollback)
    (same as #1302 on 1.5)
    authored April 17, 2014

Apr 16, 2014

  1. goodwillcoding

    update the alchemy template to use pyramid version and doc version

  2. goodwillcoding

    add pyramid version and pyramid docs branch to the scaffold generation

    machinery so it is available in scaffold templates, this will help
    generate proper links in scaffolds and not confiuse people when
    they go to documentation
  3. Michael Merickel

    minor tweaks based on toolbar changes in 2.x

    authored April 16, 2014
  4. Michael Merickel

    Merge pull request #1298 from tylereaves/master

    Fix wording in debug toolbar tutorial
    authored April 16, 2014
Something went wrong with that request. Please try again.