parent: 29e100 | patch | commitdiff
Bert JW Regeer
2016-01-03 a2dff0592714d9cde5a0a612411aa96ce9d94b3c
refs
author Bert JW Regeer <bertjw@regeer.org>
Sunday, January 3, 2016 10:09 +0100
committer Bert JW Regeer <bertjw@regeer.org>
Sunday, January 3, 2016 10:09 +0100
commita2dff0592714d9cde5a0a612411aa96ce9d94b3c
tree 6dac581990ba758670a8424cafe8bf31888471f7 tree | zip | gz
parent 29e1002a108d045e1f80be3137f2cde4e47ca642 view | diff
5558386fd1a6181b2e8ad06659049c055a7ed023 view | diff 
Merge branch 'master' into feature/alchemy-scaffold-update
11 files added
51 files modified
3377 ■■■■■ changed files
.travis.yml 5 ●●●●● diff | view | raw | blame | history
CHANGES.txt 47 ●●●●● diff | view | raw | blame | history
CONTRIBUTORS.txt 4 ●●●●● diff | view | raw | blame | history
HACKING.txt 10 ●●●●● diff | view | raw | blame | history
HISTORY.txt 4 ●●●●● diff | view | raw | blame | history
README.rst 13 ●●●●● diff | view | raw | blame | history
RELEASING.txt 14 ●●●●● diff | view | raw | blame | history
builddocs.sh 2 ●●●●● diff | view | raw | blame | history
docs/api/session.rst 1 ●●●●● diff | view | raw | blame | history
docs/api/static.rst 8 ●●●●● diff | view | raw | blame | history
docs/conf.py 9 ●●●●● diff | view | raw | blame | history
docs/designdefense.rst 183 ●●●●● diff | view | raw | blame | history
docs/glossary.rst 6 ●●●●● diff | view | raw | blame | history
docs/index.rst 13 ●●●●● diff | view | raw | blame | history
docs/narr/MyProject/development.ini 6 ●●●●● diff | view | raw | blame | history
docs/narr/MyProject/myproject/templates/mytemplate.pt 13 ●●●●● diff | view | raw | blame | history
docs/narr/MyProject/myproject/tests.py 25 ●●●●● diff | view | raw | blame | history
docs/narr/MyProject/production.ini 2 ●●●●● diff | view | raw | blame | history
docs/narr/MyProject/setup.py 45 ●●●●● diff | view | raw | blame | history
docs/narr/assets.rst 469 ●●●●● diff | view | raw | blame | history
docs/narr/commandline.rst 33 ●●●●● diff | view | raw | blame | history
docs/narr/project.rst 102 ●●●●● diff | view | raw | blame | history
docs/narr/scaffolding.rst 8 ●●●●● diff | view | raw | blame | history
docs/narr/startup.rst 27 ●●●●● diff | view | raw | blame | history
docs/narr/testing.rst 73 ●●●●● diff | view | raw | blame | history
docs/narr/threadlocals.rst 210 ●●●●● diff | view | raw | blame | history
docs/narr/upgrading.rst 159 ●●●●● diff | view | raw | blame | history
docs/narr/zca.rst 239 ●●●●● diff | view | raw | blame | history
docs/pscripts/index.rst 12 ●●●●● diff | view | raw | blame | history
docs/pscripts/pcreate.rst 13 ●●●●● diff | view | raw | blame | history
docs/pscripts/pdistreport.rst 13 ●●●●● diff | view | raw | blame | history
docs/pscripts/prequest.rst 13 ●●●●● diff | view | raw | blame | history
docs/pscripts/proutes.rst 13 ●●●●● diff | view | raw | blame | history
docs/pscripts/pserve.rst 13 ●●●●● diff | view | raw | blame | history
docs/pscripts/pshell.rst 13 ●●●●● diff | view | raw | blame | history
docs/pscripts/ptweens.rst 13 ●●●●● diff | view | raw | blame | history
docs/pscripts/pviews.rst 13 ●●●●● diff | view | raw | blame | history
docs/whatsnew-1.0.rst 2 ●●●●● diff | view | raw | blame | history
docs/whatsnew-1.1.rst 2 ●●●●● diff | view | raw | blame | history
docs/whatsnew-1.2.rst 2 ●●●●● diff | view | raw | blame | history
docs/whatsnew-1.3.rst 2 ●●●●● diff | view | raw | blame | history
docs/whatsnew-1.4.rst 2 ●●●●● diff | view | raw | blame | history
docs/whatsnew-1.5.rst 4 ●●●●● diff | view | raw | blame | history
docs/whatsnew-1.6.rst 204 ●●●●● diff | view | raw | blame | history
pyramid/authentication.py 9 ●●●●● diff | view | raw | blame | history
pyramid/config/assets.py 5 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 188 ●●●●● diff | view | raw | blame | history
pyramid/interfaces.py 63 ●●●●● diff | view | raw | blame | history
pyramid/path.py 3 ●●●●● diff | view | raw | blame | history
pyramid/scripts/prequest.py 2 ●●●●● diff | view | raw | blame | history
pyramid/scripts/pserve.py 132 ●●●●● diff | view | raw | blame | history
pyramid/session.py 24 ●●●●● diff | view | raw | blame | history
pyramid/static.py 185 ●●●●● diff | view | raw | blame | history
pyramid/tests/fixtures/manifest.json 4 ●●●●● diff | view | raw | blame | history
pyramid/tests/fixtures/manifest2.json 4 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_authentication.py 59 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_views.py 276 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_session.py 46 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_static.py 215 ●●●●● diff | view | raw | blame | history
pyramid/url.py 10 ●●●●● diff | view | raw | blame | history
setup.py 1 ●●●●● diff | view | raw | blame | history
tox.ini 87 ●●●●● diff | view | raw | blame | history