Code

Upstream merge#1

Code

Open

rmgorman wants to merge 139 commits intoPetro-Viron:masterPetro-Viron/django-jsonfield:masterfrom rpkilby:masterrpkilby/jsonfield:masterCopy head branch name to clipboard

+1,509-743

Commits

Commits on Sep 26, 2016

• Updated README.rst with svg bagde

  sobolevn

  authored
  b0e8adc

  Copy full SHA for b0e8adc

Commits on Feb 28, 2017

• Fix incompatibilities with upcoming Django 1.11+

  dmkoch

  committed
  db09cbe

  Copy full SHA for db09cbe

Commits on Mar 1, 2017

• Upgrade Django support to updated versions

  Show description for 1e3012e
  dmkoch

  committed
  1e3012e

  Copy full SHA for 1e3012e

• Merge pull request #176 from dmkoch/master

  Show description for 3beb8c1
  bradjasper

  authored
  3beb8c1

  Copy full SHA for 3beb8c1

Commits on Mar 2, 2017

• Merge pull request #171 from sobolevn/patch-1

  Show description for 63fc6fa
  dmkoch

  authored
  63fc6fa

  Copy full SHA for 63fc6fa

• Update README.rst with minor edits

  dmkoch

  authored
  ee9328e

  Copy full SHA for ee9328e

• Merge pull request #177 from bradjasper/dmkoch-patch-1

  Show description for 43e0a1d
  dmkoch

  authored
  43e0a1d

  Copy full SHA for 43e0a1d

• Add LICENSE to manifest

  Show description for 5547470
  dmkoch

  authored
  5547470

  Copy full SHA for 5547470

• Merge pull request #178 from bradjasper/dmkoch-patch-1

  Show description for 5ccf223
  dmkoch

  authored
  5ccf223

  Copy full SHA for 5ccf223

• fix: allow empty string in to_python

  Gagaro

  committed
  ed87c89

  Copy full SHA for ed87c89

• Merge pull request #179 from Gagaro/fix-has-changed

  Show description for 66f5757
  dmkoch

  authored
  66f5757

  Copy full SHA for 66f5757

• Prepare for 2.0.0 release

  dmkoch

  committed
  bd17cf7

  Copy full SHA for bd17cf7

Commits on Mar 4, 2017

• Set release date for 2.0.0

  dmkoch

  authored
  f589599

  Copy full SHA for f589599

• Update copyright year

  dmkoch

  authored
  9227ac7

  Copy full SHA for 9227ac7

Commits on Mar 7, 2017

• split out the changelog

  jayfk

  committed
  704c092

  Copy full SHA for 704c092

• Merge pull request #180 from pyupio/master

  Show description for 121ffb7
  dmkoch

  authored
  121ffb7

  Copy full SHA for 121ffb7

• Renamed method get_db_prep_value to get_prep_value

  Show description for 98189fc
  dmkoch

  committed
  98189fc

  Copy full SHA for 98189fc

• Merge pull request #182 from bradjasper/get-prep-value-fix

  Show description for ec98386
  dmkoch

  authored
  ec98386

  Copy full SHA for ec98386

Commits on Mar 8, 2017

• Add Django 1.11 to testing matrix

  dmkoch

  committed
  5bdb1d1

  Copy full SHA for 5bdb1d1

• Merge pull request #183 from bradjasper/test-matrix-django-1.11

  Show description for 19cdf7a
  dmkoch

  authored
  19cdf7a

  Copy full SHA for 19cdf7a

• Prep version 2.0.1

  dmkoch

  committed
  8a65aca

  Copy full SHA for 8a65aca

• Merge pull request #184 from bradjasper/prep-version-2.0.1

  Show description for 520be90
  dmkoch

  authored
  520be90

  Copy full SHA for 520be90

Commits on Mar 9, 2017

• Add additional documentation after maintainer switch

  dmkoch

  committed
  faf5727

  Copy full SHA for faf5727

• Merge pull request #185 from dmkoch/doc-updates

  Show description for e185c62
  dmkoch

  authored
  e185c62

  Copy full SHA for e185c62

Commits on Apr 4, 2017

• Clarify note in README

  dmkoch

  authored
  4a82f49

  Copy full SHA for 4a82f49

Commits on Apr 5, 2017

• Test with released version of Django 1.11

  dmkoch

  committed
  c22717d

  Copy full SHA for c22717d

• Merge pull request #187 from dmkoch/django-1.11

  Show description for a983874
  dmkoch

  authored
  a983874

  Copy full SHA for a983874

Commits on May 10, 2017

• Raise error with GenericForeignKeys

  tomhamiltonstubber

  committed
  88ad738

  Copy full SHA for 88ad738

Commits on May 31, 2017

• Django 1.11 compatibility, prevents AttributeError

  Show description for a9190f6
  gitaarik

  committed
  a9190f6

  Copy full SHA for a9190f6

