summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-06-18rst numbering syntaxSteve Piercy
2015-06-18Merge pull request #1847 from stevepiercy/masterSteve Piercy
2015-06-18combine extra credit sectionsSteve Piercy
2015-06-14Merge pull request #1844 from ergo/feature/alchemy-scaffold-updateMichael Merickel
2015-06-13metadata: add proper naming convention to metadata - same as suggested by ale...Marcin Lulek
2015-06-11Merge pull request #1842 from stevepiercy/masterSteve Piercy
2015-06-11Update authorization.rstorangieboot
2015-06-10Merge pull request #1838 from jenner/contibutor-for-1837Michael Merickel
2015-06-11added appropriate contributors and changes entriesIgor Stroh
2015-06-10Merge pull request #1837 from jenner/pcreate-check-existing-namesMichael Merickel
2015-06-11use input_ from p.compat, renamed optionIgor Stroh
2015-06-10added py2.6 compatibility, removed test for 'site'Igor Stroh
2015-06-10make sure user input is py2.x/py3 compatibleIgor Stroh
2015-06-10removed unused exceptionsIgor Stroh
2015-06-10handle conflicting project names gracefully, fixes: #1357Igor Stroh
2015-06-09Merge pull request #1836 from Pylons/fix-1832-masterTres Seaver
2015-06-09Return concrete classes from 'pyramid.httpexceptions.exception_response'.Tres Seaver
2015-06-06Merge pull request #1831 from stevepiercy/masterSteve Piercy
2015-06-06cherry pick 1.6-branch to masterSteve Piercy
2015-06-06Merge pull request #1829 from kissgyorgy/masterTres Seaver
2015-06-06More idiomatic codeKiss György
2015-06-05We explicitly pass in the interfaces provided by the request asChris McDonough
2015-06-05Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-06-01Merge pull request #1823 from kilodalton/fixQuickTutorialDatabasesMichael Merickel
2015-06-01added name to contributors listKaren Dalton
2015-06-01add self.config = testing.setUp and testing.tearDown back to WikiViewTests as...Karen Dalton
2015-06-01remove some calls to the testing module and self.config as they are not usedKaren Dalton
2015-06-01Add additional logging configs necessary for db script output and update test...Karen Dalton
2015-05-31Merge pull request #1817 from stevepiercy/masterSteve Piercy
2015-05-31- update testing and templating remarksSteve Piercy
2015-05-31Merge pull request #1816 from stevepiercy/masterSteve Piercy
2015-05-31move -E from Makefile to tox.ini so that we don't punish manual doc buildsSteve Piercy
2015-05-31Merge pull request #1815 from stevepiercy/masterSteve Piercy
2015-05-31add -E option to get tox to build docs and pass on jenkinsSteve Piercy
2015-05-30Merge pull request #1814 from kissgyorgy/masterSteve Piercy
2015-05-30Added notes on check_csrf view predicate. Also it is an add_view parameter, n...Kiss György
2015-05-28Merge pull request #1809 from stevepiercy/masterSteve Piercy
2015-05-28grammar, punctuation, caps, rewrap 79-columnsSteve Piercy
2015-05-28Merge pull request #1807 from stevepiercy/masterSteve Piercy
2015-05-28fix duplicate name resource_pathuralbash
2015-05-28Merge pull request #1803 from stevepiercy/masterSteve Piercy
2015-05-28grammar, punctuationSteve Piercy
2015-05-27add an example decorator showing a response being used unconditionallyMichael Merickel
2015-05-27Merge pull request #1801 from stevepiercy/masterSteve Piercy
2015-05-27clean up and make consistent across wikisSteve Piercy
2015-05-27Merge pull request #1796 from stevepiercy/masterSteve Piercy
2015-05-27- clean up and make consistent across wiki tutorialsSteve Piercy
2015-05-27Merge pull request #1795 from stevepiercy/masterSteve Piercy
2015-05-27- clean up and make consistent across both wikis authorization.rstSteve Piercy
2015-05-26Merge pull request #1790 from stevepiercy/masterSteve Piercy