summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2016-07-06Merge pull request #2684 from enkidulan/patch-1Steve Piercy
updated old link to Alembic naming convention
2016-07-06updated old link to Alembic naming conventionMaksym Shalenyi
All docs now live on alembic.zzzcomputing.com, but for some reason link http://alembic.readthedocs.org/en/latest/naming.html redirects to wrong domain.
2016-07-05Merge pull request #2679 from stevepiercy/masterSteve Piercy
Add missing tests to quick_tutorial/forms.
2016-07-05Add missing tests to quick_tutorial/forms.Steve Piercy
- Closes #2673
2016-07-04Merge pull request #2676 from stevepiercy/masterSteve Piercy
Show testsetup code in rendered docs the right way.
2016-07-04Show testsetup code in rendered docs the right way.Steve Piercy
Follow up to @tseaver comment at https://github.com/Pylons/pyramid/pull/2672#issuecomment-230310939
2016-07-03Merge pull request #2671 from stevepiercy/masterSteve Piercy
Show testsetup code in rendered docs.
2016-07-03Show testsetup code in rendered docs.Steve Piercy
For `testsetup`, Sphinx does not show code in the output: http://www.sphinx-doc.org/en/stable/ext/doctest.html#directive-testsetup This commit fixes that issue, although duplicates code. I'll submit a feature request to https://github.com/sphinx-doc/sphinx/ Fixes #2670
2016-07-02Merge pull request #2668 from stevepiercy/masterSteve Piercy
proper case heading
2016-07-02proper case headingSteve Piercy
2016-07-02Merge pull request #2664 from stevepiercy/masterSteve Piercy
Update Windows installation instructions and related bits.
2016-07-02fix overly aggressive refactorSteve Piercy
2016-07-02Update Windows installation instructions and related bits.Steve Piercy
- Use proper Windows commands and paths - Use doscon for Windows console lexer
2016-07-02Update Windows installation instructions and related bits.Steve Piercy
- Use proper Windows commands, drives, and paths - Use doscon for Windows console lexer