summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-02-29Merge branch 'master' into feature/alchemy-scaffold-updateMichael Merickel
2016-02-29Merge pull request #2385 from stevepiercy/feature/alchemy-scaffold-updateMichael Merickel
2016-02-28Merge remote-tracking branch 'upstream/feature/alchemy-scaffold-update' into ...Steve Piercy
2016-02-28redirect to edit page when user attempts to add page that already existsSteve Piercy
2016-02-28add changelog for #1370Michael Merickel
2016-02-28Merge pull request #2383 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
2016-02-28fix #1370 to use split instead of rsplit to keep consistentMichael Merickel
2016-02-28add a failing test case with #1370Michael Merickel
2016-02-28add note about deprecation warnings on py3Steve Piercy
2016-02-28Merge branch 'pr/1370'Michael Merickel
2016-02-28fix some nitsMichael Merickel
2016-02-28Merge pull request #2382 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
2016-02-28update distributing.rst (done)Steve Piercy
2016-02-28Merge pull request #2381 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
2016-02-28update tests.rst (done)Steve Piercy
2016-02-28Merge pull request #2379 from stevepiercy/feature/alchemy-scaffold-update-authcnSteve Piercy
2016-02-28apply change to all src/*/user.pySteve Piercy
2016-02-28Merge pull request #2380 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
2016-02-28wiki2 revert unnecessary hmac stuffSteve Piercy
2016-02-28wiki2 authorization (done)Steve Piercy
2016-02-27grammar fixSteve Piercy
2016-02-27wiki2 authentication bug fix and improvement against timing attackSteve Piercy
2016-02-27Merge pull request #2378 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
2016-02-26update authentication (done)Steve Piercy
2016-02-26minor grammarSteve Piercy
2016-02-26Merge pull request #2375 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
2016-02-26update definingviews (done)Steve Piercy
2016-02-24Merge pull request #2373 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
2016-02-24update definingmodels (done)Steve Piercy
2016-02-23Merge pull request #2372 from Pylons/zodb_wiki_tutorial-authnz-return_logged_inTres Seaver
2016-02-23Fix view name order, windows for 'Return logged_in to renderer.Tres Seaver
2016-02-23Merge pull request #2369 from Pylons/zodb_wiki_tutorial-view_template_attribu...Tres Seaver
2016-02-23Use correct attribute name in the ZODB Wiki tutorial view template.Tres Seaver
2016-02-23Merge pull request #2366 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
2016-02-23update definingmodels (WIP)Steve Piercy
2016-02-22Merge pull request #2364 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
2016-02-22update basiclayoutSteve Piercy
2016-02-22update installationSteve Piercy
2016-02-21Merge pull request #2363 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
2016-02-21revert a couple of the reversionsSteve Piercy
2016-02-21Remove references to pipBert JW Regeer
2016-02-21Merge pull request #2361 from ergo/patch-1Michael Merickel
2016-02-21Fix the import from metaMarcin Lulek
2016-02-21Merge pull request #2358 from stevepiercy/masterSteve Piercy
2016-02-21Merge pull request #2357 from stevepiercy/feature/alchemy-scaffold-updateSteve Piercy
2016-02-21oopsie, include installation in commitSteve Piercy
2016-02-21wiki2 docs update WIPSteve Piercy
2016-02-20fix links for babel and chameleonSteve Piercy
2016-02-18Merge pull request #2334 from mmerickel/feature/alchemy-scaffold-update-tweaksMichael Merickel
2016-02-18update tests chapterMichael Merickel