| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2015-11-12 | Restore progress after backing changes out of master. | Michael Merickel | |
| This reverts commit 049e670aef9ea5611561546fd5c0e2dd6152b9b7. | |||
| 2015-11-12 | Merge branch 'master' into feature/alchemy-scaffold-update | Tres Seaver | |
| Conflicts: docs/tutorials/wiki2/basiclayout.rst | |||
| 2015-11-12 | Merge pull request #2114 from stevepiercy/feature/alchemy-scaffold-update | Steve Piercy | |
| update wiki2/src/models and wiki2/definingmodels.rst | |||
| 2015-11-12 | update wiki2/src/models and wiki2/definingmodels.rst | Steve Piercy | |
| 2015-11-12 | Merge pull request #2113 from stevepiercy/feature/alchemy-scaffold-update | Steve Piercy | |
| basiclayout/tutorial poke in attempt to resolve merge conflict on GitHub | |||
| 2015-11-12 | basiclayout/tutorial poke in attempt to resolve merge conflict on GitHub | Steve Piercy | |
| 2015-11-12 | Merge pull request #2112 from stevepiercy/feature/alchemy-scaffold-update | Steve Piercy | |
| Finish work on basiclayout.rst and its src at wiki2/src/basiclayout/ | |||
| 2015-11-12 | basiclayout/tutorial - models, scripts, static, templates | Steve Piercy | |
| - use package instead of single file - add tests.py from scaffold - update basiclayout.rst with models section | |||
| 2015-11-11 | basiclayout/tutorial - views | Steve Piercy | |
| - use package instead of single file - add tests.py from scaffold - update basiclayout.rst with views section | |||
| 2015-11-11 | basiclayout/tutorial/setup.py - update template binding from chameleon to jinja2 | Steve Piercy | |
| 2015-11-11 | Merge pull request #2111 from stevepiercy/feature/alchemy-scaffold-update | Steve Piercy | |
| update wiki2/src/basiclayout/tutorial | |||
| 2015-11-11 | Merge pull request #2110 from Pylons/revert-2108-feature/alchemy-scaffold-update | Steve Piercy | |
| Revert "update wiki2/src/basiclayout/tutorial" | |||
| 2015-11-11 | Revert "update wiki2/src/basiclayout/tutorial" | Steve Piercy | |
| 2015-11-11 | Merge remote-tracking branch 'upstream/feature/alchemy-scaffold-update' into ↵ | Steve Piercy | |
| feature/alchemy-scaffold-update | |||
| 2015-11-11 | Merge pull request #2109 from mmerickel/fixes-from-quantified-code | Michael Merickel | |
| apply some suggestions from quantified code analysis | |||
| 2015-11-11 | apply some suggestions from quantified code analysis | Michael Merickel | |
| 2015-11-11 | Merge pull request #2108 from stevepiercy/feature/alchemy-scaffold-update | Steve Piercy | |
| update wiki2/src/basiclayout/tutorial | |||
| 2015-11-11 | - update basiclayout/tutorial/__init__.py | Steve Piercy | |
| - update section "Application configuration with ``__init__.py``" - move WIP to "Content Models with ``models.py``", wrapped by Sphinx comments | |||
| 2015-11-11 | wiki2/src/basiclayout/ | Steve Piercy | |
| - update ini files using new scaffold | |||
| 2015-11-11 | Merge pull request #2107 from stevepiercy/feature/alchemy-scaffold-update | Steve Piercy | |
| update references in literalincludes | |||
| 2015-11-11 | sqla_demo/sqla_demo | Steve Piercy | |
| - update references in literalincludes | |||
| 2015-11-11 | Merge pull request #2106 from stevepiercy/feature/alchemy-scaffold-update | Steve Piercy | |
| Add Sphinx markers for literalinclude | |||
| 2015-11-11 | sqla_demo/sqla_demo | Steve Piercy | |
| - add /models, /static, /templates, and /views | |||
| 2015-11-10 | Merge pull request #2103 from stevepiercy/feature/alchemy-scaffold-update | Bert JW Regeer | |
| docs updates for Quick Tour for feature/alchemy-scaffold-update | |||
| 2015-11-10 | sqla_demo/sqla_demo | Steve Piercy | |
| - add /models, /static, /templates, and /views | |||
| 2015-11-10 | sqla_demo/sqla_demo | Steve Piercy | |
| - update /scripts, /static, and /templates | |||
| 2015-11-10 | sqla_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 root | Steve Piercy | |
| 2015-11-10 | - remove sqla_demo.sqlite db: it's generated by the user | Steve Piercy | |
| 2015-11-09 | Merge pull request #2099 from stevepiercy/master | Steve Piercy | |
| minor grammar, fix .rst markup, rewrap to 79 columns | |||
| 2015-11-09 | minor grammar, fix .rst markup, rewrap to 79 columns | Steve Piercy | |
| 2015-11-07 | Merge pull request #2098 from ergo/feature/alchemy-scaffold-update | Bert JW Regeer | |
| add configure_mappers after all our models get imported | |||
| 2015-11-07 | add configure mappers after all our models get imported | Marcin Lulek | |
| 2015-11-07 | Merge pull request #2086 from stevepiercy/docs-reorder-index | Steve Piercy | |
| Reorder index.rst (see #2029) - Add https for git clone | |||
| 2015-11-07 | minor grammar, fix .rst markup, rewrap to 79 columns | Steve Piercy | |
| 2015-11-06 | Merge pull request #2093 from stevepiercy/master | Steve Piercy | |
| fix versionadded paragraph | |||
| 2015-11-06 | minor grammar, fix .rst markup, insert versionchanged directive, rewrap to ↵ | Steve Piercy | |
| 79 columns | |||
| 2015-11-06 | Merge pull request #2091 from stevepiercy/master | Steve Piercy | |
| minor grammar, fix .rst markup, insert versionchanged directive, rewr… | |||
| 2015-11-06 | minor grammar, fix .rst markup, insert versionchanged directive, rewrap to ↵ | Steve Piercy | |
| 79 columns | |||
| 2015-11-06 | Merge pull request #2088 from stevepiercy/master | Steve Piercy | |
| minor grammar, fix .rst markup, add emphasize lines for diff, rewrap … | |||
| 2015-11-06 | minor grammar, fix .rst markup, add emphasize lines for diff, rewrap to 79 ↵ | Steve Piercy | |
| columns | |||
| 2015-11-05 | reorder, remove redundant statements, reduce verbosity, update headings, rewrap | Steve Piercy | |
| 2015-11-05 | Merge pull request #2083 from stevepiercy/master | Steve Piercy | |
| minor grammar, fix .rst markup, rewrap to 79 columns | |||
| 2015-11-05 | minor grammar, fix .rst markup, rewrap to 79 columns | Steve Piercy | |
| 2015-11-05 | Merge pull request #2082 from naoko/wiki2-totorial-basiclayout | Michael Merickel | |
| literalinclude line number was off for Base object | |||
| 2015-11-05 | literalinclude line number was off for Base object | Naoko Reeves | |
| 2015-11-04 | Merge pull request #2080 from stevepiercy/master | Steve Piercy | |
| add missing period | |||
| 2015-11-04 | add missing period | Steve Piercy | |
| (cherry picked from commit c7b1bff) | |||
| 2015-11-04 | Merge pull request #2076 from stevepiercy/master | Steve Piercy | |
| update tb_introspector.png, minor grammar, fix .rst markup, rewrap to… | |||
| 2015-11-04 | update tb_introspector.png, minor grammar, fix .rst markup, rewrap to 79 columns | Steve Piercy | |
 |
index : pyramid | |
| Pyramid web framework (fork of https://github.com/Pylons/pyramid). | Daniel |
| summaryrefslogtreecommitdiff |