Permalink
Switch branches/tags
Nothing to show
Commits on Mar 26, 2012
  1. fix for dumpdata command

    nicholasserra committed Mar 26, 2012
Commits on Mar 8, 2012
  1. Changed formfield to use default implementation. Changed help_text to…

    bradjasper committed Mar 8, 2012
    … only set default if not set
Commits on Feb 8, 2012
Commits on Jan 30, 2012
Commits on Jan 17, 2012
  1. Removed admin TODO bug

    bradjasper committed Jan 17, 2012
  2. Bumped version to 0.6

    bradjasper committed Jan 17, 2012
  3. Merge pull request #10 from nicholasserra/master

    bradjasper committed Jan 17, 2012
    Fixed django admin bug, added django admin validation
Commits on Jan 14, 2012
  1. Fixed django admin bug, added django admin validaiton

    nicholasserra committed Jan 14, 2012
    Fixed the bug in the django admin that saved the field with invalid
    json. Added a formfield method and Form Field to validate that valid
    json is being entered in the django admin before it is saved. Throws
    django admin form error for bad json.
Commits on Nov 17, 2011
Commits on Oct 6, 2011
  1. Merge pull request #8 from pelme/master

    bradjasper committed Oct 6, 2011
    Added kwargs to customize encoding/decoding of the JSON data
  2. Added two kwargs to the field:

    pelme committed Oct 6, 2011
     * load_kwargs -- a dictionary that is used as keyword arguments passed to loads when retrieving the object
     * dump_kwargs -- a dictionary that is used as keyword arguments passed to dumps when saving the object
    
     These can be used to do custom encoding/decoding directly in the field.
  3. Removed redudant condition

    pelme committed Oct 6, 2011
  4. Added a simple .gitignore

    pelme committed Oct 6, 2011
Commits on Sep 22, 2011
  1. Merge pull request #7 from krontab/master

    bradjasper committed Sep 22, 2011
    Fixed get_db_prep_save() error
  2. Fixed get_db_prep_save() error

    KR0NTAB committed Sep 22, 2011
Commits on Sep 21, 2011
  1. Merge pull request #6 from jasonwmiller/master

    bradjasper committed Sep 21, 2011
    Fix for Django 1.3--thanks!
  2. Fix for Django 1.3 "DeprecationWarning: A Field class whose get_db_pr…

    jasonwmiller committed Sep 21, 2011
    …ep_save method hasn't been updated to take a `connection` argument."
Commits on Sep 20, 2011
Commits on Sep 15, 2011
  1. Merge pull request #5 from adamcharnock/patch-1

    bradjasper committed Sep 15, 2011
    Some existing apps expect this to be present.
Commits on Sep 14, 2011
  1. Some existing apps expect this to be present.

    adamcharnock committed Sep 14, 2011
    For example Gargoyle does this "from jsonfield import JSONField", expecting this (older) version of django-jsonfield to be present:
    
    https://bitbucket.org/schinckel/django-jsonfield
Commits on Jun 23, 2011
  1. Merge pull request #4 from jarodl/master

    bradjasper committed Jun 23, 2011
    Fixed deprecation warnings - thanks jarodl!
Commits on Feb 9, 2011
  1. Increased version to 0.3

    bradjasper committed Feb 9, 2011
Commits on Nov 9, 2010
  1. renamed nosj to jsonfield

    bradjasper committed Nov 9, 2010