Permalink
Switch branches/tags
Nothing to show
Commits on Nov 26, 2012
  1. Merge pull request #19 from depassp/patch-1

    Fix syntax for auto-enumerated list item
    jacobian committed Nov 26, 2012
  2. Merge pull request #20 from tuxcanfly/master

    Chapter 7 - fixed links to chapters 3 and 8
    jacobian committed Nov 26, 2012
Commits on Nov 20, 2012
  1. Merge pull request #12 from mpdaugherty/chapter03

    Updates to Chapter 3.
    jacobian committed Nov 20, 2012
Commits on Nov 13, 2012
Commits on Nov 9, 2012
  1. Merge pull request #16 from Meliowant/patch-2

    Updated link to the next chapter in chapter06.rst.
    jacobian committed Nov 9, 2012
Commits on Nov 7, 2012
  1. Update chapter06.rst

    Updated link to the next chapter, cause the existent one was broken.
    Meliowant committed Nov 7, 2012
  2. Merge pull request #15 from Meliowant/patch-1

    
    Changed model name from 'Book' to 'Author', so it correspond to the example.
    jacobian committed Nov 7, 2012
  3. Update chapter06.rst

    Changed model name from 'Book' to 'Author', so it correspond to the example.
    Meliowant committed Nov 7, 2012
Commits on Nov 6, 2012
  1. Merge pull request #14 from Funkmyster/master

    Updates to Chapter 5.
    jacobian committed Nov 6, 2012
Commits on Nov 5, 2012
  1. Ch5 - fixes for DB configs

    Jacob Silva committed Nov 5, 2012
  2. Merge pull request #13 from mpdaugherty/chapter04

    Removed the suggestion to put DJANGO_SETTINGS_MODULE settings into .bash_profile.
    jacobian committed Nov 5, 2012
  3. Ch5 - Update DB configs to version 1.4

    Jacob Silva committed Nov 5, 2012
Commits on Nov 4, 2012
  1. Ch5 - Fix link to Ch6

    Jacob Silva committed Nov 4, 2012
Commits on Nov 2, 2012
  1. If someone wants to develop two Django sites at the same time, settin…

    …g the DJANGO_SETTINGS_MODULE in .bash_profile seems like a bad practice.
    mpdaugherty committed Nov 2, 2012
Commits on Oct 29, 2012
  1. Merge pull request #11 from lyndsysimon/minor-cleanup

    Fixes ReST syntax error
    jacobian committed Oct 29, 2012
  2. Fixes ReST syntax error

    lyndsysimon committed Oct 29, 2012
Commits on Oct 26, 2012
  1. Fix RST note syntax.

    mpdaugherty committed Oct 26, 2012
  2. pluralize function

    mpdaugherty committed Oct 26, 2012
  3. updated more urlconf examples; made note to cover url() optional argu…

    …ments (like name=) in Chapter 8
    mpdaugherty committed Oct 26, 2012
  4. Another urlconf

    mpdaugherty committed Oct 26, 2012
  5. The default urlconf generated by django-admin includes the url() func…

    …tion and raw strings, so I think we should bring them up earlier. Otherwise, new readers may be confused by the discrepancy.
    mpdaugherty committed Oct 26, 2012
  6. web is not a proper noun

    mpdaugherty committed Oct 26, 2012
  7. Merge pull request #10 from mpdaugherty/master

    Updates to chapters 1 & 2 - mostly factual, a little style
    jacobian committed Oct 26, 2012
Commits on Oct 25, 2012
  1. rewrap paragraph

    mpdaugherty committed Oct 25, 2012
  2. Update settings.py location and do not reference DATABASE_NAME, which…

    … is not in settings.py anymore.
    mpdaugherty committed Oct 25, 2012