Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Expenditure model clean #234

Merged
merged 28 commits into from
Mar 19, 2015
Merged

Expenditure model clean #234

merged 28 commits into from
Mar 19, 2015

Commits on Mar 11, 2015

  1. Initial swing at adding row definitions for expenditure model. For #222

    @aboutaaron
    aboutaaron committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    616f4bc View commit details
    Browse the repository at this point in the history

  2. Update campaign.py

    @aboutaaron
    aboutaaron committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    72aa6a4 View commit details
    Browse the repository at this point in the history

  3. Update campaign.py

    Rachael Bale committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    fb3f8d5 View commit details
    Browse the repository at this point in the history

  4. Added help_text for memo_refno 

    lines 1736-1740
    @joannalin
    joannalin committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    4edabd1 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #224 from joannalin/expenditure-model-clean 

    Added help_text for memo_refno
    @aboutaaron
    aboutaaron committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    3a2795e View commit details
    Browse the repository at this point in the history

  6. Merge pull request #225 from rbale/expenditure-model-clean 

    Update memo_code help text
    @aboutaaron
    aboutaaron committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    d6848fd View commit details
    Browse the repository at this point in the history

  7. Merge pull request #223 from aboutaaron/expenditure-model-clean 

    Update juris_cd help text
    @palewire
    palewire committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    3e23733 View commit details
    Browse the repository at this point in the history

  8. added some tuples for attribute choices

    @aboutaaron
    aboutaaron committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    d4d9592 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'expenditure-model-clean' of github.com:california-civic… 

    …-data-coalition/django-calaccess-raw-data into expenditure-model-clean
    @aboutaaron
    aboutaaron committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    6b5c91f View commit details
    Browse the repository at this point in the history

  10. finished adding text from calaccess docs for Expn model. For #222

    @aboutaaron
    aboutaaron committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    9e403b2 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2015

  1. Initial swing at adding row definitions for expenditure model. For #222

    @aboutaaron
    aboutaaron committed Mar 12, 2015
    Configuration menu
    Copy the full SHA
    8fb0006 View commit details
    Browse the repository at this point in the history

  2. Update campaign.py

    @aboutaaron
    aboutaaron committed Mar 12, 2015
    Configuration menu
    Copy the full SHA
    e5ec6cb View commit details
    Browse the repository at this point in the history

  3. Update campaign.py

    @aboutaaron
    Rachael Bale authored and aboutaaron committed Mar 12, 2015
    Configuration menu
    Copy the full SHA
    ee188b8 View commit details
    Browse the repository at this point in the history

  4. Added help_text for memo_refno 

    lines 1736-1740
    @joannalin @aboutaaron
    joannalin authored and aboutaaron committed Mar 12, 2015
    Configuration menu
    Copy the full SHA
    c955d93 View commit details
    Browse the repository at this point in the history

  5. added some tuples for attribute choices

    @aboutaaron
    aboutaaron committed Mar 12, 2015
    Configuration menu
    Copy the full SHA
    2a13b8f View commit details
    Browse the repository at this point in the history

  6. finished adding text from calaccess docs for Expn model. For #222

    @aboutaaron
    aboutaaron committed Mar 12, 2015
    Configuration menu
    Copy the full SHA
    0580f03 View commit details
    Browse the repository at this point in the history

  7. fixed merge conflict

    @aboutaaron
    aboutaaron committed Mar 12, 2015
    Configuration menu
    Copy the full SHA
    2daf74a View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2015

  1. Initial swing at adding row definitions for expenditure model. For #222

    @aboutaaron
    aboutaaron committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    3b99a2d View commit details
    Browse the repository at this point in the history

  2. Update campaign.py

    @aboutaaron
    aboutaaron committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    35c8ce8 View commit details
    Browse the repository at this point in the history

  3. Update campaign.py

    @aboutaaron
    Rachael Bale authored and aboutaaron committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    7059635 View commit details
    Browse the repository at this point in the history

  4. Added help_text for memo_refno 

    lines 1736-1740
    @joannalin @aboutaaron
    joannalin authored and aboutaaron committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    4a8aa36 View commit details
    Browse the repository at this point in the history

  5. added some tuples for attribute choices

    @aboutaaron
    aboutaaron committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    cfd8532 View commit details
    Browse the repository at this point in the history

  6. finished adding text from calaccess docs for Expn model. For #222

    @aboutaaron
    aboutaaron committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    fbb3213 View commit details
    Browse the repository at this point in the history

  7. Initial swing at adding row definitions for expenditure model. For #222

    @aboutaaron
    aboutaaron committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    b9d7876 View commit details
    Browse the repository at this point in the history

  8. added some tuples for attribute choices

    @aboutaaron
    aboutaaron committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    bf0a3a9 View commit details
    Browse the repository at this point in the history

  9. finished adding text from calaccess docs for Expn model. For #222

    @aboutaaron
    aboutaaron committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    a4537ad View commit details
    Browse the repository at this point in the history

  10. fixed merge conflict

    @aboutaaron
    aboutaaron committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    490824b View commit details
    Browse the repository at this point in the history

  11. Added phantom db values to juris_cd choices RE #237. Did the same for… 

    … off_s_h_cd choices RE #235
    @aboutaaron
    aboutaaron committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    7a68e63 View commit details
    Browse the repository at this point in the history