[ckan-changes] [ckan/ckan] a154ab: [#2969] Fix unicode error when indexing field of t...

[GitHub]

  Branch: refs/heads/release-v2.3.5
  Home:   https://github.com/ckan/ckan
  Commit: a154ab04a544f339b750f5bb035b59bb53b8ca0f
      https://github.com/ckan/ckan/commit/a154ab04a544f339b750f5bb035b59bb53b8ca0f
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-26 (Fri, 26 Aug 2016)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#2969] Fix unicode error when indexing field of type JSON


  Commit: d1fd5c960ec2c2441571829f5a41e5f2e01c8153
      https://github.com/ckan/ckan/commit/d1fd5c960ec2c2441571829f5a41e5f2e01c8153
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-26 (Fri, 26 Aug 2016)

  Changed paths:
    M ckanext/datastore/tests/test_upsert.py

  Log Message:
  -----------
  [#2969] Add a couple of tests

Conflicts:
	ckanext/datastore/tests/test_upsert.py


  Commit: d440885d7c398390cf739f3283cca45bea3b08cf
      https://github.com/ckan/ckan/commit/d440885d7c398390cf739f3283cca45bea3b08cf
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-26 (Fri, 26 Aug 2016)

  Changed paths:
    M ckanext/reclineview/theme/public/vendor/recline/recline.js

  Log Message:
  -----------
  [#2923] Proper sanitation of header name on SlickGrid view

Fixes #2923

Cherry-picked from @smotornyuk patch on okfn/recline#498


Compare: https://github.com/ckan/ckan/compare/ed7961cd213c...d440885d7c39