summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-04-22Verify that wrapped is not NoneBert JW Regeer
2014-04-21Merge pull request #1318 from stevepiercy/masterSteve Piercy
2014-04-21Update background section same as quick_tour.rstSteve Piercy
2014-04-20Merge pull request #1313 from goodwillcoding/scaffold_versiongoodwillcoding
2014-04-20add correct handling for dev docs which now points to 'master' docsgoodwillcoding
2014-04-20Merge branch 'pull.1300'Michael Merickel
2014-04-20remove special case for dev branchesMichael Merickel
2014-04-20update the version detection to use better regex matching for versiongoodwillcoding
2014-04-20refine language some more to say 'Pyramid' lessgoodwillcoding
2014-04-20standardize on scaffold over template naminggoodwillcoding
2014-04-20update change me with the scaffold changesgoodwillcoding
2014-04-20Merge branch 'master' of github.com:Pylons/pyramid into scaffold_versiongoodwillcoding
2014-04-20clean up the language to say "Generated by"goodwillcoding
2014-04-20Merge pull request #1309 from omidraha/patch-1Steve Piercy
2014-04-20Remove repeated word.Omid Raha
2014-04-20- Correct 80-column lines specification to 79 to be compliant with PEP8 and c...Steve Piercy
2014-04-19Merge branch 'master' of github.com:Pylons/pyramid into scaffold_versiongoodwillcoding
2014-04-19Move the docs and pyramid version to scaffold template generation andgoodwillcoding
2014-04-18Merge pull request #1306 from bertjwregeer/fix.add_predicates_maybe_dottedMichael Merickel
2014-04-18Add information to CHANGESBert JW Regeer
2014-04-18_add_subscriber should resolve dotted namesBert JW Regeer
2014-04-18Merge pull request #1304 from thapar/patch-2Steve Piercy
2014-04-18Corrected the comment's languagethapar
2014-04-18Typo fix "not"-->"no"thapar
2014-04-17Merge pull request #1303 from flibustenet/patch-2Michael Merickel
2014-04-17More explicit example of set_propertyflibustenet
2014-04-16update the alchemy template to use pyramid version and doc versionMichael R
2014-04-16add pyramid version and pyramid docs branch to the scaffold generationMichael R
2014-04-16minor tweaks based on toolbar changes in 2.xMichael Merickel
2014-04-16Merge pull request #1298 from tylereaves/masterMichael Merickel
2014-04-16Update debugtoolbar.rsttylereaves
2014-04-16Update debugtoolbar.rsttylereaves
2014-04-15Merge pull request #1296 from westurner/1294_add_cgi_escape_to_quick_tourTres Seaver
2014-04-15DOC: Comment re: XSS, PEP8 imports, typowesturner
2014-04-15DOC: Add cgi.escape to quick_tour/views/views.py (Fixes #1294)westurner
2014-04-15Merge pull request #1295 from westurner/1181_default_response_content_typeTres Seaver
2014-04-15DOC: Response.content_type defaults to text/htmlwesturner
2014-04-14Merge pull request #1293 from xpostudio4/masterSteve Piercy
2014-04-14Modified the way anonymous commiters configure the remote, the olderLeonardo Jimenez
2014-04-14Merge pull request #1291 from nnja/masterMichael Merickel
2014-04-14clarify python version supportMichael Merickel
2014-04-14adding comments for python versionsNina Zakharenko
2014-04-14Change OSX to Mac OS XNina Zakharenko
2014-04-14Update the documentation for Python installation on OSX. Binaries are primary...Nina Zakharenko
2014-04-14Update python installation instructions for mac osx.Nina Zakharenko
2014-04-14mature dev statusMichael Merickel
2014-04-09Merge pull request #1289 from thapar/patch-1Michael Merickel
2014-04-09Typo correction "setupy"-->"setup.py"thapar
2014-04-09Merge pull request #1288 from stevepiercy/masterSteve Piercy
2014-04-09- add name of views.pySteve Piercy