summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-11-12add changelog for #2119Michael Merickel
2015-11-12abort when using reload with daemonMichael Merickel
2015-11-12Merge pull request #2118 from mmerickel/fix/pserve-monitor-daemonBert JW Regeer
fix usage of --monitor-restart with --daemon Closes #1216
2015-11-12improve pserve deprecation messagesMichael Merickel
2015-11-12add changelog entry for #2118Michael Merickel
2015-11-12fix usage of --monitor-restart with --daemonMichael Merickel
Fixes #1216
2015-11-12Simplify testsBert JW Regeer
2015-11-12Merge pull request #2050Bert JW Regeer
2015-11-12Merge branch 'fix/default-cachebusters'Michael Merickel
2015-11-12update cache buster prose and add ManifestCacheBusterMichael Merickel
redux of #2013
2015-11-12Revert "fix/remove-default-cachebusters"Michael Merickel
This reverts commit 7410250313f893e5952bb2697324a4d4e3d47d22. This reverts commit cbec33b898efffbfa6acaf91cae45ec0daed4d7a. This reverts commit 345ca3052c395545b90fef9104a16eed5ab051a5, reversing changes made to 47162533af84bb8d26db6d1c9ba1e63d70e9070f.
2015-11-12support asset specs in ManifestCacheBusterMichael Merickel
2015-11-12update changelog with #2013Michael Merickel
2015-11-12Merge branch 'fix/remove-default-cachebusters'Michael Merickel
2015-11-12Restore progress after backing changes out of master.Michael Merickel
This reverts commit 049e670aef9ea5611561546fd5c0e2dd6152b9b7.
2015-11-12Merge branch 'master' into feature/alchemy-scaffold-updateTres Seaver
Conflicts: docs/tutorials/wiki2/basiclayout.rst
2015-11-12Merge pull request #2114 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
update wiki2/src/models and wiki2/definingmodels.rst
2015-11-12update wiki2/src/models and wiki2/definingmodels.rstSteve Piercy
2015-11-12Merge pull request #2113 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
basiclayout/tutorial poke in attempt to resolve merge conflict on GitHub
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
Finish work on basiclayout.rst and its src at wiki2/src/basiclayout/
2015-11-12basiclayout/tutorial - models, scripts, static, templatesSteve Piercy
- use package instead of single file - add tests.py from scaffold - update basiclayout.rst with models section
2015-11-12complete cache buster docs using manifest exampleMichael Merickel
2015-11-12add manifest cache busterMichael Merickel
2015-11-11basiclayout/tutorial - viewsSteve Piercy
- use package instead of single file - add tests.py from scaffold - update basiclayout.rst with views section
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
update wiki2/src/basiclayout/tutorial
2015-11-11Merge pull request #2110 from Pylons/revert-2108-feature/alchemy-scaffold-updateSteve Piercy
Revert "update wiki2/src/basiclayout/tutorial"
2015-11-11Revert "update wiki2/src/basiclayout/tutorial"Steve Piercy
2015-11-11Merge remote-tracking branch 'upstream/feature/alchemy-scaffold-update' into ↵Steve Piercy
feature/alchemy-scaffold-update
2015-11-11Merge pull request #2109 from mmerickel/fixes-from-quantified-codeMichael Merickel
apply some suggestions from quantified code analysis
2015-11-11apply some suggestions from quantified code analysisMichael Merickel
2015-11-11Merge pull request #2108 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
update wiki2/src/basiclayout/tutorial
2015-11-11- update basiclayout/tutorial/__init__.pySteve Piercy
- update section "Application configuration with ``__init__.py``" - move WIP to "Content Models with ``models.py``", wrapped by Sphinx comments
2015-11-11wiki2/src/basiclayout/Steve Piercy
- update ini files using new scaffold
2015-11-11Merge pull request #2107 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
update references in literalincludes
2015-11-11sqla_demo/sqla_demoSteve Piercy
- update references in literalincludes
2015-11-11Merge pull request #2106 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
Add Sphinx markers for literalinclude
2015-11-11sqla_demo/sqla_demoSteve Piercy
- add /models, /static, /templates, and /views
2015-11-10Merge pull request #2103 from stevepiercy/feature/alchemy-scaffold-updateBert JW Regeer
docs updates for Quick Tour for feature/alchemy-scaffold-update
2015-11-10sqla_demo/sqla_demoSteve Piercy
- add /models, /static, /templates, and /views
2015-11-10sqla_demo/sqla_demoSteve Piercy
- update /scripts, /static, and /templates
2015-11-10sqla_demo/sqla_demo/Steve Piercy
- update __init__.py and tests.py - remove models.py and views.py in preference to modules
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
minor grammar, fix .rst markup, rewrap to 79 columns
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
add configure_mappers after all our models get imported
2015-11-07add configure mappers after all our models get importedMarcin Lulek
2015-11-07Merge pull request #2086 from stevepiercy/docs-reorder-indexSteve Piercy
Reorder index.rst (see #2029) - Add https for git clone