Commits on Jun 1, 2017

• Merge pull request #192 from gitaarik/master

  Show description for 1f2da34
  dmkoch

  authored
  1f2da34

  Copy full SHA for 1f2da34

• Add on_delete arg to ForeignKey constructor

  Show description for b65fbfe
  dmkoch

  authored
  b65fbfe

  Copy full SHA for b65fbfe

• Merge pull request #190 from tomhamiltonstubber/issue-with-generic-foreign-keys

  Show description for 0ed1bd7
  dmkoch

  authored
  0ed1bd7

  Copy full SHA for 0ed1bd7

Commits on Jun 18, 2017

• Prep version 2.0.2

  dmkoch

  committed
  8c15972

  Copy full SHA for 8c15972

• Merge pull request #196 from dmkoch/prep-version-2.0.2

  Show description for 4aa0f10
  dmkoch

  authored
  4aa0f10

  Copy full SHA for 4aa0f10

Commits on Jun 22, 2017

• Correct 2.0.2 release date in CHANGES

  dmkoch

  authored
  b2fbb6a

  Copy full SHA for b2fbb6a

Commits on Aug 31, 2017

• Eliminate Django 2.0 deprecation warning

  Show description for 1a65db2
  mmautner

  committed
  1a65db2

  Copy full SHA for 1a65db2

Commits on Oct 9, 2017

• Support display of non-ascii characters

  

  Ann Paul

  committed
  4f4b2be

  Copy full SHA for 4f4b2be

Commits on Oct 11, 2017

• Merge pull request #204 from Madefire/master

  Show description for 8d4d051
  dmkoch

  authored
  8d4d051

  Copy full SHA for 8d4d051

• Merge pull request #207 from annp89/support-non-ascii

  Show description for 19b62ed
  dmkoch

  authored
  19b62ed

  Copy full SHA for 19b62ed

Commits on May 7, 2018

• Remove docker files

  

  Ryan P Kilby

  committed
  1985d1b

  Copy full SHA for 1985d1b

• Move tests out of package

  

  Ryan P Kilby

  committed
  887447a

  Copy full SHA for 887447a

• Use manage.py to run tests

  

  Ryan P Kilby

  committed
  5f5c2de

  Copy full SHA for 5f5c2de

• Make tests runnable outside of app

  

  Ryan P Kilby

  committed
  5b5674a

  Copy full SHA for 5b5674a

• Update CI

  

  Ryan P Kilby

  committed
  03a4261

  Copy full SHA for 03a4261

• Update JSONEncoder from DRF

  

  Ryan P Kilby

  committed
  e133144

  Copy full SHA for e133144

• Add lint/isort config, fix complaints

  

  Ryan P Kilby

  committed
  acf71da

  Copy full SHA for acf71da

• Drop py2k support

  

  Ryan P Kilby

  committed
  02b07d1

  Copy full SHA for 02b07d1

• Update distribution info

  

  Ryan P Kilby

  committed
  8ce228e

  Copy full SHA for 8ce228e

• Remove south migration handling

  

  Ryan P Kilby

  committed
  149cac4

  Copy full SHA for 149cac4

• Make optional arguments keyword-only

  

  Ryan P Kilby

  committed
  2fa46ae

  Copy full SHA for 2fa46ae

• Add field deconstruction

  

  Ryan P Kilby

  committed
  0d91583

  Copy full SHA for 0d91583

• Small fixes

  

  Ryan P Kilby

  committed
  2ea5211

  Copy full SHA for 2ea5211

• Move form fields into separate module

  

  Ryan P Kilby

  committed
  0014179

  Copy full SHA for 0014179

• Combine travis builds

  

  Ryan P Kilby

  committed
  bf256cd

  Copy full SHA for bf256cd

• Ignore coverage for encoder copied from DRF

  

  Ryan P Kilby

  committed
  c797e76

  Copy full SHA for c797e76

• Remove unneeded form field, remove old method

  

  Ryan P Kilby

  committed
  6aafd5a

  Copy full SHA for 6aafd5a

Commits on May 8, 2018

• Renamed JSONFieldBase => JSONFieldMixin

  

  Ryan P Kilby

  committed
  bb85034

  Copy full SHA for bb85034

• Update README

  

  Ryan P Kilby

  committed
  895e5da

  Copy full SHA for 895e5da

• Update changelog

  

  Ryan P Kilby

  committed
  16c77bc

  Copy full SHA for 16c77bc

• Bump major version

  

  Ryan P Kilby

  committed
  4dd0753

  Copy full SHA for 4dd0753

Commits on May 21, 2018

• Refactor test models

  

  Ryan P Kilby

  committed
  87121ca

  Copy full SHA for 87121ca

• Move form into test casse setup

  

  Ryan P Kilby

  committed
  794986f

  Copy full SHA for 794986f

