summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-10remove unused testing dependenciesChris McDonough
2013-08-10Merge branch 'master' of github.com:junaidali/pyramid into junaidali-masterChris McDonough
2013-08-10Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-10Merge branch 'cd34-master'Chris McDonough
2013-08-10add change noteChris McDonough
2013-08-10Merge branch 'master' of github.com:cd34/pyramid into cd34-masterChris McDonough
2013-08-09Merge pull request #1070 from Pylons/feature/sphinx-autoversionChris McDonough
update sphinx conf.py to use the pyramid version from pkg_resources instead of needing to change it manually
2013-08-10Merge branch 'joulez-pserve.verbosity'Chris McDonough
2013-08-10add change noteChris McDonough
2013-08-10Merge branch 'pserve.verbosity' of github.com:joulez/pyramid into ↵Chris McDonough
joulez-pserve.verbosity
2013-08-10Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-10update sphinx to use the version from the package automaticallyMichael Merickel
2013-08-09Merge pull request #1069 from tisdall/masterChris McDonough
another dose of spelling corrections...
2013-08-09"agsinst" to "against"tisdall
2013-08-09"intead" to "instead"tisdall
2013-08-09"arent" to "aren't"tisdall
2013-08-09"repetion" to "repetition"tisdall
2013-08-09"offical" to "official"tisdall
2013-08-09"wilcard" to "wildcard"tisdall
2013-08-09"dermine" to "determine"tisdall
2013-08-09"argments" to "arguments"; "agument" to "argument"tisdall
2013-08-08Merge pull request #1066 from tisdall/masterMichael Merickel
yet another spelling correction
2013-08-08"resouce" to "resource"tisdall
2013-08-08Merge pull request #1065 from tisdall/masterMichael Merickel
more spelling corrections
2013-08-08"readded" to "re-added"tisdall
2013-08-08"refered" to "referred"tisdall
2013-08-08"unecessary" to "unnecessary"tisdall
2013-08-08"langauges" to "languages"tisdall
2013-08-08Merge pull request #1064 from tisdall/masterMichael Merickel
spelling fixes
2013-08-08"behavor" to "behavior"tisdall
2013-08-08changed "obect" to "object"tisdall
2013-08-06Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-06add missing word ``pserve``Steve Piercy
2013-08-06add redis session mentionChris McDonough
2013-08-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-02add pdistreport commandChris McDonough
2013-08-02add a docstring for not_Chris McDonough
2013-08-02Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-02point at add-on documentationChris McDonough
2013-08-02quiet keyword sets verbose level to 0, test_pserve.py restored to previous stateJulian Paul Glass
2013-08-01Changed to an incrementing verbose level, (-q, --quiet) option added, all ↵Julian Paul Glass
references to quiet=BOOL removed (can't have both) Updated test_pserve.py
2013-08-01Merge branch 'pserve.verbosity' of https://github.com/joulez/pyramid into ↵Julian Paul Glass
pserve.verbosity
2013-08-01Updated test_pserve.py - ins.options.verboseJulian Paul Glass
2013-08-01table layouts and templates, query attributes (edit,new,del)Julian Paul Glass
2013-08-01Replaced references tow self.verbose with self.option.verboseJulian Paul Glass
2013-07-31Added verbosity option -v --verbose to pserve.pyJulian Paul Glass
2013-07-31Added verbosity option -v --verbose to pserve.pyJulian Paul Glass
2013-07-28Merge branch 'dslatten-patch-1'Chris McDonough
2013-07-28Merge branch 'master' into dslatten-patch-1Chris McDonough
2013-07-28Merge branch 'master' of github.com:Pylons/pyramidChris McDonough