summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-11-12Restore progress after backing changes out of master.Michael Merickel
2015-11-12Merge branch 'master' into feature/alchemy-scaffold-updateTres Seaver
2015-11-12Merge pull request #2114 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
2015-11-12update wiki2/src/models and wiki2/definingmodels.rstSteve Piercy
2015-11-12Merge pull request #2113 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
2015-11-12basiclayout/tutorial poke in attempt to resolve merge conflict on GitHubSteve Piercy
2015-11-12Merge pull request #2112 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
2015-11-12basiclayout/tutorial - models, scripts, static, templatesSteve Piercy
2015-11-12complete cache buster docs using manifest exampleMichael Merickel
2015-11-12add manifest cache busterMichael Merickel
2015-11-11basiclayout/tutorial - viewsSteve Piercy
2015-11-11basiclayout/tutorial/setup.py - update template binding from chameleon to jinja2Steve Piercy
2015-11-11Merge pull request #2111 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
2015-11-11Merge pull request #2110 from Pylons/revert-2108-feature/alchemy-scaffold-updateSteve Piercy
2015-11-11Revert "update wiki2/src/basiclayout/tutorial"Steve Piercy
2015-11-11Merge remote-tracking branch 'upstream/feature/alchemy-scaffold-update' into ...Steve Piercy
2015-11-11Merge pull request #2109 from mmerickel/fixes-from-quantified-codeMichael Merickel
2015-11-11apply some suggestions from quantified code analysisMichael Merickel
2015-11-11Merge pull request #2108 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
2015-11-11- update basiclayout/tutorial/__init__.pySteve Piercy
2015-11-11wiki2/src/basiclayout/Steve Piercy
2015-11-11Merge pull request #2107 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
2015-11-11sqla_demo/sqla_demoSteve Piercy
2015-11-11Merge pull request #2106 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
2015-11-11sqla_demo/sqla_demoSteve Piercy
2015-11-10Merge pull request #2103 from stevepiercy/feature/alchemy-scaffold-updateBert JW Regeer
2015-11-10sqla_demo/sqla_demoSteve Piercy
2015-11-10sqla_demo/sqla_demoSteve Piercy
2015-11-10sqla_demo/sqla_demo/Steve Piercy
2015-11-10- update files at project rootSteve Piercy
2015-11-10- remove sqla_demo.sqlite db: it's generated by the userSteve Piercy
2015-11-09Merge pull request #2099 from stevepiercy/masterSteve Piercy
2015-11-09minor grammar, fix .rst markup, rewrap to 79 columnsSteve Piercy
2015-11-07Merge pull request #2098 from ergo/feature/alchemy-scaffold-updateBert JW Regeer
2015-11-07add configure mappers after all our models get importedMarcin Lulek
2015-11-07Merge pull request #2086 from stevepiercy/docs-reorder-indexSteve Piercy
2015-11-07minor grammar, fix .rst markup, rewrap to 79 columnsSteve Piercy
2015-11-06Merge pull request #2093 from stevepiercy/masterSteve Piercy
2015-11-06minor grammar, fix .rst markup, insert versionchanged directive, rewrap to 79...Steve Piercy
2015-11-06Merge pull request #2091 from stevepiercy/masterSteve Piercy
2015-11-06minor grammar, fix .rst markup, insert versionchanged directive, rewrap to 79...Steve Piercy
2015-11-06Merge pull request #2088 from stevepiercy/masterSteve Piercy
2015-11-06minor grammar, fix .rst markup, add emphasize lines for diff, rewrap to 79 co...Steve Piercy
2015-11-05reorder, remove redundant statements, reduce verbosity, update headings, rewrapSteve Piercy
2015-11-05Merge pull request #2083 from stevepiercy/masterSteve Piercy
2015-11-05minor grammar, fix .rst markup, rewrap to 79 columnsSteve Piercy
2015-11-05Merge pull request #2082 from naoko/wiki2-totorial-basiclayoutMichael Merickel
2015-11-05literalinclude line number was off for Base objectNaoko Reeves
2015-11-04Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-11-04Merge pull request #2080 from stevepiercy/masterSteve Piercy