summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-16rename teststaticappbase to staticappbase so non-nose testrunner (e.g. ↵Chris McDonough
pytest testrunner) wont pick it up as a test, tear down the global registries in a new teardown to avoid globals pollution seen when running under py.test testrunner
2013-08-16remove dead codeChris McDonough
2013-08-16Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-16undoing bash highlighting to just text. bash prepends a $ which makes ↵Steve Piercy
copy/paste of commands annoying, and for Windows with \ in the path, it is an escape character and does weird colorization.
2013-08-16merge changes from kusut PR#1085 and stevepiercy PR#1084Steve Piercy
wrap to 79 columns remove duplicate link of Windows extensions at top of file to prevent early clickage
2013-08-16and fix 79 colsSteve Piercy
2013-08-16Sphinx: WAAAAAAH! Just shut up and duplicate the link already.Steve Piercy
2013-08-16Clean up directions for install Python 2 and 3 and Python extensions on ↵Steve Piercy
Windows, per feedback from Windows guinea pigs at SFPython Hack Night.
2013-08-15prefer the functionish printPhilip Jenvey
2013-08-15Merge pull request #1091 from tshepang/diffMichael Merickel
remove extraneous space
2013-08-15Merge pull request #1090 from andresmrm/patch-2Michael Merickel
ZODB now supports Python3.
2013-08-16remove extraneous spaceTshepang Lekhonkhobe
2013-08-15ZODB now supports Python3.Andrés Martano
2013-08-15Merge pull request #1089 from tshepang/diffSteve Piercy
fix misplaced symbol
2013-08-15fix misplaced symbolTshepang Lekhonkhobe
2013-08-15Merge pull request #1088 from tshepang/diffSteve Piercy
fix some rST issues Looks good. Thank you!
2013-08-15fix some rST issuesTshepang Lekhonkhobe
2013-08-15Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-15cleanup cherrypy runnerMichael Merickel
2013-08-15Merge pull request #1086 from tomster/fix.issue718Chris McDonough
Make ``pserve.cherrypy_server_runner`` Python 3 compatible.
2013-08-15Merge pull request #1085 from kusut/patch-1Michael Merickel
Update install.rst
2013-08-15Make ``pserve.cherrypy_server_runner`` Python 3 compatible.Tom Lazar
Closes https://github.com/Pylons/pyramid/issues/718
2013-08-15sign the contribution agreement...Andreas Zeidler
2013-08-15added myself to contributors listTom Lazar
2013-08-15Update install.rstkusut
- simplify installation by removing distribute (merge with setuptools) - update setuptools link - simplify windows tutorial by dropping 3.2, latest python version only (2.7 and 3.3)
2013-08-15Add reference to the pull requestsTom Lazar
Conflicts: CHANGES.txt
2013-08-15Merge pull request #1078 from wichert/auth-explicit-domainAndreas Zeidler
Allow explicit auth cookie domain setting.
2013-08-15Merge pull request #1083 from Themanwithoutaplan/masterSteve Piercy
Added myself to the contributors.
2013-08-15Merge pull request #1072 from wichert/auth-parent-domain-cleanupAndreas Zeidler
No cookies on other domain when using parent_domain
2013-08-15Added myself to the contributors.themanwithoutaplan
2013-08-14Merge remote-tracking branch 'origin/master'Paul Everitt
2013-08-14Changes recommended by Lisa Ballard at PyLadies via Steve Piercy, thanks Lisa!Paul Everitt
2013-08-14prevent reparenting if no properties are definedMichael Merickel
2013-08-13remove some dead codeMichael Merickel
2013-08-13Merge pull request #1082 from Pylons/fix.mako.partial.1037Blaise Laflamme
Fix.mako.partial.1037
2013-08-14fixed line indentationBlaise Laflamme
2013-08-14added bug fix to changesBlaise Laflamme
2013-08-13added deprecation warning for mako tupleBlaise Laflamme
2013-08-13added mako renderer testBlaise Laflamme
2013-08-13fixed mako renderer returning a tuple with a previous defname value in some ↵Blaise Laflamme
circumstances
2013-08-13Merge branch 'master' into docs.gettingstartedPaul Everitt
2013-08-13Merge branch 'master' of github.com:Pylons/pyramidPaul Everitt
2013-08-13Shut up warning about latexindex not being in a TOC. Add back in a label ↵Paul Everitt
that could be used for api_documentation references.
2013-08-13fix a regression with the current_route_url changes in #1081Michael Merickel
2013-08-13Merge branch 'pull/1081'Michael Merickel
2013-08-13fix line lengthMichael Merickel
2013-08-13Merge branch 'fix-1040' of odontomachus/pyramid into pull/1081Michael Merickel
2013-08-13Fixed documentation width, signed contributors agreement and added a test ↵Jonathan Villemaire-Krajden
for duplicate query strings.
2013-08-13Merge remote-tracking branch 'origin/master' into docs.gettingstartedPaul Everitt
Conflicts: docs/index.rst docs/latexindex.rst setup.py
2013-08-13Merge branch 'master' of github.com:Pylons/pyramidPaul Everitt
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-25 07:09:15 +0000