Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Sep 04, 2011
@mcdonc mcdonc unit test straddling for 1.2a5+ 7641487
@mcdonc mcdonc defer committing under autocommit until we've placed actions into the…
… pyramid action queue
f906410
@mcdonc mcdonc no need for a custom ConfigurationMachine 9a51bdb
@mcdonc mcdonc comment 0781c51
@mcdonc mcdonc prep for 0.6 90e948c
Commits on Oct 07, 2011
@mcdonc mcdonc includeOverrides didn't work in Pyramid 1.2 9577a3b
@mcdonc mcdonc changelog note 054b649
@mcdonc mcdonc prep for 0.7 8b30bfd
Commits on Nov 07, 2011
@blaflamme blaflamme updated docs for rtd 1ca736c
Commits on Dec 05, 2011
@mcdonc mcdonc fix test 56c1d39
@mcdonc mcdonc Merge branch 'master' of github.com:Pylons/pyramid_zcml 8333bb0
Commits on Dec 06, 2011
@mcdonc mcdonc depend on zope.configuration 3.8.0dev+ and bump our version to 0.8dev 8051e04
@mcdonc mcdonc fix tox.ini for py25 1a01786
@mcdonc mcdonc prep for 0.8 126c7dc
@jinty jinty Allow specifying features to load_zcml 95c173e
Commits on Dec 15, 2011
@mcdonc mcdonc - Drop dependency on PasteScript (Pyramid 1.3 compat).
- Rename "paster_templates" dir to "scaffolds".

- Make scaffold compatible with Pyramid 1.3a2+.

- Drop scaffolding dependency on WebError.

- Scaffold now uses ``pyramid#wsgiref`` server instead of ``paste#http``
  server.  This will require the use of Pyramid 1.0.2, 1.1.3, 1.2.5, or
  1.3a2+.
d9349bb
@mcdonc mcdonc prevent import warning on pyramid 1.2 a9d0fbd
@mcdonc mcdonc fix directives for newer sphinxen cc0ddca
@mcdonc mcdonc use newer-style git checkout of theme da4523b
@mcdonc mcdonc remove submodule cruft 7bd9ffd
@mcdonc mcdonc add note about pcreate a75fa79
@mcdonc mcdonc prep for 0.9 d259acc
@mcdonc mcdonc prep for 0.9.1 bb26a18
Commits on Feb 20, 2012
@mcdonc mcdonc - Stop depending on ``pyramid.config.Configurator.with_context``. Moved
  logic into this package in Pyramid 1.3a9+.

- Respect Pyramid 1.3a9+ ``introspection`` Configurator attribute.
f384a7e
@mcdonc mcdonc fix for 1.0 and 1.1 branches aa322c9
@mcdonc mcdonc prep for 0.9.2 73dae88
@mcdonc mcdonc this will be pulled in as necessary c37d9cb
@mcdonc mcdonc use pyramid makefile be61353
@mcdonc mcdonc sigh, fix date after release 426f0c3
Commits on Nov 27, 2012
@huubbouma huubbouma Fix xhr predicate behavour, so it does as it is specified in the
documentation:
"If xhr is not specified, the HTTP_X_REQUESTED_WITH HTTP header is not
taken into consideration [..]"
2769f19
Commits on Nov 28, 2012
@huubbouma huubbouma Forgot to fix the xhr parameter initialisation for the view directive. 9b710c5
Commits on Jan 29, 2013
@tseaver tseaver Merge pull request #5 from huubbouma/master
fix xhr predicate in view configuration
e0b839c
@tseaver tseaver Drop support for Python 2.5 / Jython. e2a9557
@tseaver tseaver Fix one set of tests broken against current Pyramid. fb56a92
@tseaver tseaver Back to tests passing. 10956bc
@tseaver tseaver Drop support for Pyramid < 1.3.
Rip out some ancient BBB code.
52a6aaf
@tseaver tseaver Add Python 3.2 / 3.3 support. 564979f
@tseaver tseaver Add 'setup.py dev' alias.
Runs 'setup.py develop' and installs testing dependencies.
7005b1e
@tseaver tseaver Add 'setup.py docs' alias.
Runs 'setup.py develop' and installs documentation dependencies.
df40a44
@tseaver tseaver Note upcoming version bump. f26ed05
Commits on Feb 28, 2013
@tseaver tseaver Typo d8a4334
@tseaver tseaver Tag 1.0.0 release. cc11a83
Commits on Aug 06, 2013
@mcdonc mcdonc fix isphinx target 796e67d
Commits on Feb 04, 2015
@tseaver tseaver Merge branch 'master' of github.com:Pylons/pyramid_zcml f493a5a
@tseaver tseaver Silence setuptools chatter.
Prefer Python 2.7 for coverage.
8f1d72c
@tseaver tseaver Add 'pyramid_mako' testing dependency and configure it in tests.
Current versions of Pyramid split out 'Mako' integration.
2b89201
@tseaver tseaver Accomodate updated AuthTkt. d041694
@tseaver tseaver Accomodate recent Venusian. 5dc4ca1
@tseaver tseaver Pin pyramid / venusian to deal with updated tests. d54989b
@tseaver tseaver Changelog for new version pins. ad6cb31
@tseaver tseaver Merge branch 'master' of https://github.com/jinty/pyramid_zcml into j…
…inty-master

Conflicts:
	pyramid_zcml/__init__.py
0ea22fe
@tseaver tseaver Merge branch 'jinty-master' 54875c6
@tseaver tseaver Changelog for PR #1. be1c4f8
@tseaver tseaver Add support for Python 3.4. 1dfa9bc
@tseaver tseaver Garden 09965e4
@tseaver tseaver Add testing for PyPy3. a7ae203
@tseaver tseaver Require 100% test coverage. 3bb0fcd
@tseaver tseaver Wire up Travis support. d36ee4a
@tseaver tseaver Bow to Py3k unittest nannyism. b39ddea
@tseaver tseaver Strengthen the hash algorithm used in '<authtkauthpolicy>' directive.
Update from 'md5' -> 'sha512'.
e8957bf
@tseaver tseaver Note deprecation of 'custom_predicates'. 2fe4032
@tseaver tseaver Suppress deprecation warning spew. d12ad86