Permalink
Commits on May 8, 2016
  1. Merge pull request #2557 from stevepiercy/1.5-branch

    stevepiercy committed May 8, 2016
    update link to ez_setup.py
  2. update link to ez_setup.py

    stevepiercy committed May 8, 2016
    (cherry picked from commit 1f3e1a3)
Commits on Apr 8, 2016
  1. Merge pull request #2441 from stevepiercy/1.5-branch

    stevepiercy committed Apr 8, 2016
    Add pyramid_jinja2 example to i18n docs. Fixes #2437.
  2. Add pyramid_jinja2 example to i18n docs. Fixes #2437.

    stevepiercy committed Apr 8, 2016
    (cherry picked from commit 88c92b8)
Commits on Mar 8, 2016
  1. Merge pull request #2405 from stevepiercy/1.5-branch

    stevepiercy committed Mar 8, 2016
    rewrite renderer glossary entry to read more easily
  2. rewrite renderer glossary entry to read more easily

    stevepiercy committed Mar 8, 2016
    (cherry picked from commit 94bad26)
Commits on Mar 3, 2016
  1. Merge pull request #2396 from stevepiercy/1.5-branch

    stevepiercy committed Mar 3, 2016
    update link to videos
  2. update link to videos

    stevepiercy committed Mar 3, 2016
    (cherry picked from commit 6c36d78)
Commits on Mar 2, 2016
  1. Merge pull request #2391 from stevepiercy/1.5-branch

    stevepiercy committed Mar 2, 2016
    give sentence a colostomy, break into two
  2. give sentence a colostomy, break into two

    stevepiercy committed Mar 2, 2016
    (cherry picked from commit 51f0560)
Commits on Feb 25, 2016
  1. Merge pull request #2374 from stevepiercy/1.5-branch

    stevepiercy committed Feb 25, 2016
    wiki docs and src fixes - cherrypick and backport to 1.5 branch
  2. Fix view name order, windows for 'Return logged_in to renderer.

    tseaver committed with stevepiercy Feb 23, 2016
    (cherry picked from commit 8ba7f8f)
  3. Use correct attribute name in the ZODB Wiki tutorial view template.

    tseaver committed with stevepiercy Feb 23, 2016
    (cherry picked from commit 4812967)
Commits on Feb 21, 2016
  1. Merge pull request #2360 from stevepiercy/1.5-branch

    stevepiercy committed Feb 21, 2016
    fix links for babel and chameleon
  2. fix links for babel and chameleon

    stevepiercy committed Feb 21, 2016
    (cherry picked from commit 8d212aa)
Commits on Feb 17, 2016
  1. Merge pull request #2355 from stevepiercy/1.5-branch

    stevepiercy committed Feb 17, 2016
    minor grammar and punctuation through "wrapping up"
  2. minor grammar and punctuation through "wrapping up"

    stevepiercy committed Feb 16, 2016
    (cherry picked from commit 583caef)
Commits on Feb 15, 2016
  1. Merge pull request #2352 from stevepiercy/1.5-branch

    stevepiercy committed Feb 15, 2016
    minor grammar and punctuation through "Explicitly WSGI"
  2. minor grammar and punctuation through "Explicitly WSGI"

    stevepiercy committed Feb 14, 2016
    (cherry picked from commit b0fcf1a)
Commits on Feb 13, 2016
  1. Merge pull request #2349 from stevepiercy/1.5-branch

    stevepiercy committed Feb 13, 2016
    minor grammar and punctuation through "thread locals are a nuisance"
  2. minor grammar and punctuation through "thread locals are a nuisance"

    stevepiercy committed Feb 13, 2016
    (cherry picked from commit 288b462)
Commits on Feb 11, 2016
  1. Merge pull request #2346 from stevepiercy/1.5-branch

    stevepiercy committed Feb 11, 2016
    minor grammar and punctuation through "routes need relative ordering"
Commits on Feb 8, 2016
  1. Merge pull request #2343 from stevepiercy/1.5-branch

    stevepiercy committed Feb 8, 2016
    fix pyramid_tm url
  2. fix pyramid_tm url

    mmerickel committed with stevepiercy Feb 7, 2016
    (cherry picked from commit ed04017)
Commits on Feb 7, 2016
  1. Merge pull request #2341 from stevepiercy/1.5-branch

    stevepiercy committed Feb 7, 2016
    minor grammar and punctuation through "import-time side-effects are e…
  2. minor grammar and punctuation through "import-time side-effects are e…

    stevepiercy committed Feb 7, 2016
    …vil"
    
    (cherry picked from commit 46f74df)
Commits on Feb 6, 2016
  1. Merge pull request #2338 from stevepiercy/1.5-branch

    stevepiercy committed Feb 6, 2016
    minor grammar and punctuation
  2. minor grammar and punctuation

    stevepiercy committed Feb 6, 2016
    (cherry picked from commit ed5209f)
Commits on Feb 3, 2016
  1. Merge pull request #2333 from stevepiercy/1.5-branch

    stevepiercy committed Feb 3, 2016
    each step is for every release, unless explicitly stated as "major re…
  2. each step is for every release, unless explicitly stated as "major re…

    stevepiercy committed Feb 3, 2016
    …lease only"
    
    (cherry picked from commit daa0e4d)
Commits on Feb 1, 2016
  1. Merge pull request #2326 from stevepiercy/1.5-branch

    stevepiercy committed Feb 1, 2016
    minor grammar, "simpler traversal machinery"
  2. minor grammar, "simpler traversal machinery"

    stevepiercy committed Feb 1, 2016
    (cherry picked from commit 7045a9a)
Commits on Jan 31, 2016
  1. Merge pull request #2320 from stevepiercy/1.5-branch

    stevepiercy committed Jan 31, 2016
    latest_url is not needed after all