Code

alchemy scaffold updates#2024

Code

Merged

mmerickel merged 130 commits intomasterPylons/pyramid:masterfrom feature/alchemy-scaffold-updatePylons/pyramid:feature/alchemy-scaffold-updateCopy head branch name to clipboardFeb 29, 2016

+5,142-3,497

Commits

Commits on Nov 10, 2015

• Merge pull request #2103 from stevepiercy/feature/alchemy-scaffold-update

  Show description for 286705c
  digitalresistor

  committed
  286705c

  Copy full SHA for 286705c

Commits on Nov 12, 2015

• Merge pull request #2106 from stevepiercy/feature/alchemy-scaffold-update

  Show description for 8a14c0d
  stevepiercy

  committed
  8a14c0d

  Copy full SHA for 8a14c0d

• Merge pull request #2107 from stevepiercy/feature/alchemy-scaffold-update

  Show description for a99fcc4
  stevepiercy

  committed
  a99fcc4

  Copy full SHA for a99fcc4

• Merge remote-tracking branch 'upstream/feature/alchemy-scaffold-update' into feature/alchemy-scaffold-update

  stevepiercy

  committed
  ae86705

  Copy full SHA for ae86705

• Merge pull request #2111 from stevepiercy/feature/alchemy-scaffold-update

  Show description for 2aba031
  stevepiercy

  committed
  2aba031

  Copy full SHA for 2aba031

• basiclayout/tutorial/setup.py - update template binding from chameleon to jinja2

  stevepiercy

  committed
  406024d

  Copy full SHA for 406024d

• basiclayout/tutorial - views

  Show description for 392cc17
  stevepiercy

  committed
  392cc17

  Copy full SHA for 392cc17

• basiclayout/tutorial - models, scripts, static, templates

  Show description for 0409cf1
  stevepiercy

  committed
  0409cf1

  Copy full SHA for 0409cf1

• Merge pull request #2112 from stevepiercy/feature/alchemy-scaffold-update

  Show description for 16a490f
  stevepiercy

  committed
  16a490f

  Copy full SHA for 16a490f

• basiclayout/tutorial poke in attempt to resolve merge conflict on GitHub

  stevepiercy

  committed
  1b994c6

  Copy full SHA for 1b994c6

• Merge pull request #2113 from stevepiercy/feature/alchemy-scaffold-update

  Show description for a43ba42
  stevepiercy

  committed
  a43ba42

  Copy full SHA for a43ba42

• update wiki2/src/models and wiki2/definingmodels.rst

  stevepiercy

  committed
  bfa4994

  Copy full SHA for bfa4994

• Merge pull request #2114 from stevepiercy/feature/alchemy-scaffold-update

  Show description for e99cd35
  stevepiercy

  committed
  e99cd35

  Copy full SHA for e99cd35

• Merge branch 'master' into feature/alchemy-scaffold-update

  Show description for b4c96d2
  tseaver

  committed
  b4c96d2

  Copy full SHA for b4c96d2

• Restore progress after backing changes out of master.

  Show description for 414b67b
  mmerickel

  committed
  414b67b

  Copy full SHA for 414b67b

Commits on Nov 13, 2015

• update wiki2/src/views and wiki2/definingviews.rst

  stevepiercy

  committed
  3214690

  Copy full SHA for 3214690

• update wiki2/src/views and wiki2/definingviews.rst

  stevepiercy

  committed
  429529a

  Copy full SHA for 429529a

• Merge pull request #2122 from stevepiercy/feature/alchemy-scaffold-update

  Show description for c172ec1
  stevepiercy

  committed
  c172ec1

  Copy full SHA for c172ec1

• correct line numbers in and remove obsolete WIP block wiki2/basiclayout.rst

  stevepiercy

  committed
  3525fa1

  Copy full SHA for 3525fa1

• Merge pull request #2123 from stevepiercy/feature/alchemy-scaffold-update

  Show description for cad9db7
  stevepiercy

  committed
  cad9db7

  Copy full SHA for cad9db7

Commits on Nov 14, 2015

• minor changes to narrative flow

  stevepiercy

  committed
  2f68647

  Copy full SHA for 2f68647

