[ckan-changes] [ckan/ckan] 609d54: [#3467] separate total calculation + include_total...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 609d54b2996848eb13e3dba64c189f80c672ddbf
      https://github.com/ckan/ckan/commit/609d54b2996848eb13e3dba64c189f80c672ddbf
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-05 (Sun, 05 Mar 2017)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#3467] separate total calculation + include_total param


  Commit: 9df0c7b3aa5b7e03b97682223f82d947697d36dc
      https://github.com/ckan/ckan/commit/9df0c7b3aa5b7e03b97682223f82d947697d36dc
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-24 (Fri, 24 Mar 2017)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/mailer.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/model/activity.py
    M ckan/templates/organization/index.html
    R ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/tests/logic/action/test_get.py
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/templates/datapusher/resource_data.html
    A ckanext/datapusher/templates/package/resource_edit_base.html
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/templates/datastore/dictionary.html
    A ckanext/datastore/templates/package/resource_edit_base.html
    M ckanext/datastore/templates/package/resource_read.html
    M doc/maintaining/installing/install-from-source.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 3467-datastore-total


  Commit: af2f061fdd08219d5070415be118d6063d38341f
      https://github.com/ckan/ckan/commit/af2f061fdd08219d5070415be118d6063d38341f
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-03-24 (Fri, 24 Mar 2017)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Merge pull request #3467 from ckan/3467-datastore-total

faster datastore total calculation + make optional


Compare: https://github.com/ckan/ckan/compare/fe5958213436...af2f061fdd08