summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-08-31re-enable support for resolving conflicts across ordersMichael Merickel
This feature was silently dropped in Pyramid 1.4 when deferred discriminators were added. It is re-introduced such that it's possible to override an action in order X by defining an action in order Y where Y <= X with a non-conflicting includepath. This also takes special care to avoid undeferring the discriminator for an action until the execution engine is ready to start executing actions of the same order. This gives time for required actions to execute prior, allowing the discriminator to depend on earlier actions. fixes #2697
2016-08-31add extra tests for testing action discriminators across ordersMichael Merickel
2016-08-31add test cases to reproduce #2697Michael Merickel
2016-08-20Merge pull request #2754 from stevepiercy/masterSteve Piercy
add testing for py36
2016-08-19attempt to add testing for py36Steve Piercy
2016-08-19attempt to add testing for py36Steve Piercy
2016-08-19attempt to add testing for py36Steve Piercy
2016-08-18Merge pull request #2752 from stevepiercy/masterSteve Piercy
update output for pcreate --list in Quick Tutorial
2016-08-18update output for pcreate --list in Quick TutorialSteve Piercy
2016-08-16Merge pull request #2745 from mmerickel/fix/2744Michael Merickel
revert changes to the renderers from #2706
2016-08-16Fix #2744 by reverting #2706Michael Merickel
This reverts commit c7d8f6515d4b154c4a4cf2cbaac9789fbcd19282. This reverts commit 0dcd259c0263c14e8c51d9e204c1419daffbd2ce. This reverts commit 412ed2e1988e2fd70d02e4176c9c9c7855b0093c.
2016-08-15Merge pull request #2742 from stevepiercy/masterSteve Piercy
Fix up URLs to include default language and reduce verbosity
2016-08-15Fix up URLs to include default language and reduce verbositySteve Piercy
(cherry picked from commit d6b2c66)
2016-08-15Merge pull request #2739 from stevepiercy/masterSteve Piercy
update output of pcreate --list for Quick Tour
2016-08-15update output of pcreate --list for Quick TourSteve Piercy
2016-08-15fix alchemy scaffold help textMichael Merickel
2016-07-30Merge pull request #2730 from stevepiercy/masterSteve Piercy
forward port docs fixes from 1.7-branch
2016-07-29corrected folder name in docsandrew david burt
one of the instances of the tutorial's folder name was mistyped as "tutorials" rather than "tutorial" in the "Route declarations" section (cherry picked from commit 696f17c)
2016-07-29remove essentially duplicate "note" section under "initializing the database"andrew david burt
The note section under "initializing the database" was entered twice, the same except differing verb tenses. I removed one. (cherry picked from commit 96c1e36)
2016-07-24Merge pull request #2722 from stevepiercy/masterSteve Piercy
Add highlighting of changed lines
2016-07-23Add highlighting of changed linesSteve Piercy
2016-07-23Merge pull request #2719 from stevepiercy/masterSteve Piercy
Rewrite Quick Tutorial narrative in authentication.rst for consistent…
2016-07-23Rewrite Quick Tutorial narrative in authentication.rst for consistent flowSteve Piercy
2016-07-21Merge pull request #2716 from keitheis/quick_tutorial_hashpw_bcryptSteve Piercy
Add one-way password hash to security example in Quick Tutorial.
2016-07-22Sign CONTRIBUTORS.txtKeith Yang
2016-07-21Add one-way password hash to security example in Quick Tutorial.Keith Yang
2016-07-19Merge pull request #2711 from inklesspen/nongendered-example-languageSteve Piercy
Change gendered language in examples
2016-07-19Change gendered language in examplesJon Davidson
Some examples in documentation use "dude" and "bro" -- for example, "Not found, bro". While playful, this language can make some people uncomfortable. I have changed the wording to something equally playful that doesn't make assumptions about the reader's gender.
2016-07-19Merge PR #2706: Fix Renderers: JSON is not textBert JW Regeer
Closes #2706
2016-07-17Merge pull request #2710 from stevepiercy/masterSteve Piercy
Fix commands in quick tutorial
2016-07-17Corrected test command in static_assets.rstChristian Kollee
(cherry picked from commit 619c4b8)
2016-07-17Corrected command line for testsChristian Kollee
(cherry picked from commit df3db24)
2016-07-16Update CHANGES.txt for #2706Bert JW Regeer
2016-07-16Add a test that covers the no charset caseBert JW Regeer
2016-07-16JSON renderers now return bytes objectsBert JW Regeer
2016-07-16Warn if the renderer response is text_type but no charsetBert JW Regeer
If the Response contains no charset we can't use Response.text. We now implicitly encode to UTF-8 after showing a warning.
2016-07-16Merge pull request #2704 from mmerickel/fix/set-password-unicodeMichael Merickel
fix the wiki2 tutorial to set the password as unicode
2016-07-16fix the wiki2 tutorial to set the password as unicodeMichael Merickel
Something really weird is happening but this fixes it. SQLAlchemy is returning the "password_hash" from queries as the type that it was inserted as. Not consistently unicode or bytes. If I insert bytes, then I get bytes back out. If I insert unicode then I get unicode back out. It's unclear why, as the type is Text, the data we're storing is unambiguously US-ASCII and the connection is using a consistent text_factory for unicode conversions of "str" on Python 3. Here, we ensure that we always insert the value as unicode which appears to fix downstream issues like those mentioned in #2605. I was able to reproduce that bug and confirm this fixes it if the original database is initialized using this fix. Obsoletes #2623.
2016-07-16Merge pull request #2702 from stevepiercy/masterSteve Piercy
Fix link to zope.component docs
2016-07-16Fix link to zope.component docsSteve Piercy
2016-07-12Merge pull request #2695 from stevepiercy/masterSteve Piercy
Correct change note
2016-07-12Correct change noteSteve Piercy
2016-07-08Merge pull request #2690 from stevepiercy/masterSteve Piercy
Add change note for #2687
2016-07-08Add change note for #2687Steve Piercy
2016-07-08Merge pull request #2687 from sontek/support_classes_in_proutesSteve Piercy
This shows the correct view when a class and `attr` is involved.
2016-07-06link to hacking and contributingMichael Merickel
2016-07-06make coverage 100%John Anderson
2016-07-06This shows the correct view when a class and `attr` is involved.John Anderson
2016-07-06Merge pull request #2685 from stevepiercy/masterSteve Piercy
Update links for Alembix
2016-07-06Update links for AlembixSteve Piercy
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-21 11:39:35 +0000