[ckan-changes] [ckan/ckan] 64f54f: [#1696] Only get active memberships

Tue Dec 16 16:16:52 UTC 2014

  Branch: refs/heads/1903-remove-old-authz-code
  Home:   https://github.com/ckan/ckan
  Commit: 64f54f5acc6a9470d56a1ef085b04b7ca15e6114
      https://github.com/ckan/ckan/commit/64f54f5acc6a9470d56a1ef085b04b7ca15e6114
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#1696] Only get active memberships

  Commit: eddc7a735de0e400faf381b1bf9391972c94b403
      https://github.com/ckan/ckan/commit/eddc7a735de0e400faf381b1bf9391972c94b403
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  [#2034] sort and limit in subqueries before unions

  Commit: 6060ee4fa2c60de7c952f7a5bcaa7063230f0c30
      https://github.com/ckan/ckan/commit/6060ee4fa2c60de7c952f7a5bcaa7063230f0c30
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  [#2034] real subqueries required for limits inside unions

  Commit: e4fb845c2170e1d4f8510dccbc1723557bad6cfa
      https://github.com/ckan/ckan/commit/e4fb845c2170e1d4f8510dccbc1723557bad6cfa
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  [#2034] distinct now required before offset+limit

  Commit: 272a428c582bfcefd164bcf147fd03cec9d54d84
      https://github.com/ckan/ckan/commit/272a428c582bfcefd164bcf147fd03cec9d54d84
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/lib/base.py
    R ckan/lib/field_types.py
    M ckan/logic/converters.py
    A ckan/new_tests/lib/test_base.py
    M ckan/public/base/css/main.css
    M ckan/templates/package/snippets/package_basic_fields.html
    R ckan/tests/functional/test_cors.py
    R ckan/tests/lib/test_field_types.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/reclineview/theme/public/recline_view.js
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/getting-started.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 2034-activity-query-performance-1

  Commit: c04c273c31845a293b8e7b135e89b5d066b6e9f2
      https://github.com/ckan/ckan/commit/c04c273c31845a293b8e7b135e89b5d066b6e9f2
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  [#2034] apply distinct after union

  Commit: a4de57e5838d649f4ce873187cd148c08973427c
      https://github.com/ckan/ckan/commit/a4de57e5838d649f4ce873187cd148c08973427c
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  [#2034] select_from now called select_entity_from in sqlalchemy 0.9

  Commit: e7f87acdeb754280a7b7457217a9734812de4224
      https://github.com/ckan/ckan/commit/e7f87acdeb754280a7b7457217a9734812de4224
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-18 (Tue, 18 Nov 2014)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/config/who.ini
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/authenticator.py
    R ckan/lib/repoze_patch.py
    M ckan/tests/lib/test_authenticator.py
    M ckan/tests/test_coding_standards.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#1661] Remove repoze.who OpenID plugin

  Commit: e2a6089587f68b0a2e2f60c8d8c57c80c977511c
      https://github.com/ckan/ckan/commit/e2a6089587f68b0a2e2f60c8d8c57c80c977511c
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-18 (Tue, 18 Nov 2014)

  Changed paths:
    M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  [#1661] Remove unused test method

  Commit: 3db6fe82bef91035671ac9bdf1b3035819251877
      https://github.com/ckan/ckan/commit/3db6fe82bef91035671ac9bdf1b3035819251877
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-18 (Tue, 18 Nov 2014)

  Changed paths:
    M requirements.txt

  Log Message:
  -----------
  [#1661] Remove python-openid requirement

  Commit: bead693b6b3d3e9b9d0580d4a9ed823d08040e98
      https://github.com/ckan/ckan/commit/bead693b6b3d3e9b9d0580d4a9ed823d08040e98
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-18 (Tue, 18 Nov 2014)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  [#1661] Add note to changelog

  Commit: b6dccb0dd879612fedf033f8907bf2dd3acec33c
      https://github.com/ckan/ckan/commit/b6dccb0dd879612fedf033f8907bf2dd3acec33c
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-18 (Tue, 18 Nov 2014)

  Changed paths:
    M test-core.ini

  Log Message:
  -----------
  [#1661] Remove openid setting from test config

  Commit: eba7f2d77fc556302eb881cbd526ddc98ba85d77
      https://github.com/ckan/ckan/commit/eba7f2d77fc556302eb881cbd526ddc98ba85d77
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#1661] Amend comment referring to OpenID

  Commit: 84a55048d20950dbc3570b4c6120796ee4aff5e6
      https://github.com/ckan/ckan/commit/84a55048d20950dbc3570b4c6120796ee4aff5e6
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#2065] exclude datasets on group/org edit view

  Commit: d8e1cd64d62f0555f4e6dcd1746507eb0aa7544f
      https://github.com/ckan/ckan/commit/d8e1cd64d62f0555f4e6dcd1746507eb0aa7544f
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/middleware.py
    M ckan/config/solr/schema.xml
    M ckan/config/who.ini
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    A ckan/lib/auth_tkt.py
    M ckan/lib/cli.py
    R ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.py
    M ckan/new_authz.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/test_auth_tkt.py
    M ckan/new_tests/logic/action/test_get.py
    A ckan/new_tests/test_authz.py
    M ckan/pastertemplates/__init__.py
    A ckan/pastertemplates/template/+dot+coveragerc_tmpl
    A ckan/pastertemplates/template/+dot+gitignore_tmpl
    A ckan/pastertemplates/template/+dot+travis.yml_tmpl
    A ckan/pastertemplates/template/LICENSE_tmpl
    A ckan/pastertemplates/template/MANIFEST.in_tmpl
    A ckan/pastertemplates/template/README.rst_tmpl
    A ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    A ckan/pastertemplates/template/bin/travis-run.sh_tmpl
    R ckan/pastertemplates/template/ckanext/+project+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/fanstatic/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/plugin.py_tmpl
    A ckan/pastertemplates/template/ckanext/+project_shortname+/public/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/templates/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/test_plugin.py_tmpl
    M ckan/pastertemplates/template/ckanext/__init__.py
    R ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore
    A ckan/pastertemplates/template/ckanext_+project_shortname+.egg-info/.gitignore
    A ckan/pastertemplates/template/dev-requirements.txt_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    A ckan/pastertemplates/template/test.ini_tmpl
    M ckan/templates/package/read_base.html
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/logic/test_auth.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M doc/maintaining/configuration.rst
    M doc/maintaining/paster.rst

  Log Message:
  -----------
  Merge branch 'master' ckan/ckan into 1661-openid

  Commit: 451bbd0577d0fefec08fc45a32e9780f1a8ddbbd
      https://github.com/ckan/ckan/commit/451bbd0577d0fefec08fc45a32e9780f1a8ddbbd
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  [#1661] OpenID changelog wording

  Commit: d14e32d438da3947017e9fcc5362535d62e3b9a0
      https://github.com/ckan/ckan/commit/d14e32d438da3947017e9fcc5362535d62e3b9a0
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-11-24 (Mon, 24 Nov 2014)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Reduces the number of calls to get_package_type.

get_package_type in the package controller is called at the start of
several functions to retrieve the type field of the package - this is
done with a direct database call.  Most of these methods will go on to
call package_show before needing the value of package_type, and so this
PR removes lots of the calls and replaces them with pkg_dict accesses
closer to the where it is needed.

_get_package_type comment has also changed to more closely reflect what
it actually does (rather than what we wish it did).

This should close #2080

  Commit: 88ebc690df3ad4da7134cb18ae5273ebdadef264
      https://github.com/ckan/ckan/commit/88ebc690df3ad4da7134cb18ae5273ebdadef264
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-11-24 (Mon, 24 Nov 2014)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  Updated docstring and added test

  Commit: 61c9851f89ea4b6e2b1446a2d2bac02390403a81
      https://github.com/ckan/ckan/commit/61c9851f89ea4b6e2b1446a2d2bac02390403a81
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-11-25 (Tue, 25 Nov 2014)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Merge branch '2065-group-org-edit-many-datasets' of github.com:wardi/ckan

  Commit: 775c417700380294b912911800ff8afb16f722bb
      https://github.com/ckan/ckan/commit/775c417700380294b912911800ff8afb16f722bb
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-11-25 (Tue, 25 Nov 2014)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/middleware.py
    M ckan/config/who.ini
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    R ckan/lib/repoze_patch.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_authenticator.py
    M ckan/tests/test_coding_standards.py
    M requirements.in
    M requirements.txt
    M test-core.ini

  Log Message:
  -----------
  Merge branch '1661-openid' of github.com:brew/ckan into brew-1661-openid

Conflicts:
	ckan/config/middleware.py

  Commit: bbf0003c09a52577c8000159c35db90b682e2485
      https://github.com/ckan/ckan/commit/bbf0003c09a52577c8000159c35db90b682e2485
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-11-25 (Tue, 25 Nov 2014)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/logic/action/get.py
    M ckan/templates/group/index.html

  Log Message:
  -----------
  [#2001] Changing template to use sort by title. Add doc for organization_list.

  Commit: 8a4d4cf90a1348b3515264de01f2874f289a1945
      https://github.com/ckan/ckan/commit/8a4d4cf90a1348b3515264de01f2874f289a1945
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-11-25 (Tue, 25 Nov 2014)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge pull request #2084 from ckan/2080-reduce-use-of-get-package-type

Reduces the number of calls to get_package_type.

  Commit: 1037a2ef70d5ca3081954ca6f380fba632564f35
      https://github.com/ckan/ckan/commit/1037a2ef70d5ca3081954ca6f380fba632564f35
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-11-25 (Tue, 25 Nov 2014)

  Changed paths:
    M ckan/logic/action/create.py

  Log Message:
  -----------
  Fixes #2089 by updating the docstring.

  Commit: 1c003970498f667fe43eeb943384be91903d206f
      https://github.com/ckan/ckan/commit/1c003970498f667fe43eeb943384be91903d206f
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-25 (Tue, 25 Nov 2014)

  Changed paths:
    M ckan/logic/action/create.py

  Log Message:
  -----------
  Merge pull request #2097 from ckan/2089-fix-package-create-docstring

Fixes #2089 by updating the docstring.

  Commit: a94558f635589071bb6246db6024fb3ae0eab92d
      https://github.com/ckan/ckan/commit/a94558f635589071bb6246db6024fb3ae0eab92d
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-11-27 (Thu, 27 Nov 2014)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/logic/action/get.py
    M ckan/templates/group/index.html
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  Merge pull request #2086 from ckan/2001-mbellotti-sort-group-by-title

Sort by title for groups and orgs

  Commit: bb35f2cd6ae9127bcdd39b0d86e5ebc4a20cbe79
      https://github.com/ckan/ckan/commit/bb35f2cd6ae9127bcdd39b0d86e5ebc4a20cbe79
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-28 (Fri, 28 Nov 2014)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/new_tests/logic/action/test_get.py

  Log Message:
  -----------
  [#1318] Don' show the full help docstring on API calls

Instead show a link to a new `help_show` action that displays it.

  Commit: bf378508bb7acd60535ab860f0efdbe211be9ae3
      https://github.com/ckan/ckan/commit/bf378508bb7acd60535ab860f0efdbe211be9ae3
  Author: amercader <amercadero at gmail.com>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  [#2108] Document OpenID changes in who.ini

  Commit: 0fef8f5802ed964d58a3f593085a55914cb803f6
      https://github.com/ckan/ckan/commit/0fef8f5802ed964d58a3f593085a55914cb803f6
  Author: amercader <amercadero at gmail.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  Merge branch '1696-groups-membership'

  Commit: c3ca36da94d9c8720c6425345e10e748ec874b91
      https://github.com/ckan/ckan/commit/c3ca36da94d9c8720c6425345e10e748ec874b91
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-12-09 (Tue, 09 Dec 2014)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  Merge branch '2034-activity-query-performance-1' of https://github.com/wardi/ckan into wardi-2034-activity-query-performance-1

  Commit: 1f923c258a95c452b142344d0c548c68fab52aba
      https://github.com/ckan/ckan/commit/1f923c258a95c452b142344d0c548c68fab52aba
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-12-09 (Tue, 09 Dec 2014)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  Merge branch 'wardi-2034-activity-query-performance-1'

  Commit: e6b85c91aec8dad48965b827b66929bf82132592
      https://github.com/ckan/ckan/commit/e6b85c91aec8dad48965b827b66929bf82132592
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-12-09 (Tue, 09 Dec 2014)

  Changed paths:
    M ckan/tests/__init__.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py

  Log Message:
  -----------
  Fix tests for API calls to check help is url

  Commit: 5119209090a2163c780e88f90f3a55b60e0bcd88
      https://github.com/ckan/ckan/commit/5119209090a2163c780e88f90f3a55b60e0bcd88
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2014-12-09 (Tue, 09 Dec 2014)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/tests/__init__.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py

  Log Message:
  -----------
  Merge pull request #1318 from ckan/1318-help_show-action

CKAN API - remove help string from standard calls

  Commit: 7e22f870898d48f1c7b7c965184fba564e3ac60b
      https://github.com/ckan/ckan/commit/7e22f870898d48f1c7b7c965184fba564e3ac60b
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-12-09 (Tue, 09 Dec 2014)

  Changed paths:
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    A ckan/migration/versions/075_remove_old_authz_model.py
    M ckan/model/__init__.py
    R ckan/model/authz.py
    M ckan/model/user.py
    M ckan/tests/functional/api/model/test_group.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/test_admin.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_user.py

  Log Message:
  -----------
  Removes the old auth models and their use.

Removes all of the old auth models, and contains a migration to delete
the now unused tables.  There are a few components still depending
(secretly behind the scenes) on PackageRole and as a result for this PR
to be complete it needs to re-implement `number_administered_packages``

  Commit: ccf41322ddc2f3133edf2d02b0e73389292a6993
      https://github.com/ckan/ckan/commit/ccf41322ddc2f3133edf2d02b0e73389292a6993
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-12-09 (Tue, 09 Dec 2014)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  Remove unused init_configuration_data

  Commit: 1a67a671071bac374c24c7de907c8f319aca8771
      https://github.com/ckan/ckan/commit/1a67a671071bac374c24c7de907c8f319aca8771
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  Removed spurious commit after creating tables

  Commit: 8bdaf04b59d16b4159a44aea6062bcdad6cfd201
      https://github.com/ckan/ckan/commit/8bdaf04b59d16b4159a44aea6062bcdad6cfd201
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Log Message:
  -----------
  MERGE conflict

Compare: https://github.com/ckan/ckan/compare/f99b9b911ac8...8bdaf04b59d1