• Merge pull request #2131 from stevepiercy/feature/alchemy-scaffold-update

  Show description for d317187
  stevepiercy

  committed
  d317187

  Copy full SHA for d317187

• commit new wiki2/src/views/tutorial files

  stevepiercy

  committed
  73c256e

  Copy full SHA for 73c256e

• Merge pull request #2132 from stevepiercy/feature/alchemy-scaffold-update

  Show description for df3c66c
  stevepiercy

  committed
  df3c66c

  Copy full SHA for df3c66c

Commits on Nov 15, 2015

• wiki2/authorization.rst - progress on models and security from module to subpackage

  stevepiercy

  committed
  a47f067

  Copy full SHA for a47f067

Commits on Nov 16, 2015

• wrap content with <p>

  stevepiercy

  committed
  a81ac71

  Copy full SHA for a81ac71

• - complete rewrite of wiki2/authorization.rst

  Show description for 4040cf7
  stevepiercy

  committed
  4040cf7

  Copy full SHA for 4040cf7

• Merge pull request #2139 from stevepiercy/feature/alchemy-scaffold-update

  Show description for 7210fa2
  stevepiercy

  committed
  7210fa2

  Copy full SHA for 7210fa2

• - update wiki2/design.rst to use jinja templates

  Show description for 6fcd98a
  stevepiercy

  committed
  6fcd98a

  Copy full SHA for 6fcd98a

• Merge pull request #2140 from stevepiercy/feature/alchemy-scaffold-update

  Show description for a4fe417
  stevepiercy

  committed
  a4fe417

  Copy full SHA for a4fe417

Commits on Nov 21, 2015

• wiki2/tests - commit progress

  stevepiercy

  committed
  fe4465b

  Copy full SHA for fe4465b

Commits on Dec 2, 2015

• Add documentation why we add a naming convention

  digitalresistor

  committed
  9b12c01

  Copy full SHA for 9b12c01

• - rewrite wiki2/tests.rst (removed an obsolete reference to testing models, per 2885a7b)

  Show description for f10fb24
  stevepiercy

  committed
  f10fb24

  Copy full SHA for f10fb24

• Merge pull request #2155 from stevepiercy/feature/alchemy-scaffold-update

  Show description for 60641ea
  stevepiercy

  committed
  60641ea

  Copy full SHA for 60641ea

• - add comment to NAMING_CONVENTION per 9b12c01

  stevepiercy

  committed
  022a6e0

  Copy full SHA for 022a6e0

• - adjust linenos for NAMING_CONVENTION comment

  stevepiercy

  committed
  86d90fb

  Copy full SHA for 86d90fb

• Merge pull request #2156 from stevepiercy/feature/alchemy-scaffold-update

  Show description for 952cf40
  stevepiercy

  committed
  952cf40

  Copy full SHA for 952cf40

Commits on Dec 4, 2015

• - add updated tutorial and documentation files due to scaffold enhancements

  stevepiercy

  committed
  690fbb9

  Copy full SHA for 690fbb9

• Merge pull request #2157 from stevepiercy/feature/alchemy-scaffold-update

  Show description for 29e1002
  stevepiercy

  committed
  29e1002

  Copy full SHA for 29e1002

Commits on Jan 3, 2016

• Merge branch 'master' into feature/alchemy-scaffold-update

  digitalresistor

  committed
  a2dff05

  Copy full SHA for a2dff05

Commits on Jan 31, 2016

• minor tweaks

  mmerickel

  committed
  13846e6

  Copy full SHA for 13846e6

• add a 404 error view

  mmerickel

  committed
  ab495cf

  Copy full SHA for ab495cf

• stop using the meta package from the outside

  mmerickel

  committed
  67f733e

  Copy full SHA for 67f733e

• Merge branch 'master' into feature/alchemy-scaffold-update

  mmerickel

  committed
  3eb1c35

  Copy full SHA for 3eb1c35

Commits on Feb 4, 2016

• improve the models api/usage and add a lot of comments

  mmerickel

  committed
  a6d08e1

  Copy full SHA for a6d08e1

Commits on Feb 5, 2016

• rename dbmaker to session_factory

  mmerickel

  committed
  f4e1ca8

  Copy full SHA for f4e1ca8

