summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-13Fixes to documentation, added change to what's new.Jonathan Villemaire-Krajden
2013-08-13Updated CHANGESJonathan Villemaire-Krajden
Fixes 1040.
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
to virtualenv (and give an explanation), explain virtualenv on Python 2.7.
2013-08-13Merge pull request #1076 from kusut/docs.gettingstarted.easy_installPaul Everitt
Docs.gettingstarted.easy install
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
This is useful as an escape hatch when dealing with enviroments where no normal rules apply.
2013-08-12About to give Intersphinx a shot.Paul Everitt
2013-08-12Merge pull request #1077 from jeffszusz/#967_DocumentationTypoMichael Merickel
#967 fixed 'Sommetime' -> 'Sometimes' in templates.rst
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
- consistent with another docs (pyramid/substanced uses easy_install). - prevent pip/easy_install namespace package fiasco since the docs uses setup.py develop instead of pip install -e
2013-08-11Merge pull request #1075 from cd34/masterSteve Piercy
added myself to CONTRIBUTORS.txt
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
Still need to do more linking and perhaps add a section on root factories, authorization, authentication.
2013-08-10accepted contributors licenseJunaid Ali
2013-08-10Merge pull request #1071 from joulez/masterChris McDonough
Appended name to CONTRIBUTORS.txt
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
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