/pyramid

Permalink
Switch branches/tags
Nothing to show
Commits on Apr 15, 2015

  1. prep for 1.4.8

    @mcdonc
    mcdonc committed Apr 15, 2015
    f5a38b7
Commits on Apr 14, 2015

  1. prep for 1.4.7

    @mcdonc
    mcdonc committed Apr 14, 2015
    3fa1b74

  2. Add some validation for the JSONP callback

    @bertjwregeer
    bertjwregeer committed Apr 14, 2015 
    cherry-pick from b6ffe51
    ed3bfd0
Commits on Dec 27, 2014

  1. Merge pull request #1505 from stevepiercy/1.4-branch

    @stevepiercy
    stevepiercy committed Dec 27, 2014 
    cherrypick from master, pin Sphinx to 1.2.3
    337d1d2

  2. - pin Sphinx >= 1.2.3 for RTD

    @stevepiercy
    stevepiercy committed Dec 27, 2014
    19a1426

  3. - establish minimum version of 1.2.3 for Sphinx. I hope this works. See

    @stevepiercy
    stevepiercy committed Dec 26, 2014 
    #1068
    1dbfb69
Commits on May 31, 2014

  1. bump 1.4.6

    @mmerickel
    mmerickel committed May 31, 2014
    01138a3

  2. stop using distribute on py3 with modern releases of setuptools

    @mmerickel
    mmerickel committed May 31, 2014
    b77cc98

  3. convert TranslationStringFactory docs to function to satisfy sphinx

    @mmerickel
    mmerickel committed May 31, 2014
    5f1b3ab
Commits on Apr 18, 2014

  1. clarify changes

    @mmerickel
    mmerickel committed Apr 18, 2014
    55560cb

  2. Add information to CHANGES

    @bertjwregeer
    bertjwregeer committed Apr 18, 2014 
    Conflicts:
	CHANGES.txt
    8df6e05

  3. _add_subscriber should resolve dotted names

    @bertjwregeer
    bertjwregeer committed Apr 18, 2014
    fdef349
Commits on Mar 11, 2014

  1. Merge pull request #1271 from manicou/patch-1

    @mmerickel
    mmerickel committed Mar 11, 2014 
    Update authorization.rst
    578c8dd

  2. Update authorization.rst

    @manicou
    manicou committed Mar 11, 2014 
    Small typo when illustrating how to use "groupfinder". Missing an 's' in the list item
    486b3af
Commits on Feb 26, 2014

  1. Merge pull request #1248 from dobesv/patch-1

    @tseaver
    tseaver committed Feb 26, 2014 
    Fix documentation for add_notfound_view()
    9181cbf

  2. Fix documentation for add_notfound_view()

    @dobesv
    dobesv committed Feb 26, 2014 
    It referred to HTTPForbidden as the exception instead of HTTPNotFound.
    8c6fe86
Commits on Nov 12, 2013

  1. backport easiest commit ever

    @mmerickel
    mmerickel committed Nov 12, 2013
    31b179d
Commits on Nov 7, 2013

  1. document add_adapter

    @mmerickel
    mmerickel committed Nov 7, 2013
    ac78256
Commits on Oct 15, 2013

  1. Merge pull request #1167 from waveform80/patch-1

    @stevepiercy
    stevepiercy committed Oct 15, 2013 
    Minor grammatical corrections
    5f2d9b4

  2. Minor grammatical corrections

    @waveform80
    waveform80 committed Oct 15, 2013
    e7ad9bd
Commits on Oct 14, 2013

  1. Merge branch 'bug/namespace-packages' of github.com:mattjeffery/pyram…

    @mcdonc
    mcdonc committed Oct 14, 2013 
    …id into mattjeffery-bug/namespace-packages
    4d213b3
Commits on Oct 12, 2013

  1. Merge pull request #1158 from hariharan-uno/patch-3

    @stevepiercy
    stevepiercy committed Oct 12, 2013 
    Spell mistake corrected
    3466f13

  2. Spell mistake corrected

    @hariharan-uno
    hariharan-uno committed Oct 12, 2013
    7c12a1c
Commits on Oct 11, 2013

  1. Update package_name() to work with namespace pkgs

    @dhellmann @mattjeffery
    dhellmann authored and mattjeffery committed Sep 5, 2013 
    The logic in pyramid.path.package_name() should take into
account the fact that namespace packages created by
setuptools do not have __init__.py[c] files, and so they
have no __file__ attribute.

This resolves an issue with WSME
(https://bugs.launchpad.net/wsme/+bug/1221201)

Change-Id: I39bc32a9c38fa11c4cef22a041077ed9001091be
(cherry picked from commit c062d5a)
    c5ccafa

  2. Merge pull request #1155 from mattjeffery/patch-1

    @mmerickel
    mmerickel committed Oct 11, 2013 
    Corrected date for 1.4.5 release in change log file
    bac4476

  3. Corrected date for 1.4.5 release in change log file

    @mattjeffery
    mattjeffery committed Oct 11, 2013 
    The date for the 1.4.5 release was incorrect, it has been updated to the correct date.
    28f6e91
Commits on Oct 6, 2013

  1. Merge pull request #1143 from BauhausSP/patch-1

    @mmerickel
    mmerickel committed Oct 6, 2013 
    Fixed an example
    1059c02

  2. Fixed an example

    @emilgpa
    emilgpa committed Oct 6, 2013 
    "from pyramid.view import view_config" instead of "from pyramid.view. import view_config"
    9c81b88
Commits on Sep 28, 2013

  1. Use parsed-literal sphinx directive to dynamically insert the version…

    @stevepiercy
    stevepiercy committed Sep 28, 2013 
    … number of Pyramid for easy_install. Resolves Issue #1129. I have committed this to 1.4-branch only, and I'll need to run it by smarter people for the branch master.
    127c587
Commits on Sep 22, 2013

  1. Merge pull request #1126 from keresian/patch-1

    @mmerickel
    mmerickel committed Sep 22, 2013 
    Missing view_defaults import, causes error on use.
    c9f809a

  2. Missing view_defaults import, causes error on use.

    @keresian
    keresian committed Sep 22, 2013 
    Example missing view_defaults import.
    05ede1d
Commits on Sep 20, 2013

  1. subrepo dance

    @mcdonc
    mcdonc committed Sep 20, 2013
    e8f7b99
Commits on Sep 14, 2013

  1. use most recent theme version

    @mcdonc
    mcdonc committed Sep 14, 2013
    d7e8fd0
Commits on Sep 9, 2013

  1. rely on pylons_sphinx_latesturl

    @mcdonc
    mcdonc committed Sep 9, 2013
    cd6096d

  2. Update theme.

    @tseaver
    tseaver committed Sep 9, 2013
    04a7a98