• make models/__init__.py a template

  mmerickel

  committed
  0e21c2a

  Copy full SHA for 0e21c2a

• update source for basiclayout

  mmerickel

  committed
  35dc507

  Copy full SHA for 35dc507

• fix the Base import

  mmerickel

  committed
  9b83981

  Copy full SHA for 9b83981

• unindent literalincludes

  mmerickel

  committed
  8ec0b01

  Copy full SHA for 8ec0b01

• update basiclayout prose

  mmerickel

  committed
  7b89a7e

  Copy full SHA for 7b89a7e

• link to create_all sqla method

  mmerickel

  committed
  21d69fd

  Copy full SHA for 21d69fd

• minor grammar and punctuation tweaks, break up run-on sentences.

  stevepiercy

  committed
  ab68f1f

  Copy full SHA for ab68f1f

Commits on Feb 7, 2016

• assume the user is in the tutorial folder

  Show description for d1cb346
  mmerickel

  committed
  d1cb346

  Copy full SHA for d1cb346

• reference addon links for pyramid_jinja2, pyramid_tm, zope.sqlalchemy and transaction

  mmerickel

  committed
  8d45715

  Copy full SHA for 8d45715

• update definingmodels chapter of wiki2 tutorial

  mmerickel

  committed
  d6243ac

  Copy full SHA for d6243ac

Commits on Feb 8, 2016

• update definingviews chapter of wiki2 tutorial

  mmerickel

  committed
  4b23c9f

  Copy full SHA for 4b23c9f

• update authorization chapter of wiki2 tutorial

  mmerickel

  committed
  14cff75

  Copy full SHA for 14cff75

• minor fixes to wiki2 distributing chapter

  mmerickel

  committed
  4337a25

  Copy full SHA for 4337a25

• expose the session factory on the registry

  mmerickel

  committed
  0b02e46

  Copy full SHA for 0b02e46

• [wip] update tests in wiki2 tutorial

  mmerickel

  committed
  1c10801

  Copy full SHA for 1c10801

Commits on Feb 9, 2016

• Merge pull request #2 from stevepiercy/mmerickel-feature/alchemy-scaffold-update-tweaks

  Show description for ed218d3
  mmerickel

  committed
  ed218d3

  Copy full SHA for ed218d3

• fix tests to get the bind from dbsession_factory properly

  mmerickel

  committed
  d6a758e

  Copy full SHA for d6a758e

• fix jinja2 none test

  mmerickel

  committed
  91ffcca

  Copy full SHA for 91ffcca

• fix functional tests

  mmerickel

  committed
  62f0411

  Copy full SHA for 62f0411

Commits on Feb 11, 2016

• split login from forbidden

  mmerickel

  committed
  ff88c15

  Copy full SHA for ff88c15

• several simple refactorings

  Show description for 07d38f5
  mmerickel

  committed
  07d38f5

  Copy full SHA for 07d38f5

• explain the base layout.jinja2 template and notfound view

  mmerickel

  committed
  e01b270

  Copy full SHA for e01b270

• update 404 templates

  mmerickel

  committed
  9a7cfe3

  Copy full SHA for 9a7cfe3

• move security into one place

  mmerickel

  committed
  f2e9c68

  Copy full SHA for f2e9c68

Commits on Feb 12, 2016

• copy layout and templates from views to authorization

  mmerickel

  committed
  cb5a848

  Copy full SHA for cb5a848

• create an actual user model to prepare for security

  mmerickel

  committed
  81e5989

  Copy full SHA for 81e5989

• let's go ahead and bite off more than we can chew by adding object-security

  Show description for e6e4f65
  mmerickel

  committed
  e6e4f65

  Copy full SHA for e6e4f65

• update the models chapter with the new user model

  mmerickel

  committed
  574ba1a

  Copy full SHA for 574ba1a

• add the bcrypt dependency

  mmerickel

  committed
  a115c6d

  Copy full SHA for a115c6d

• forward port changes to models / scripts to later chapters

  mmerickel

  committed
  4872a1e

  Copy full SHA for 4872a1e

• update the views/models with setup.py develop

  mmerickel

  committed
  23c2d7b

  Copy full SHA for 23c2d7b

