summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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 for...Jonathan Villemaire-Krajden
2013-08-13Merge remote-tracking branch 'origin/master' into docs.gettingstartedPaul Everitt
2013-08-13Merge branch 'master' of github.com:Pylons/pyramidPaul Everitt
2013-08-13Fixes to documentation, added change to what's new.Jonathan Villemaire-Krajden
2013-08-13Updated CHANGESJonathan Villemaire-Krajden
2013-08-13Updated doc string for Request.current_route_url.Jonathan Villemaire-Krajden
2013-08-13Request.current_route_url() now returns the query string by default.Jonathan Villemaire-Krajden
2013-08-13Add Intersphinx for Beaker, clean up some broken references, change from pip ...Paul Everitt
2013-08-13Merge pull request #1076 from kusut/docs.gettingstarted.easy_installPaul Everitt
2013-08-13Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-08-12Forgot to add the subdirPaul Everitt
2013-08-12All wrapped up, pre-merge.Paul Everitt
2013-08-12Merge branch 'pull/1079'Michael Merickel
2013-08-12remove the "thread" referenceMichael Merickel
2013-08-12Merge branch 'master' of latteier/pyramid into pull/1079Michael Merickel
2013-08-12Mention subscriber predicates.Amos Latteier
2013-08-12Minor fixes suggested by @tshepang and @mmerickel thanks!Amos Latteier
2013-08-12Fix tab/space snafu.Amos Latteier
2013-08-12Add documentation for creating and firing custom events. See issue #982.Amos Latteier
2013-08-12Allow explicit cookie domain setting.Wichert Akkerman
2013-08-12About to give Intersphinx a shot.Paul Everitt
2013-08-12Merge pull request #1077 from jeffszusz/#967_DocumentationTypoMichael Merickel
2013-08-12Update templates.rstJeff Szusz
2013-08-12#967 fixed 'Sommetime' -> 'Sometime' in templates.rstJeff Szusz
2013-08-12use easy_install instead of pip in quick_tour guide.kusut
2013-08-11Merge pull request #1075 from cd34/masterSteve Piercy
2013-08-12added myself to CONTRIBUTORS.txtChris Davies
2013-08-11Merge junaidali-master branch.Tres Seaver
2013-08-11updated doc _themeBlaise Laflamme
2013-08-11Per discussion with Chris, just wrap up "getting started" as the Quick Tour. ...Paul Everitt
2013-08-10accepted contributors licenseJunaid Ali
2013-08-10Merge pull request #1071 from joulez/masterChris McDonough
2013-08-10No cookies on other domain with parent_domainWichert Akkerman
2013-08-10Appended name to CONTRIBUTORS.txtJulian Paul Glass
2013-08-10add change noteChris McDonough
2013-08-10Merge branch 'junaidali-master'Chris McDonough
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
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 joulez-pser...Chris McDonough
2013-08-10Merge branch 'master' of github.com:Pylons/pyramidChris McDonough