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

Tue Dec 9 18:25:40 UTC 2014

  Branch: refs/heads/1852-default-resource-views
  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: 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: 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: 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: 29799a7f097c813a9c40be23ac86888336d50248
      https://github.com/ckan/ckan/commit/29799a7f097c813a9c40be23ac86888336d50248
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-27 (Thu, 27 Nov 2014)

  Changed paths:
    M ckan/config/environment.py
    M ckan/plugins/core.py

  Log Message:
  -----------
  [#2105] reset validator cache in update_config, not on plugin load

  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: 4a39eed25d63a9369182506ae3daad2e82c5e6f6
      https://github.com/ckan/ckan/commit/4a39eed25d63a9369182506ae3daad2e82c5e6f6
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M ckan/lib/dictization/model_save.py

  Log Message:
  -----------
  Add comment for non-obvious slice operator.

  Commit: 5c0e4a4f4dba07b300aaf345246c167289d70f55
      https://github.com/ckan/ckan/commit/5c0e4a4f4dba07b300aaf345246c167289d70f55
  Author: amercader <amercadero at gmail.com>
  Date:   2014-12-05 (Fri, 05 Dec 2014)

  Changed paths:
    A ckan/public/base/images/od_80x15_blue.png
    A ckan/public/base/images/placeholder-200x125.png
    A ckan/public/base/images/placeholder-420x220.png
    A ckan/public/base/images/placeholder-680x400.png
    M ckan/templates/development/snippets/markup.html
    M ckan/templates/footer.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/related.html

  Log Message:
  -----------
  [#1951] Host all images locally to avoid SSL errors and network problems

  Commit: 56e0e086f8f0ddd87113147a7cb8c4d9343bf5a7
      https://github.com/ckan/ckan/commit/56e0e086f8f0ddd87113147a7cb8c4d9343bf5a7
  Author: amercader <amercadero at gmail.com>
  Date:   2014-12-05 (Fri, 05 Dec 2014)

  Changed paths:
    M ckan/templates/development/snippets/markup.html
    M ckan/templates/footer.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/related.html

  Log Message:
  -----------
  [#1951] Use url_for_static everywhere

  Commit: 79680946b2c6d376dea73f85a4ce19be6d50d5e9
      https://github.com/ckan/ckan/commit/79680946b2c6d376dea73f85a4ce19be6d50d5e9
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M ckan/pastertemplates/template/ckanext/__init__.py

  Log Message:
  -----------
  [#2123] namespace boilerplate for ckanext template

  Commit: bb4123335f4f297156273fb9872da86ed9cf77dc
      https://github.com/ckan/ckan/commit/bb4123335f4f297156273fb9872da86ed9cf77dc
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M ckanext/textview/theme/public/css/text.css

  Log Message:
  -----------
  [#1982] Add max-height to text resource view

  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: 480d87bd90a4bf93ee75c00344df295956e90110
      https://github.com/ckan/ckan/commit/480d87bd90a4bf93ee75c00344df295956e90110
  Author: amercader <amercadero at gmail.com>
  Date:   2014-12-09 (Tue, 09 Dec 2014)

  Changed paths:
    M ckanext/textview/theme/public/css/text.css

  Log Message:
  -----------
  Merge branch '1982-textview-scrollbar' of https://github.com/brew/ckan into brew-1982-textview-scrollbar

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

  Changed paths:
    M ckanext/textview/theme/public/css/text.css

  Log Message:
  -----------
  Merge branch 'brew-1982-textview-scrollbar'

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

  Changed paths:
    M ckan/pastertemplates/template/ckanext/__init__.py

  Log Message:
  -----------
  Merge branch '2123-namespace-boilerplate' of https://github.com/brew/ckan into brew-2123-namespace-boilerplate

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

  Changed paths:
    M ckan/pastertemplates/template/ckanext/__init__.py

  Log Message:
  -----------
  Merge branch 'brew-2123-namespace-boilerplate'

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

  Changed paths:
    M ckan/config/environment.py
    M ckan/plugins/core.py

  Log Message:
  -----------
  Merge branch '2105-n-ivalidators' of https://github.com/wardi/ckan into wardi-2105-n-ivalidators

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

  Changed paths:
    M ckan/config/environment.py
    M ckan/plugins/core.py

  Log Message:
  -----------
  Merge branch 'wardi-2105-n-ivalidators'

  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: 9f87897e71047fe77ac63279e0fdafb77306bcdc
      https://github.com/ckan/ckan/commit/9f87897e71047fe77ac63279e0fdafb77306bcdc
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-09 (Tue, 09 Dec 2014)

  Changed paths:
    M ckan/lib/dictization/model_save.py

  Log Message:
  -----------
  Fixed comment since resource_group now gone.

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

  Changed paths:
    M ckan/lib/dictization/model_save.py

  Log Message:
  -----------
  Merge pull request #2116 from ckan/comment-slice

Add comment for non-obvious slice operator.

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

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/dictization/model_save.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 branch 'master' of github.com:ckan/ckan

  Commit: 5ccbdf64b3896675208c9ed023efe910b9dfd268
      https://github.com/ckan/ckan/commit/5ccbdf64b3896675208c9ed023efe910b9dfd268
  Author: Ian Ward <ian at excess.org>
  Date:   2014-12-09 (Tue, 09 Dec 2014)

  Changed paths:
    A ckan/public/base/images/od_80x15_blue.png
    A ckan/public/base/images/placeholder-200x125.png
    A ckan/public/base/images/placeholder-420x220.png
    A ckan/public/base/images/placeholder-680x400.png
    M ckan/templates/development/snippets/markup.html
    M ckan/templates/footer.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/related.html

  Log Message:
  -----------
  Merge branch '1951-local-images-only'

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

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/environment.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_save.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/model/activity.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/pastertemplates/template/ckanext/__init__.py
    M ckan/plugins/core.py
    A ckan/public/base/images/od_80x15_blue.png
    A ckan/public/base/images/placeholder-200x125.png
    A ckan/public/base/images/placeholder-420x220.png
    A ckan/public/base/images/placeholder-680x400.png
    M ckan/templates/development/snippets/markup.html
    M ckan/templates/footer.html
    M ckan/templates/group/index.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/related.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckanext/textview/theme/public/css/text.css

  Log Message:
  -----------
  Merge branch 'master' into 1852-default-resource-views

Conflicts:
	ckan/new_tests/logic/action/test_get.py

Compare: https://github.com/ckan/ckan/compare/21e8204fbd3d...6194b5cb32ab