Commits on Feb 13, 2016

• improve the views section by removing quirks and explaining transactions

  mmerickel

  committed
  60891b8

  Copy full SHA for 60891b8

Commits on Feb 14, 2016

• fix syntax

  mmerickel

  committed
  4c391c5

  Copy full SHA for 4c391c5

• highlight more appropriate lines in views

  mmerickel

  committed
  bca6c99

  Copy full SHA for bca6c99

• fix unicode issues with check_password

  mmerickel

  committed
  42c9316

  Copy full SHA for 42c9316

• split routes into a separate module

  mmerickel

  committed
  da5ebc2

  Copy full SHA for da5ebc2

• implement the authentication example code

  mmerickel

  committed
  00b2c69

  Copy full SHA for 00b2c69

Commits on Feb 16, 2016

• add a new authentication chapter

  mmerickel

  committed
  659a254

  Copy full SHA for 659a254

Commits on Feb 17, 2016

• use page.name to prepare for context

  mmerickel

  committed
  38b4076

  Copy full SHA for 38b4076

• remove whitespace

  mmerickel

  committed
  f2c4368

  Copy full SHA for f2c4368

• add first cut at source for authorization chapter

  mmerickel

  committed
  2fa9046

  Copy full SHA for 2fa9046

Commits on Feb 18, 2016

• update the authorization chapter

  mmerickel

  committed
  9e85d2b

  Copy full SHA for 9e85d2b

• add webtest and tests_require to setup.py

  mmerickel

  committed
  91f7ed4

  Copy full SHA for 91f7ed4

• add fallback for next_url

  mmerickel

  committed
  50e08a7

  Copy full SHA for 50e08a7

• update tests chapter

  mmerickel

  committed
  66fabb4

  Copy full SHA for 66fabb4

• Merge pull request #2334 from mmerickel/feature/alchemy-scaffold-update-tweaks

  Show description for 5dc1c80
  mmerickel

  committed
  5dc1c80

  Copy full SHA for 5dc1c80

Commits on Feb 21, 2016

• wiki2 docs update WIP

  Show description for 6a2bdac
  stevepiercy

  committed
  6a2bdac

  Copy full SHA for 6a2bdac

• oopsie, include installation in commit

  stevepiercy

  committed
  25fed63

  Copy full SHA for 25fed63

• Merge pull request #2357 from stevepiercy/feature/alchemy-scaffold-update

  Show description for e9e3ce2
  stevepiercy

  committed
  e9e3ce2

  Copy full SHA for e9e3ce2

• Fix the import from meta

  ergo

  committed
  798e854

  Copy full SHA for 798e854

• Merge pull request #2361 from ergo/patch-1

  Show description for 754e868
  mmerickel

  committed
  754e868

  Copy full SHA for 754e868

• Remove references to pip

  digitalresistor

  committed
  93fa23a

  Copy full SHA for 93fa23a

Commits on Feb 22, 2016

• revert a couple of the reversions

  stevepiercy

  committed
  1c0a3d7

  Copy full SHA for 1c0a3d7

• Merge pull request #2363 from stevepiercy/feature/alchemy-scaffold-update

  Show description for 45a96aa
  stevepiercy

  committed
  45a96aa

  Copy full SHA for 45a96aa

• update installation

  Show description for 8571f2b
  stevepiercy

  committed
  8571f2b

  Copy full SHA for 8571f2b

• update basiclayout

  Show description for 4f87e54
  stevepiercy

  committed
  4f87e54

  Copy full SHA for 4f87e54

• Merge pull request #2364 from stevepiercy/feature/alchemy-scaffold-update

  Show description for 5a1fa7f
  stevepiercy

  committed
  5a1fa7f

  Copy full SHA for 5a1fa7f

Commits on Feb 23, 2016

• update definingmodels (WIP)

  Show description for 15fb09b
  stevepiercy

  committed
  15fb09b

  Copy full SHA for 15fb09b

• Merge pull request #2366 from stevepiercy/feature/alchemy-scaffold-update

  Show description for 9784164
  stevepiercy

  committed
  9784164

  Copy full SHA for 9784164

Commits on Feb 24, 2016