• Remove unnecessary models file

  

  Ryan P Kilby

  committed
  a7d908c

  Copy full SHA for a7d908c

• Make error message a sentence

  

  Ryan P Kilby

  committed
  ecc0206

  Copy full SHA for ecc0206

• Fix model full_clean behavior

  

  Ryan P Kilby

  committed
  168f2e2

  Copy full SHA for 168f2e2

• Update changelog

  

  Ryan P Kilby

  committed
  baf7ed0

  Copy full SHA for baf7ed0

• Drop universal wheel build

  

  Ryan P Kilby

  committed
  2565ee0

  Copy full SHA for 2565ee0

• Bump version

  

  Ryan P Kilby

  committed
  aed087e

  Copy full SHA for aed087e

Commits on Jul 13, 2018

• Fix date typos in changelog (#3)

  

  yozlet

  authored and

  Ryan P Kilby

  committed
  45be812

  Copy full SHA for 45be812

Commits on Sep 24, 2018

• Add Python 3.7 & Django 2.1 support (#6)

  Show description for 05ed04c
  rpkilby

  authored
  05ed04c

  Copy full SHA for 05ed04c

Commits on Dec 21, 2018

• Update changelog

  rpkilby

  committed
  527e41d

  Copy full SHA for 527e41d

• Bump version

  rpkilby

  committed
  4f656c1

  Copy full SHA for 4f656c1

Commits on Mar 28, 2019

• Testing updates (#13)

  rpkilby

  authored
  e912a05

  Copy full SHA for e912a05

Commits on Apr 18, 2019

• Move to CircleCI (#14)

  Show description for a533f85
  rpkilby

  authored
  a533f85

  Copy full SHA for a533f85

Commits on Aug 8, 2019

• Fix tox dist name conflict (#15)

  rpkilby

  authored
  2a8081f

  Copy full SHA for 2a8081f

Commits on Oct 24, 2019

• Add Django 3.0 support (#16)

  Show description for f468e75
  

  therefromhere

  authored and

  rpkilby

  committed
  f468e75

  Copy full SHA for f468e75

• Bump version

  rpkilby

  committed
  54160d6

  Copy full SHA for 54160d6

Commits on Dec 5, 2019

• Drop unsupported versions (#21)

  Show description for 4e1a6bb
  rpkilby

  authored
  4e1a6bb

  Copy full SHA for 4e1a6bb

Commits on Dec 6, 2019

• Fix use with select_related (#22)

  rpkilby

  authored
  9982f0c

  Copy full SHA for 9982f0c

• Fix field deconstruction (#23)

  rpkilby

  authored
  09b2482

  Copy full SHA for 09b2482

• Update release process

  rpkilby

  committed
  491694e

  Copy full SHA for 491694e

• Update changelog

  rpkilby

  committed
  891e4fd

  Copy full SHA for 891e4fd

• Bump version

  rpkilby

  committed
  d330b1b

  Copy full SHA for d330b1b

Commits on Dec 9, 2019

• Fix readme

  rpkilby

  committed
  388dcfb

  Copy full SHA for 388dcfb

Commits on Feb 15, 2020

• Update encoder from DRF 3.11.0

  rpkilby

  committed
  8975b82

  Copy full SHA for 8975b82

• Don't use unicode gettext variants

  rpkilby

  committed
  a1d6e58

  Copy full SHA for a1d6e58

• Remove unnecessary form field mixin

  rpkilby

  committed
  5dbe816

  Copy full SHA for 5dbe816

• New-style super

  rpkilby

  committed
  745e133

  Copy full SHA for 745e133

• Fix form field kwargs handling

  Show description for fe05190
  rpkilby

  committed
  fe05190

  Copy full SHA for fe05190

• Ensure help text supports translations

  rpkilby

  committed
  9dd6934

  Copy full SHA for 9dd6934

• Fix form field styling

  Show description for 4ddcd64
  rpkilby

  committed
  4ddcd64

  Copy full SHA for 4ddcd64

• Test form saving/rendering

  rpkilby

  committed
  8242a92

  Copy full SHA for 8242a92

• Fix field value deserialization

  rpkilby

  committed
  9261399

  Copy full SHA for 9261399

• Use named error messages

  rpkilby

  committed
  b41b533

  Copy full SHA for b41b533

• Fix invalid value handling

  rpkilby

  committed
  a7e3f21

  Copy full SHA for a7e3f21

• Fix field serialization

  rpkilby

  committed
  2cf0215

  Copy full SHA for 2cf0215

• Differentiate int/float value tests

  rpkilby

  committed
  a5897a0

  Copy full SHA for a5897a0

• Move forms tests to separate module

  rpkilby

  committed
  5ed2d3b

  Copy full SHA for 5ed2d3b

• Add bound vs unbound rendering tests

  rpkilby

  committed
  194e7d3

  Copy full SHA for 194e7d3

• Make test variables more consistent

  rpkilby

  committed
  9aea78f

  Copy full SHA for 9aea78f

• Add test for disabled field

  rpkilby

  committed
  63c1d35

  Copy full SHA for 63c1d35

• Ensure loaded value is check-aware

  rpkilby

  committed
  808a3cf

  Copy full SHA for 808a3cf

• Remove old tests

  rpkilby

  committed
  46ae093

  Copy full SHA for 46ae093

• Use setdefault over 'in' condition

  rpkilby

  committed
  eac6214

  Copy full SHA for eac6214

• Move help_text to form field

  Show description for f7d1224
  rpkilby

  committed
  f7d1224

  Copy full SHA for f7d1224

• Update manifest to include test suite

  rpkilby

  committed
  500cb9e

  Copy full SHA for 500cb9e

• Remove old Django versions from tox config

  rpkilby

  committed
  5a6726c

  Copy full SHA for 5a6726c

• Update changelog

  rpkilby

  committed
  314bc9b

  Copy full SHA for 314bc9b

• Add sdist to release process notes

  rpkilby

  committed
  bcc9106

  Copy full SHA for bcc9106

• Bump major version

  rpkilby

  committed
  91be5cd

  Copy full SHA for 91be5cd

• Revert jsonfield2 back to jsonfield

  rpkilby

  committed
  eb05235

  Copy full SHA for eb05235

• Update changelog

  rpkilby

  committed
  08e2599

  Copy full SHA for 08e2599

• Move package under src directory

  rpkilby

  committed
  74d7923

  Copy full SHA for 74d7923

• Set major version

  rpkilby

  committed
  e05203c

  Copy full SHA for e05203c

• Merge pull request #238 from rpkilby/rewrite

  Show description for e0e88a6
  rpkilby

  authored
  e0e88a6

  Copy full SHA for e0e88a6

Commits on Feb 17, 2020

• Set python_requires='>=3.6' (#241)

  Nicusor97

  authored
  c91a95f

  Copy full SHA for c91a95f

Commits on Feb 22, 2020

• Test handling for callable defaults

  rpkilby

  committed
  3e62892

  Copy full SHA for 3e62892

• Regenerate migrations

  rpkilby

  committed
  f60a918

  Copy full SHA for f60a918

• Ensure 'values()' deserializes results

  rpkilby

  committed
  5ada6a5

  Copy full SHA for 5ada6a5

• Refactor OrderedDict test

  rpkilby

  committed
  cc92f35

  Copy full SHA for cc92f35

• Test MTI deserialization

  rpkilby

  committed
  c6e2b8e

  Copy full SHA for c6e2b8e

• Test serialize/deserialize

  rpkilby

  committed
  c3867f0

  Copy full SHA for c3867f0

• Test serialize/deserialize on unsaved instances

  rpkilby

  committed
  ac06e8d

  Copy full SHA for ac06e8d

• Test deferred access

  rpkilby

  committed
  b320645

  Copy full SHA for b320645

• Move regex test under QueryTests

  rpkilby

  committed
  b5677a9

  Copy full SHA for b5677a9

• Test exact query lookups

  rpkilby

  committed
  afeed2c

  Copy full SHA for afeed2c

• Test form has_changed

  rpkilby

  committed
  d35c0d0

  Copy full SHA for d35c0d0

• Test null querying

  rpkilby

  committed
  090e987

  Copy full SHA for 090e987

• Document querying and null handling

  rpkilby

  committed
  e43baa2

  Copy full SHA for e43baa2

• Update test suite instructions

  rpkilby

  committed
  4e6e4df

  Copy full SHA for 4e6e4df

• Merge pull request #245 from rpkilby/testing

  Show description for 1ef0fc8
  rpkilby

  authored
  1ef0fc8

  Copy full SHA for 1ef0fc8

• Test non-JSONField form field

  rpkilby

  committed
  d69898a

  Copy full SHA for d69898a

• Minor packaging cleanup

  rpkilby

  committed
  5d0a185

  Copy full SHA for 5d0a185

• Enable form rendering of non-ascii values (#246)

  rpkilby

  authored
  a7a5a71

  Copy full SHA for a7a5a71

• Remove help text from form field (#247)

  Show description for 5e0de07
  rpkilby

  authored
  5e0de07

  Copy full SHA for 5e0de07

• Handle loading invalid JSON from db (#248)

  rpkilby

  authored
  c2f8780

  Copy full SHA for c2f8780

• Update changelog

  rpkilby

  committed
  c6cade0

  Copy full SHA for c6cade0

• Remove old test code

  rpkilby

  committed
  f981188

  Copy full SHA for f981188

• Bump minor version

  rpkilby

  committed
  cb749a8

  Copy full SHA for cb749a8