Permalink
Commits on Jan 29, 2016
  1. fix framework shootout link

    See #2305
    stevepiercy committed Jan 29, 2016
Commits on Oct 29, 2015
  1. Merge pull request #2059 from stevepiercy/1.4-branch

    - add Git Branches per #2050 (comment)
    stevepiercy committed Oct 29, 2015
  2. - add Git Branches per #2050 (comment)

    - add links to resources of Coding Style and Standards and Git Workflow
    - fix git clone command
    stevepiercy committed Oct 29, 2015
  3. Fix year on v1.4.9

    stevepiercy committed Oct 29, 2015
Commits on Aug 31, 2015
  1. update changelog

    mmerickel committed Aug 31, 2015
  2. Fix Pyramid against WebOb >=1.5.0

    Due to changes in WebOb we may no longer create a Response() object with
    an invalid status (i.e. 'None None'). For the top-level HTTPException if
    it is not correctly overriden in child classes then we now use '520
    Unknown Error'.
    
    While not an official RFC error, this has been used by Microsoft's Azure
    as well as CloudFlare to signify an error that doesn't have a more
    appropriate error message.
    bertjwregeer committed with mmerickel Aug 3, 2015
Commits on Jun 9, 2015
  1. Merge pull request #1833 from Pylons/fix-1832-1.4-branch

    Return concrete classes from 'pyramid.httpexceptions.exception_response'
    tseaver committed Jun 9, 2015
  2. Remove redundant 'pass'.

    tseaver committed Jun 9, 2015
  3. Return concrete classes from 'pyramid.httpexceptions.exception_respon…

    …se'.
    
    The base classes are not appropriate for ``400`` and ``500`` status codes.
    
    See:  #1832
    tseaver committed Jun 9, 2015
Commits on May 12, 2015
  1. Merge pull request #1669 from stevepiercy/1.4-branch

    adding extension pylons_sphinx_latesturl
    stevepiercy committed May 12, 2015
  2. Merge pull request #1668 from stevepiercy/1.4-branch

    add "Read the latest version of this page" red button to 1.4-branch
    stevepiercy committed May 12, 2015
Commits on May 6, 2015
  1. Merge pull request #1662 from stevepiercy/1.4-branch

    bump and unpin versions. RTD uses Sphinx 1.3.1 now.
    stevepiercy committed May 6, 2015
Commits on Apr 29, 2015
  1. prep 1.4.9

    mmerickel committed Apr 29, 2015
  2. prep 1.4.8

    mmerickel committed Apr 29, 2015
  3. Merge pull request #1647 from Pylons/1.4-fix-jsonp

    backport jsonp fixes from master
    mmerickel committed Apr 29, 2015
Commits on Apr 27, 2015
Commits on Apr 26, 2015
  1. backport jsonp fixes from master

    mmerickel committed Apr 26, 2015
Commits on Apr 18, 2015
  1. Merge pull request #1640 from stevepiercy/1.4-branch

    replace git submodule with new pylons-sphinx-themes package. See #1614, #1596
    stevepiercy committed Apr 18, 2015
  2. - add missing glossary term "Translation Context"

    - bump version to 1.4.8 in docs
    - replace git submodule with new pylons-sphinx-themes package. See #1614, #1596
    stevepiercy committed Apr 18, 2015
  3. - add missing glossary term "Translation Context"

    - bump version to 1.4.8 in docs
    - replace git submodule with new pylons-sphinx-themes package. See #1614, #1596
    stevepiercy committed Apr 18, 2015
Commits on Apr 15, 2015
  1. prep for 1.4.8

    mcdonc committed Apr 15, 2015
Commits on Apr 14, 2015
  1. prep for 1.4.7

    mcdonc committed Apr 14, 2015
  2. Add some validation for the JSONP callback

    cherry-pick from b6ffe51
    bertjwregeer committed Apr 14, 2015
Commits on Dec 27, 2014
  1. Merge pull request #1505 from stevepiercy/1.4-branch

    cherrypick from master, pin Sphinx to 1.2.3
    stevepiercy committed Dec 27, 2014
Commits on May 31, 2014
  1. bump 1.4.6

    mmerickel committed May 31, 2014
Commits on Apr 18, 2014
  1. clarify changes

    mmerickel committed Apr 18, 2014
  2. Add information to CHANGES

    Conflicts:
    	CHANGES.txt
    bertjwregeer committed Apr 18, 2014