Code

Added JSONField.#3454

Code

Merged

tomchristie merged 4 commits intomasterencode/django-rest-framework:masterfrom json-fieldencode/django-rest-framework:json-fieldCopy head branch name to clipboardSep 28, 2015

+102

Commits

Commits on Sep 28, 2015

• Added JSONField. Closes #3170.

  tomchristie

  committed
  10dbf13

  Copy full SHA for 10dbf13

• Work around 2.x/3.x json.dumps() return type fuzziness

  tomchristie

  committed
  ec8098b

  Copy full SHA for ec8098b

• Don't attempt to test dicts (unordered)

  tomchristie

  committed
  dad207d

  Copy full SHA for dad207d

• Handle binary or unicode with JSONField

  tomchristie

  committed
  265ec8a

  Copy full SHA for 265ec8a