summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-04-14mature dev statusMichael Merickel
2014-04-09Merge pull request #1289 from thapar/patch-1Michael Merickel
Typo correction "setupy"-->"setup.py"
2014-04-09Typo correction "setupy"-->"setup.py"thapar
2014-04-09Merge pull request #1288 from stevepiercy/masterSteve Piercy
- add name of views.py
2014-04-09- add name of views.pySteve Piercy
2014-04-09Merge pull request #1287 from stevepiercy/masterSteve Piercy
- clarify Windows setuptools instructions
2014-04-09- clarify Windows setuptools instructionsSteve Piercy
- correct typo on location
2014-04-08add bdist_wheel unversalityChris McDonough
2014-04-08vb master to 1.6devChris McDonough
2014-04-08Merge branch '1.5-branch'Chris McDonough
2014-04-08prep for 1.5 releaseChris McDonough
2014-04-08no idea how this ever worked without pyramid being installed into the python ↵Chris McDonough
being used to run the tests first
2014-04-08make pdf build againChris McDonough
2014-04-08i have no idea why we do this in here, but let's make it at least correctChris McDonough
2014-04-08fix typo and update whatsnewChris McDonough
2014-04-08add changenoteChris McDonough
2014-04-08Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-04-08Merge pull request #1286 from wichert/drop-setupcfg-from-scaffoldsChris McDonough
Drop setup.cfg from scaffolds
2014-04-08Drop setup.cfg from scaffoldsWichert Akkerman
Since setup.cfg is no longer needed for Babel, and no scaffold or documentation references nose there is no need to keep them.
2014-04-08Merge branch 'wichert-doc-update-for-lingua2'Chris McDonough
2014-04-08add changenoteChris McDonough
2014-04-08Remove Babel from all setup.cfg filesWichert Akkerman
2014-04-08Always mention the msg* commands come from GettextWichert Akkerman
2014-04-08Remove lingua references from setup.cfg description.Wichert Akkerman
2014-04-08Fix $VENT typoWichert Akkerman
2014-04-08Keep using easy_install.Wichert Akkerman
2014-04-08Update Lingua glossary item.Wichert Akkerman
2014-04-08Update documentation for Lingua 2Wichert Akkerman
2014-04-08Merge branch '1.5-branch'Chris McDonough
2014-04-08fix merge conflict while merging master to 1.5 branchChris McDonough
2014-04-07Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2014-03-27broadcast 3.4 supportMichael Merickel
2014-03-27Merge pull request #1188 from msabramo/patch-4Michael Merickel
tox.ini: Add py34
2014-03-26Merge pull request #1280 from dhaaker/patch-2Steve Piercy
Update hello_world.rst
2014-03-26Merge pull request #1279 from dhaaker/patch-1Steve Piercy
Remove whitespace before the open parenthesis
2014-03-26Update hello_world.rstDaniel Haaker
Modify 'Extra Credit' to reflect code example
2014-03-26Remove whitespace before the open parenthesisDaniel Haaker
2014-03-24Merge pull request #1269 from msabramo/test_unicode_in_urlMichael Merickel
Add integration tests for Unicode in URL
2014-03-21Merge pull request #1276 from stevepiercy/masterSteve Piercy
Minor rendering, syntax, and grammar fixes
2014-03-21- fix indentation of code blockSteve Piercy
2014-03-21- correct bad .rst syntaxSteve Piercy
2014-03-18Merge pull request #1275 from thapar/patch-3Tres Seaver
Added note to place login/logout route definitions before `/{pagename}` ...
2014-03-17Corrected inline markup to use * for italicsthapar
2014-03-17Added note to place login/logout route definitions before `/{pagename}` routethapar
Resolves https://github.com/Pylons/pyramid/issues/1274
2014-03-13Strip redundant logging config from tutorial INI files.Tres Seaver
Leave it for the 'logging' and 'scaffolds' sections, where it is germane.
2014-03-11test_unicode_in_url_404: Add comment to clarify why request_path_unicodeMarc Abramowitz
is expected to be in res.txt
2014-03-11Convert from u prefix to byte string and decodeMarc Abramowitz
because the u prefix is not supported in Python 3.2
2014-03-11Remove 'b'; WebTest or WebOb doesn't like Python 3 bytes for URLsMarc Abramowitz
2014-03-10Add integration tests for Unicode in URLMarc Abramowitz
2014-03-10Merge pull request #1267 from sbivol/masterTres Seaver
Remove extra concatenation from request.static_url()