Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Branch: master
Commits on Jul 29, 2015
  1. @mcdonc
  2. @mcdonc
Commits on Jul 23, 2015
  1. @stevepiercy

    Merge pull request #1861 from davidjb/patch-2

    stevepiercy authored
    Use correct cache argument in cache busting doco
  2. @davidjb

    Use correct cache argument in cache busting doco

    davidjb authored
    Minor correction; it's ``cache_max_age`` rather than ``max_cache_age``.
Commits on Jul 15, 2015
  1. @mcdonc
Commits on Jun 23, 2015
  1. @mcdonc
Commits on Jun 18, 2015
  1. @stevepiercy

    Merge pull request #1852 from stevepiercy/master

    stevepiercy authored
    rst numbering syntax
  2. @stevepiercy

    rst numbering syntax

    stevepiercy authored
  3. @stevepiercy

    Merge pull request #1847 from stevepiercy/master

    stevepiercy authored
    combine extra credit sections
  4. @stevepiercy
Commits on Jun 11, 2015
  1. @stevepiercy

    Merge pull request #1842 from stevepiercy/master

    stevepiercy authored
    Update authorization.rst - cherrypick from 1.5
  2. @orangieboot @stevepiercy

    Update authorization.rst

    orangieboot authored stevepiercy committed
    Removed extra colons
Commits on Jun 10, 2015
  1. @mmerickel

    Merge pull request #1838 from jenner/contibutor-for-1837

    mmerickel authored
    added appropriate contributors and changes entries
  2. added appropriate contributors and changes entries

    Igor Stroh authored
  3. @mmerickel

    Merge pull request #1837 from jenner/pcreate-check-existing-names

    mmerickel authored
    handle conflicting project names gracefully, fixes: #1357
  4. use input_ from p.compat, renamed option

    Igor Stroh authored
    - Use pyramid.compat.input_ instead of manually checking
      for python version and chosing the appropriate
      input/raw_input function
    - Renamed--force-conflicting-name option to --ignore-conflicting-name
    - Display invalid scaffold names in a sorted manner
  5. added py2.6 compatibility, removed test for 'site'

    Igor Stroh authored
    - Made sure str.format() calls are py2.6 compatible
    - Removed test_scaffolds/test_init.py#test_pre_site
      since the check is handled in pcreate script
  6. make sure user input is py2.x/py3 compatible

    Igor Stroh authored
    - Use input() in python3 and raw_input in python 2.x
    - Remoced unused local variables
  7. removed unused exceptions

    Igor Stroh authored
  8. handle conflicting project names gracefully, fixes: #1357

    Igor Stroh authored
    - Check for importable packages/modules with the same
      name as the package to be created
    - Added --force-conflicting-name option to enforce the
      use of a conflicting package
    - Added appropriate tests
Commits on Jun 9, 2015
  1. @tseaver

    Merge pull request #1836 from Pylons/fix-1832-master

    tseaver authored
    Return concrete classes from 'pyramid.httpexceptions.exception_response'
  2. @tseaver

    Return concrete classes from 'pyramid.httpexceptions.exception_respon…

    tseaver authored
    …se'.
    
    The base classes are not appropriate for 400 and 500 status codes.
    
    See: #1832
Commits on Jun 6, 2015
  1. @stevepiercy

    Merge pull request #1831 from stevepiercy/master

    stevepiercy authored
    cherry pick 1.6-branch to master
  2. @stevepiercy
  3. @tseaver

    Merge pull request #1829 from kissgyorgy/master

    tseaver authored
    More idiomatic Python
  4. @kissgyorgy

    More idiomatic code

    kissgyorgy authored
Commits on Jun 5, 2015
  1. @mcdonc

    We explicitly pass in the interfaces provided by the request as

    mcdonc authored
    request_iface to _call_view; we don't want _call_view to use
    request.request_iface, because render_view_to_response and friends are
    pretty much limited to finding views that are not views associated with
    routes, and the only thing request.request_iface is used for is to find
    route-based views.  The render_view_to_response API is (and always has
    been) a stepchild API reserved for use of those who actually use
    traversal.  Doing this fixes an infinite recursion bug introduced in
    Pyramid 1.6a1, and causes the render_view* APIs to behave as they did in
    1.5 and previous. We should probably provide some sort of different API
    that would allow people to find views for routes.
    
    Fixes #1643.
  2. @mcdonc
Commits on Jun 1, 2015
  1. @mmerickel

    Merge pull request #1823 from kilodalton/fixQuickTutorialDatabases

    mmerickel authored
    Quick Tutorial Database: Logging configs for db script output + fix scoped session warning
  2. @kilodalton
  3. @kilodalton

    add self.config = testing.setUp and testing.tearDown back to WikiView…

    kilodalton authored
    …Tests as it is a standard pattern for view tests
  4. @kilodalton
  5. @kilodalton

    Add additional logging configs necessary for db script output and upd…

    kilodalton authored
    …ate tests.py to fix the 'At least one scoped session' warning
Commits on May 31, 2015
  1. @stevepiercy

    Merge pull request #1817 from stevepiercy/master

    stevepiercy authored
    - update testing and templating remarks
  2. @stevepiercy

    - update testing and templating remarks

    stevepiercy authored
    - grammar, punctuation, 79-column rewrapping, case corrections
Something went wrong with that request. Please try again.