• update definingmodels (done)

  Show description for 2dc061b
  stevepiercy

  committed
  2dc061b

  Copy full SHA for 2dc061b

• Merge pull request #2373 from stevepiercy/feature/alchemy-scaffold-update

  Show description for 8e5d2bf
  stevepiercy

  committed
  8e5d2bf

  Copy full SHA for 8e5d2bf

Commits on Feb 26, 2016

• update definingviews (done)

  Show description for c956c9b
  stevepiercy

  committed
  c956c9b

  Copy full SHA for c956c9b

• Merge pull request #2375 from stevepiercy/feature/alchemy-scaffold-update

  Show description for 4337d23
  stevepiercy

  committed
  4337d23

  Copy full SHA for 4337d23

Commits on Feb 27, 2016

• minor grammar

  stevepiercy

  committed
  492b800

  Copy full SHA for 492b800

• update authentication (done)

  Show description for 79054f0
  stevepiercy

  committed
  79054f0

  Copy full SHA for 79054f0

• Merge pull request #2378 from stevepiercy/feature/alchemy-scaffold-update

  Show description for a6db36c
  stevepiercy

  committed
  a6db36c

  Copy full SHA for a6db36c

• wiki2 authentication bug fix and improvement against timing attack

  Show description for 082d3b2
  stevepiercy

  committed
  082d3b2

  Copy full SHA for 082d3b2

• grammar fix

  stevepiercy

  committed
  f63feb6

  Copy full SHA for f63feb6

Commits on Feb 28, 2016

• wiki2 authorization (done)

  Show description for f99052e
  stevepiercy

  committed
  f99052e

  Copy full SHA for f99052e

• wiki2 revert unnecessary hmac stuff

  stevepiercy

  committed
  ee4050a

  Copy full SHA for ee4050a

• Merge pull request #2380 from stevepiercy/feature/alchemy-scaffold-update

  Show description for 8c76c75
  stevepiercy

  committed
  8c76c75

  Copy full SHA for 8c76c75

• apply change to all src/*/user.py

  stevepiercy

  committed
  a26a08b

  Copy full SHA for a26a08b

• Merge pull request #2379 from stevepiercy/feature/alchemy-scaffold-update-authcn

  Show description for 860310e
  stevepiercy

  committed
  860310e

  Copy full SHA for 860310e

• update tests.rst (done)

  Show description for 606f753
  stevepiercy

  committed
  606f753

  Copy full SHA for 606f753

• Merge pull request #2381 from stevepiercy/feature/alchemy-scaffold-update

  Show description for 0c3f2ba
  stevepiercy

  committed
  0c3f2ba

  Copy full SHA for 0c3f2ba

• update distributing.rst (done)

  Show description for 3a89ff8
  stevepiercy

  committed
  3a89ff8

  Copy full SHA for 3a89ff8

• Merge pull request #2382 from stevepiercy/feature/alchemy-scaffold-update

  Show description for 154d86f
  stevepiercy

  committed
  154d86f

  Copy full SHA for 154d86f

• fix some nits

  mmerickel

  committed
  44c0870

  Copy full SHA for 44c0870

• add note about deprecation warnings on py3

  stevepiercy

  committed
  de30625

  Copy full SHA for de30625

• Merge pull request #2383 from stevepiercy/feature/alchemy-scaffold-update

  Show description for 20eac53
  stevepiercy

  committed
  20eac53

  Copy full SHA for 20eac53

Commits on Feb 29, 2016

• redirect to edit page when user attempts to add page that already exists

  Show description for 3e30040
  stevepiercy

  committed
  3e30040

  Copy full SHA for 3e30040

• Merge remote-tracking branch 'upstream/feature/alchemy-scaffold-update' into feature/alchemy-scaffold-update

  stevepiercy

  committed
  ae5cccc

  Copy full SHA for ae5cccc

• Merge pull request #2385 from stevepiercy/feature/alchemy-scaffold-update

  Show description for 0c185a3
  mmerickel

  committed
  0c185a3

  Copy full SHA for 0c185a3

• Merge branch 'master' into feature/alchemy-scaffold-update

  mmerickel

  committed
  a79bac6

  Copy full SHA for a79bac6