[ckan-changes] [ckan/ckan] 40f59a: [#2234] Persist datastore_active as a resource ext...

GitHub noreply at github.com
Thu Feb 25 12:49:51 UTC 2016


  Branch: refs/heads/2681-lazy-json
  Home:   https://github.com/ckan/ckan
  Commit: 40f59a8ab83fcb696d2672c4725cba6572d8477c
      https://github.com/ckan/ckan/commit/40f59a8ab83fcb696d2672c4725cba6572d8477c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

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

  Log Message:
  -----------
  [#2234] Persist datastore_active as a resource extra

Rather than setting it at runtime, store a `datastore_active` resource
extra set to True on `datastore_create` and remove it on
`datastore_delete`. To keep previous behaviour `datastore_active=False`
is still added by default on `before_show`.


  Commit: 8afa23902a0657de8b3b12ff4958c4202053777e
      https://github.com/ckan/ckan/commit/8afa23902a0657de8b3b12ff4958c4202053777e
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/controllers/package.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/model/resource_view.py
    A ckan/new_tests/lib/test_cli.py
    M ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_delete.py
    M ckan/new_tests/model/test_resource.py
    M ckan/templates/organization/member_new.html
    M ckan/templates/user/read_base.html
    M ckanext/datapusher/logic/action.py
    M ckanext/multilingual/plugin.py
    R ckanext/pdfview/__init__.py
    R ckanext/pdfview/plugin.py
    R ckanext/pdfview/tests/__init__.py
    R ckanext/pdfview/tests/test_view.py
    R ckanext/pdfview/theme/public/css/pdf.css
    R ckanext/pdfview/theme/public/css/recline.css
    R ckanext/pdfview/theme/public/img/ajaxload-circle.gif
    R ckanext/pdfview/theme/public/pdf_view.js
    R ckanext/pdfview/theme/public/resource.config
    R ckanext/pdfview/theme/public/vendor/l10n/ar/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ar/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ca/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/cs/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/cs/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/da/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/de/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/de/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/el/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/es/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/he/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/he/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/it/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/it/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ja/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ko/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/locale.properties.js
    R ckanext/pdfview/theme/public/vendor/l10n/lt/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/lt/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/lt/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/nl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ro/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ro/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ru/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ru/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sv/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/tr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/vi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/viewer.properties
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-small.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/shadow.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/texture.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.js
    R ckanext/pdfview/theme/public/vendor/webL10n/README.md
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/pdfview/theme/templates/pdf.html
    M ckanext/reclineview/plugin.py
    M ckanext/textview/plugin.py
    M doc/contributing/frontend/templating.rst
    M doc/maintaining/configuration.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 2234-persist-datastore_active


  Commit: b60ab6b4091f9cfeea901a6d45e661242e7dbfb7
      https://github.com/ckan/ckan/commit/b60ab6b4091f9cfeea901a6d45e661242e7dbfb7
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#2234] Fix commented lines


  Commit: 66549991119191fb00a7aaf907e4027036df4561
      https://github.com/ckan/ckan/commit/66549991119191fb00a7aaf907e4027036df4561
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M ckan/lib/mailer.py
    A ckan/templates/emails/invite_user.txt
    A ckan/templates/emails/reset_password.txt
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#1527] Make emails customizable

Read the reset password and invite user emails body from text templates
(which are magically translated!) and the subjects from config options.


  Commit: 9eeb6a7a7f590049dbc22fa39b03c24a08691eb8
      https://github.com/ckan/ckan/commit/9eeb6a7a7f590049dbc22fa39b03c24a08691eb8
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M ckan/lib/mailer.py
    R ckan/tests/legacy/lib/test_mailer.py
    R ckan/tests/legacy/mock_mail_server.py
    A ckan/tests/lib/test_mailer.py
    A ckan/tests/mock_mail_server.py

  Log Message:
  -----------
  [#1527] Update mailing tests


  Commit: 3a863ab446d5cd7e33f4f2de716b3b6884ca0124
      https://github.com/ckan/ckan/commit/3a863ab446d5cd7e33f4f2de716b3b6884ca0124
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M ckan/lib/mailer.py
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  [#1527] PEP8


  Commit: 52e033586b95be99782081bece2a5899208678d2
      https://github.com/ckan/ckan/commit/52e033586b95be99782081bece2a5899208678d2
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M ckan/tests/lib/test_mailer.py

  Log Message:
  -----------
  [#1527] Fix wrong import


  Commit: c0c6e90ac7af0faf8bfa67c3d05900c71296e3be
      https://github.com/ckan/ckan/commit/c0c6e90ac7af0faf8bfa67c3d05900c71296e3be
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M ckan/lib/mailer.py
    M ckan/tests/lib/test_mailer.py

  Log Message:
  -----------
  [#1527] Fix bug on From header, added test


  Commit: 1830e2e98ed6de3e9a07a6f31a147fdebbf68295
      https://github.com/ckan/ckan/commit/1830e2e98ed6de3e9a07a6f31a147fdebbf68295
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

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

  Log Message:
  -----------
  [#1527] Raise NotFound on user invite if group does not exist


  Commit: 281996344f1c6f84af9ecc2679dc8c8a42aab41e
      https://github.com/ckan/ckan/commit/281996344f1c6f84af9ecc2679dc8c8a42aab41e
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/logic/action/create.py
    M ckan/templates/emails/invite_user.txt
    M ckan/tests/lib/test_mailer.py

  Log Message:
  -----------
  [#1527] Add information about the org/group and role to the invite email

The current invite email doesn't really give you much information about
what you are actually signing for. This adds the organization title and
the role that you've been assigned to the invite email.


  Commit: 3607016766108f09aed076861f4dd21818e2f9fd
      https://github.com/ckan/ckan/commit/3607016766108f09aed076861f4dd21818e2f9fd
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    A ckan/tests/legacy/mock_mail_server.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/lib/test_mailer.py
    R ckan/tests/mock_mail_server.py

  Log Message:
  -----------
  [#1527] Keep mock email server on legacy folder


  Commit: 422df7555c477ab04ceb2281940e10a8b5834855
      https://github.com/ckan/ckan/commit/422df7555c477ab04ceb2281940e10a8b5834855
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M ckan/lib/mailer.py
    A ckan/templates/emails/invite_user_subject.txt
    A ckan/templates/emails/reset_password_subject.txt
    M ckan/tests/lib/test_mailer.py
    A ckanext/example_theme/custom_emails/__init__.py
    A ckanext/example_theme/custom_emails/plugin.py
    A ckanext/example_theme/custom_emails/templates/emails/invite_user.txt
    A ckanext/example_theme/custom_emails/templates/emails/invite_user_subject.txt
    A ckanext/example_theme/custom_emails/templates/emails/reset_password.txt
    A ckanext/example_theme/custom_emails/templates/emails/reset_password_subject.txt
    A ckanext/example_theme/custom_emails/tests.py
    M doc/maintaining/configuration.rst
    M setup.py

  Log Message:
  -----------
  [#1527] Read email subjects from templates as well

As per @wardi's suggestion. Added a new example plugin with tests


  Commit: c3b6fc6431be0f877c7c0b5803938bc967a32de2
      https://github.com/ckan/ckan/commit/c3b6fc6431be0f877c7c0b5803938bc967a32de2
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M ckan/tests/lib/test_mailer.py
    M setup.py

  Log Message:
  -----------
  [#1527] Fix assert_in import, failing on Travis because nose/unitest versions


  Commit: be28d6bac9178b15627fb950878a16b1c7962306
      https://github.com/ckan/ckan/commit/be28d6bac9178b15627fb950878a16b1c7962306
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M ckanext/example_theme/custom_emails/tests.py

  Log Message:
  -----------
  [#1527] Fix assert_in import, failing on Travis because nose/unitest versions


  Commit: 2d160215f7f55582ad66b724b6ab7817937d7690
      https://github.com/ckan/ckan/commit/2d160215f7f55582ad66b724b6ab7817937d7690
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-07-28 (Tue, 28 Jul 2015)

  Changed paths:
    M requirements.txt

  Log Message:
  -----------
  Reorder requirements.txt - no actual changes


  Commit: 0f1c8582d38089da5bddce93028bd5249f170e51
      https://github.com/ckan/ckan/commit/0f1c8582d38089da5bddce93028bd5249f170e51
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-07-28 (Tue, 28 Jul 2015)

  Changed paths:
    M dev-requirements.txt
    M requirements.txt

  Log Message:
  -----------
  Update requirements.txt purely by running pip-compile (assume 1.1.2 is a newer version from when it was run before, hence the new order and comments).


  Commit: ab044562d383f2e734cb02dd5b2b6922dbb2699c
      https://github.com/ckan/ckan/commit/ab044562d383f2e734cb02dd5b2b6922dbb2699c
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-08-19 (Wed, 19 Aug 2015)

  Changed paths:
    A ckan/tests/plugins/test_toolkit.py

  Log Message:
  -----------
  Add test for ckan version checkers.


  Commit: 4d8264caf82cbb078ef1789294fa526b5d9a92f5
      https://github.com/ckan/ckan/commit/4d8264caf82cbb078ef1789294fa526b5d9a92f5
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2015-08-24 (Mon, 24 Aug 2015)

  Changed paths:
    M ckan/lib/search/__init__.py

  Log Message:
  -----------
  (Showstopper) Don't crash when crashing.

If an error occurs (especially when importing data using paster) that
contains a unicode string (such as a multilingual package name), the
try...catch will also crash when attempting to print it, resulting in
some very confusing stack traces that bury the real stack trace.


  Commit: 796e95412c9edc05f44181a53ad86c3147eb24ac
      https://github.com/ckan/ckan/commit/796e95412c9edc05f44181a53ad86c3147eb24ac
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-09-02 (Wed, 02 Sep 2015)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    R ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/079_remove_related_items.py
    M ckan/model/__init__.py
    M ckan/model/group.py
    R ckan/model/related.py
    M ckan/public/base/test/index.html
    R ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/package/read_base.html
    R ckan/templates/package/related_list.html
    R ckan/templates/related/base_form_page.html
    R ckan/templates/related/confirm_delete.html
    R ckan/templates/related/dashboard.html
    R ckan/templates/related/edit.html
    R ckan/templates/related/edit_form.html
    R ckan/templates/related/new.html
    R ckan/templates/related/snippets/related_form.html
    R ckan/templates/related/snippets/related_item.html
    R ckan/templates/related/snippets/related_list.html
    R ckan/templates/snippets/related.html
    M ckan/tests/factories.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/functional/test_home.py
    R ckan/tests/legacy/functional/test_related.py
    M ckan/tests/legacy/functional/test_revision.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/auth/test_init.py
    M ckan/tests/test_factories.py

  Log Message:
  -----------
  Removes the related item feature

Once users are migrated over to ckanext-showcase, this PR will remove all traces
of the related-items feature from core.


  Commit: 78ca144d28a796c6c651d1df03e945fe7e6eb174
      https://github.com/ckan/ckan/commit/78ca144d28a796c6c651d1df03e945fe7e6eb174
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M ckan/controllers/group.py
    M ckanext/example_igroupform/plugin.py
    A ckanext/example_igroupform/templates/example_igroup_form/group_form.html
    M ckanext/example_igroupform/tests/test_controllers.py
    M setup.py

  Log Message:
  -----------
  [#2617] Fix to allow IGroupForm group_form use.

This commit allows extensions implementing IGroupForm's group_form
method to define a custom form template that will be used for the
default group type, 'group'.


  Commit: 6eefe9bbc017d6859a1ef48d4dafff8fd66d14dc
      https://github.com/ckan/ckan/commit/6eefe9bbc017d6859a1ef48d4dafff8fd66d14dc
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#2617] package_form --> group_form in IGroupForm


  Commit: 5dd9cd8dc96505841893d741200085948f41f30c
      https://github.com/ckan/ckan/commit/5dd9cd8dc96505841893d741200085948f41f30c
  Author: Tryggvi Bjorgvinsson <tryggvi.bjorgvinsson at okfn.org>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

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

  Log Message:
  -----------
  Fix api documentation parameter name typo for config_option_show

A minor documentation fix. The function
logic.action.get.config_option_show needs a parameter to identify
what config option value to show. That parameter is called 'key'
but the documentation stated that it's called 'id' which therefore
isn't correct.


  Commit: 17b0a0938a08736d3624fcbf0d6fc865398266ff
      https://github.com/ckan/ckan/commit/17b0a0938a08736d3624fcbf0d6fc865398266ff
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-09-11 (Fri, 11 Sep 2015)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  Removes deprecation warning.

Tests were logging

DeprecationWarning: BaseException.message has been deprecated as of Python 2.6

every time something tried to extract a message from an exception extending
ActionError.  This PR fixes that and also does PEP8 on the __init__.py file.


  Commit: 32198591188acecdfc90c76bc412dfc57b1d5e54
      https://github.com/ckan/ckan/commit/32198591188acecdfc90c76bc412dfc57b1d5e54
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-09-11 (Fri, 11 Sep 2015)

  Changed paths:
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  Remove ckan/logic/__init__ from PEP8 blacklist


  Commit: b0b7fb10e5166461860c834317b2dfa278c50b37
      https://github.com/ckan/ckan/commit/b0b7fb10e5166461860c834317b2dfa278c50b37
  Author: amercader <amercadero at gmail.com>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M ckan/i18n/check_po_files.py

  Log Message:
  -----------
  [#2613] Improve check_po_files to take plural forms into account


  Commit: 0e8d4dc68bbed0b7db74e27dae23258e7d89c3d4
      https://github.com/ckan/ckan/commit/0e8d4dc68bbed0b7db74e27dae23258e7d89c3d4
  Author: amercader <amercadero at gmail.com>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M ckan/i18n/check_po_files.py
    A ckan/tests/i18n/test_check_po_files.py

  Log Message:
  -----------
  [#2613] Add tests for check_po_files

Move the validator ones to the tests rather than the module


  Commit: 595b330642b5515321ee193f00797276cfe2d03a
      https://github.com/ckan/ckan/commit/595b330642b5515321ee193f00797276cfe2d03a
  Author: amercader <amercadero at gmail.com>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M ckan/lib/email_notifications.py
    M ckan/templates/activity_streams/activity_stream_email_notifications.text

  Log Message:
  -----------
  [#2613] Fix a couple of singular/plural ungettext calls

Both singular and plural forms must have the {placeholders}


  Commit: 2a3d575225169107d2eb6222f028f9b5ff3c388e
      https://github.com/ckan/ckan/commit/2a3d575225169107d2eb6222f028f9b5ff3c388e
  Author: amercader <amercadero at gmail.com>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  [#2613] Whitelist PEP8 check_po_files


  Commit: cd53881325f87a5c2e92257507bea5a0f638f2bf
      https://github.com/ckan/ckan/commit/cd53881325f87a5c2e92257507bea5a0f638f2bf
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-16 (Wed, 16 Sep 2015)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#2647] user_show include_password_hash parameter


  Commit: d35ec41527e72e15787de9e4bd60e2fc19142a0f
      https://github.com/ckan/ckan/commit/d35ec41527e72e15787de9e4bd60e2fc19142a0f
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

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

  Log Message:
  -----------
  [#2647] user_create accept password_hash from sysadmin


  Commit: aa597433df33f09e57ee9cd18e2e61cfe39679d1
      https://github.com/ckan/ckan/commit/aa597433df33f09e57ee9cd18e2e61cfe39679d1
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

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

  Log Message:
  -----------
  [#2647] user_update accept password_hash from sysadmin


  Commit: 5512fea72ef96159762bc7ce14349872eb989309
      https://github.com/ckan/ckan/commit/5512fea72ef96159762bc7ce14349872eb989309
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  [#2647] include_password_hash tests


  Commit: 2a6d0ec586e8d79fcc6d6bb202417d78d52e9e07
      https://github.com/ckan/ckan/commit/2a6d0ec586e8d79fcc6d6bb202417d78d52e9e07
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#2647] fix check for password_hash in user_password_not_empty


  Commit: 46ec9880d8a6393c9809ff7ae5b3aaeb7be81d91
      https://github.com/ckan/ckan/commit/46ec9880d8a6393c9809ff7ae5b3aaeb7be81d91
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_update.py

  Log Message:
  -----------
  [#2647] test for user_create, user_update


  Commit: 43cb0863be792a23003faeee5fca110e43bbd069
      https://github.com/ckan/ckan/commit/43cb0863be792a23003faeee5fca110e43bbd069
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_update.py

  Log Message:
  -----------
  [#2647] pep8


  Commit: 2c5e3ce87fff1474abcc752bc820085dfef8eec4
      https://github.com/ckan/ckan/commit/2c5e3ce87fff1474abcc752bc820085dfef8eec4
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  [#2654] Add Pylons ungettext to toolkit


  Commit: 85bbec4ea41ab9ac2c254c973db11155509c2b31
      https://github.com/ckan/ckan/commit/85bbec4ea41ab9ac2c254c973db11155509c2b31
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

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

  Log Message:
  -----------
  [#2647] Use user navl schema instead of authz


  Commit: 2a6bd60dfc66d319c4b64fccaf1cafa91cd7bb57
      https://github.com/ckan/ckan/commit/2a6bd60dfc66d319c4b64fccaf1cafa91cd7bb57
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#2647] fix user schema


  Commit: c17080a32cfb3196ec89179a2ee1151c06381258
      https://github.com/ckan/ckan/commit/c17080a32cfb3196ec89179a2ee1151c06381258
  Author: Stefan Novak <stefan at novak.io>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M ckan/lib/helpers.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  allow url schemes to be configured in config


  Commit: b847f7fd0b5f4fd33e66078e455a40716ec440fb
      https://github.com/ckan/ckan/commit/b847f7fd0b5f4fd33e66078e455a40716ec440fb
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-06 (Tue, 06 Oct 2015)

  Changed paths:
    M ckan/lib/munge.py
    M ckan/tests/lib/test_munge.py

  Log Message:
  -----------
  [#2669] Fix title munge resulting in multiple dashes.


  Commit: 50a98caf02ede59c0f7c6cf7e4aa738424ee49c4
      https://github.com/ckan/ckan/commit/50a98caf02ede59c0f7c6cf7e4aa738424ee49c4
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

  Changed paths:
    M requirements.txt

  Log Message:
  -----------
  [#2561] Run pip-compile again


  Commit: 5f10aef6b8bfd4baa931678f9fdcb7e86c38aeaf
      https://github.com/ckan/ckan/commit/5f10aef6b8bfd4baa931678f9fdcb7e86c38aeaf
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

  Changed paths:
    M CHANGELOG.rst
    M bin/less
    M ckan/authz.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    R ckan/controllers/related.py
    M ckan/controllers/storage.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    A ckan/lib/lazyjson.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/update.py
    A ckan/migration/versions/078_remove_old_authz_model.py
    A ckan/migration/versions/079_resource_revision_index.py
    A ckan/migration/versions/080_continuity_id_indexes.py
    M ckan/model/__init__.py
    R ckan/model/authz.py
    M ckan/model/domain_object.py
    M ckan/model/group.py
    M ckan/model/modification.py
    M ckan/pastertemplates/__init__.py
    A ckan/pastertemplates/template/setup.cfg_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/main.js
    M ckan/public/base/test/index.html
    A ckan/public/base/vendor/moment-with-locales.js
    M ckan/public/base/vendor/resource.config
    R ckan/public/css/boilerplate.css
    R ckan/public/css/bootstrap.min.css
    R ckan/public/css/chosen.css
    R ckan/public/css/forms.css
    R ckan/public/css/handheld.css
    R ckan/public/css/style.css
    R ckan/public/images/bullet_separator.png
    R ckan/public/images/button-shadow.png
    R ckan/public/images/chevron-down.png
    R ckan/public/images/chevron-up.png
    R ckan/public/images/chosen-sprite.png
    R ckan/public/images/ckan_logo_fullname_long.png
    R ckan/public/images/dlbg.png
    R ckan/public/images/dragbars.png
    R ckan/public/images/icons/add.png
    R ckan/public/images/icons/arrow-closed.gif
    R ckan/public/images/icons/arrow-down-16.png
    R ckan/public/images/icons/arrow-down-32.png
    R ckan/public/images/icons/arrow-open.gif
    R ckan/public/images/icons/arrow-right-16-black.png
    R ckan/public/images/icons/arrow-right-16.png
    R ckan/public/images/icons/arrow-right-32.png
    R ckan/public/images/icons/arrow_down.png
    R ckan/public/images/icons/arrow_down_grey.png
    R ckan/public/images/icons/arrow_up.png
    R ckan/public/images/icons/atom_feed.png
    R ckan/public/images/icons/ckan.ico
    R ckan/public/images/icons/comments.png
    R ckan/public/images/icons/delete.png
    R ckan/public/images/icons/door.png
    R ckan/public/images/icons/door_grey.png
    R ckan/public/images/icons/door_open.png
    R ckan/public/images/icons/drive_web.png
    R ckan/public/images/icons/edit-collapse.png
    R ckan/public/images/icons/edit-expand.png
    R ckan/public/images/icons/error.png
    R ckan/public/images/icons/followers.png
    R ckan/public/images/icons/group.png
    R ckan/public/images/icons/group_add.png
    R ckan/public/images/icons/group_edit.png
    R ckan/public/images/icons/key.png
    R ckan/public/images/icons/lock.png
    R ckan/public/images/icons/magnifier.png
    R ckan/public/images/icons/note.png
    R ckan/public/images/icons/openid.png
    R ckan/public/images/icons/package-disabled.png
    R ckan/public/images/icons/package.png
    R ckan/public/images/icons/package_add.png
    R ckan/public/images/icons/package_edit.png
    R ckan/public/images/icons/page_stack.png
    R ckan/public/images/icons/page_white.png
    R ckan/public/images/icons/page_white_add.png
    R ckan/public/images/icons/page_white_code.png
    R ckan/public/images/icons/page_white_compressed.png
    R ckan/public/images/icons/page_white_cup.png
    R ckan/public/images/icons/page_white_database.png
    R ckan/public/images/icons/page_white_error.png
    R ckan/public/images/icons/page_white_excel.png
    R ckan/public/images/icons/page_white_gear.png
    R ckan/public/images/icons/page_white_json.png
    R ckan/public/images/icons/page_white_link.png
    R ckan/public/images/icons/page_white_rdf.png
    R ckan/public/images/icons/page_white_stack.png
    R ckan/public/images/icons/page_white_text.png
    R ckan/public/images/icons/pencil.png
    R ckan/public/images/icons/remove.png
    R ckan/public/images/icons/star.png
    R ckan/public/images/icons/tag_blue.png
    R ckan/public/images/icons/unfilter.png
    R ckan/public/images/icons/user.png
    R ckan/public/images/icons/user_grey.png
    R ckan/public/images/icons/world_go.png
    R ckan/public/images/ldquo.png
    R ckan/public/images/photo-placeholder.png
    R ckan/public/images/stars.png
    R ckan/public/img/collaborate.png
    R ckan/public/img/find.png
    R ckan/public/img/glyphicons-halflings-white.png
    R ckan/public/img/glyphicons-halflings.png
    R ckan/public/img/lod2.png
    R ckan/public/img/logo.png
    R ckan/public/img/logo_64px_wide.png
    R ckan/public/img/share.png
    R ckan/public/scripts/application.js
    R ckan/public/scripts/dataexplorer/icon-sprite.png
    R ckan/public/scripts/dataexplorer/loading.gif
    R ckan/public/scripts/dataexplorer/table-view-template.js
    R ckan/public/scripts/dataexplorer/table-view.css
    R ckan/public/scripts/dataexplorer/table-view.js
    R ckan/public/scripts/dataexplorer/table-view.ui.js
    R ckan/public/scripts/outside.js
    R ckan/public/scripts/templates.js
    R ckan/public/scripts/vendor/backbone/0.5.1/backbone.js
    R ckan/public/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js
    R ckan/public/scripts/vendor/flot/0.7/excanvas.js
    R ckan/public/scripts/vendor/flot/0.7/jquery.flot.js
    R ckan/public/scripts/vendor/html5shiv/html5.js
    R ckan/public/scripts/vendor/jquery.chosen/0.9.7/chosen.js
    R ckan/public/scripts/vendor/jquery.cookie/jquery.cookie.min.js
    R ckan/public/scripts/vendor/jquery.event.drag/2.0/jquery.event.drag.min.js
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.fileupload-ui.css
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.fileupload-ui.js
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.fileupload.js
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.iframe-transport.js
    R ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
    R ckan/public/scripts/vendor/jquery.placeholder/jquery.placeholder.js
    R ckan/public/scripts/vendor/jquery.tmpl/beta1/jquery.tmpl.js
    R ckan/public/scripts/vendor/jquery/1.7.1/jquery.js
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_0_000_40x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_100_000_40x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_75_ffffff_40x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_100_f0f0f0_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_55_fbf9ee_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_65_ffffff_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_75_dadada_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_95_fef1ec_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_highlight-soft_100_f0f0f0_1x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_000_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_222222_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_2e83ff_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_444444_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_888888_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_b22_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_cd0a0a_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/jquery-ui.custom.css
    R ckan/public/scripts/vendor/jqueryui/1.8.14/jquery-ui.min.js
    R ckan/public/scripts/vendor/json2.js
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/layers.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/marker-shadow.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/marker.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/popup-close.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/zoom-in.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/zoom-out.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.css
    R ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.ie.css
    R ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.js
    R ckan/public/scripts/vendor/modernizr/1.7/modernizr.min.js
    R ckan/public/scripts/vendor/moment/1.6.2/moment.js
    R ckan/public/scripts/vendor/mustache/0.5.0-dev/mustache.js
    R ckan/public/scripts/vendor/openid-selector/css/openid.css
    R ckan/public/scripts/vendor/openid-selector/images/aol.gif
    R ckan/public/scripts/vendor/openid-selector/images/blogger.ico
    R ckan/public/scripts/vendor/openid-selector/images/claimid.ico
    R ckan/public/scripts/vendor/openid-selector/images/facebook.gif
    R ckan/public/scripts/vendor/openid-selector/images/flickr.ico
    R ckan/public/scripts/vendor/openid-selector/images/google.gif
    R ckan/public/scripts/vendor/openid-selector/images/livejournal.ico
    R ckan/public/scripts/vendor/openid-selector/images/myopenid.ico
    R ckan/public/scripts/vendor/openid-selector/images/openid-inputicon.gif
    R ckan/public/scripts/vendor/openid-selector/images/openid.gif
    R ckan/public/scripts/vendor/openid-selector/images/technorati.ico
    R ckan/public/scripts/vendor/openid-selector/images/verisign.gif
    R ckan/public/scripts/vendor/openid-selector/images/verisign.ico
    R ckan/public/scripts/vendor/openid-selector/images/vidoop.ico
    R ckan/public/scripts/vendor/openid-selector/images/wordpress.ico
    R ckan/public/scripts/vendor/openid-selector/images/yahoo.gif
    R ckan/public/scripts/vendor/openid-selector/js/jquery-1.2.6.min.js
    R ckan/public/scripts/vendor/openid-selector/js/openid-jquery.js
    R ckan/public/scripts/vendor/recline/css/recline.css
    R ckan/public/scripts/vendor/resize/resize.js
    R ckan/public/scripts/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    R ckan/public/scripts/vendor/slickgrid/2.0.1/README.txt
    R ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-asc.gif
    R ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-desc.gif
    R ckan/public/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    R ckan/public/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    R ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.css
    R ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckan/public/scripts/vendor/underscore/1.1.6/underscore.js
    R ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/read.html
    R ckan/templates/package/read.n3
    R ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/snippets/additional_info.html
    R ckan/templates/related/base_form_page.html
    R ckan/templates/related/confirm_delete.html
    R ckan/templates/related/dashboard.html
    R ckan/templates/related/edit.html
    R ckan/templates/related/edit_form.html
    R ckan/templates/related/new.html
    R ckan/templates/related/snippets/related_form.html
    R ckan/templates/related/snippets/related_item.html
    R ckan/templates/related/snippets/related_list.html
    A ckan/templates/snippets/local_friendly_datetime.html
    M ckan/templates/snippets/organization_item.html
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_group.py
    A ckan/tests/controllers/test_home.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    A ckan/tests/controllers/test_tags.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/ckantestplugins.py
    M ckan/tests/legacy/functional/api/model/test_group.py
    R ckan/tests/legacy/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/model/test_tag.py
    M ckan/tests/legacy/functional/api/test_package_search.py
    R ckan/tests/legacy/functional/api/test_revision_search.py
    M ckan/tests/legacy/functional/test_admin.py
    M ckan/tests/legacy/functional/test_group.py
    R ckan/tests/legacy/functional/test_home.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/legacy/functional/test_related.py
    R ckan/tests/legacy/functional/test_storage.py
    M ckan/tests/legacy/lib/test_cli.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/legacy/lib/test_dictization_schema.py
    M ckan/tests/legacy/lib/test_helpers.py
    M ckan/tests/legacy/lib/test_solr_package_search.py
    M ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/legacy/models/test_user.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_plugins.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.py
    A ckanext/datapusher/interfaces.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    A ckanext/datastore/tests/test_disable.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    A ckanext/example_itranslation/__init__.py
    A ckanext/example_itranslation/babel_mapping.cfg
    A ckanext/example_itranslation/i18n/ckanext-example_itranslation.pot
    A ckanext/example_itranslation/i18n/en/LC_MESSAGES/ckanext-example_itranslation.mo
    A ckanext/example_itranslation/i18n/en/LC_MESSAGES/ckanext-example_itranslation.po
    A ckanext/example_itranslation/i18n/en/LC_MESSAGES/ckanext-example_translation.po
    A ckanext/example_itranslation/i18n/fr/LC_MESSAGES/ckanext-example_itranslation.mo
    A ckanext/example_itranslation/i18n/fr/LC_MESSAGES/ckanext-example_itranslation.po
    A ckanext/example_itranslation/plugin.py
    A ckanext/example_itranslation/plugin_v1.py
    A ckanext/example_itranslation/setup.cfg
    A ckanext/example_itranslation/templates/home/index.html
    A ckanext/example_itranslation/tests/__init__.py
    A ckanext/example_itranslation/tests/test_plugin.py
    M ckanext/example_theme/v08_custom_helper_function/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/stats/controller.py
    R ckanext/stats/public/ckanext/stats/app.js
    R ckanext/stats/public/ckanext/stats/demo.html
    R ckanext/stats/public/ckanext/stats/style.css
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    R ckanext/stats/templates_legacy/__init__.py
    R ckanext/stats/templates_legacy/ckanext/__init__.py
    R ckanext/stats/templates_legacy/ckanext/stats/__init__.py
    R ckanext/stats/templates_legacy/ckanext/stats/index.html
    R ckanext/stats/templates_legacy/ckanext/stats/leaderboard.html
    M ckanext/stats/tests/test_stats_lib.py
    R doc/api.rst
    M doc/api/legacy-api.rst
    M doc/contents.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/issues.rst
    M doc/contributing/reviewing.rst
    M doc/extensions/index.rst
    A doc/extensions/translating-extensions.rst
    M doc/index.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/linked-data-and-rdf.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into upgrade-requirements

Conflicts:
	requirements.txt


  Commit: 301efbaa8040af7e9c75998f8e961aa51ac3fd73
      https://github.com/ckan/ckan/commit/301efbaa8040af7e9c75998f8e961aa51ac3fd73
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

  Changed paths:
    M ckan/lib/lazyjson.py
    M ckan/logic/action/get.py
    A ckan/tests/lib/test_lazyjson.py

  Log Message:
  -----------
  [#2561] Add test to show issue with lazy json and the newer simplejson library.


  Commit: 7cd6cc13cb570b62748bb7c885155561ed7b8edd
      https://github.com/ckan/ckan/commit/7cd6cc13cb570b62748bb7c885155561ed7b8edd
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-12 (Mon, 12 Oct 2015)

  Changed paths:
    M requirements.txt

  Log Message:
  -----------
  [#2561] Use old version of simplejson for now cos of #2681.


  Commit: 34e143bc6e5a2a940535536f7bf383be4ee9e867
      https://github.com/ckan/ckan/commit/34e143bc6e5a2a940535536f7bf383be4ee9e867
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-12 (Mon, 12 Oct 2015)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into upgrade-requirements

Conflicts:
	requirements.txt


  Commit: ab46d45f932cfb8062c3d1e40bb402ee193b9578
      https://github.com/ckan/ckan/commit/ab46d45f932cfb8062c3d1e40bb402ee193b9578
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-12 (Mon, 12 Oct 2015)

  Changed paths:
    M ckan/lib/lazyjson.py
    M ckan/logic/action/get.py
    R ckan/tests/lib/test_lazyjson.py

  Log Message:
  -----------
  Revert "[#2561] Add test to show issue with lazy json and the newer simplejson library."

This reverts commit 301efbaa8040af7e9c75998f8e961aa51ac3fd73.


  Commit: ac221ec98d73943ae0a7028cc1ab9fba23988509
      https://github.com/ckan/ckan/commit/ac221ec98d73943ae0a7028cc1ab9fba23988509
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-10-15 (Thu, 15 Oct 2015)

  Changed paths:
    M ckan/lib/munge.py
    M ckan/tests/lib/test_munge.py

  Log Message:
  -----------
  Merge pull request #2675 from ckan/munge-improve

Fix title munge resulting in multiple dashes


  Commit: 8465a72759d5219d99a75b5cfb16cf7f77fe33c4
      https://github.com/ckan/ckan/commit/8465a72759d5219d99a75b5cfb16cf7f77fe33c4
  Author: amercader <amercadero at gmail.com>
  Date:   2015-10-15 (Thu, 15 Oct 2015)

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

  Log Message:
  -----------
  [#2589] Document hard limit on package_search


  Commit: 4c267bf3e5a5185e0e5319c2c5b7f55c249149f8
      https://github.com/ckan/ckan/commit/4c267bf3e5a5185e0e5319c2c5b7f55c249149f8
  Author: alexandru-m-g <alexandru-m-g at users.noreply.github.com>
  Date:   2015-10-19 (Mon, 19 Oct 2015)

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

  Log Message:
  -----------
  pacakge_search: improve speed on getting facet display names for orgs and groups


  Commit: b6bf279d98a6e0eb3739d60b908c7b63ef15e5fc
      https://github.com/ckan/ckan/commit/b6bf279d98a6e0eb3739d60b908c7b63ef15e5fc
  Author: alexandru-m-g <alexandru-m-g at users.noreply.github.com>
  Date:   2015-10-19 (Mon, 19 Oct 2015)

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

  Log Message:
  -----------
  pacakge_search: pkg variable no longer exists after trusting solr for getting the package data


  Commit: 839e2309e93e35c762c0e1a1e2b5614be5f54049
      https://github.com/ckan/ckan/commit/839e2309e93e35c762c0e1a1e2b5614be5f54049
  Author: alexandru-m-g <alexandru-m-g at users.noreply.github.com>
  Date:   2015-10-19 (Mon, 19 Oct 2015)

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

  Log Message:
  -----------
  pacakge_search: changing dict comprehension syntax to be 2.6 compatible


  Commit: 60baef5a3566ea3ee3fa948cf8bf62b3aeb5aa56
      https://github.com/ckan/ckan/commit/60baef5a3566ea3ee3fa948cf8bf62b3aeb5aa56
  Author: amercader <amercadero at gmail.com>
  Date:   2015-10-19 (Mon, 19 Oct 2015)

  Changed paths:
    M dev-requirements.txt
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'upgrade-requirements'


  Commit: 2f8d75c4da1ce5bf1fe9c59ab0f9aa8e3cd32270
      https://github.com/ckan/ckan/commit/2f8d75c4da1ce5bf1fe9c59ab0f9aa8e3cd32270
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

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

  Log Message:
  -----------
  Merge pull request #2589 from ckan/2589-document-dataset-limit

Package_search does not return more than a 1000 rows


  Commit: b33a08d3c3d1afc9daccdfe149622950326c388d
      https://github.com/ckan/ckan/commit/b33a08d3c3d1afc9daccdfe149622950326c388d
  Author: Ian Ward <ian at excess.org>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M ckan/templates/package/snippets/resource_form.html

  Log Message:
  -----------
  [#2696] errors block for resource_form to match package_form


  Commit: b6d6a25d0183b9eb35b598ea9a51c7da2c096401
      https://github.com/ckan/ckan/commit/b6d6a25d0183b9eb35b598ea9a51c7da2c096401
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

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

  Log Message:
  -----------
  Make sure package_autocomplete uses LIKE with wildcards

The current implementation uses 'q%' to search for packages starting
with a certain search term. This commit changes this to use the
following format: '%q%', thus search for the term anywhere in the title
and name field.


  Commit: 91f3fa27c3e155dc06266193069e3a035b4f1fb3
      https://github.com/ckan/ckan/commit/91f3fa27c3e155dc06266193069e3a035b4f1fb3
  Author: amercader <amercadero at gmail.com>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
    M .coveragerc
    M CHANGELOG.rst
    R bin/canada.py
    R bin/ckan-correct-tags.py
    R bin/ckan-edit-tags.py
    R bin/ckan-edit-tags2.py
    R bin/ckan-hmg-breakdown.py
    R bin/ckan-hmg-update-licenses.py
    R bin/ckan-rest-edit-tags.py
    R bin/ckan_edit_local.py
    R bin/ckan_spam.py
    R bin/copy-ckan-2-ckan.py
    R bin/dump-ukgov.py
    R bin/dump_23_pkgs.py
    R bin/fixes.py
    M bin/less
    R bin/loadconfig.py
    R bin/ons-load.py
    R bin/revision_manager.py
    R bin/status.py
    R bin/talisckan.py
    R bin/webstore_test.py
    M ckan/__init__.py
    A ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    R ckan/controllers/related.py
    M ckan/controllers/storage.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    M ckan/i18n/eu/LC_MESSAGES/ckan.mo
    M ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lo/LC_MESSAGES/ckan.mo
    M ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    M ckan/i18n/my/LC_MESSAGES/ckan.mo
    M ckan/i18n/my/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    A ckan/i18n/ne/LC_MESSAGES/ckan.mo
    A ckan/i18n/ne/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/sw/LC_MESSAGES/ckan.mo
    M ckan/i18n/sw/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/captcha.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    A ckan/lib/lazyjson.py
    M ckan/lib/mailer.py
    M ckan/lib/munge.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/uploader.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/077_add_revisions_to_system_info.py
    A ckan/migration/versions/078_remove_old_authz_model.py
    A ckan/migration/versions/079_resource_revision_index.py
    A ckan/migration/versions/080_continuity_id_indexes.py
    M ckan/model/__init__.py
    R ckan/model/authz.py
    M ckan/model/domain_object.py
    M ckan/model/group.py
    M ckan/model/license.py
    M ckan/model/modification.py
    M ckan/model/system_info.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests.py
    R ckan/new_tests/__init__.py
    R ckan/new_tests/config/__init__.py
    R ckan/new_tests/controllers/__init__.py
    R ckan/new_tests/controllers/test_api.py
    R ckan/new_tests/controllers/test_feed.py
    R ckan/new_tests/controllers/test_group.py
    R ckan/new_tests/controllers/test_package.py
    R ckan/new_tests/controllers/test_util.py
    R ckan/new_tests/factories.py
    R ckan/new_tests/helpers.py
    R ckan/new_tests/lib/__init__.py
    R ckan/new_tests/lib/dictization/__init__.py
    R ckan/new_tests/lib/dictization/test_model_dictize.py
    R ckan/new_tests/lib/navl/__init__.py
    R ckan/new_tests/lib/navl/test_dictization_functions.py
    R ckan/new_tests/lib/navl/test_validators.py
    R ckan/new_tests/lib/search/__init__.py
    R ckan/new_tests/lib/search/test_index.py
    R ckan/new_tests/lib/test_auth_tkt.py
    R ckan/new_tests/lib/test_base.py
    R ckan/new_tests/lib/test_cli.py
    R ckan/new_tests/lib/test_config_tool.py
    R ckan/new_tests/lib/test_datapreview.py
    R ckan/new_tests/lib/test_helpers.py
    R ckan/new_tests/lib/test_munge.py
    R ckan/new_tests/logic/__init__.py
    R ckan/new_tests/logic/action/__init__.py
    R ckan/new_tests/logic/action/test_create.py
    R ckan/new_tests/logic/action/test_delete.py
    R ckan/new_tests/logic/action/test_get.py
    R ckan/new_tests/logic/action/test_patch.py
    R ckan/new_tests/logic/action/test_update.py
    R ckan/new_tests/logic/auth/__init__.py
    R ckan/new_tests/logic/auth/test_create.py
    R ckan/new_tests/logic/auth/test_delete.py
    R ckan/new_tests/logic/auth/test_get.py
    R ckan/new_tests/logic/auth/test_init.py
    R ckan/new_tests/logic/auth/test_update.py
    R ckan/new_tests/logic/test_conversion.py
    R ckan/new_tests/logic/test_converters.py
    R ckan/new_tests/logic/test_schema.py
    R ckan/new_tests/logic/test_validators.py
    R ckan/new_tests/migration/__init__.py
    R ckan/new_tests/model/__init__.py
    R ckan/new_tests/model/test_resource.py
    R ckan/new_tests/model/test_resource_view.py
    R ckan/new_tests/model/test_user.py
    R ckan/new_tests/plugins/__init__.py
    R ckan/new_tests/test_authz.py
    R ckan/new_tests/test_coding_standards.py
    R ckan/new_tests/test_factories.py
    M ckan/pastertemplates/__init__.py
    M ckan/pastertemplates/template/README.rst_tmpl
    A ckan/pastertemplates/template/setup.cfg_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/less/masthead.less
    M ckan/public/base/test/index.html
    A ckan/public/base/vendor/moment-with-locales.js
    M ckan/public/base/vendor/resource.config
    R ckan/public/css/boilerplate.css
    R ckan/public/css/bootstrap.min.css
    R ckan/public/css/chosen.css
    R ckan/public/css/forms.css
    R ckan/public/css/handheld.css
    R ckan/public/css/style.css
    R ckan/public/images/bullet_separator.png
    R ckan/public/images/button-shadow.png
    R ckan/public/images/chevron-down.png
    R ckan/public/images/chevron-up.png
    R ckan/public/images/chosen-sprite.png
    R ckan/public/images/ckan_logo_fullname_long.png
    R ckan/public/images/dlbg.png
    R ckan/public/images/dragbars.png
    R ckan/public/images/icons/add.png
    R ckan/public/images/icons/arrow-closed.gif
    R ckan/public/images/icons/arrow-down-16.png
    R ckan/public/images/icons/arrow-down-32.png
    R ckan/public/images/icons/arrow-open.gif
    R ckan/public/images/icons/arrow-right-16-black.png
    R ckan/public/images/icons/arrow-right-16.png
    R ckan/public/images/icons/arrow-right-32.png
    R ckan/public/images/icons/arrow_down.png
    R ckan/public/images/icons/arrow_down_grey.png
    R ckan/public/images/icons/arrow_up.png
    R ckan/public/images/icons/atom_feed.png
    R ckan/public/images/icons/ckan.ico
    R ckan/public/images/icons/comments.png
    R ckan/public/images/icons/delete.png
    R ckan/public/images/icons/door.png
    R ckan/public/images/icons/door_grey.png
    R ckan/public/images/icons/door_open.png
    R ckan/public/images/icons/drive_web.png
    R ckan/public/images/icons/edit-collapse.png
    R ckan/public/images/icons/edit-expand.png
    R ckan/public/images/icons/error.png
    R ckan/public/images/icons/followers.png
    R ckan/public/images/icons/group.png
    R ckan/public/images/icons/group_add.png
    R ckan/public/images/icons/group_edit.png
    R ckan/public/images/icons/key.png
    R ckan/public/images/icons/lock.png
    R ckan/public/images/icons/magnifier.png
    R ckan/public/images/icons/note.png
    R ckan/public/images/icons/openid.png
    R ckan/public/images/icons/package-disabled.png
    R ckan/public/images/icons/package.png
    R ckan/public/images/icons/package_add.png
    R ckan/public/images/icons/package_edit.png
    R ckan/public/images/icons/page_stack.png
    R ckan/public/images/icons/page_white.png
    R ckan/public/images/icons/page_white_add.png
    R ckan/public/images/icons/page_white_code.png
    R ckan/public/images/icons/page_white_compressed.png
    R ckan/public/images/icons/page_white_cup.png
    R ckan/public/images/icons/page_white_database.png
    R ckan/public/images/icons/page_white_error.png
    R ckan/public/images/icons/page_white_excel.png
    R ckan/public/images/icons/page_white_gear.png
    R ckan/public/images/icons/page_white_json.png
    R ckan/public/images/icons/page_white_link.png
    R ckan/public/images/icons/page_white_rdf.png
    R ckan/public/images/icons/page_white_stack.png
    R ckan/public/images/icons/page_white_text.png
    R ckan/public/images/icons/pencil.png
    R ckan/public/images/icons/remove.png
    R ckan/public/images/icons/star.png
    R ckan/public/images/icons/tag_blue.png
    R ckan/public/images/icons/unfilter.png
    R ckan/public/images/icons/user.png
    R ckan/public/images/icons/user_grey.png
    R ckan/public/images/icons/world_go.png
    R ckan/public/images/ldquo.png
    R ckan/public/images/photo-placeholder.png
    R ckan/public/images/stars.png
    R ckan/public/img/collaborate.png
    R ckan/public/img/find.png
    R ckan/public/img/glyphicons-halflings-white.png
    R ckan/public/img/glyphicons-halflings.png
    R ckan/public/img/lod2.png
    R ckan/public/img/logo.png
    R ckan/public/img/logo_64px_wide.png
    R ckan/public/img/share.png
    R ckan/public/scripts/application.js
    R ckan/public/scripts/dataexplorer/icon-sprite.png
    R ckan/public/scripts/dataexplorer/loading.gif
    R ckan/public/scripts/dataexplorer/table-view-template.js
    R ckan/public/scripts/dataexplorer/table-view.css
    R ckan/public/scripts/dataexplorer/table-view.js
    R ckan/public/scripts/dataexplorer/table-view.ui.js
    R ckan/public/scripts/outside.js
    R ckan/public/scripts/templates.js
    R ckan/public/scripts/vendor/backbone/0.5.1/backbone.js
    R ckan/public/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js
    R ckan/public/scripts/vendor/flot/0.7/excanvas.js
    R ckan/public/scripts/vendor/flot/0.7/jquery.flot.js
    R ckan/public/scripts/vendor/html5shiv/html5.js
    R ckan/public/scripts/vendor/jquery.chosen/0.9.7/chosen.js
    R ckan/public/scripts/vendor/jquery.cookie/jquery.cookie.min.js
    R ckan/public/scripts/vendor/jquery.event.drag/2.0/jquery.event.drag.min.js
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.fileupload-ui.css
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.fileupload-ui.js
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.fileupload.js
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.iframe-transport.js
    R ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
    R ckan/public/scripts/vendor/jquery.placeholder/jquery.placeholder.js
    R ckan/public/scripts/vendor/jquery.tmpl/beta1/jquery.tmpl.js
    R ckan/public/scripts/vendor/jquery/1.7.1/jquery.js
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_0_000_40x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_100_000_40x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_75_ffffff_40x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_100_f0f0f0_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_55_fbf9ee_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_65_ffffff_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_75_dadada_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_95_fef1ec_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_highlight-soft_100_f0f0f0_1x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_000_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_222222_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_2e83ff_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_444444_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_888888_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_b22_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_cd0a0a_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/jquery-ui.custom.css
    R ckan/public/scripts/vendor/jqueryui/1.8.14/jquery-ui.min.js
    R ckan/public/scripts/vendor/json2.js
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/layers.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/marker-shadow.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/marker.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/popup-close.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/zoom-in.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/zoom-out.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.css
    R ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.ie.css
    R ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.js
    R ckan/public/scripts/vendor/modernizr/1.7/modernizr.min.js
    R ckan/public/scripts/vendor/moment/1.6.2/moment.js
    R ckan/public/scripts/vendor/mustache/0.5.0-dev/mustache.js
    R ckan/public/scripts/vendor/openid-selector/css/openid.css
    R ckan/public/scripts/vendor/openid-selector/images/aol.gif
    R ckan/public/scripts/vendor/openid-selector/images/blogger.ico
    R ckan/public/scripts/vendor/openid-selector/images/claimid.ico
    R ckan/public/scripts/vendor/openid-selector/images/facebook.gif
    R ckan/public/scripts/vendor/openid-selector/images/flickr.ico
    R ckan/public/scripts/vendor/openid-selector/images/google.gif
    R ckan/public/scripts/vendor/openid-selector/images/livejournal.ico
    R ckan/public/scripts/vendor/openid-selector/images/myopenid.ico
    R ckan/public/scripts/vendor/openid-selector/images/openid-inputicon.gif
    R ckan/public/scripts/vendor/openid-selector/images/openid.gif
    R ckan/public/scripts/vendor/openid-selector/images/technorati.ico
    R ckan/public/scripts/vendor/openid-selector/images/verisign.gif
    R ckan/public/scripts/vendor/openid-selector/images/verisign.ico
    R ckan/public/scripts/vendor/openid-selector/images/vidoop.ico
    R ckan/public/scripts/vendor/openid-selector/images/wordpress.ico
    R ckan/public/scripts/vendor/openid-selector/images/yahoo.gif
    R ckan/public/scripts/vendor/openid-selector/js/jquery-1.2.6.min.js
    R ckan/public/scripts/vendor/openid-selector/js/openid-jquery.js
    R ckan/public/scripts/vendor/recline/css/recline.css
    R ckan/public/scripts/vendor/resize/resize.js
    R ckan/public/scripts/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    R ckan/public/scripts/vendor/slickgrid/2.0.1/README.txt
    R ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-asc.gif
    R ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-desc.gif
    R ckan/public/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    R ckan/public/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    R ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.css
    R ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckan/public/scripts/vendor/underscore/1.1.6/underscore.js
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    R ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/read.html
    R ckan/templates/package/read.n3
    R ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_view.html
    R ckan/templates/related/base_form_page.html
    R ckan/templates/related/confirm_delete.html
    R ckan/templates/related/dashboard.html
    R ckan/templates/related/edit.html
    R ckan/templates/related/edit_form.html
    R ckan/templates/related/new.html
    R ckan/templates/related/snippets/related_form.html
    R ckan/templates/related/snippets/related_item.html
    R ckan/templates/related/snippets/related_list.html
    A ckan/templates/snippets/local_friendly_datetime.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckan/templates/user/snippets/user_search.html
    M ckan/tests/__init__.py
    R ckan/tests/ckantestplugins.py
    A ckan/tests/config/__init__.py
    A ckan/tests/config/test_environment.py
    A ckan/tests/config/test_middleware.py
    A ckan/tests/controllers/__init__.py
    A ckan/tests/controllers/test_admin.py
    A ckan/tests/controllers/test_api.py
    A ckan/tests/controllers/test_feed.py
    A ckan/tests/controllers/test_group.py
    A ckan/tests/controllers/test_home.py
    A ckan/tests/controllers/test_organization.py
    A ckan/tests/controllers/test_package.py
    A ckan/tests/controllers/test_tags.py
    A ckan/tests/controllers/test_user.py
    A ckan/tests/controllers/test_util.py
    A ckan/tests/factories.py
    R ckan/tests/functional/__init__.py
    R ckan/tests/functional/api/__init__.py
    R ckan/tests/functional/api/base.py
    R ckan/tests/functional/api/model/__init__.py
    R ckan/tests/functional/api/model/test_group.py
    R ckan/tests/functional/api/model/test_group_and_organization_purge.py
    R ckan/tests/functional/api/model/test_licenses.py
    R ckan/tests/functional/api/model/test_package.py
    R ckan/tests/functional/api/model/test_ratings.py
    R ckan/tests/functional/api/model/test_relationships.py
    R ckan/tests/functional/api/model/test_revisions.py
    R ckan/tests/functional/api/model/test_tag.py
    R ckan/tests/functional/api/model/test_vocabulary.py
    R ckan/tests/functional/api/test_activity.py
    R ckan/tests/functional/api/test_api.py
    R ckan/tests/functional/api/test_dashboard.py
    R ckan/tests/functional/api/test_email_notifications.py
    R ckan/tests/functional/api/test_follow.py
    R ckan/tests/functional/api/test_misc.py
    R ckan/tests/functional/api/test_package_search.py
    R ckan/tests/functional/api/test_resource.py
    R ckan/tests/functional/api/test_resource_search.py
    R ckan/tests/functional/api/test_revision_search.py
    R ckan/tests/functional/api/test_user.py
    R ckan/tests/functional/api/test_util.py
    R ckan/tests/functional/base.py
    R ckan/tests/functional/test_activity.py
    R ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_error.py
    R ckan/tests/functional/test_group.py
    R ckan/tests/functional/test_home.py
    R ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_pagination.py
    R ckan/tests/functional/test_preview_interface.py
    R ckan/tests/functional/test_related.py
    R ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_storage.py
    R ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tracking.py
    R ckan/tests/functional/test_user.py
    A ckan/tests/helpers.py
    R ckan/tests/html_check.py
    A ckan/tests/legacy/__init__.py
    A ckan/tests/legacy/ckantestplugins.py
    A ckan/tests/legacy/functional/__init__.py
    A ckan/tests/legacy/functional/api/__init__.py
    A ckan/tests/legacy/functional/api/base.py
    A ckan/tests/legacy/functional/api/model/__init__.py
    A ckan/tests/legacy/functional/api/model/test_group.py
    A ckan/tests/legacy/functional/api/model/test_licenses.py
    A ckan/tests/legacy/functional/api/model/test_package.py
    A ckan/tests/legacy/functional/api/model/test_ratings.py
    A ckan/tests/legacy/functional/api/model/test_relationships.py
    A ckan/tests/legacy/functional/api/model/test_revisions.py
    A ckan/tests/legacy/functional/api/model/test_tag.py
    A ckan/tests/legacy/functional/api/model/test_vocabulary.py
    A ckan/tests/legacy/functional/api/test_activity.py
    A ckan/tests/legacy/functional/api/test_api.py
    A ckan/tests/legacy/functional/api/test_dashboard.py
    A ckan/tests/legacy/functional/api/test_email_notifications.py
    A ckan/tests/legacy/functional/api/test_follow.py
    A ckan/tests/legacy/functional/api/test_misc.py
    A ckan/tests/legacy/functional/api/test_package_search.py
    A ckan/tests/legacy/functional/api/test_resource.py
    A ckan/tests/legacy/functional/api/test_resource_search.py
    A ckan/tests/legacy/functional/api/test_user.py
    A ckan/tests/legacy/functional/api/test_util.py
    A ckan/tests/legacy/functional/base.py
    A ckan/tests/legacy/functional/test_activity.py
    A ckan/tests/legacy/functional/test_admin.py
    A ckan/tests/legacy/functional/test_error.py
    A ckan/tests/legacy/functional/test_group.py
    A ckan/tests/legacy/functional/test_package.py
    A ckan/tests/legacy/functional/test_pagination.py
    A ckan/tests/legacy/functional/test_preview_interface.py
    A ckan/tests/legacy/functional/test_related.py
    A ckan/tests/legacy/functional/test_revision.py
    A ckan/tests/legacy/functional/test_tag.py
    A ckan/tests/legacy/functional/test_tracking.py
    A ckan/tests/legacy/functional/test_user.py
    A ckan/tests/legacy/html_check.py
    A ckan/tests/legacy/lib/__init__.py
    A ckan/tests/legacy/lib/solr/schema-no-version.xml
    A ckan/tests/legacy/lib/solr/schema-wrong-version.xml
    A ckan/tests/legacy/lib/test_accept.py
    A ckan/tests/legacy/lib/test_alphabet_pagination.py
    A ckan/tests/legacy/lib/test_authenticator.py
    A ckan/tests/legacy/lib/test_cli.py
    A ckan/tests/legacy/lib/test_dictization.py
    A ckan/tests/legacy/lib/test_dictization_schema.py
    A ckan/tests/legacy/lib/test_email_notifications.py
    A ckan/tests/legacy/lib/test_hash.py
    A ckan/tests/legacy/lib/test_helpers.py
    A ckan/tests/legacy/lib/test_i18n.py
    A ckan/tests/legacy/lib/test_mailer.py
    A ckan/tests/legacy/lib/test_navl.py
    A ckan/tests/legacy/lib/test_resource_search.py
    A ckan/tests/legacy/lib/test_simple_search.py
    A ckan/tests/legacy/lib/test_solr_package_search.py
    A ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py
    A ckan/tests/legacy/lib/test_solr_schema_version.py
    A ckan/tests/legacy/lib/test_solr_search_index.py
    A ckan/tests/legacy/lib/test_tag_search.py
    A ckan/tests/legacy/logic/__init__.py
    A ckan/tests/legacy/logic/test_action.py
    A ckan/tests/legacy/logic/test_auth.py
    A ckan/tests/legacy/logic/test_init.py
    A ckan/tests/legacy/logic/test_member.py
    A ckan/tests/legacy/logic/test_tag.py
    A ckan/tests/legacy/logic/test_tag_vocab.py
    A ckan/tests/legacy/logic/test_validators.py
    A ckan/tests/legacy/misc/__init__.py
    A ckan/tests/legacy/misc/test_format_text.py
    A ckan/tests/legacy/misc/test_mock_mail_server.py
    A ckan/tests/legacy/misc/test_sync.py
    A ckan/tests/legacy/mock_mail_server.py
    A ckan/tests/legacy/mock_plugin.py
    A ckan/tests/legacy/models/__init__.py
    A ckan/tests/legacy/models/test_activity.py
    A ckan/tests/legacy/models/test_extras.py
    A ckan/tests/legacy/models/test_follower.py
    A ckan/tests/legacy/models/test_group.py
    A ckan/tests/legacy/models/test_misc.py
    A ckan/tests/legacy/models/test_package.py
    A ckan/tests/legacy/models/test_package_relationships.py
    A ckan/tests/legacy/models/test_purge_revision.py
    A ckan/tests/legacy/models/test_resource.py
    A ckan/tests/legacy/models/test_revision.py
    A ckan/tests/legacy/models/test_user.py
    A ckan/tests/legacy/pylons_controller.py
    A ckan/tests/legacy/schema/__init__.py
    A ckan/tests/legacy/schema/test_schema.py
    A ckan/tests/legacy/test_coding_standards.py
    A ckan/tests/legacy/test_dumper.py
    A ckan/tests/legacy/test_plugins.py
    A ckan/tests/legacy/test_versions.py
    M ckan/tests/lib/__init__.py
    A ckan/tests/lib/dictization/__init__.py
    A ckan/tests/lib/dictization/test_model_dictize.py
    A ckan/tests/lib/navl/__init__.py
    A ckan/tests/lib/navl/test_dictization_functions.py
    A ckan/tests/lib/navl/test_validators.py
    A ckan/tests/lib/search/__init__.py
    A ckan/tests/lib/search/test_index.py
    R ckan/tests/lib/solr/schema-no-version.xml
    R ckan/tests/lib/solr/schema-wrong-version.xml
    R ckan/tests/lib/test_accept.py
    R ckan/tests/lib/test_alphabet_pagination.py
    A ckan/tests/lib/test_app_globals.py
    A ckan/tests/lib/test_auth_tkt.py
    R ckan/tests/lib/test_authenticator.py
    A ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_cli.py
    A ckan/tests/lib/test_config_tool.py
    A ckan/tests/lib/test_datapreview.py
    R ckan/tests/lib/test_dictization.py
    R ckan/tests/lib/test_dictization_schema.py
    R ckan/tests/lib/test_email_notifications.py
    R ckan/tests/lib/test_hash.py
    M ckan/tests/lib/test_helpers.py
    R ckan/tests/lib/test_i18n.py
    R ckan/tests/lib/test_mailer.py
    A ckan/tests/lib/test_munge.py
    R ckan/tests/lib/test_navl.py
    R ckan/tests/lib/test_resource_search.py
    R ckan/tests/lib/test_simple_search.py
    R ckan/tests/lib/test_solr_package_search.py
    R ckan/tests/lib/test_solr_package_search_synchronous_update.py
    R ckan/tests/lib/test_solr_schema_version.py
    R ckan/tests/lib/test_solr_search_index.py
    R ckan/tests/lib/test_tag_search.py
    A ckan/tests/logic/action/__init__.py
    A ckan/tests/logic/action/test_create.py
    A ckan/tests/logic/action/test_delete.py
    A ckan/tests/logic/action/test_get.py
    A ckan/tests/logic/action/test_patch.py
    A ckan/tests/logic/action/test_update.py
    A ckan/tests/logic/auth/__init__.py
    A ckan/tests/logic/auth/test_create.py
    A ckan/tests/logic/auth/test_delete.py
    A ckan/tests/logic/auth/test_get.py
    A ckan/tests/logic/auth/test_init.py
    A ckan/tests/logic/auth/test_update.py
    R ckan/tests/logic/test_action.py
    R ckan/tests/logic/test_auth.py
    A ckan/tests/logic/test_conversion.py
    A ckan/tests/logic/test_converters.py
    R ckan/tests/logic/test_init.py
    R ckan/tests/logic/test_member.py
    A ckan/tests/logic/test_schema.py
    R ckan/tests/logic/test_tag.py
    R ckan/tests/logic/test_tag_vocab.py
    M ckan/tests/logic/test_validators.py
    A ckan/tests/migration/__init__.py
    R ckan/tests/misc/__init__.py
    R ckan/tests/misc/test_format_text.py
    R ckan/tests/misc/test_mock_mail_server.py
    R ckan/tests/misc/test_sync.py
    R ckan/tests/mock_mail_server.py
    R ckan/tests/mock_plugin.py
    A ckan/tests/model/__init__.py
    A ckan/tests/model/licenses.v1
    A ckan/tests/model/licenses.v2
    A ckan/tests/model/test_license.py
    A ckan/tests/model/test_resource.py
    A ckan/tests/model/test_resource_view.py
    A ckan/tests/model/test_system_info.py
    A ckan/tests/model/test_user.py
    R ckan/tests/models/__init__.py
    R ckan/tests/models/test_activity.py
    R ckan/tests/models/test_extras.py
    R ckan/tests/models/test_follower.py
    R ckan/tests/models/test_group.py
    R ckan/tests/models/test_license.py
    R ckan/tests/models/test_misc.py
    R ckan/tests/models/test_package.py
    R ckan/tests/models/test_package_relationships.py
    R ckan/tests/models/test_purge_revision.py
    R ckan/tests/models/test_resource.py
    R ckan/tests/models/test_revision.py
    R ckan/tests/models/test_user.py
    A ckan/tests/plugins/__init__.py
    R ckan/tests/pylons_controller.py
    R ckan/tests/schema/__init__.py
    R ckan/tests/schema/test_schema.py
    A ckan/tests/test_authz.py
    M ckan/tests/test_coding_standards.py
    R ckan/tests/test_dumper.py
    A ckan/tests/test_factories.py
    R ckan/tests/test_plugins.py
    R ckan/tests/test_versions.py
    R ckan/tests/test_wsgi_ckanclient.py
    R ckan/tests/wsgi_ckanclient.py
    A ckanext/datapusher/interfaces.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datapusher/tests/test_default_views.py
    A ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_delete.py
    A ckanext/datastore/tests/test_disable.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_info.py
    M ckanext/datastore/tests/test_interface.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    A ckanext/example_iconfigurer/__init__.py
    A ckanext/example_iconfigurer/controller.py
    A ckanext/example_iconfigurer/plugin.py
    A ckanext/example_iconfigurer/plugin_v1.py
    A ckanext/example_iconfigurer/plugin_v2.py
    A ckanext/example_iconfigurer/templates/admin/config.html
    A ckanext/example_iconfigurer/templates/admin/myext_config.html
    A ckanext/example_iconfigurer/tests/__init__.py
    A ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    A ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py
    A ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py
    M ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    A ckanext/example_igroupform/__init__.py
    A ckanext/example_igroupform/plugin.py
    A ckanext/example_igroupform/tests/__init__.py
    A ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    A ckanext/example_itranslation/__init__.py
    A ckanext/example_itranslation/babel_mapping.cfg
    A ckanext/example_itranslation/i18n/ckanext-example_itranslation.pot
    A ckanext/example_itranslation/i18n/en/LC_MESSAGES/ckanext-example_itranslation.mo
    A ckanext/example_itranslation/i18n/en/LC_MESSAGES/ckanext-example_itranslation.po
    A ckanext/example_itranslation/i18n/en/LC_MESSAGES/ckanext-example_translation.po
    A ckanext/example_itranslation/i18n/fr/LC_MESSAGES/ckanext-example_itranslation.mo
    A ckanext/example_itranslation/i18n/fr/LC_MESSAGES/ckanext-example_itranslation.po
    A ckanext/example_itranslation/plugin.py
    A ckanext/example_itranslation/plugin_v1.py
    A ckanext/example_itranslation/setup.cfg
    A ckanext/example_itranslation/templates/home/index.html
    A ckanext/example_itranslation/tests/__init__.py
    A ckanext/example_itranslation/tests/test_plugin.py
    M ckanext/example_theme/v08_custom_helper_function/plugin.py
    M ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    M ckanext/imageview/tests/test_view.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    M ckanext/reclineview/theme/templates/recline_map_form.html
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/controller.py
    R ckanext/stats/public/ckanext/stats/app.js
    R ckanext/stats/public/ckanext/stats/demo.html
    R ckanext/stats/public/ckanext/stats/style.css
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    R ckanext/stats/templates_legacy/__init__.py
    R ckanext/stats/templates_legacy/ckanext/__init__.py
    R ckanext/stats/templates_legacy/ckanext/stats/__init__.py
    R ckanext/stats/templates_legacy/ckanext/stats/index.html
    R ckanext/stats/templates_legacy/ckanext/stats/leaderboard.html
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/tests/test_view.py
    M contrib/docker/my_init.d/50_configure
    M dev-requirements.txt
    R doc/api.rst
    M doc/api/index.rst
    M doc/api/legacy-api.rst
    M doc/contents.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/template-blocks.rst
    M doc/contributing/issues.rst
    M doc/contributing/release-process.rst
    M doc/contributing/reviewing.rst
    M doc/contributing/testing.rst
    M doc/extensions/index.rst
    A doc/extensions/remote-config-update.rst
    A doc/extensions/translating-extensions.rst
    A doc/images/custom_config_fields.png
    M doc/index.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/linked-data-and-rdf.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 2234-persist-datastore_active


  Commit: a843385bf1963c6ee26aca70f98bb871b97abfe8
      https://github.com/ckan/ckan/commit/a843385bf1963c6ee26aca70f98bb871b97abfe8
  Author: Mark Winterbottom <mark at winterbottom.me>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  Fixed typo.


  Commit: 587e20647820f833f01e28ae4309c2adf19fbf17
      https://github.com/ckan/ckan/commit/587e20647820f833f01e28ae4309c2adf19fbf17
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

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

  Log Message:
  -----------
  Merge pull request #2698 from metaodi/2697-like-query-autocomplete

[#2697] Make sure package_autocomplete uses LIKE with wildcards


  Commit: 999d4aa77505863013c7bd450695f79307aac34d
      https://github.com/ckan/ckan/commit/999d4aa77505863013c7bd450695f79307aac34d
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

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

  Log Message:
  -----------
  Revert "[#2697] Make sure package_autocomplete uses LIKE with wildcards"


  Commit: 518bdbd8dbcd1df171161da98a43ab4e3811d725
      https://github.com/ckan/ckan/commit/518bdbd8dbcd1df171161da98a43ab4e3811d725
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

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

  Log Message:
  -----------
  Merge pull request #2701 from ckan/revert-2698-2697-like-query-autocomplete

Revert "[#2697] Make sure package_autocomplete uses LIKE with wildcards"


  Commit: 0c020f72bc4029d1cc3fdd4c39a4998fe7672f80
      https://github.com/ckan/ckan/commit/0c020f72bc4029d1cc3fdd4c39a4998fe7672f80
  Author: amercader <amercadero at gmail.com>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
    A ckan/migration/versions/081_set_datastore_active.py

  Log Message:
  -----------
  [#2234] Add migration script to generate the extra in existing instances


  Commit: c78329c4b8e996d4d84469350518b3c56ce374fb
      https://github.com/ckan/ckan/commit/c78329c4b8e996d4d84469350518b3c56ce374fb
  Author: amercader <amercadero at gmail.com>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
    M ckan/migration/versions/081_set_datastore_active.py

  Log Message:
  -----------
  Only migrate if there are actually datastore tables


  Commit: 375c7899adf1b164db328f60324096b318282824
      https://github.com/ckan/ckan/commit/375c7899adf1b164db328f60324096b318282824
  Author: amercader <amercadero at gmail.com>
  Date:   2015-10-22 (Thu, 22 Oct 2015)

  Changed paths:
    M ckan/migration/versions/081_set_datastore_active.py

  Log Message:
  -----------
  [#2234] Ignore metadata table on migration


  Commit: 43c18b83818fbdbac938990205e8eab62d8b56dd
      https://github.com/ckan/ckan/commit/43c18b83818fbdbac938990205e8eab62d8b56dd
  Author: amercader <amercadero at gmail.com>
  Date:   2015-10-22 (Thu, 22 Oct 2015)

  Changed paths:
    A circle.yml

  Log Message:
  -----------
  Add CircleCI conf file


  Commit: 80ddf337053308e8a38ab3c2b4adf5a82e4508ea
      https://github.com/ckan/ckan/commit/80ddf337053308e8a38ab3c2b4adf5a82e4508ea
  Author: LondonAppDev <mark at winterbottom.me>
  Date:   2015-10-22 (Thu, 22 Oct 2015)

  Changed paths:
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  Update adding-custom-fields.rst


  Commit: e25c8e91047ec2f7d355b5e661b0a3c3c8a5f815
      https://github.com/ckan/ckan/commit/e25c8e91047ec2f7d355b5e661b0a3c3c8a5f815
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-22 (Thu, 22 Oct 2015)

  Changed paths:
    A circle.yml

  Log Message:
  -----------
  Merge pull request #2703 from ckan/circleci

Add CircleCI conf file


  Commit: 610946edc277aa474d1d5434f9062b06c85996fc
      https://github.com/ckan/ckan/commit/610946edc277aa474d1d5434f9062b06c85996fc
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-22 (Thu, 22 Oct 2015)

  Changed paths:
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  Merge pull request #2654 from ckan/2654-tk-ungettext

Docs say extensions should import ungettext from ckan.plugins.toolkit. Doesn't have ungettext.


  Commit: 603afb116476365d0402baa9be75d958a4dacfee
      https://github.com/ckan/ckan/commit/603afb116476365d0402baa9be75d958a4dacfee
  Author: amercader <amercadero at gmail.com>
  Date:   2015-10-22 (Thu, 22 Oct 2015)

  Changed paths:
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/LondonAppDev/ckan into LondonAppDev-master


  Commit: 88ce9240d0015fb014a66a01995b7a013b49aa11
      https://github.com/ckan/ckan/commit/88ce9240d0015fb014a66a01995b7a013b49aa11
  Author: amercader <amercadero at gmail.com>
  Date:   2015-10-22 (Thu, 22 Oct 2015)

  Changed paths:
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  Merge branch 'LondonAppDev-master'


  Commit: f003e254a2d354d2ec658628dbea1fa0e48bc768
      https://github.com/ckan/ckan/commit/f003e254a2d354d2ec658628dbea1fa0e48bc768
  Author: amercader <amercadero at gmail.com>
  Date:   2015-10-22 (Thu, 22 Oct 2015)

  Changed paths:
    M ckan/templates/package/snippets/resource_form.html

  Log Message:
  -----------
  Merge branch '2696-resource-errors-block' of https://github.com/wardi/ckan into wardi-2696-resource-errors-block


  Commit: 1c79507ee9583a4849ea7abdedd4196017fbec04
      https://github.com/ckan/ckan/commit/1c79507ee9583a4849ea7abdedd4196017fbec04
  Author: amercader <amercadero at gmail.com>
  Date:   2015-10-22 (Thu, 22 Oct 2015)

  Changed paths:
    M ckan/templates/package/snippets/resource_form.html

  Log Message:
  -----------
  Merge branch 'wardi-2696-resource-errors-block'


  Commit: 30a3c133fc033ed946d2301ee9299395a314fc68
      https://github.com/ckan/ckan/commit/30a3c133fc033ed946d2301ee9299395a314fc68
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-10-23 (Fri, 23 Oct 2015)

  Changed paths:
    M ckan/lib/search/__init__.py

  Log Message:
  -----------
  Merge branch 'TkTech-crash_on_crash'


  Commit: 40ec62215190e246cc957a615434043a9a5e6fe4
      https://github.com/ckan/ckan/commit/40ec62215190e246cc957a615434043a9a5e6fe4
  Author: Ryan Xingyu Zhou <ryan.zxy at gmail.com>
  Date:   2015-10-23 (Fri, 23 Oct 2015)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  fixes error message when using GET on POST-only actions


  Commit: 75a9120b10ca9643a1fe2d1b1aa64204cb052f84
      https://github.com/ckan/ckan/commit/75a9120b10ca9643a1fe2d1b1aa64204cb052f84
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-26 (Mon, 26 Oct 2015)

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

  Log Message:
  -----------
  Fix typo.


  Commit: 8c977e3e8f30fdc06c159caaefe7fc98f4c1d168
      https://github.com/ckan/ckan/commit/8c977e3e8f30fdc06c159caaefe7fc98f4c1d168
  Author: Alex Palcuie <alex.palcuie at hootsuite.com>
  Date:   2015-10-26 (Mon, 26 Oct 2015)

  Changed paths:
    M ckan/pastertemplates/template/+dot+travis.yml_tmpl

  Log Message:
  -----------
  Use old style Travis builds


  Commit: ca38b52481bebcbf7716fc2d8b86951a1df570cb
      https://github.com/ckan/ckan/commit/ca38b52481bebcbf7716fc2d8b86951a1df570cb
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

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

  Log Message:
  -----------
  Merge pull request #2708 from ckan/typo-constriants

Fix typo.


  Commit: 27b4159751e5171159432ab5bb70408c8952ad08
      https://github.com/ckan/ckan/commit/27b4159751e5171159432ab5bb70408c8952ad08
  Author: amercader <amercadero at gmail.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    A ckan/tests/plugins/test_toolkit.py

  Log Message:
  -----------
  Merge branch 'test-check-ckan-version'


  Commit: 7c67423554454e9bc23f357c07a0c847a3ee55cd
      https://github.com/ckan/ckan/commit/7c67423554454e9bc23f357c07a0c847a3ee55cd
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M ckan/pastertemplates/template/bin/travis-build.bash_tmpl

  Log Message:
  -----------
  Test extensions against latest ckan release branch rather than hard-coded 2.2.


  Commit: ca98012cffe52ccbcb96fd771975e5e0c91072c6
      https://github.com/ckan/ckan/commit/ca98012cffe52ccbcb96fd771975e5e0c91072c6
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M ckan/pastertemplates/template/+dot+travis.yml_tmpl

  Log Message:
  -----------
  Merge pull request #2711 from govro/master

Use old style Travis builds


  Commit: 7e0e18c61ae6e2be326d4c34500d5cbd630727c0
      https://github.com/ckan/ckan/commit/7e0e18c61ae6e2be326d4c34500d5cbd630727c0
  Author: Ryan Xingyu Zhou <ryan.zxy at gmail.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  fix pep8 error


  Commit: 575e825038cee47bf1cd2ae4829e04f8fcd65461
      https://github.com/ckan/ckan/commit/575e825038cee47bf1cd2ae4829e04f8fcd65461
  Author: Ryan Xingyu Zhou <ryan.zxy at gmail.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  fixes pep8 error


  Commit: 06cb1278e913b889728e15345d93e6abaf4ac792
      https://github.com/ckan/ckan/commit/06cb1278e913b889728e15345d93e6abaf4ac792
  Author: Ryan Xingyu Zhou <ryan.zxy at gmail.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/tests/legacy/functional/api/test_api.py

  Log Message:
  -----------
  fix test case


  Commit: fee3bbb70668aa5c77da9676fbe3946f1fbdc6a9
      https://github.com/ckan/ckan/commit/fee3bbb70668aa5c77da9676fbe3946f1fbdc6a9
  Author: amercader <amercadero at gmail.com>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M ckan/pastertemplates/template/+dot+travis.yml_tmpl

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan


  Commit: 03ac7857d4aee932bbcfbfd98b2d9b4747cba092
      https://github.com/ckan/ckan/commit/03ac7857d4aee932bbcfbfd98b2d9b4747cba092
  Author: amercader <amercadero at gmail.com>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M CHANGELOG.rst
    R bin/canada.py
    R bin/ckan-correct-tags.py
    R bin/ckan-edit-tags.py
    R bin/ckan-edit-tags2.py
    R bin/ckan-hmg-breakdown.py
    R bin/ckan-hmg-update-licenses.py
    R bin/ckan-rest-edit-tags.py
    R bin/ckan_edit_local.py
    R bin/ckan_spam.py
    R bin/copy-ckan-2-ckan.py
    R bin/dump-ukgov.py
    R bin/dump_23_pkgs.py
    R bin/fixes.py
    M bin/less
    R bin/loadconfig.py
    R bin/ons-load.py
    R bin/revision_manager.py
    R bin/status.py
    R bin/talisckan.py
    R bin/webstore_test.py
    A circle.yml
    M ckan/__init__.py
    M ckan/authz.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    R ckan/controllers/related.py
    M ckan/controllers/storage.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    A ckan/lib/lazyjson.py
    M ckan/lib/munge.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/uploader.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    A ckan/migration/versions/077_add_revisions_to_system_info.py
    A ckan/migration/versions/078_remove_old_authz_model.py
    A ckan/migration/versions/079_resource_revision_index.py
    A ckan/migration/versions/080_continuity_id_indexes.py
    M ckan/model/__init__.py
    R ckan/model/authz.py
    M ckan/model/domain_object.py
    M ckan/model/group.py
    M ckan/model/modification.py
    M ckan/model/system_info.py
    M ckan/pastertemplates/__init__.py
    M ckan/pastertemplates/template/+dot+travis.yml_tmpl
    M ckan/pastertemplates/template/README.rst_tmpl
    A ckan/pastertemplates/template/setup.cfg_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/main.js
    M ckan/public/base/test/index.html
    A ckan/public/base/vendor/moment-with-locales.js
    M ckan/public/base/vendor/resource.config
    R ckan/public/css/boilerplate.css
    R ckan/public/css/bootstrap.min.css
    R ckan/public/css/chosen.css
    R ckan/public/css/forms.css
    R ckan/public/css/handheld.css
    R ckan/public/css/style.css
    R ckan/public/images/bullet_separator.png
    R ckan/public/images/button-shadow.png
    R ckan/public/images/chevron-down.png
    R ckan/public/images/chevron-up.png
    R ckan/public/images/chosen-sprite.png
    R ckan/public/images/ckan_logo_fullname_long.png
    R ckan/public/images/dlbg.png
    R ckan/public/images/dragbars.png
    R ckan/public/images/icons/add.png
    R ckan/public/images/icons/arrow-closed.gif
    R ckan/public/images/icons/arrow-down-16.png
    R ckan/public/images/icons/arrow-down-32.png
    R ckan/public/images/icons/arrow-open.gif
    R ckan/public/images/icons/arrow-right-16-black.png
    R ckan/public/images/icons/arrow-right-16.png
    R ckan/public/images/icons/arrow-right-32.png
    R ckan/public/images/icons/arrow_down.png
    R ckan/public/images/icons/arrow_down_grey.png
    R ckan/public/images/icons/arrow_up.png
    R ckan/public/images/icons/atom_feed.png
    R ckan/public/images/icons/ckan.ico
    R ckan/public/images/icons/comments.png
    R ckan/public/images/icons/delete.png
    R ckan/public/images/icons/door.png
    R ckan/public/images/icons/door_grey.png
    R ckan/public/images/icons/door_open.png
    R ckan/public/images/icons/drive_web.png
    R ckan/public/images/icons/edit-collapse.png
    R ckan/public/images/icons/edit-expand.png
    R ckan/public/images/icons/error.png
    R ckan/public/images/icons/followers.png
    R ckan/public/images/icons/group.png
    R ckan/public/images/icons/group_add.png
    R ckan/public/images/icons/group_edit.png
    R ckan/public/images/icons/key.png
    R ckan/public/images/icons/lock.png
    R ckan/public/images/icons/magnifier.png
    R ckan/public/images/icons/note.png
    R ckan/public/images/icons/openid.png
    R ckan/public/images/icons/package-disabled.png
    R ckan/public/images/icons/package.png
    R ckan/public/images/icons/package_add.png
    R ckan/public/images/icons/package_edit.png
    R ckan/public/images/icons/page_stack.png
    R ckan/public/images/icons/page_white.png
    R ckan/public/images/icons/page_white_add.png
    R ckan/public/images/icons/page_white_code.png
    R ckan/public/images/icons/page_white_compressed.png
    R ckan/public/images/icons/page_white_cup.png
    R ckan/public/images/icons/page_white_database.png
    R ckan/public/images/icons/page_white_error.png
    R ckan/public/images/icons/page_white_excel.png
    R ckan/public/images/icons/page_white_gear.png
    R ckan/public/images/icons/page_white_json.png
    R ckan/public/images/icons/page_white_link.png
    R ckan/public/images/icons/page_white_rdf.png
    R ckan/public/images/icons/page_white_stack.png
    R ckan/public/images/icons/page_white_text.png
    R ckan/public/images/icons/pencil.png
    R ckan/public/images/icons/remove.png
    R ckan/public/images/icons/star.png
    R ckan/public/images/icons/tag_blue.png
    R ckan/public/images/icons/unfilter.png
    R ckan/public/images/icons/user.png
    R ckan/public/images/icons/user_grey.png
    R ckan/public/images/icons/world_go.png
    R ckan/public/images/ldquo.png
    R ckan/public/images/photo-placeholder.png
    R ckan/public/images/stars.png
    R ckan/public/img/collaborate.png
    R ckan/public/img/find.png
    R ckan/public/img/glyphicons-halflings-white.png
    R ckan/public/img/glyphicons-halflings.png
    R ckan/public/img/lod2.png
    R ckan/public/img/logo.png
    R ckan/public/img/logo_64px_wide.png
    R ckan/public/img/share.png
    R ckan/public/scripts/application.js
    R ckan/public/scripts/dataexplorer/icon-sprite.png
    R ckan/public/scripts/dataexplorer/loading.gif
    R ckan/public/scripts/dataexplorer/table-view-template.js
    R ckan/public/scripts/dataexplorer/table-view.css
    R ckan/public/scripts/dataexplorer/table-view.js
    R ckan/public/scripts/dataexplorer/table-view.ui.js
    R ckan/public/scripts/outside.js
    R ckan/public/scripts/templates.js
    R ckan/public/scripts/vendor/backbone/0.5.1/backbone.js
    R ckan/public/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js
    R ckan/public/scripts/vendor/flot/0.7/excanvas.js
    R ckan/public/scripts/vendor/flot/0.7/jquery.flot.js
    R ckan/public/scripts/vendor/html5shiv/html5.js
    R ckan/public/scripts/vendor/jquery.chosen/0.9.7/chosen.js
    R ckan/public/scripts/vendor/jquery.cookie/jquery.cookie.min.js
    R ckan/public/scripts/vendor/jquery.event.drag/2.0/jquery.event.drag.min.js
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.fileupload-ui.css
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.fileupload-ui.js
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.fileupload.js
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.iframe-transport.js
    R ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
    R ckan/public/scripts/vendor/jquery.placeholder/jquery.placeholder.js
    R ckan/public/scripts/vendor/jquery.tmpl/beta1/jquery.tmpl.js
    R ckan/public/scripts/vendor/jquery/1.7.1/jquery.js
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_0_000_40x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_100_000_40x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_75_ffffff_40x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_100_f0f0f0_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_55_fbf9ee_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_65_ffffff_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_75_dadada_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_95_fef1ec_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_highlight-soft_100_f0f0f0_1x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_000_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_222222_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_2e83ff_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_444444_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_888888_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_b22_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_cd0a0a_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/jquery-ui.custom.css
    R ckan/public/scripts/vendor/jqueryui/1.8.14/jquery-ui.min.js
    R ckan/public/scripts/vendor/json2.js
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/layers.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/marker-shadow.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/marker.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/popup-close.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/zoom-in.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/zoom-out.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.css
    R ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.ie.css
    R ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.js
    R ckan/public/scripts/vendor/modernizr/1.7/modernizr.min.js
    R ckan/public/scripts/vendor/moment/1.6.2/moment.js
    R ckan/public/scripts/vendor/mustache/0.5.0-dev/mustache.js
    R ckan/public/scripts/vendor/openid-selector/css/openid.css
    R ckan/public/scripts/vendor/openid-selector/images/aol.gif
    R ckan/public/scripts/vendor/openid-selector/images/blogger.ico
    R ckan/public/scripts/vendor/openid-selector/images/claimid.ico
    R ckan/public/scripts/vendor/openid-selector/images/facebook.gif
    R ckan/public/scripts/vendor/openid-selector/images/flickr.ico
    R ckan/public/scripts/vendor/openid-selector/images/google.gif
    R ckan/public/scripts/vendor/openid-selector/images/livejournal.ico
    R ckan/public/scripts/vendor/openid-selector/images/myopenid.ico
    R ckan/public/scripts/vendor/openid-selector/images/openid-inputicon.gif
    R ckan/public/scripts/vendor/openid-selector/images/openid.gif
    R ckan/public/scripts/vendor/openid-selector/images/technorati.ico
    R ckan/public/scripts/vendor/openid-selector/images/verisign.gif
    R ckan/public/scripts/vendor/openid-selector/images/verisign.ico
    R ckan/public/scripts/vendor/openid-selector/images/vidoop.ico
    R ckan/public/scripts/vendor/openid-selector/images/wordpress.ico
    R ckan/public/scripts/vendor/openid-selector/images/yahoo.gif
    R ckan/public/scripts/vendor/openid-selector/js/jquery-1.2.6.min.js
    R ckan/public/scripts/vendor/openid-selector/js/openid-jquery.js
    R ckan/public/scripts/vendor/recline/css/recline.css
    R ckan/public/scripts/vendor/resize/resize.js
    R ckan/public/scripts/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    R ckan/public/scripts/vendor/slickgrid/2.0.1/README.txt
    R ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-asc.gif
    R ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-desc.gif
    R ckan/public/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    R ckan/public/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    R ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.css
    R ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckan/public/scripts/vendor/underscore/1.1.6/underscore.js
    M ckan/templates/admin/config.html
    R ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/read.html
    R ckan/templates/package/read.n3
    R ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    R ckan/templates/related/base_form_page.html
    R ckan/templates/related/confirm_delete.html
    R ckan/templates/related/dashboard.html
    R ckan/templates/related/edit.html
    R ckan/templates/related/edit_form.html
    R ckan/templates/related/new.html
    R ckan/templates/related/snippets/related_form.html
    R ckan/templates/related/snippets/related_item.html
    R ckan/templates/related/snippets/related_list.html
    A ckan/templates/snippets/local_friendly_datetime.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/snippets/user_search.html
    M ckan/tests/config/test_environment.py
    A ckan/tests/controllers/test_admin.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_group.py
    A ckan/tests/controllers/test_home.py
    A ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    A ckan/tests/controllers/test_tags.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/factories.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/ckantestplugins.py
    M ckan/tests/legacy/functional/api/model/test_group.py
    R ckan/tests/legacy/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/model/test_tag.py
    M ckan/tests/legacy/functional/api/model/test_vocabulary.py
    M ckan/tests/legacy/functional/api/test_dashboard.py
    M ckan/tests/legacy/functional/api/test_package_search.py
    R ckan/tests/legacy/functional/api/test_revision_search.py
    M ckan/tests/legacy/functional/api/test_util.py
    M ckan/tests/legacy/functional/test_admin.py
    M ckan/tests/legacy/functional/test_group.py
    R ckan/tests/legacy/functional/test_home.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/legacy/functional/test_related.py
    R ckan/tests/legacy/functional/test_storage.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/lib/test_cli.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/legacy/lib/test_dictization_schema.py
    M ckan/tests/legacy/lib/test_helpers.py
    M ckan/tests/legacy/lib/test_solr_package_search.py
    M ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/legacy/models/test_group.py
    M ckan/tests/legacy/models/test_user.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_plugins.py
    R ckan/tests/legacy/test_wsgi_ckanclient.py
    R ckan/tests/legacy/wsgi_ckanclient.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    A ckan/tests/lib/test_app_globals.py
    M ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_munge.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/test_get.py
    M ckan/tests/logic/auth/test_update.py
    A ckan/tests/model/test_system_info.py
    A ckan/tests/plugins/test_toolkit.py
    A ckanext/datapusher/interfaces.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    A ckanext/datastore/tests/test_disable.py
    M ckanext/example_iconfigurer/plugin.py
    A ckanext/example_iconfigurer/plugin_v1.py
    A ckanext/example_iconfigurer/plugin_v2.py
    A ckanext/example_iconfigurer/templates/admin/config.html
    A ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    A ckanext/example_itranslation/__init__.py
    A ckanext/example_itranslation/babel_mapping.cfg
    A ckanext/example_itranslation/i18n/ckanext-example_itranslation.pot
    A ckanext/example_itranslation/i18n/en/LC_MESSAGES/ckanext-example_itranslation.mo
    A ckanext/example_itranslation/i18n/en/LC_MESSAGES/ckanext-example_itranslation.po
    A ckanext/example_itranslation/i18n/en/LC_MESSAGES/ckanext-example_translation.po
    A ckanext/example_itranslation/i18n/fr/LC_MESSAGES/ckanext-example_itranslation.mo
    A ckanext/example_itranslation/i18n/fr/LC_MESSAGES/ckanext-example_itranslation.po
    A ckanext/example_itranslation/plugin.py
    A ckanext/example_itranslation/plugin_v1.py
    A ckanext/example_itranslation/setup.cfg
    A ckanext/example_itranslation/templates/home/index.html
    A ckanext/example_itranslation/tests/__init__.py
    A ckanext/example_itranslation/tests/test_plugin.py
    M ckanext/example_theme/v08_custom_helper_function/plugin.py
    M ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    M ckanext/multilingual/solr/schema.xml
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    M ckanext/reclineview/theme/templates/recline_map_form.html
    M ckanext/resourceproxy/controller.py
    M ckanext/stats/controller.py
    R ckanext/stats/public/ckanext/stats/app.js
    R ckanext/stats/public/ckanext/stats/demo.html
    R ckanext/stats/public/ckanext/stats/style.css
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    R ckanext/stats/templates_legacy/__init__.py
    R ckanext/stats/templates_legacy/ckanext/__init__.py
    R ckanext/stats/templates_legacy/ckanext/stats/__init__.py
    R ckanext/stats/templates_legacy/ckanext/stats/index.html
    R ckanext/stats/templates_legacy/ckanext/stats/leaderboard.html
    M ckanext/stats/tests/test_stats_lib.py
    M contrib/docker/my_init.d/50_configure
    M dev-requirements.txt
    R doc/api.rst
    M doc/api/index.rst
    M doc/api/legacy-api.rst
    M doc/contents.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/template-blocks.rst
    M doc/contributing/issues.rst
    M doc/contributing/release-process.rst
    M doc/contributing/reviewing.rst
    M doc/extensions/adding-custom-fields.rst
    M doc/extensions/index.rst
    A doc/extensions/remote-config-update.rst
    A doc/extensions/translating-extensions.rst
    A doc/images/custom_config_fields.png
    M doc/index.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/linked-data-and-rdf.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 1527-custom-emails

Conflicts:
	setup.py


  Commit: 42770ab9b3378af47ce9f25b189f6dc14caeac50
      https://github.com/ckan/ckan/commit/42770ab9b3378af47ce9f25b189f6dc14caeac50
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M ckan/i18n/ckan.pot

  Log Message:
  -----------
  Update POT.


  Commit: 2c7c5a4d66586b5fa56262fa54904ea2e69d83bb
      https://github.com/ckan/ckan/commit/2c7c5a4d66586b5fa56262fa54904ea2e69d83bb
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M ckan/i18n/ckan.pot

  Log Message:
  -----------
  Removed .txt message extractors that only added the text of the MIT licence.

Conflicts:
	setup.py


  Commit: 24085c8eb4109119523c1c5321dfd351789c4091
      https://github.com/ckan/ckan/commit/24085c8eb4109119523c1c5321dfd351789c4091
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M .tx/config
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/check_po_files.py
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  [i18n] Updated po files from transifex in preparation for release.


  Commit: 865c7666dc2e2ad4609f34f69651316ea494449d
      https://github.com/ckan/ckan/commit/865c7666dc2e2ad4609f34f69651316ea494449d
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    R ckan/i18n/dv/LC_MESSAGES/ckan.mo
    R ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    R ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    R ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    R ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    R ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    R ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    R ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    R ckan/i18n/eu/LC_MESSAGES/ckan.mo
    R ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    R ckan/i18n/lo/LC_MESSAGES/ckan.mo
    R ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    R ckan/i18n/my/LC_MESSAGES/ckan.mo
    R ckan/i18n/my/LC_MESSAGES/ckan.po
    R ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    R ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/ne/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    R ckan/i18n/sw/LC_MESSAGES/ckan.mo
    R ckan/i18n/sw/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    R ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    R ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  [i18n] Re-updated po files from transifex and added in new pot strings, in preparation for release. Deleted langs with 0% translation.


  Commit: 15a8de8dd9aed54948ef8dbf44a84cfdd6a91b39
      https://github.com/ckan/ckan/commit/15a8de8dd9aed54948ef8dbf44a84cfdd6a91b39
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M .tx/config
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo

  Log Message:
  -----------
  Update strings files before CKAN 2.4 call for translation


  Commit: fc990d78437a373c485b6a66e1fb62991eb26e01
      https://github.com/ckan/ckan/commit/fc990d78437a373c485b6a66e1fb62991eb26e01
  Author: amercader <amercadero at gmail.com>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Update strings from Transifex


  Commit: 9ee22bbdf1577cc3beb6413b32ff24a68ea9f126
      https://github.com/ckan/ckan/commit/9ee22bbdf1577cc3beb6413b32ff24a68ea9f126
  Author: amercader <amercadero at gmail.com>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    M ckan/i18n/ne/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Update po files from Transifex


  Commit: 03c7274546ac1e0f605ab5385a7bd3314185a0da
      https://github.com/ckan/ckan/commit/03c7274546ac1e0f605ab5385a7bd3314185a0da
  Author: amercader <amercadero at gmail.com>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo

  Log Message:
  -----------
  Compile strings after update from 2.4


  Commit: c9ba1c655a95256486fd4fd7e2b3072499455490
      https://github.com/ckan/ckan/commit/c9ba1c655a95256486fd4fd7e2b3072499455490
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  resource_edit incorrectly setting action to new instead of edit.


  Commit: b255470083c508cbf55b2f3384489908eb47fb9b
      https://github.com/ckan/ckan/commit/b255470083c508cbf55b2f3384489908eb47fb9b
  Author: Ian Ward <ian at excess.org>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge pull request #2710 from TkTech/action_edit_master

resource_edit incorrectly setting action to new instead of edit.


  Commit: 26fc98341c6a67c996cf53e0ea92ce2e46618705
      https://github.com/ckan/ckan/commit/26fc98341c6a67c996cf53e0ea92ce2e46618705
  Author: Ian Ward <ian at excess.org>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/tests/legacy/functional/api/test_api.py

  Log Message:
  -----------
  Merge pull request #2707 from perceptron-XYZ/master

fixes error message when using GET on POST-only actions


  Commit: 887b8514ce23e54100f894391495047410e8d821
      https://github.com/ckan/ckan/commit/887b8514ce23e54100f894391495047410e8d821
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M .tx/config
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/check_po_files.py
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    R ckan/i18n/dv/LC_MESSAGES/ckan.mo
    R ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    R ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    R ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    R ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    R ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    R ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    R ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    R ckan/i18n/eu/LC_MESSAGES/ckan.mo
    R ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    R ckan/i18n/lo/LC_MESSAGES/ckan.mo
    R ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    R ckan/i18n/my/LC_MESSAGES/ckan.mo
    R ckan/i18n/my/LC_MESSAGES/ckan.po
    R ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    R ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    R ckan/i18n/sw/LC_MESSAGES/ckan.mo
    R ckan/i18n/sw/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    R ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    R ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Merge pull request #2714 from ckan/update-master-translations-with-2.4-ones

Update master translations with 2.4 ones


  Commit: 87002a1696a0d69bded817844d3cd2d7c2bd9756
      https://github.com/ckan/ckan/commit/87002a1696a0d69bded817844d3cd2d7c2bd9756
  Author: Jan Dvořák <mordae at anilinux.org>
  Date:   2015-11-02 (Mon, 02 Nov 2015)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckanext/resourceproxy/controller.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Read both resource proxy constants from config file

Namely, following keys (with defaults):

    ckan.resource_proxy.max_file_size = 1048576
    ckan.resource_proxy.chunk_size = 4096

Signed-off-by: Jan Dvořák <mordae at anilinux.org>


  Commit: 70cb793c11f4424283687f33beffbf99cf325b7c
      https://github.com/ckan/ckan/commit/70cb793c11f4424283687f33beffbf99cf325b7c
  Author: joetsoi <joetsoi at users.noreply.github.com>
  Date:   2015-11-02 (Mon, 02 Nov 2015)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/package/base.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/resource_info.html
    M ckan/templates/package/snippets/resource_item.html

  Log Message:
  -----------
  [#2678] Add core translation get_translated helper

Change package templates to use helper


  Commit: 10560ea2d1266da926cbfe8b3f2882e0d1fb3629
      https://github.com/ckan/ckan/commit/10560ea2d1266da926cbfe8b3f2882e0d1fb3629
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-04 (Wed, 04 Nov 2015)

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

  Log Message:
  -----------
  Merge branch 'package-search-facets-speed' of https://github.com/alexandru-m-g/ckan into alexandru-m-g-package-search-facets-speed


  Commit: 27789db25aa2b8f057502abe9b43031f45f41a18
      https://github.com/ckan/ckan/commit/27789db25aa2b8f057502abe9b43031f45f41a18
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-04 (Wed, 04 Nov 2015)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  [#2724] Reworked #2692 slightly. Facet test and others moved from legacy.


  Commit: 34e1e3f05f52b9ec5b2c2ff79af9822e6d01dd0a
      https://github.com/ckan/ckan/commit/34e1e3f05f52b9ec5b2c2ff79af9822e6d01dd0a
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-04 (Wed, 04 Nov 2015)

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

  Log Message:
  -----------
  [#2724] Improve log.


  Commit: 7a0ebbd8b783c183c6231c9f96d906c9e9263acc
      https://github.com/ckan/ckan/commit/7a0ebbd8b783c183c6231c9f96d906c9e9263acc
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  [#2724] Fix tests.


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/plugins.py
    M ckan/plugins/interfaces.py
    M ckanext/example_igroupform/plugin.py
    A ckanext/example_igroupform/templates/example_igroup_form/group_form.html
    M ckanext/example_igroupform/tests/test_controllers.py
    M setup.py

  Log Message:
  -----------
  Merge pull request #2617 from ckan/2617-group-form

IGroupForm: new groups (of type 'group') use group_form


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

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  Merge pull request #2725 from ckan/alexandru-m-g-package-search-facets-speed

Package search facets speed


  Commit: 9d55aa675e4ecaa344383744ecaa8a3e3d4bdf78
      https://github.com/ckan/ckan/commit/9d55aa675e4ecaa344383744ecaa8a3e3d4bdf78
  Author: amercader <amercadero at gmail.com>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckanext/resourceproxy/controller.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch 'singularita-corp-master'


  Commit: 9c59b4dffb344ae815f3670be885d5efe1c6b70c
      https://github.com/ckan/ckan/commit/9c59b4dffb344ae815f3670be885d5efe1c6b70c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M ckan/pastertemplates/template/bin/travis-build.bash_tmpl

  Log Message:
  -----------
  Merge branch 'extension-test-branch'


  Commit: 096106fdac02d893de3c1f21cc676560544a0004
      https://github.com/ckan/ckan/commit/096106fdac02d893de3c1f21cc676560544a0004
  Author: amercader <amercadero at gmail.com>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/plugins.py
    M ckan/logic/action/get.py
    M ckan/plugins/interfaces.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/logic/action/test_get.py
    M ckanext/example_igroupform/plugin.py
    A ckanext/example_igroupform/templates/example_igroup_form/group_form.html
    M ckanext/example_igroupform/tests/test_controllers.py
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan


  Commit: 832702fbddb360c40bbba0f8d2fe4556ca0dfbd5
      https://github.com/ckan/ckan/commit/832702fbddb360c40bbba0f8d2fe4556ca0dfbd5
  Author: amercader <amercadero at gmail.com>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#2234] Use resource_patch to set the datastore_active flag


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

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  [#1651] Update RTD Sphinx theme to fix list issues


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

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  [#1651] Update httpretty to fix test failures on ubuntu 14.04, fixes #2018


  Commit: 609dee4718299b3c966684142aa6bcf420710a00
      https://github.com/ckan/ckan/commit/609dee4718299b3c966684142aa6bcf420710a00
  Author: amercader <amercadero at gmail.com>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M doc/conf.py
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/installing/index.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst

  Log Message:
  -----------
  [#1651] Update docs to support Ubuntu 14.04 and 12.04

Reviewed and updated docs for package install, source install and source
deployment.


  Commit: 7518391dbee55ff27f0b1636ca3741c0b61e069d
      https://github.com/ckan/ckan/commit/7518391dbee55ff27f0b1636ca3741c0b61e069d
  Author: amercader <amercadero at gmail.com>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M doc/conf.py
    M doc/contributing/frontend/index.rst

  Log Message:
  -----------
  [#1651] Simplify Node.js install instructions, fixes #1829


  Commit: 5f68e7e2a21dc4867b5ab248c10c3e795cbe4f77
      https://github.com/ckan/ckan/commit/5f68e7e2a21dc4867b5ab248c10c3e795cbe4f77
  Author: amercader <amercadero at gmail.com>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M doc/contributing/frontend/index.rst

  Log Message:
  -----------
  [#1651] Fix Sphinx warning


  Commit: 7b83c947d9ef56e7cf3aba802ba4259817ac7866
      https://github.com/ckan/ckan/commit/7b83c947d9ef56e7cf3aba802ba4259817ac7866
  Author: amercader <amercadero at gmail.com>
  Date:   2015-11-10 (Tue, 10 Nov 2015)

  Changed paths:
    M ckanext/datapusher/tests/test.py
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  [#1651] Avoid testing with httpretty + Solr on Python 2.6

When running on Python 2.6, httpretty doesn't play nice with Solr (it
causes read timeouts). The tests are still run but we avoid using Solr,
either by using `use_cache`=False on `package_show` or disabling the
automatic indexing of datatasets when running on Python 2.6.


  Commit: 9ef3f9e18be2e0df9a54db17d7d102148abc9fdd
      https://github.com/ckan/ckan/commit/9ef3f9e18be2e0df9a54db17d7d102148abc9fdd
  Author: amercader <amercadero at gmail.com>
  Date:   2015-11-10 (Tue, 10 Nov 2015)

  Changed paths:
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  [#1651] Pep8


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

  Changed paths:
    M ckan/logic/schema.py
    A ckan/migration/versions/081_set_datastore_active.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Merge pull request #2234 from ckan/2234-persist-datastore_active

datastore sets datastore_active on resource at runtime.


  Commit: 8a2f0afb2b449f1d5297ed34379f6cd4ae61ddc7
      https://github.com/ckan/ckan/commit/8a2f0afb2b449f1d5297ed34379f6cd4ae61ddc7
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-12 (Thu, 12 Nov 2015)

  Changed paths:
    M ckan/lib/cli.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  Looked for all SQL execute statements and passed params to execute where possible (for security).


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

  Changed paths:
    M ckan/lib/dumper.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_dumper.py

  Log Message:
  -----------
  Remove v. old and unused Dumper and PackagesXlWriter.


  Commit: 90135acfe615e0bf6f6ea09de5abec0430828c3d
      https://github.com/ckan/ckan/commit/90135acfe615e0bf6f6ea09de5abec0430828c3d
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M ckan/lib/dumper.py

  Log Message:
  -----------
  Fix minor refactor done for lint.


  Commit: 998af9cd9c994f325a0a46ff4514f4d11cabeb26
      https://github.com/ckan/ckan/commit/998af9cd9c994f325a0a46ff4514f4d11cabeb26
  Author: joetsoi <joetsoi at users.noreply.github.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M ckan/i18n/check_po_files.py
    M ckan/lib/email_notifications.py
    M ckan/templates/activity_streams/activity_stream_email_notifications.text
    A ckan/tests/i18n/test_check_po_files.py
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  Merge branch '2613-fix-po-checker'

Conflicts:
	ckan/i18n/check_po_files.py


  Commit: 9d693b6aa8213dcaf281aca0c1f52ebb11c4b9ef
      https://github.com/ckan/ckan/commit/9d693b6aa8213dcaf281aca0c1f52ebb11c4b9ef
  Author: amercader <amercadero at gmail.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M ckanext/datapusher/tests/test.py
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  [#1651] Skip tests all together on Python 2.6


  Commit: 13d2e889e41fd963a8d14444f4c05a32e06b9398
      https://github.com/ckan/ckan/commit/13d2e889e41fd963a8d14444f4c05a32e06b9398
  Author: amercader <amercadero at gmail.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M ckan/i18n/check_po_files.py
    M ckan/lib/email_notifications.py
    M ckan/logic/schema.py
    A ckan/migration/versions/081_set_datastore_active.py
    M ckan/templates/activity_streams/activity_stream_email_notifications.text
    A ckan/tests/i18n/test_check_po_files.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Merge branch 'master' into 1651-ubuntu-14.04


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

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

  Log Message:
  -----------
  Another SQL execute fixed.


  Commit: 47c05fdd035a86c3967b5e543c2070b56bfee230
      https://github.com/ckan/ckan/commit/47c05fdd035a86c3967b5e543c2070b56bfee230
  Author: amercader <amercadero at gmail.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M ckan/i18n/check_po_files.py

  Log Message:
  -----------
  [#2736] Fix bad merge in check_po_files.py

`entity` is no longer used after #2613. Also removes the encoding bit as
it doesn't display the characters properly.

And it fixes a PEP8 breakage on master.


  Commit: cc1fd08bebe00fc40d86e52b639e5ca062461c0c
      https://github.com/ckan/ckan/commit/cc1fd08bebe00fc40d86e52b639e5ca062461c0c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M ckan/migration/versions/081_set_datastore_active.py

  Log Message:
  -----------
  [#2234] Improve datastore connection checks on migration

If the datastore connection is set on the config file but the user or
database don't actually exist, skip the migration.

Note that this only happens when the config options are there but the
datastore plugin is not loaded (like in many extensions that extend
their test.ini with the core test-core.ini). Otherwise the connection
will crash anyway during the loading of the plugin itself.


  Commit: e8c31ccfb750226ff1b1e26b5218be9b44d05e2d
      https://github.com/ckan/ckan/commit/e8c31ccfb750226ff1b1e26b5218be9b44d05e2d
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M ckan/i18n/check_po_files.py

  Log Message:
  -----------
  Merge pull request #2737 from ckan/2736-bad-merge-check-po-files

[#2736] Fix bad merge in check_po_files.py (Fixes master failures)


  Commit: 8a19b6680386c590b684b59b62ca276974a9d8f0
      https://github.com/ckan/ckan/commit/8a19b6680386c590b684b59b62ca276974a9d8f0
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M ckan/i18n/check_po_files.py

  Log Message:
  -----------
  Merge branch 'master' into 1651-ubuntu-14.04


  Commit: b04082813a2bd43813b0d2a446af989b3c2fb413
      https://github.com/ckan/ckan/commit/b04082813a2bd43813b0d2a446af989b3c2fb413
  Author: amercader <amercadero at gmail.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M ckan/i18n/check_po_files.py

  Log Message:
  -----------
  Merge branch 'master' into 2234-further-migration-checks


  Commit: 918eebee07c277d7a2315185adfb9f3f21a480e7
      https://github.com/ckan/ckan/commit/918eebee07c277d7a2315185adfb9f3f21a480e7
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    A ckan/migration/versions/082_add_metadata_created.py
    M ckan/model/package.py

  Log Message:
  -----------
  Adds metadata_created as a proper DB field.

Currently the metadata_created is calculated on each access by querying
the package_revision table and finding the oldest revision.  There's
little advantage to this over setting the field to be a column on the
package table and defaulting to now().  This means it can be overwritten
by those components, like harvesting, that require the ability to do so
- without meddling with revisions.

This should fix #2735


  Commit: e03e7da93c342a1db107dacf6a44fe1446deff6e
      https://github.com/ckan/ckan/commit/e03e7da93c342a1db107dacf6a44fe1446deff6e
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    R ckan/lib/accept.py
    R ckan/tests/legacy/lib/test_accept.py

  Log Message:
  -----------
  Remove old RDF rendering of dataset page

As ckanext-dcat is now a thing, and the old templates are removed, we no
longer need to support .rdf extensions or conneg - and so this PR
removes them.


  Commit: 0f50cbf73ab626a7dd67ec16b2282be619d81b03
      https://github.com/ckan/ckan/commit/0f50cbf73ab626a7dd67ec16b2282be619d81b03
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M ckanext/datapusher/tests/test.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M dev-requirements.txt
    M doc/conf.py
    M doc/contributing/frontend/index.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/installing/index.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst

  Log Message:
  -----------
  Merge pull request #2726 from ckan/1651-ubuntu-14.04

Updated documentation and tests for Ubuntu 14.04 support


  Commit: ce7c162dbe79f556b014261b96f9eef5c4ded69c
      https://github.com/ckan/ckan/commit/ce7c162dbe79f556b014261b96f9eef5c4ded69c
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M ckan/tests/logic/test_validators.py

  Log Message:
  -----------
  Some tests for the validators *_exists.

Coverage
(https://coveralls.io/builds/3602797/source?filename=ckan%2Flogic%2Fvalidators.py)
suggests these tests weren't covered, so these test the success and fail
cases for group_exists, package_exists etc.


  Commit: 5f18d81e0519abafddc5dd447676d484493b7794
      https://github.com/ckan/ckan/commit/5f18d81e0519abafddc5dd447676d484493b7794
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-11-19 (Thu, 19 Nov 2015)

  Changed paths:
    M ckan/migration/versions/082_add_metadata_created.py

  Log Message:
  -----------
  Allow new metadata_created field be null

This is so that we don't set the value just to overwrite it with the UPDATE


  Commit: 9635971e3b6a9fb813904cd9b7913d3d6d1796eb
      https://github.com/ckan/ckan/commit/9635971e3b6a9fb813904cd9b7913d3d6d1796eb
  Author: Ian Ward <ian at excess.org>
  Date:   2015-11-19 (Thu, 19 Nov 2015)

  Changed paths:
    M ckan/migration/versions/081_set_datastore_active.py

  Log Message:
  -----------
  Merge pull request #2738 from ckan/2234-further-migration-checks

[#2234] Improve datastore connection checks on migration


  Commit: 305de4d2bbf9526ffbf94fdcb04b9687d676095b
      https://github.com/ckan/ckan/commit/305de4d2bbf9526ffbf94fdcb04b9687d676095b
  Author: Ross Thompson <ross.thompson at statcan.gc.ca>
  Date:   2015-11-20 (Fri, 20 Nov 2015)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#2746] Simplify test for empty or missing value in markdown_extract


  Commit: 1f9a144d31f953573188e66d552f99be431388e2
      https://github.com/ckan/ckan/commit/1f9a144d31f953573188e66d552f99be431388e2
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Profiler prints out stats - easier for quick profile - runsnakerun is hard to install.


  Commit: be821072f8a5f1556b713d7e324818216def4ae5
      https://github.com/ckan/ckan/commit/be821072f8a5f1556b713d7e324818216def4ae5
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M ckan/lib/activity_streams_session_extension.py
    M ckan/tests/lib/test_munge.py

  Log Message:
  -----------
  Quieten v noisy debug - it clouds out more useful general debug.


  Commit: 0b2762bb087fd7d101742e720e5dc55dc4ffe026
      https://github.com/ckan/ckan/commit/0b2762bb087fd7d101742e720e5dc55dc4ffe026
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M ckan/tests/lib/test_munge.py

  Log Message:
  -----------
  Revert separate change.


  Commit: e25d86719a3df06e5de9d1f49694345b7186a043
      https://github.com/ckan/ckan/commit/e25d86719a3df06e5de9d1f49694345b7186a043
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M ckan/tests/lib/test_munge.py

  Log Message:
  -----------
  Asserts less long-winded


  Commit: ece4fa6d30840965f0e12ba0196f75bba73178b1
      https://github.com/ckan/ckan/commit/ece4fa6d30840965f0e12ba0196f75bba73178b1
  Author: amercader <amercadero at gmail.com>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M ckan/controllers/error.py

  Log Message:
  -----------
  [#2753] Use default encoding if the response does not provide one

See issue for details


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

  Changed paths:
    M ckan/lib/dumper.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_dumper.py

  Log Message:
  -----------
  Merge pull request #2731 from ckan/remove-dumper

Remove Dumper and PackagesXlWriter


  Commit: c49d3b7850d9c741911e83572cc03110efd59a93
      https://github.com/ckan/ckan/commit/c49d3b7850d9c741911e83572cc03110efd59a93
  Author: amercader <amercadero at gmail.com>
  Date:   2015-11-24 (Tue, 24 Nov 2015)

  Changed paths:
    A ckan/migration/versions/082_create_index_creator_user_id.py

  Log Message:
  -----------
  [#2752] Add migration script for creator_user_id column

On the package table. This massively speeds up the user_list query.


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

  Changed paths:
    M ckan/controllers/error.py

  Log Message:
  -----------
  Merge pull request #2753 from ckan/2753-error-response-encoding

Prevent unicode error on error controller


  Commit: 98f350a0e6341c2b9b0787e1f709b6afbc63cb57
      https://github.com/ckan/ckan/commit/98f350a0e6341c2b9b0787e1f709b6afbc63cb57
  Author: Ian Ward <ian at excess.org>
  Date:   2015-11-24 (Tue, 24 Nov 2015)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge pull request #2747 from thriuin/master

[#2746] Simplify test for empty or missing value in markdown_extract


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

  Changed paths:
    M ckan/tests/logic/test_validators.py

  Log Message:
  -----------
  Merge pull request #2743 from ckan/test-exists-validators

Some tests for the validators *_exists.


  Commit: 419dae821e848d46ea6fca33d75fc16f75c647ca
      https://github.com/ckan/ckan/commit/419dae821e848d46ea6fca33d75fc16f75c647ca
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-24 (Tue, 24 Nov 2015)

  Changed paths:
    M .coveragerc

  Log Message:
  -----------
  Coveralls - try excluding libraries using just "include".


  Commit: 3318779e91389b718c688ac098ef5569e9d2f870
      https://github.com/ckan/ckan/commit/3318779e91389b718c688ac098ef5569e9d2f870
  Author: amercader <amercadero at gmail.com>
  Date:   2015-11-24 (Tue, 24 Nov 2015)

  Changed paths:
    M ckan/tests/lib/test_munge.py

  Log Message:
  -----------
  Merge branch 'munge-asserts'


  Commit: 4dbfa464f7c9582094ba2e341745b50b8137ba38
      https://github.com/ckan/ckan/commit/4dbfa464f7c9582094ba2e341745b50b8137ba38
  Author: amercader <amercadero at gmail.com>
  Date:   2015-11-24 (Tue, 24 Nov 2015)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    R ckan/lib/accept.py
    R ckan/tests/legacy/lib/test_accept.py

  Log Message:
  -----------
  Merge branch '2741-remove-rdf-cruft'


  Commit: 0a184e09e5c80a1bd1f54b787d1784f7dd04bb8b
      https://github.com/ckan/ckan/commit/0a184e09e5c80a1bd1f54b787d1784f7dd04bb8b
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-24 (Tue, 24 Nov 2015)

  Changed paths:
    A ckan/migration/versions/082_create_index_creator_user_id.py

  Log Message:
  -----------
  Merge pull request #2752 from ckan/2752-user_list-improvements

user_list performance enhancement


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

  Changed paths:
    R .coveragerc
    M bin/travis-run-tests

  Log Message:
  -----------
  Rather than use .coveragerc, specify options on nosetests command-line - you dont get duplicates that way.


  Commit: ed30bd05bbb698c2493e4c560ab3cd55eae01d72
      https://github.com/ckan/ckan/commit/ed30bd05bbb698c2493e4c560ab3cd55eae01d72
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2015-11-24 (Tue, 24 Nov 2015)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_update.py

  Log Message:
  -----------
  Merge pull request #2647 from wardi/2647-user-password-hash

allow exporting and importing users, with their passwords


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

  Changed paths:
    M ckan/config/resource_formats.json

  Log Message:
  -----------
  Add torrent and ics formats. Identified by ckanext-qa.


  Commit: 7cdd0446b75ad197d4178a2cf2c2eff3589c6612
      https://github.com/ckan/ckan/commit/7cdd0446b75ad197d4178a2cf2c2eff3589c6612
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-25 (Wed, 25 Nov 2015)

  Changed paths:
    M ckan/lib/activity_streams_session_extension.py

  Log Message:
  -----------
  Remove useless logs after all. Convert some to comments. PEP8


  Commit: 0d0c2f9ab54d4425cbd25b5e0371165f55202ee2
      https://github.com/ckan/ckan/commit/0d0c2f9ab54d4425cbd25b5e0371165f55202ee2
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

  Changed paths:
    M ckan/tests/legacy/functional/test_group.py

  Log Message:
  -----------
  Found additional reference to the noisy logger.


  Commit: 3521c588338069464555cf56e866ec4ad30739f6
      https://github.com/ckan/ckan/commit/3521c588338069464555cf56e866ec4ad30739f6
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

  Changed paths:
    M ckan/tests/legacy/functional/api/test_dashboard.py

  Log Message:
  -----------
  Clear search index so you can run this test multiple times without failures caused by the first run not being cleaned up.


  Commit: 0456a6f57f0b2a2eafcfbb9bbad98deda71ac692
      https://github.com/ckan/ckan/commit/0456a6f57f0b2a2eafcfbb9bbad98deda71ac692
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

  Changed paths:
    M ckan/__init__.py

  Log Message:
  -----------
  Update version number


  Commit: 64ec13ac2b6d65b841cc15af26da1d5dcac5e173
      https://github.com/ckan/ckan/commit/64ec13ac2b6d65b841cc15af26da1d5dcac5e173
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

  Changed paths:
    M doc/contributing/release-process.rst

  Log Message:
  -----------
  Transifex updates. Freeze strings on branch.


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

  Changed paths:
    M doc/contributing/release-process.rst

  Log Message:
  -----------
  Command for turning the instructions into a checklist, like https://github.com/ckan/ckan/issues/2758


  Commit: 6cbdd1b98a65c5be8a692c55b45ac3f128f08a52
      https://github.com/ckan/ckan/commit/6cbdd1b98a65c5be8a692c55b45ac3f128f08a52
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

  Changed paths:
    M doc/contributing/release-process.rst

  Log Message:
  -----------
  Add asking for help testing.


  Commit: a004da006e5f382deeacb8a6a949781064dc9c23
      https://github.com/ckan/ckan/commit/a004da006e5f382deeacb8a6a949781064dc9c23
  Author: J. Oppenlaender <j.oppenlaender at web.de>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  typo


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

  Changed paths:
    M doc/contributing/release-process.rst

  Log Message:
  -----------
  Add intermediate section


  Commit: 61958a6af1a846b23ac2a7c043f317e1e55ba909
      https://github.com/ckan/ckan/commit/61958a6af1a846b23ac2a7c043f317e1e55ba909
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

  Changed paths:
    M doc/contributing/release-process.rst

  Log Message:
  -----------
  Improve formatting


  Commit: 347c72b4edab0dc85f68759d35ecd23bef95cbd2
      https://github.com/ckan/ckan/commit/347c72b4edab0dc85f68759d35ecd23bef95cbd2
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-27 (Fri, 27 Nov 2015)

  Changed paths:
    M doc/contributing/release-process.rst

  Log Message:
  -----------
  Transifex improvements.


  Commit: 482a80422b8abe6e02ac3e2f376323c222b9d47b
      https://github.com/ckan/ckan/commit/482a80422b8abe6e02ac3e2f376323c222b9d47b
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-11-27 (Fri, 27 Nov 2015)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge pull request #2759 from joetm/master

typo in comment


  Commit: 4d79ad32c4a4fd55fd8789b144ec1c635927e714
      https://github.com/ckan/ckan/commit/4d79ad32c4a4fd55fd8789b144ec1c635927e714
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2015-12-01 (Tue, 01 Dec 2015)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Add security at ckan.org to the README


  Commit: 48521ede569270bb9502cdc5f2b11d76a8795ed2
      https://github.com/ckan/ckan/commit/48521ede569270bb9502cdc5f2b11d76a8795ed2
  Author: Ian Ward <ian at excess.org>
  Date:   2015-12-01 (Tue, 01 Dec 2015)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Merge pull request #2764 from ckan/amercader-add-sec-email-to-readme

Add security at ckan.org to the README


  Commit: 2bd13792a561d9dc38681e95443f63f1255944f9
      https://github.com/ckan/ckan/commit/2bd13792a561d9dc38681e95443f63f1255944f9
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-12-01 (Tue, 01 Dec 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/helpers.py
    M ckan/tests/legacy/misc/test_format_text.py
    M ckan/tests/legacy/models/test_package.py
    M ckan/tests/lib/test_helpers.py
    M requirements.txt

  Log Message:
  -----------
  Replace markdown library with python-markdown

Replaces the previous markdown renderer that was problematic (and
unmaintained) with the more widely used python-markdown.

As python-markdown has deprecated the safe_mode for removing HTML, this
PR also contains bleach to strip out any HTML provided - as recommended
by the python-markdown docs.

The only noticeable change in rendering is that the previous library
inserted a newline before a closing p tag, which python-markdown doesn't
do.  This is unlikely to change how the content is rendered.


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

  Changed paths:
    M requirements.txt

  Log Message:
  -----------
  Include ordereddict for 2.6


  Commit: 25f5edca3c7e862a696c560ba7d5431beb94c6cb
      https://github.com/ckan/ckan/commit/25f5edca3c7e862a696c560ba7d5431beb94c6cb
  Author: amercader <amercadero at gmail.com>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
    M ckan/controllers/error.py

  Log Message:
  -----------
  [#2770] Return default error page on fanstatic errors


  Commit: eef140ba9525afc74ef2548b490a78f8df9ceb3d
      https://github.com/ckan/ckan/commit/eef140ba9525afc74ef2548b490a78f8df9ceb3d
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Use a more recent version of python-markdown that still claims to support Python 2.6


  Commit: f29ecf1e04568f5bbd77bf82da1a4b8da398afb1
      https://github.com/ckan/ckan/commit/f29ecf1e04568f5bbd77bf82da1a4b8da398afb1
  Author: Ian Ward <ian at excess.org>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
    M ckan/controllers/error.py

  Log Message:
  -----------
  Merge pull request #2770 from ckan/2770-fanstatic-error-pages

Don't template fanstatic error pages


  Commit: 3735d9011b45b0e0264af1697a3e7a174eef0e40
      https://github.com/ckan/ckan/commit/3735d9011b45b0e0264af1697a3e7a174eef0e40
  Author: Fernando Aramendi <fernando at devartis.com>
  Date:   2015-12-04 (Fri, 04 Dec 2015)

  Changed paths:
    M ckan/templates/package/related_list.html

  Log Message:
  -----------
  added check_access to Add related item button rendering


  Commit: 2655c450dc233a2f8f31e15aafd44d721cd85601
      https://github.com/ckan/ckan/commit/2655c450dc233a2f8f31e15aafd44d721cd85601
  Author: amercader <amercadero at gmail.com>
  Date:   2015-12-08 (Tue, 08 Dec 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/helpers.py
    M ckan/tests/legacy/misc/test_format_text.py
    M ckan/tests/legacy/models/test_package.py
    M ckan/tests/lib/test_helpers.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'replace-markdown-lib'


  Commit: 4071b8e6a4e401428c6d80931f5dac2d08871031
      https://github.com/ckan/ckan/commit/4071b8e6a4e401428c6d80931f5dac2d08871031
  Author: amercader <amercadero at gmail.com>
  Date:   2015-12-08 (Tue, 08 Dec 2015)

  Changed paths:
    M ckan/config/resource_formats.json

  Log Message:
  -----------
  Merge branch 'formats'


  Commit: 289a8b3527f805a12d0a14b9ead64ce8b36a4b3f
      https://github.com/ckan/ckan/commit/289a8b3527f805a12d0a14b9ead64ce8b36a4b3f
  Author: amercader <amercadero at gmail.com>
  Date:   2015-12-08 (Tue, 08 Dec 2015)

  Changed paths:
    R .coveragerc
    M bin/travis-run-tests

  Log Message:
  -----------
  Merge branch 'coveralls-exclude-libraries'


  Commit: 55fb759a99a14b69f4fb9370bae0c2d8724bd83d
      https://github.com/ckan/ckan/commit/55fb759a99a14b69f4fb9370bae0c2d8724bd83d
  Author: amercader <amercadero at gmail.com>
  Date:   2015-12-08 (Tue, 08 Dec 2015)

  Changed paths:
    M ckan/lib/cli.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  Merge branch 'sql-params'


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

  Changed paths:
    M doc/contributing/release-process.rst

  Log Message:
  -----------
  Merge branch 'release-process'


  Commit: 50dc951b858aa4679aedc20cc81a833a8d4c5c8b
      https://github.com/ckan/ckan/commit/50dc951b858aa4679aedc20cc81a833a8d4c5c8b
  Author: amercader <amercadero at gmail.com>
  Date:   2015-12-08 (Tue, 08 Dec 2015)

  Changed paths:
    R .coveragerc
    M .tx/config
    M CHANGELOG.rst
    M README.rst
    M bin/travis-run-tests
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/check_po_files.py
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    R ckan/i18n/dv/LC_MESSAGES/ckan.mo
    R ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    R ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    R ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    R ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    R ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    R ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    R ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    R ckan/i18n/eu/LC_MESSAGES/ckan.mo
    R ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    R ckan/i18n/lo/LC_MESSAGES/ckan.mo
    R ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    R ckan/i18n/my/LC_MESSAGES/ckan.mo
    R ckan/i18n/my/LC_MESSAGES/ckan.po
    R ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    R ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    R ckan/i18n/sw/LC_MESSAGES/ckan.mo
    R ckan/i18n/sw/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    R ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    R ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    R ckan/lib/accept.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dumper.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/081_set_datastore_active.py
    A ckan/migration/versions/082_create_index_creator_user_id.py
    M ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    M ckan/plugins/interfaces.py
    M ckan/templates/activity_streams/activity_stream_email_notifications.text
    A ckan/tests/i18n/test_check_po_files.py
    M ckan/tests/legacy/functional/api/test_api.py
    R ckan/tests/legacy/lib/test_accept.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/misc/test_format_text.py
    M ckan/tests/legacy/models/test_package.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_dumper.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_munge.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/test_validators.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/example_igroupform/plugin.py
    A ckanext/example_igroupform/templates/example_igroup_form/group_form.html
    M ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M dev-requirements.txt
    M doc/conf.py
    M doc/contributing/frontend/index.rst
    M doc/contributing/release-process.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/installing/index.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 1527-custom-emails


  Commit: 695c2033fc1fbc57ecb72c83d650a2539739f2a1
      https://github.com/ckan/ckan/commit/695c2033fc1fbc57ecb72c83d650a2539739f2a1
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2015-12-08 (Tue, 08 Dec 2015)

  Changed paths:
    M ckan/lib/helpers.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge pull request #2663 from ohsu-computational-biology/allow-configurable-uri-schemes

Allow url schemes to be configured in config


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

  Changed paths:
    M ckan/templates/package/related_list.html

  Log Message:
  -----------
  Merge pull request #2774 from fara/master

added check_access to Add related item button rendering


  Commit: ec8ea872dc2512102e43b826bb95985ffe572027
      https://github.com/ckan/ckan/commit/ec8ea872dc2512102e43b826bb95985ffe572027
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-12-09 (Wed, 09 Dec 2015)

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#2771] Add group_controller to IGroupForm interface


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

  Changed paths:
    M ckan/tests/legacy/lib/test_resource_search.py

  Log Message:
  -----------
  [#1527] Change resource fields in legacy tests to avoid conflicts


  Commit: 69e6ce309ddbb17e25d0361c6c74464bfbe87cad
      https://github.com/ckan/ckan/commit/69e6ce309ddbb17e25d0361c6c74464bfbe87cad
  Author: Florian Mayer <Florian.Wendelin.Mayer at gmail.com>
  Date:   2015-12-10 (Thu, 10 Dec 2015)

  Changed paths:
    M doc/extensions/best-practices.rst

  Log Message:
  -----------
  Pin third party requs in requirements.txt, not setup.py

Add a section to Docs >  Extensions > Best practices about third party requirements as advocated by @davidread in https://github.com/ckan/ckan/issues/2470


  Commit: 2bfc3044da96f4e54259700cbcb868ffc7a49782
      https://github.com/ckan/ckan/commit/2bfc3044da96f4e54259700cbcb868ffc7a49782
  Author: amercader <amercadero at gmail.com>
  Date:   2015-12-10 (Thu, 10 Dec 2015)

  Changed paths:
    M ckanext/example_itranslation/setup.cfg
    M doc/extensions/translating-extensions.rst

  Log Message:
  -----------
  [#2783] Improve Translating extensions documentation

Improve formatting, clarify paths, fix typos.


  Commit: c83e2ee0745ec1efaa64bd251a184d28c142b8fb
      https://github.com/ckan/ckan/commit/c83e2ee0745ec1efaa64bd251a184d28c142b8fb
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-12-10 (Thu, 10 Dec 2015)

  Changed paths:
    M doc/extensions/best-practices.rst

  Log Message:
  -----------
  Merge pull request #2782 from florianm/patch-1

Pin third party requs in requirements.txt, not setup.py


  Commit: 9a4d5c41cd859b2dcab112995a506535a4feed1c
      https://github.com/ckan/ckan/commit/9a4d5c41cd859b2dcab112995a506535a4feed1c
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-12-11 (Fri, 11 Dec 2015)

  Changed paths:
    M doc/maintaining/upgrading/index.rst

  Log Message:
  -----------
  Mention deps for upcoming patch releases.


  Commit: 075b3c104e6923b47c01d7ea01434961fdbfccfd
      https://github.com/ckan/ckan/commit/075b3c104e6923b47c01d7ea01434961fdbfccfd
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M doc/extensions/translating-extensions.rst

  Log Message:
  -----------
  [#2783] Typo fixes and simplifications for docs


  Commit: e9c68a7a38ea55c936e34f80c8ddbcad809111e3
      https://github.com/ckan/ckan/commit/e9c68a7a38ea55c936e34f80c8ddbcad809111e3
  Author: Ian Ward <ian at excess.org>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  Remove user when using API callbacks


  Commit: f36d6da0408b2be1be415c1f40bd3cbc3d1c2c80
      https://github.com/ckan/ckan/commit/f36d6da0408b2be1be415c1f40bd3cbc3d1c2c80
  Author: Ian Ward <ian at excess.org>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M ckan/tests/controllers/test_api.py

  Log Message:
  -----------
  test user removed when using API callbacks


  Commit: 9426543c69899b37a2d1b82205707f5d3f29ec4c
      https://github.com/ckan/ckan/commit/9426543c69899b37a2d1b82205707f5d3f29ec4c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update changelog for patch releases


  Commit: 940c35ee6f904c89cb2b99a0eeb94b38a418c702
      https://github.com/ckan/ckan/commit/940c35ee6f904c89cb2b99a0eeb94b38a418c702
  Author: amercader <amercadero at gmail.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M ckanext/example_itranslation/setup.cfg
    M doc/extensions/translating-extensions.rst

  Log Message:
  -----------
  Merge branch '2783-improve-ext-trans-docs'


  Commit: 0b8395ee518b5c66a6ec096627e03cf4e62290cd
      https://github.com/ckan/ckan/commit/0b8395ee518b5c66a6ec096627e03cf4e62290cd
  Author: amercader <amercadero at gmail.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Merge branch '2771-group-controller-on-igroupform' of https://github.com/metaodi/ckan into metaodi-2771-group-controller-on-igroupform


  Commit: 1ed75d3e66d654573d3a49375b0b66307bb688c7
      https://github.com/ckan/ckan/commit/1ed75d3e66d654573d3a49375b0b66307bb688c7
  Author: amercader <amercadero at gmail.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Merge branch 'metaodi-2771-group-controller-on-igroupform'


  Commit: 5642abe2d9b2dab12cbf114015df04590aeab6bc
      https://github.com/ckan/ckan/commit/5642abe2d9b2dab12cbf114015df04590aeab6bc
  Author: amercader <amercadero at gmail.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M doc/contributing/release-process.rst

  Log Message:
  -----------
  Update release process with deb packaging instructions


  Commit: f17ee8cb83b766172456427184731577b7a978a8
      https://github.com/ckan/ckan/commit/f17ee8cb83b766172456427184731577b7a978a8
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M doc/contributing/release-process.rst

  Log Message:
  -----------
  Merge pull request #2791 from ckan/release-packages-s3

Update release process docs with deb packaging instructions


  Commit: 248006d01c2dd2c07b34245e4d73f732ff67f29b
      https://github.com/ckan/ckan/commit/248006d01c2dd2c07b34245e4d73f732ff67f29b
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Add changelog for 2.5.0 and patch releases.


  Commit: bcb78438898d874306ddadcab5d19ed70df3aef8
      https://github.com/ckan/ckan/commit/bcb78438898d874306ddadcab5d19ed70df3aef8
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-12-16 (Wed, 16 Dec 2015)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fix spelling


  Commit: 353948e7ebf45cc093f9a24986fe4734cfc28141
      https://github.com/ckan/ckan/commit/353948e7ebf45cc093f9a24986fe4734cfc28141
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M ckan/tests/controllers/test_admin.py

  Log Message:
  -----------
  Fix test for when "paster front-end-build" has been run, eg during release.


  Commit: e8c4af328224668ebe3ee825d6106d7f3ab0020e
      https://github.com/ckan/ckan/commit/e8c4af328224668ebe3ee825d6106d7f3ab0020e
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M CHANGELOG.rst
    M setup.py

  Log Message:
  -----------
  Change version to 2.5.1 because of problem reuploading to pypi.

Conflicts:

	ckan/__init__.py


  Commit: d04b4d7c272a6bcd6d52cd773b6122551215e05b
      https://github.com/ckan/ckan/commit/d04b4d7c272a6bcd6d52cd773b6122551215e05b
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  [#2795] Unpin coveralls requirement


  Commit: 082858f23b343644e823115605476628e1a767d9
      https://github.com/ckan/ckan/commit/082858f23b343644e823115605476628e1a767d9
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/check_po_files.py
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  i18n copied from release-v2.5.1 branch.


  Commit: 26f5b710302e145f6e8f8a8b28452290983f12e5
      https://github.com/ckan/ckan/commit/26f5b710302e145f6e8f8a8b28452290983f12e5
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M doc/contributing/release-process.rst

  Log Message:
  -----------
  Release process, from learnings of latest release.


  Commit: 367d758a41c5fb38e81397f952fdd95939ddfb67
      https://github.com/ckan/ckan/commit/367d758a41c5fb38e81397f952fdd95939ddfb67
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M doc/contributing/release-process.rst

  Log Message:
  -----------
  Add info on doing patch releases.


  Commit: 61f59d83604a792006e945878424fb7957ce6e49
      https://github.com/ckan/ckan/commit/61f59d83604a792006e945878424fb7957ce6e49
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M ckanext/example_itranslation/tests/test_plugin.py

  Log Message:
  -----------
  [i18n] Remove test that was broken by the real es translation being done. Cannot see a better way and test is not really important.


  Commit: c41f8653c3e81da81444104dd7c0dd3c375281aa
      https://github.com/ckan/ckan/commit/c41f8653c3e81da81444104dd7c0dd3c375281aa
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M ckanext/example_itranslation/tests/test_plugin.py

  Log Message:
  -----------
  Merge branch 'master' into document-patch-releasing


  Commit: 7d90dcb61e1212bf91fbbe3c77b71fc7187fc78b
      https://github.com/ckan/ckan/commit/7d90dcb61e1212bf91fbbe3c77b71fc7187fc78b
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M ckanext/example_itranslation/tests/test_plugin.py

  Log Message:
  -----------
  Merge branch 'master' into release-learnings


  Commit: bc3d14a5453e1c5d40c4a18c12fa60d672623178
      https://github.com/ckan/ckan/commit/bc3d14a5453e1c5d40c4a18c12fa60d672623178
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-12-18 (Fri, 18 Dec 2015)

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

  Log Message:
  -----------
  [#2802] Fix assert to test for message in response


  Commit: 7c25227118d101e3b331928ab81c2da392025f8f
      https://github.com/ckan/ckan/commit/7c25227118d101e3b331928ab81c2da392025f8f
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-12-23 (Wed, 23 Dec 2015)

  Changed paths:
    R .coveragerc
    M .tx/config
    M CHANGELOG.rst
    M README.rst
    M bin/travis-run-tests
    A circle.yml
    M ckan/__init__.py
    M ckan/authz.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/storage.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/check_po_files.py
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    R ckan/i18n/dv/LC_MESSAGES/ckan.mo
    R ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    R ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    R ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    R ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    R ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    R ckan/i18n/eu/LC_MESSAGES/ckan.mo
    R ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    R ckan/i18n/lo/LC_MESSAGES/ckan.mo
    R ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    R ckan/i18n/my/LC_MESSAGES/ckan.mo
    R ckan/i18n/my/LC_MESSAGES/ckan.po
    R ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    R ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    R ckan/i18n/sw/LC_MESSAGES/ckan.mo
    R ckan/i18n/sw/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    R ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    R ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    R ckan/lib/accept.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dumper.py
    M ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/lazyjson.py
    M ckan/lib/munge.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/delete.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    R ckan/migration/versions/079_remove_related_items.py
    A ckan/migration/versions/079_resource_revision_index.py
    A ckan/migration/versions/080_continuity_id_indexes.py
    A ckan/migration/versions/081_set_datastore_active.py
    A ckan/migration/versions/082_create_index_creator_user_id.py
    A ckan/migration/versions/083_remove_related_items.py
    M ckan/model/domain_object.py
    M ckan/model/group.py
    M ckan/model/modification.py
    M ckan/pastertemplates/__init__.py
    M ckan/pastertemplates/template/+dot+travis.yml_tmpl
    M ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    A ckan/pastertemplates/template/setup.cfg_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/main.js
    A ckan/public/base/vendor/moment-with-locales.js
    M ckan/public/base/vendor/resource.config
    R ckan/public/css/boilerplate.css
    R ckan/public/css/bootstrap.min.css
    R ckan/public/css/chosen.css
    R ckan/public/css/forms.css
    R ckan/public/css/handheld.css
    R ckan/public/css/style.css
    R ckan/public/images/bullet_separator.png
    R ckan/public/images/button-shadow.png
    R ckan/public/images/chevron-down.png
    R ckan/public/images/chevron-up.png
    R ckan/public/images/chosen-sprite.png
    R ckan/public/images/ckan_logo_fullname_long.png
    R ckan/public/images/dlbg.png
    R ckan/public/images/dragbars.png
    R ckan/public/images/icons/add.png
    R ckan/public/images/icons/arrow-closed.gif
    R ckan/public/images/icons/arrow-down-16.png
    R ckan/public/images/icons/arrow-down-32.png
    R ckan/public/images/icons/arrow-open.gif
    R ckan/public/images/icons/arrow-right-16-black.png
    R ckan/public/images/icons/arrow-right-16.png
    R ckan/public/images/icons/arrow-right-32.png
    R ckan/public/images/icons/arrow_down.png
    R ckan/public/images/icons/arrow_down_grey.png
    R ckan/public/images/icons/arrow_up.png
    R ckan/public/images/icons/atom_feed.png
    R ckan/public/images/icons/ckan.ico
    R ckan/public/images/icons/comments.png
    R ckan/public/images/icons/delete.png
    R ckan/public/images/icons/door.png
    R ckan/public/images/icons/door_grey.png
    R ckan/public/images/icons/door_open.png
    R ckan/public/images/icons/drive_web.png
    R ckan/public/images/icons/edit-collapse.png
    R ckan/public/images/icons/edit-expand.png
    R ckan/public/images/icons/error.png
    R ckan/public/images/icons/followers.png
    R ckan/public/images/icons/group.png
    R ckan/public/images/icons/group_add.png
    R ckan/public/images/icons/group_edit.png
    R ckan/public/images/icons/key.png
    R ckan/public/images/icons/lock.png
    R ckan/public/images/icons/magnifier.png
    R ckan/public/images/icons/note.png
    R ckan/public/images/icons/openid.png
    R ckan/public/images/icons/package-disabled.png
    R ckan/public/images/icons/package.png
    R ckan/public/images/icons/package_add.png
    R ckan/public/images/icons/package_edit.png
    R ckan/public/images/icons/page_stack.png
    R ckan/public/images/icons/page_white.png
    R ckan/public/images/icons/page_white_add.png
    R ckan/public/images/icons/page_white_code.png
    R ckan/public/images/icons/page_white_compressed.png
    R ckan/public/images/icons/page_white_cup.png
    R ckan/public/images/icons/page_white_database.png
    R ckan/public/images/icons/page_white_error.png
    R ckan/public/images/icons/page_white_excel.png
    R ckan/public/images/icons/page_white_gear.png
    R ckan/public/images/icons/page_white_json.png
    R ckan/public/images/icons/page_white_link.png
    R ckan/public/images/icons/page_white_rdf.png
    R ckan/public/images/icons/page_white_stack.png
    R ckan/public/images/icons/page_white_text.png
    R ckan/public/images/icons/pencil.png
    R ckan/public/images/icons/remove.png
    R ckan/public/images/icons/star.png
    R ckan/public/images/icons/tag_blue.png
    R ckan/public/images/icons/unfilter.png
    R ckan/public/images/icons/user.png
    R ckan/public/images/icons/user_grey.png
    R ckan/public/images/icons/world_go.png
    R ckan/public/images/ldquo.png
    R ckan/public/images/photo-placeholder.png
    R ckan/public/images/stars.png
    R ckan/public/img/collaborate.png
    R ckan/public/img/find.png
    R ckan/public/img/glyphicons-halflings-white.png
    R ckan/public/img/glyphicons-halflings.png
    R ckan/public/img/lod2.png
    R ckan/public/img/logo.png
    R ckan/public/img/logo_64px_wide.png
    R ckan/public/img/share.png
    R ckan/public/scripts/application.js
    R ckan/public/scripts/dataexplorer/icon-sprite.png
    R ckan/public/scripts/dataexplorer/loading.gif
    R ckan/public/scripts/dataexplorer/table-view-template.js
    R ckan/public/scripts/dataexplorer/table-view.css
    R ckan/public/scripts/dataexplorer/table-view.js
    R ckan/public/scripts/dataexplorer/table-view.ui.js
    R ckan/public/scripts/outside.js
    R ckan/public/scripts/templates.js
    R ckan/public/scripts/vendor/backbone/0.5.1/backbone.js
    R ckan/public/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js
    R ckan/public/scripts/vendor/flot/0.7/excanvas.js
    R ckan/public/scripts/vendor/flot/0.7/jquery.flot.js
    R ckan/public/scripts/vendor/html5shiv/html5.js
    R ckan/public/scripts/vendor/jquery.chosen/0.9.7/chosen.js
    R ckan/public/scripts/vendor/jquery.cookie/jquery.cookie.min.js
    R ckan/public/scripts/vendor/jquery.event.drag/2.0/jquery.event.drag.min.js
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.fileupload-ui.css
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.fileupload-ui.js
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.fileupload.js
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.iframe-transport.js
    R ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
    R ckan/public/scripts/vendor/jquery.placeholder/jquery.placeholder.js
    R ckan/public/scripts/vendor/jquery.tmpl/beta1/jquery.tmpl.js
    R ckan/public/scripts/vendor/jquery/1.7.1/jquery.js
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_0_000_40x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_100_000_40x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_75_ffffff_40x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_100_f0f0f0_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_55_fbf9ee_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_65_ffffff_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_75_dadada_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_95_fef1ec_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_highlight-soft_100_f0f0f0_1x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_000_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_222222_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_2e83ff_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_444444_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_888888_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_b22_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_cd0a0a_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/jquery-ui.custom.css
    R ckan/public/scripts/vendor/jqueryui/1.8.14/jquery-ui.min.js
    R ckan/public/scripts/vendor/json2.js
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/layers.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/marker-shadow.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/marker.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/popup-close.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/zoom-in.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/zoom-out.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.css
    R ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.ie.css
    R ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.js
    R ckan/public/scripts/vendor/modernizr/1.7/modernizr.min.js
    R ckan/public/scripts/vendor/moment/1.6.2/moment.js
    R ckan/public/scripts/vendor/mustache/0.5.0-dev/mustache.js
    R ckan/public/scripts/vendor/openid-selector/css/openid.css
    R ckan/public/scripts/vendor/openid-selector/images/aol.gif
    R ckan/public/scripts/vendor/openid-selector/images/blogger.ico
    R ckan/public/scripts/vendor/openid-selector/images/claimid.ico
    R ckan/public/scripts/vendor/openid-selector/images/facebook.gif
    R ckan/public/scripts/vendor/openid-selector/images/flickr.ico
    R ckan/public/scripts/vendor/openid-selector/images/google.gif
    R ckan/public/scripts/vendor/openid-selector/images/livejournal.ico
    R ckan/public/scripts/vendor/openid-selector/images/myopenid.ico
    R ckan/public/scripts/vendor/openid-selector/images/openid-inputicon.gif
    R ckan/public/scripts/vendor/openid-selector/images/openid.gif
    R ckan/public/scripts/vendor/openid-selector/images/technorati.ico
    R ckan/public/scripts/vendor/openid-selector/images/verisign.gif
    R ckan/public/scripts/vendor/openid-selector/images/verisign.ico
    R ckan/public/scripts/vendor/openid-selector/images/vidoop.ico
    R ckan/public/scripts/vendor/openid-selector/images/wordpress.ico
    R ckan/public/scripts/vendor/openid-selector/images/yahoo.gif
    R ckan/public/scripts/vendor/openid-selector/js/jquery-1.2.6.min.js
    R ckan/public/scripts/vendor/openid-selector/js/openid-jquery.js
    R ckan/public/scripts/vendor/recline/css/recline.css
    R ckan/public/scripts/vendor/resize/resize.js
    R ckan/public/scripts/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    R ckan/public/scripts/vendor/slickgrid/2.0.1/README.txt
    R ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-asc.gif
    R ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-desc.gif
    R ckan/public/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    R ckan/public/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    R ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.css
    R ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckan/public/scripts/vendor/underscore/1.1.6/underscore.js
    M ckan/templates/activity_streams/activity_stream_email_notifications.text
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/organization_form.html
    A ckan/templates/package/related_list.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/resource_form.html
    A ckan/templates/snippets/local_friendly_datetime.html
    M ckan/templates/snippets/organization_item.html
    M ckan/tests/controllers/test_admin.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_group.py
    A ckan/tests/controllers/test_home.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    A ckan/tests/controllers/test_tags.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/helpers.py
    A ckan/tests/i18n/test_check_po_files.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/functional/api/model/test_group.py
    R ckan/tests/legacy/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/legacy/functional/api/model/test_tag.py
    M ckan/tests/legacy/functional/api/test_api.py
    M ckan/tests/legacy/functional/api/test_package_search.py
    R ckan/tests/legacy/functional/api/test_revision_search.py
    M ckan/tests/legacy/functional/test_group.py
    M ckan/tests/legacy/functional/test_home.py
    A ckan/tests/legacy/functional/test_related.py
    R ckan/tests/legacy/functional/test_storage.py
    R ckan/tests/legacy/lib/test_accept.py
    M ckan/tests/legacy/lib/test_cli.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/legacy/lib/test_dictization_schema.py
    M ckan/tests/legacy/lib/test_helpers.py
    M ckan/tests/legacy/lib/test_solr_package_search.py
    M ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/legacy/misc/test_format_text.py
    M ckan/tests/legacy/models/test_package.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_dumper.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_munge.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/test_validators.py
    A ckan/tests/plugins/test_toolkit.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    A ckanext/datastore/tests/test_disable.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_igroupform/plugin.py
    A ckanext/example_igroupform/templates/example_igroup_form/group_form.html
    M ckanext/example_igroupform/tests/test_controllers.py
    A ckanext/example_itranslation/__init__.py
    A ckanext/example_itranslation/babel_mapping.cfg
    A ckanext/example_itranslation/i18n/ckanext-example_itranslation.pot
    A ckanext/example_itranslation/i18n/en/LC_MESSAGES/ckanext-example_itranslation.mo
    A ckanext/example_itranslation/i18n/en/LC_MESSAGES/ckanext-example_itranslation.po
    A ckanext/example_itranslation/i18n/en/LC_MESSAGES/ckanext-example_translation.po
    A ckanext/example_itranslation/i18n/fr/LC_MESSAGES/ckanext-example_itranslation.mo
    A ckanext/example_itranslation/i18n/fr/LC_MESSAGES/ckanext-example_itranslation.po
    A ckanext/example_itranslation/plugin.py
    A ckanext/example_itranslation/plugin_v1.py
    A ckanext/example_itranslation/setup.cfg
    A ckanext/example_itranslation/templates/home/index.html
    A ckanext/example_itranslation/tests/__init__.py
    A ckanext/example_itranslation/tests/test_plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/controller.py
    R ckanext/stats/public/ckanext/stats/app.js
    R ckanext/stats/public/ckanext/stats/demo.html
    R ckanext/stats/public/ckanext/stats/style.css
    R ckanext/stats/templates_legacy/__init__.py
    R ckanext/stats/templates_legacy/ckanext/__init__.py
    R ckanext/stats/templates_legacy/ckanext/stats/__init__.py
    R ckanext/stats/templates_legacy/ckanext/stats/index.html
    R ckanext/stats/templates_legacy/ckanext/stats/leaderboard.html
    M dev-requirements.txt
    R doc/api.rst
    M doc/api/legacy-api.rst
    M doc/conf.py
    M doc/contents.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/issues.rst
    M doc/contributing/release-process.rst
    M doc/contributing/reviewing.rst
    M doc/extensions/adding-custom-fields.rst
    M doc/extensions/best-practices.rst
    M doc/extensions/index.rst
    A doc/extensions/translating-extensions.rst
    M doc/index.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/installing/index.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/upgrading/index.rst
    M doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge from master and update migration filename


  Commit: 340d5bcd6ca651b0e86bbbd6ed911ba0977835d0
      https://github.com/ckan/ckan/commit/340d5bcd6ca651b0e86bbbd6ed911ba0977835d0
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-12-23 (Wed, 23 Dec 2015)

  Changed paths:
    M ckan/controllers/package.py
    R ckan/tests/legacy/functional/test_home.py
    R ckan/tests/legacy/functional/test_related.py
    M ckan/tests/legacy/logic/test_action.py

  Log Message:
  -----------
  Remove test_home from legacy tests as was removed in master


  Commit: e225985c82e007746aed67ab3504d52d958f86dd
      https://github.com/ckan/ckan/commit/e225985c82e007746aed67ab3504d52d958f86dd
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-12-23 (Wed, 23 Dec 2015)

  Changed paths:
    M ckan/migration/versions/083_remove_related_items.py

  Log Message:
  -----------
  Change migration to emit a warning if data exists

If there is related data, it is not deleted but the user is given a
warning to allow them to migrate to ckanext-showcase and how to manually
delete the tables.


  Commit: 62ad314de5f3a86218210519c77ff8d7a5b1ff7f
      https://github.com/ckan/ckan/commit/62ad314de5f3a86218210519c77ff8d7a5b1ff7f
  Author: Ian Ward <ian at excess.org>
  Date:   2015-12-28 (Mon, 28 Dec 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2815] add user parameter to paster profile command


  Commit: ab685c76f3de8a5f6a4d0fa9fcc31d1b99af3e23
      https://github.com/ckan/ckan/commit/ab685c76f3de8a5f6a4d0fa9fcc31d1b99af3e23
  Author: Ian Ward <ian at excess.org>
  Date:   2015-12-31 (Thu, 31 Dec 2015)

  Changed paths:
    M ckan/authz.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/__init__.py
    M ckanext/resourceproxy/controller.py

  Log Message:
  -----------
  [#2817] stop passing c.author as context['user']


  Commit: 65a40b62c5144553c17de8fbb33e5295a452c1f8
      https://github.com/ckan/ckan/commit/65a40b62c5144553c17de8fbb33e5295a452c1f8
  Author: Ian Ward <ian at excess.org>
  Date:   2015-12-31 (Thu, 31 Dec 2015)

  Changed paths:
    M ckan/tests/__init__.py

  Log Message:
  -----------
  [#2818] remove legacy test import hack


  Commit: 60061b0e035163a43611154d12bd99471a401113
      https://github.com/ckan/ckan/commit/60061b0e035163a43611154d12bd99471a401113
  Author: Ian Ward <ian at excess.org>
  Date:   2015-12-31 (Thu, 31 Dec 2015)

  Changed paths:
    R ckan/new_tests.py

  Log Message:
  -----------
  [#2818] remove legacy new_tests import hack


  Commit: 5786994b3af7095174edef3712cf2711da8dc9b7
      https://github.com/ckan/ckan/commit/5786994b3af7095174edef3712cf2711da8dc9b7
  Author: Ian Ward <ian at excess.org>
  Date:   2015-12-31 (Thu, 31 Dec 2015)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/render.py

  Log Message:
  -----------
  [#2818] remove package controller c.form compat hack


  Commit: 34c2f7e1e6f829af9d6d534c42f272dc0501705d
      https://github.com/ckan/ckan/commit/34c2f7e1e6f829af9d6d534c42f272dc0501705d
  Author: Ian Ward <ian at excess.org>
  Date:   2015-12-31 (Thu, 31 Dec 2015)

  Changed paths:
    R ckan/new_authz.py
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  [#2818] remove new_authz import hack


  Commit: b105ac07353764d179917606722bed0a799000a4
      https://github.com/ckan/ckan/commit/b105ac07353764d179917606722bed0a799000a4
  Author: Ian Ward <ian at excess.org>
  Date:   2015-12-31 (Thu, 31 Dec 2015)

  Changed paths:
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py
    M ckanext/example_igroupform/tests/test_controllers.py

  Log Message:
  -----------
  [#2818] fix extensions new_tests references


  Commit: 4a3b37520c0626085c4643a6be517ea2ea3edaf3
      https://github.com/ckan/ckan/commit/4a3b37520c0626085c4643a6be517ea2ea3edaf3
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-01-05 (Tue, 05 Jan 2016)

  Changed paths:
    M doc/maintaining/installing/install-using-docker.rst

  Log Message:
  -----------
  [#2820] Add warning so that we can link to this version of the instructions, archived in github.


  Commit: 53cae62a95f3bf5ec8179c8d745a59e7231fb9dd
      https://github.com/ckan/ckan/commit/53cae62a95f3bf5ec8179c8d745a59e7231fb9dd
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-01-05 (Tue, 05 Jan 2016)

  Changed paths:
    M doc/maintaining/installing/install-using-docker.rst

  Log Message:
  -----------
  [#2820] Link to datacats. Include link to archived method.


  Commit: a359bce80067569e4f2d0ca7b7c4e00665e11460
      https://github.com/ckan/ckan/commit/a359bce80067569e4f2d0ca7b7c4e00665e11460
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2016-01-06 (Wed, 06 Jan 2016)

  Changed paths:
    M ckan/model/package.py

  Log Message:
  -----------
  Stops Package.get avoiding the cache

SQLAlchemy has a session cache containing objects that it has retrieved
recently, which are stored in an identity map (pk->object). If you call
session.query(cls).get(pk) the object will be retrieved from the cache
(identity map), if you call session.query(cls).filter() then Sqlalchemy
has to query the database again.

In Package.get() the query to find by id (before looking by name) uses
filter and so will always bypass the session cache. Once upon a time it
used session.query(cls).get(reference), but this was lost in a change
(where eager loading was added, then removed in a later commit).

For a contrived, and probably sub-optimal example ...

for pkg in some_query_that_fetches_packages():
    pkg_dict = logic.get_action('package_show')(context, {'id': pkg.id})

In these cases package_show is issuing another query to the
database, even though the package object is in the session cache
ready for retrieval.

There is more information on how the Session cache works at
http://docs.sqlalchemy.org/en/latest/orm/session_basics.html#is-the-session-a-cache

This should fix #2823 although there are likely other places this could
be done (e.g. group/user)


  Commit: 181290d3b7911a406398a1b95dbb0794b4e42a78
      https://github.com/ckan/ckan/commit/181290d3b7911a406398a1b95dbb0794b4e42a78
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2016-01-06 (Wed, 06 Jan 2016)

  Changed paths:
    M ckan/model/group.py
    M ckan/model/resource.py
    M ckan/model/resource_view.py
    M ckan/model/task_status.py

  Log Message:
  -----------
  Converts more models to use sqlalchemy cache.

In a similar vein to #2824 this PR will have more model objects use the
session cache in .get() where an ID (PK) is provided.

Related to #2823


  Commit: 0eb09531072a730e34be86d59d80537679ffe5a9
      https://github.com/ckan/ckan/commit/0eb09531072a730e34be86d59d80537679ffe5a9
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2016-01-06 (Wed, 06 Jan 2016)

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

  Log Message:
  -----------
  Merge pull request #2802 from ckan/2802-fix-assert

Fix assert_true to test for message in response


  Commit: 9362268b0781f5fc8f061a15cf64c038be20d091
      https://github.com/ckan/ckan/commit/9362268b0781f5fc8f061a15cf64c038be20d091
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2016-01-07 (Thu, 07 Jan 2016)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Merge pull request #2815 from wardi/2815-paster-profile-user

Add user parameter to paster profile command


  Commit: 5708fbef8c97a901c9955ae032bafa8c38552926
      https://github.com/ckan/ckan/commit/5708fbef8c97a901c9955ae032bafa8c38552926
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-01-07 (Thu, 07 Jan 2016)

  Changed paths:
    M doc/maintaining/installing/index.rst
    M doc/maintaining/installing/install-using-docker.rst

  Log Message:
  -----------
  [#2820] Get rid of link to datacats and links to docker install page, but leave the page to warn people if they get look via google.


  Commit: ab55a9490c18f715f684876354f6755fe6bbc68f
      https://github.com/ckan/ckan/commit/ab55a9490c18f715f684876354f6755fe6bbc68f
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2016-01-07 (Thu, 07 Jan 2016)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/render.py
    R ckan/new_authz.py
    R ckan/new_tests.py
    M ckan/tests/__init__.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py
    M ckanext/example_igroupform/tests/test_controllers.py

  Log Message:
  -----------
  Merge pull request #2818 from wardi/2818-remove-compat-hacks

remove some deprecated compatibility hacks


  Commit: 57abd7463bcf3881223a65a3e45927ec081e5e84
      https://github.com/ckan/ckan/commit/57abd7463bcf3881223a65a3e45927ec081e5e84
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-01-07 (Thu, 07 Jan 2016)

  Changed paths:
    R doc/maintaining/installing/install-using-docker.rst

  Log Message:
  -----------
  [#2820] Get rid of docker install page - fails test if we have an orphan.


  Commit: 9b5cb5cb1afafa9543ff554a4543cb46f7383074
      https://github.com/ckan/ckan/commit/9b5cb5cb1afafa9543ff554a4543cb46f7383074
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-07 (Thu, 07 Jan 2016)

  Changed paths:
    M doc/maintaining/installing/index.rst
    R doc/maintaining/installing/install-using-docker.rst

  Log Message:
  -----------
  Merge pull request #2821 from ckan/docker-update

Docker install archived


  Commit: 9d97d5348c08f2d4ca68ef1473fab46cfc8ad590
      https://github.com/ckan/ckan/commit/9d97d5348c08f2d4ca68ef1473fab46cfc8ad590
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-07 (Thu, 07 Jan 2016)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/logic/action/create.py
    A ckan/templates/emails/invite_user.txt
    A ckan/templates/emails/invite_user_subject.txt
    A ckan/templates/emails/reset_password.txt
    A ckan/templates/emails/reset_password_subject.txt
    R ckan/tests/legacy/lib/test_mailer.py
    M ckan/tests/legacy/lib/test_resource_search.py
    M ckan/tests/legacy/mock_mail_server.py
    M ckan/tests/legacy/test_coding_standards.py
    A ckan/tests/lib/test_mailer.py
    M ckan/tests/logic/action/test_create.py
    A ckanext/example_theme/custom_emails/__init__.py
    A ckanext/example_theme/custom_emails/plugin.py
    A ckanext/example_theme/custom_emails/templates/emails/invite_user.txt
    A ckanext/example_theme/custom_emails/templates/emails/invite_user_subject.txt
    A ckanext/example_theme/custom_emails/templates/emails/reset_password.txt
    A ckanext/example_theme/custom_emails/templates/emails/reset_password_subject.txt
    A ckanext/example_theme/custom_emails/tests.py
    M setup.py

  Log Message:
  -----------
  Merge pull request #2465 from ckan/1527-custom-emails

[#1527] Allow to customize emails sent from CKAN


  Commit: 1da267da161f99c55dcfcd7c7d1ba16a944b8a17
      https://github.com/ckan/ckan/commit/1da267da161f99c55dcfcd7c7d1ba16a944b8a17
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#2678] dataset name has no _translated version


  Commit: 341521aa318eed5c312fd2223aa3d9b01472d4be
      https://github.com/ckan/ckan/commit/341521aa318eed5c312fd2223aa3d9b01472d4be
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

  Changed paths:
    M ckan/templates/package/base.html

  Log Message:
  -----------
  [#2678] organization name has no _translated version


  Commit: c539a44f1e28e96668ae9888f0ecbd5cb2e65baf
      https://github.com/ckan/ckan/commit/c539a44f1e28e96668ae9888f0ecbd5cb2e65baf
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

  Changed paths:
    M ckan/templates/package/confirm_delete.html

  Log Message:
  -----------
  [#2678] package/confirm_delete: use display name


  Commit: bb64a871ea3a3802c67949201bfe3f7f5df9ba79
      https://github.com/ckan/ckan/commit/bb64a871ea3a3802c67949201bfe3f7f5df9ba79
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

  Changed paths:
    M ckan/lib/activity_streams_session_extension.py
    M ckan/tests/legacy/functional/api/test_dashboard.py
    M ckan/tests/legacy/functional/test_group.py

  Log Message:
  -----------
  Merge pull request #2750 from ckan/quiet-activity-logs

Quieten activity logs


  Commit: 9596c5c95d5bb232add5201f6436bc9093483619
      https://github.com/ckan/ckan/commit/9596c5c95d5bb232add5201f6436bc9093483619
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Merge pull request #2751 from ckan/profiler-improve

Profiler prints out stats - easier for quick profile


  Commit: 8d52ecb9a62948833552bea406cb6a7a8d88ce69
      https://github.com/ckan/ckan/commit/8d52ecb9a62948833552bea406cb6a7a8d88ce69
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

  Changed paths:
    M ckan/model/package.py

  Log Message:
  -----------
  Merge pull request #2824 from ckan/2823-use-sqlalchemy-cache-for-packages

Stops Package.get avoiding the cache


  Commit: 12ba7794543f235833b63a4f715e269ace21ca56
      https://github.com/ckan/ckan/commit/12ba7794543f235833b63a4f715e269ace21ca56
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

  Changed paths:
    M ckan/model/group.py
    M ckan/model/resource.py
    M ckan/model/resource_view.py
    M ckan/model/task_status.py

  Log Message:
  -----------
  Merge pull request #2825 from ckan/2823-use-sqlalchemy-cache-for-more-objects

Converts more models to use sqlalchemy cache.


  Commit: 2e42f4fddc6e0e04de508aa70071ed9665c987a6
      https://github.com/ckan/ckan/commit/2e42f4fddc6e0e04de508aa70071ed9665c987a6
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

  Changed paths:
    M ckan/tests/controllers/test_package.py

  Log Message:
  -----------
  [#2678] update confirm delete test


  Commit: 4b7d9e00dec555ea0cf9495f6d52445ea2ba851b
      https://github.com/ckan/ckan/commit/4b7d9e00dec555ea0cf9495f6d52445ea2ba851b
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/package/base.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/resource_info.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/tests/controllers/test_package.py

  Log Message:
  -----------
  Merge pull request #2729 from ckan/2678-core-multilingual-fields

[#2678] Add core translation get_translated helper


  Commit: d36cbdcea76993b68a923b903bf16caaceed5c22
      https://github.com/ckan/ckan/commit/d36cbdcea76993b68a923b903bf16caaceed5c22
  Author: amercader <amercadero at gmail.com>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  Merge branch '2795-coveralls-requirement'


  Commit: 681c5f7b7cc60adf55672356fa7fe9bdf5c6ffe4
      https://github.com/ckan/ckan/commit/681c5f7b7cc60adf55672356fa7fe9bdf5c6ffe4
  Author: amercader <amercadero at gmail.com>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M doc/contributing/release-process.rst

  Log Message:
  -----------
  Add latest release branch step


  Commit: 7d6415873d569878ce32da9e0357e53106c49ffa
      https://github.com/ckan/ckan/commit/7d6415873d569878ce32da9e0357e53106c49ffa
  Author: amercader <amercadero at gmail.com>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M doc/contributing/release-process.rst

  Log Message:
  -----------
  Merge branch 'document-patch-releasing'


  Commit: 962e55e85b221adf2ddd80bf220ad811bd174bf9
      https://github.com/ckan/ckan/commit/962e55e85b221adf2ddd80bf220ad811bd174bf9
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M doc/contributing/release-process.rst

  Log Message:
  -----------
  Dont pull from transifex files under 5% - tip from amercader.


  Commit: 71ee8fcff1e3fa6114cba42e4c572f73c40e30ac
      https://github.com/ckan/ckan/commit/71ee8fcff1e3fa6114cba42e4c572f73c40e30ac
  Author: amercader <amercadero at gmail.com>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M doc/contributing/release-process.rst

  Log Message:
  -----------
  Merge branch 'release-learnings'


  Commit: fe509225a2af50d4f9e2f52083845cbbbd2ba7b9
      https://github.com/ckan/ckan/commit/fe509225a2af50d4f9e2f52083845cbbbd2ba7b9
  Author: amercader <amercadero at gmail.com>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M circle.yml

  Log Message:
  -----------
  Output JUnit XML output for tests on CircleCI

This allows to list failures directly on top of the report so you don't
have to scroll through the nose output.


  Commit: d49b3ecc26428d78f74bf8a9c0b8ac582e05f22f
      https://github.com/ckan/ckan/commit/d49b3ecc26428d78f74bf8a9c0b8ac582e05f22f
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M ckan/templates/snippets/organization_item.html

  Log Message:
  -----------
  Fixed the url for the organization_item template

Fixes #2827


  Commit: 1003bc7c7c26f07ad3f24167a0f7facb0bd7782c
      https://github.com/ckan/ckan/commit/1003bc7c7c26f07ad3f24167a0f7facb0bd7782c
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2016-01-13 (Wed, 13 Jan 2016)

  Changed paths:
    M LICENSE.txt
    M ckan/config/environment.py
    M ckan/controllers/group.py
    M ckan/lib/base.py
    M ckan/lib/extract.py
    M ckan/lib/render.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/misc/test_format_text.py
    M ckan/tests/legacy/pylons_controller.py
    M ckanext/test_tag_vocab_plugin.py
    M doc/maintaining/configuration.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Removes all of the code for processing genshi templates

As genshi was deprecated 2.5 years ago, it's about time we removed it.
This PR removes genshi.


  Commit: 7cc772bddac46c023c68f928f67233ea1fd991f9
      https://github.com/ckan/ckan/commit/7cc772bddac46c023c68f928f67233ea1fd991f9
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-14 (Thu, 14 Jan 2016)

  Changed paths:
    M circle.yml

  Log Message:
  -----------
  Merge pull request #2830 from ckan/circleci-junit-output

Output JUnit XML output for tests on CircleCI


  Commit: 8f64f4c05ea5967d85c40773c57943046595de5b
      https://github.com/ckan/ckan/commit/8f64f4c05ea5967d85c40773c57943046595de5b
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2016-01-14 (Thu, 14 Jan 2016)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/tests/legacy/functional/test_package.py

  Log Message:
  -----------
  Returns 404 for WUI unauthorised access.

Instead of sending the user to the login page and logging them out, this
change will instead give the user a 404.  This is currently only applied
to deleted datasets.


  Commit: cc0bb58ebd35c0b96f2795d54cbceac1921069ee
      https://github.com/ckan/ckan/commit/cc0bb58ebd35c0b96f2795d54cbceac1921069ee
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-15 (Fri, 15 Jan 2016)

  Changed paths:
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  [#2835] toolkit: add StopOnError


  Commit: 6d0121b96b5c0e9e5a6010b7032731e5bd77c629
      https://github.com/ckan/ckan/commit/6d0121b96b5c0e9e5a6010b7032731e5bd77c629
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-15 (Fri, 15 Jan 2016)

  Changed paths:
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  [#2835] toolkit: add DefaultOrganizationForm


  Commit: 27d3da03ef4a02f18f879e0cf7ffa28cf0cb191b
      https://github.com/ckan/ckan/commit/27d3da03ef4a02f18f879e0cf7ffa28cf0cb191b
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-15 (Fri, 15 Jan 2016)

  Changed paths:
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  [#2835] toolkit: add template helpers "h"


  Commit: 7bff7a22fd357a291eaff85431c134d78abc4857
      https://github.com/ckan/ckan/commit/7bff7a22fd357a291eaff85431c134d78abc4857
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2016-01-19 (Tue, 19 Jan 2016)

  Changed paths:
    A CONDUCT.rst

  Log Message:
  -----------
  Adds a code of conduct


  Commit: 2b172a054847db79e07c121bf320bf295a6bad09
      https://github.com/ckan/ckan/commit/2b172a054847db79e07c121bf320bf295a6bad09
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-19 (Tue, 19 Jan 2016)

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

  Log Message:
  -----------
  [#2835] toolkit: use magic-free version of template helper "h"


  Commit: a44c3fbd0b2f4b81ff18db093a48e67233956a26
      https://github.com/ckan/ckan/commit/a44c3fbd0b2f4b81ff18db093a48e67233956a26
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-19 (Tue, 19 Jan 2016)

  Changed paths:
    M ckan/tests/plugins/test_toolkit.py

  Log Message:
  -----------
  [#2835] test magic-free helper


  Commit: 6ceadf5e64ca0eeddc7689bfd48aa9e29af11918
      https://github.com/ckan/ckan/commit/6ceadf5e64ca0eeddc7689bfd48aa9e29af11918
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-19 (Tue, 19 Jan 2016)

  Changed paths:
    M ckan/config/environment.py
    M ckan/tests/plugins/test_toolkit.py

  Log Message:
  -----------
  [#2835] fix magic-free helpers


  Commit: fa0c1d029d19fd01a9a54bb931f3864ec2efd493
      https://github.com/ckan/ckan/commit/fa0c1d029d19fd01a9a54bb931f3864ec2efd493
  Author: amercader <amercadero at gmail.com>
  Date:   2016-01-20 (Wed, 20 Jan 2016)

  Changed paths:
    M doc/maintaining/apps-ideas.rst
    M doc/maintaining/configuration.rst
    M test-core.ini

  Log Message:
  -----------
  [#2833] Update config docs after genshi removal


  Commit: fd57a785dbe46e68e96d8f3e42a2c40b82897b8f
      https://github.com/ckan/ckan/commit/fd57a785dbe46e68e96d8f3e42a2c40b82897b8f
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2016-01-20 (Wed, 20 Jan 2016)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  Removes the now unused method parameter to render


  Commit: de1dde238985a746e403677e13f713cf1a04835b
      https://github.com/ckan/ckan/commit/de1dde238985a746e403677e13f713cf1a04835b
  Author: amercader <amercadero at gmail.com>
  Date:   2016-01-20 (Wed, 20 Jan 2016)

  Changed paths:
    M LICENSE.txt
    M ckan/config/environment.py
    M ckan/controllers/group.py
    M ckan/lib/base.py
    M ckan/lib/extract.py
    M ckan/lib/render.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/misc/test_format_text.py
    M ckan/tests/legacy/pylons_controller.py
    M ckanext/test_tag_vocab_plugin.py
    M doc/maintaining/apps-ideas.rst
    M doc/maintaining/configuration.rst
    M requirements.in
    M requirements.txt
    M test-core.ini

  Log Message:
  -----------
  Merge branch '2833-remove-genshi'


  Commit: 4e929e3126c57e2b0ca2277e7c0105ac39db3377
      https://github.com/ckan/ckan/commit/4e929e3126c57e2b0ca2277e7c0105ac39db3377
  Author: amercader <amercadero at gmail.com>
  Date:   2016-01-20 (Wed, 20 Jan 2016)

  Changed paths:
    M ckan/templates/snippets/organization_item.html

  Log Message:
  -----------
  Merge branch 'fix-2827' of https://github.com/LaurentGoderre/ckan into LaurentGoderre-fix-2827


  Commit: c70637b6b94d521490e0ccc667044b5ed785a253
      https://github.com/ckan/ckan/commit/c70637b6b94d521490e0ccc667044b5ed785a253
  Author: amercader <amercadero at gmail.com>
  Date:   2016-01-20 (Wed, 20 Jan 2016)

  Changed paths:
    M ckan/templates/snippets/organization_item.html

  Log Message:
  -----------
  Merge branch 'LaurentGoderre-fix-2827'


  Commit: ed2a2413998146b980791b91fb014234ef165fa7
      https://github.com/ckan/ckan/commit/ed2a2413998146b980791b91fb014234ef165fa7
  Author: amercader <amercadero at gmail.com>
  Date:   2016-01-20 (Wed, 20 Jan 2016)

  Changed paths:
    M ckan/authz.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/__init__.py
    M ckanext/resourceproxy/controller.py

  Log Message:
  -----------
  Merge branch '2817-context-user-always-username' of https://github.com/wardi/ckan into wardi-2817-context-user-always-username


  Commit: 1a7885ed1fd71cb76e42db597dfdea531959fe41
      https://github.com/ckan/ckan/commit/1a7885ed1fd71cb76e42db597dfdea531959fe41
  Author: amercader <amercadero at gmail.com>
  Date:   2016-01-20 (Wed, 20 Jan 2016)

  Changed paths:
    M ckan/authz.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/__init__.py
    M ckanext/resourceproxy/controller.py

  Log Message:
  -----------
  Merge branch 'wardi-2817-context-user-always-username'


  Commit: 6441e0cf83814ea643cf62123d105a59a1559e15
      https://github.com/ckan/ckan/commit/6441e0cf83814ea643cf62123d105a59a1559e15
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2016-01-20 (Wed, 20 Jan 2016)

  Changed paths:
    R ckan/public/base/javascript/modules/related-item.js
    M ckan/public/base/javascript/resource.config
    R ckan/public/base/test/spec/modules/related-item.spec.js
    R ckan/templates/package/related_list.html

  Log Message:
  -----------
  Remove un-needed related item templates


  Commit: 602b6f05dceefb2c98531eab81c7cbdea20821fb
      https://github.com/ckan/ckan/commit/602b6f05dceefb2c98531eab81c7cbdea20821fb
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/083_remove_related_items.py
    M ckan/model/__init__.py
    M ckan/model/group.py
    R ckan/model/related.py
    R ckan/public/base/javascript/modules/related-item.js
    M ckan/public/base/javascript/resource.config
    R ckan/public/base/test/spec/modules/related-item.spec.js
    R ckan/templates/package/related_list.html
    R ckan/templates/snippets/related.html
    M ckan/tests/factories.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/functional/api/test_activity.py
    R ckan/tests/legacy/functional/test_related.py
    M ckan/tests/legacy/functional/test_revision.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/auth/test_init.py
    M ckan/tests/test_factories.py

  Log Message:
  -----------
  Merge branch 'ckan-2609-delete-related-items'


  Commit: 1d665023c03ca9f7404af807a9b55e140f58fde3
      https://github.com/ckan/ckan/commit/1d665023c03ca9f7404af807a9b55e140f58fde3
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-01-22 (Fri, 22 Jan 2016)

  Changed paths:
    M ckan/config/environment.py
    M ckan/plugins/toolkit.py
    M ckan/tests/plugins/test_toolkit.py

  Log Message:
  -----------
  Merge branch 'wardi-2835-toolkit-test-helpers-factories'


  Commit: 89f78cc25787a77e172147ce2f4a31869c4cf459
      https://github.com/ckan/ckan/commit/89f78cc25787a77e172147ce2f4a31869c4cf459
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-01-25 (Mon, 25 Jan 2016)

  Changed paths:
    A ckan/public/base/images/ckan-logo-white.svg
    A ckan/public/base/images/ckan-logo.svg

  Log Message:
  -----------
  Added the SVG version of the logo


  Commit: 412bd2d0cca6f8938ce70f8df1b293b356f97bd3
      https://github.com/ckan/ckan/commit/412bd2d0cca6f8938ce70f8df1b293b356f97bd3
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-25 (Mon, 25 Jan 2016)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/tests/legacy/functional/test_package.py

  Log Message:
  -----------
  Merge pull request #2831 from ckan/2805-show-404-for-deleted-datasets

Show 404 when user has no permission for deleted package


  Commit: 0ca368cdca7fa2f5c31206893a00e1f0883d9208
      https://github.com/ckan/ckan/commit/0ca368cdca7fa2f5c31206893a00e1f0883d9208
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-25 (Mon, 25 Jan 2016)

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  Merge pull request #2638 from ckan/cleanup-exception-deprecations

Removes deprecation warning.


  Commit: f5875be08733bafa6eaca0086466a57b6705c51c
      https://github.com/ckan/ckan/commit/f5875be08733bafa6eaca0086466a57b6705c51c
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-25 (Mon, 25 Jan 2016)

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

  Log Message:
  -----------
  Merge pull request #2622 from trickvi/master

Fix api documentation parameter name typo for config_option_show


  Commit: bd95b15f130f5312c932f1157a00ae16de4b0964
      https://github.com/ckan/ckan/commit/bd95b15f130f5312c932f1157a00ae16de4b0964
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-25 (Mon, 25 Jan 2016)

  Changed paths:
    A ckan/migration/versions/082_add_metadata_created.py
    M ckan/model/package.py

  Log Message:
  -----------
  Merge pull request #2739 from ckan/2735-metadata-created-as-field

Adds metadata_created as a proper DB field.


  Commit: 63b2af18b86f03e9cf5e04dc616e06279247bd08
      https://github.com/ckan/ckan/commit/63b2af18b86f03e9cf5e04dc616e06279247bd08
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-25 (Mon, 25 Jan 2016)

  Changed paths:
    R ckan/migration/versions/082_add_metadata_created.py
    A ckan/migration/versions/084_add_metadata_created.py

  Log Message:
  -----------
  fix migration name sequence


  Commit: 496cd8db96a41c40dcf8aabb5afd462f1cb89bf1
      https://github.com/ckan/ckan/commit/496cd8db96a41c40dcf8aabb5afd462f1cb89bf1
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2016-01-26 (Tue, 26 Jan 2016)

  Changed paths:
    M CONDUCT.rst

  Log Message:
  -----------
  Change the email address for complaints


  Commit: 7fafb2e441babe7c6831bc0693eae289e161941a
      https://github.com/ckan/ckan/commit/7fafb2e441babe7c6831bc0693eae289e161941a
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2016-01-26 (Tue, 26 Jan 2016)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/schema.py
    M ckan/model/resource.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/lib/dictization/test_model_dictize.py

  Log Message:
  -----------
  Removes webstore_* from resource schema.

These fields were added around CKAN 1.7, and have been unused since CKAN
1.8. This PR will remove them.


  Commit: 3ac74d7b98d47bb75db1d9b4e36adc9c33a846fb
      https://github.com/ckan/ckan/commit/3ac74d7b98d47bb75db1d9b4e36adc9c33a846fb
  Author: amercader <amercadero at gmail.com>
  Date:   2016-01-27 (Wed, 27 Jan 2016)

  Changed paths:
    A CONDUCT.rst

  Log Message:
  -----------
  Merge branch 'code-of-conduct'


  Commit: 05c8e9c90296be8557fee4e24b4acc703dc2313f
      https://github.com/ckan/ckan/commit/05c8e9c90296be8557fee4e24b4acc703dc2313f
  Author: amercader <amercadero at gmail.com>
  Date:   2016-01-27 (Wed, 27 Jan 2016)

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

  Log Message:
  -----------
  [#2848] Avoid package_search exception when using use_default_schema

The parameter needs to be removed before sending the query to Solr

Also improved the boolean checking and fixed the docs.


  Commit: b479848579e114fbfe2f81249524d0e857e3efce
      https://github.com/ckan/ckan/commit/b479848579e114fbfe2f81249524d0e857e3efce
  Author: Michail Alexakis <alexakis at imis.athena-innovation.gr>
  Date:   2016-01-27 (Wed, 27 Jan 2016)

  Changed paths:
    M ckanext/datastore/helpers.py
    M ckanext/datastore/tests/test_helpers.py

  Log Message:
  -----------
  Encode EXPLAIN SQL before sending to datastore


  Commit: 22bf30ff6c45a43f1e71ee247b427874e5ab9f52
      https://github.com/ckan/ckan/commit/22bf30ff6c45a43f1e71ee247b427874e5ab9f52
  Author: Marc Fortier <Marc.Fortier at statcan.gc.ca>
  Date:   2016-01-27 (Wed, 27 Jan 2016)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  fix ckan.root_path

The language selector is passing a babel Locale object but
_add_i18n_to_url expects a str.


  Commit: 41c6f6cfbd6bc01c9fc19d6b7d40f2425b008ba2
      https://github.com/ckan/ckan/commit/41c6f6cfbd6bc01c9fc19d6b7d40f2425b008ba2
  Author: Michail Alexakis <alexakis at imis.athena-innovation.gr>
  Date:   2016-01-27 (Wed, 27 Jan 2016)

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

  Log Message:
  -----------
  Provide unicode CREATE TABLE statements (datastore tests)


  Commit: e24f7e58fcc0d7b45dbe26f521b3f7e6ed0f604b
      https://github.com/ckan/ckan/commit/e24f7e58fcc0d7b45dbe26f521b3f7e6ed0f604b
  Author: Michail Alexakis <alexakis at imis.athena-innovation.gr>
  Date:   2016-01-28 (Thu, 28 Jan 2016)

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

  Log Message:
  -----------
  Provide unicode queries for testing `get_table_names_from_sql` (datastore tests)


  Commit: a63de1b9d97c86fe80be30c43fcaf0fa5167e465
      https://github.com/ckan/ckan/commit/a63de1b9d97c86fe80be30c43fcaf0fa5167e465
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-28 (Thu, 28 Jan 2016)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  Merge pull request #2851 from marcfor/ckan-ckan

fix ckan.root_path


  Commit: 5e86b3e9057482d06f604284fe7f4eb8df3b3934
      https://github.com/ckan/ckan/commit/5e86b3e9057482d06f604284fe7f4eb8df3b3934
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-28 (Thu, 28 Jan 2016)

  Changed paths:
    A ckan/public/base/images/ckan-logo-white.svg
    A ckan/public/base/images/ckan-logo.svg

  Log Message:
  -----------
  Merge pull request #2840 from LaurentGoderre/logo-svg

Added the SVG version of the logo


  Commit: 56b622a7fedd38ba0fcea5431c29a0194c7b9cf8
      https://github.com/ckan/ckan/commit/56b622a7fedd38ba0fcea5431c29a0194c7b9cf8
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2016-01-28 (Thu, 28 Jan 2016)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Makes the group controller pass type when known.

In a couple of places, the group controller knows what type the group
is, but doesn't pass it to the auth/action functions.

Also removes an unused method.


  Commit: 502f841e4edd4e2ca8cc2b3a44dcad3f67dd10ce
      https://github.com/ckan/ckan/commit/502f841e4edd4e2ca8cc2b3a44dcad3f67dd10ce
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-02-01 (Mon, 01 Feb 2016)

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

  Log Message:
  -----------
  Fix exception in log.error a few lines later than this change. https://github.com/ckan/ckan/commit/34e1e3f05f52b9ec5b2c2ff79af9822e6d01dd0a#commitcomment-15781370


  Commit: a3325855ae82e42aadf841ec718217e6a872a322
      https://github.com/ckan/ckan/commit/a3325855ae82e42aadf841ec718217e6a872a322
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-02-05 (Fri, 05 Feb 2016)

  Changed paths:
    M ckan/config/resource_formats.json

  Log Message:
  -----------
  Add format - Web Map Tile Service eg https://data.gov.uk/dataset/bathymetry-web-map-tile-service


  Commit: 628b13a8f854118749de31af9ce09b703ace12d1
      https://github.com/ckan/ckan/commit/628b13a8f854118749de31af9ce09b703ace12d1
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-02-05 (Fri, 05 Feb 2016)

  Changed paths:
    M ckan/lib/formatters.py

  Log Message:
  -----------
  Changed the date formatter to display the timezone abbreviation instead of full name


  Commit: cb05019dab4599de715cb84bb900992d3975cd7c
      https://github.com/ckan/ckan/commit/cb05019dab4599de715cb84bb900992d3975cd7c
  Author: amercader <amercadero at gmail.com>
  Date:   2016-02-09 (Tue, 09 Feb 2016)

  Changed paths:
    M ckanext/datastore/helpers.py
    M ckanext/datastore/tests/test_helpers.py

  Log Message:
  -----------
  Merge branch '2841-datastore-explain-sql' of https://github.com/PublicaMundi/ckan into PublicaMundi-2841-datastore-explain-sql


  Commit: dda8e7b9d19876688e974eb971d6293f4b1da8a1
      https://github.com/ckan/ckan/commit/dda8e7b9d19876688e974eb971d6293f4b1da8a1
  Author: amercader <amercadero at gmail.com>
  Date:   2016-02-09 (Tue, 09 Feb 2016)

  Changed paths:
    M ckanext/datastore/helpers.py
    M ckanext/datastore/tests/test_helpers.py

  Log Message:
  -----------
  Merge branch 'PublicaMundi-2841-datastore-explain-sql'


  Commit: 6d331c86d97bf15a704ff081176660f5a912d893
      https://github.com/ckan/ckan/commit/6d331c86d97bf15a704ff081176660f5a912d893
  Author: amercader <amercadero at gmail.com>
  Date:   2016-02-09 (Tue, 09 Feb 2016)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/schema.py
    M ckan/model/resource.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/lib/dictization/test_model_dictize.py

  Log Message:
  -----------
  Merge branch 'remove-webstore-fields'


  Commit: c749d54418bf58421cc39c0728a807927bc0fbe4
      https://github.com/ckan/ckan/commit/c749d54418bf58421cc39c0728a807927bc0fbe4
  Author: amercader <amercadero at gmail.com>
  Date:   2016-02-09 (Tue, 09 Feb 2016)

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

  Log Message:
  -----------
  Merge branch 'solr-error-msg-fix'


  Commit: a5094c2b9aef6ac52a3a3c78c41508eafb684db0
      https://github.com/ckan/ckan/commit/a5094c2b9aef6ac52a3a3c78c41508eafb684db0
  Author: amercader <amercadero at gmail.com>
  Date:   2016-02-09 (Tue, 09 Feb 2016)

  Changed paths:
    M ckan/lib/formatters.py

  Log Message:
  -----------
  Merge branch 'tz-abbr' of https://github.com/LaurentGoderre/ckan into LaurentGoderre-tz-abbr


  Commit: 3c6f8285ed644904b9da938e34700d71ae5f5ccd
      https://github.com/ckan/ckan/commit/3c6f8285ed644904b9da938e34700d71ae5f5ccd
  Author: amercader <amercadero at gmail.com>
  Date:   2016-02-09 (Tue, 09 Feb 2016)

  Changed paths:
    M ckan/lib/formatters.py

  Log Message:
  -----------
  Merge branch 'LaurentGoderre-tz-abbr'


  Commit: 4486d7649a76059e9ac3d79703b40faf58e238e7
      https://github.com/ckan/ckan/commit/4486d7649a76059e9ac3d79703b40faf58e238e7
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-02-11 (Thu, 11 Feb 2016)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/search/query.py
    M ckan/templates/snippets/search_form.html
    M ckan/tests/controllers/test_package.py

  Log Message:
  -----------
  Deal with a bad "sort" param better - dont log as error and disturb admins.


  Commit: 3d3ccfb565fa0402a17af02b920f14da2bd5a2e7
      https://github.com/ckan/ckan/commit/3d3ccfb565fa0402a17af02b920f14da2bd5a2e7
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-02-11 (Thu, 11 Feb 2016)

  Changed paths:
    M bin/travis-run-tests
    M ckan/lib/search/query.py

  Log Message:
  -----------
  Logging to help debug travis


  Commit: e7676c113f6ff1c25482059a8c9a251cdc79b22e
      https://github.com/ckan/ckan/commit/e7676c113f6ff1c25482059a8c9a251cdc79b22e
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-02-11 (Thu, 11 Feb 2016)

  Changed paths:
    M bin/travis-run-tests
    M ckan/lib/search/query.py

  Log Message:
  -----------
  Alternative SOLR error message seen on Travis. Both are solr-jetty 1.4.1, so not sure why we get different ones.


  Commit: 42637b0cbcb0f9668126852c987aa02430736a3d
      https://github.com/ckan/ckan/commit/42637b0cbcb0f9668126852c987aa02430736a3d
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-02-11 (Thu, 11 Feb 2016)

  Changed paths:
    M ckan/lib/search/query.py

  Log Message:
  -----------
  Fix syntax


  Commit: b39e0949f072f3f59226a2bd8266d1d6b6c078a0
      https://github.com/ckan/ckan/commit/b39e0949f072f3f59226a2bd8266d1d6b6c078a0
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-02-11 (Thu, 11 Feb 2016)

  Changed paths:
    M bin/travis-run-tests
    M ckan/lib/search/query.py

  Log Message:
  -----------
  Logging to help debug travis


  Commit: c01461bfc4e9983816bdc3ae03f091d2b1123c39
      https://github.com/ckan/ckan/commit/c01461bfc4e9983816bdc3ae03f091d2b1123c39
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-02-11 (Thu, 11 Feb 2016)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Expose the display_timezone through a helper


  Commit: 30f5b46530f424d701a9be43cf12dc56f766d607
      https://github.com/ckan/ckan/commit/30f5b46530f424d701a9be43cf12dc56f766d607
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-02-11 (Thu, 11 Feb 2016)

  Changed paths:
    M ckan/config/environment.py
    M ckan/exceptions.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Validates the display_timezone on startup


  Commit: 9e907dccfb84c19872c40077ab8833c1cf53428f
      https://github.com/ckan/ckan/commit/9e907dccfb84c19872c40077ab8833c1cf53428f
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-02-11 (Thu, 11 Feb 2016)

  Changed paths:
    M ckan/tests/config/test_environment.py
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  Added unit test for the get_display_timezone helper


  Commit: ec2ecfb6df2091440c52cf3fed026fa8a8d3356d
      https://github.com/ckan/ckan/commit/ec2ecfb6df2091440c52cf3fed026fa8a8d3356d
  Author: Ian Ward <ian at excess.org>
  Date:   2016-02-11 (Thu, 11 Feb 2016)

  Changed paths:
    M ckan/config/environment.py
    M ckan/exceptions.py
    M ckan/lib/helpers.py
    M ckan/tests/config/test_environment.py
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  Merge pull request #2868 from LaurentGoderre/display-timezone-helper

Added a display_timezone helper


  Commit: 77127bcd3d5462263f9b6f0e611cfdea5c8c09d8
      https://github.com/ckan/ckan/commit/77127bcd3d5462263f9b6f0e611cfdea5c8c09d8
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-02-12 (Fri, 12 Feb 2016)

  Changed paths:
    M bin/travis-run-tests
    M ckan/lib/search/query.py

  Log Message:
  -----------
  Deal with SOLR error coming back as HTML on travis.


  Commit: e3825c86e9117a5adbc47b60882a9eddfd6e3d2d
      https://github.com/ckan/ckan/commit/e3825c86e9117a5adbc47b60882a9eddfd6e3d2d
  Author: amercader <amercadero at gmail.com>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M ckan/config/resource_formats.json

  Log Message:
  -----------
  Merge branch 'add-wmts-format'


  Commit: 6264bd489c86e8f75228e8db10213552d901fbc1
      https://github.com/ckan/ckan/commit/6264bd489c86e8f75228e8db10213552d901fbc1
  Author: amercader <amercadero at gmail.com>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Merge branch '2852-ensure-grouptype-used'


  Commit: 70790836026c7c9f4d40d91966291da6754a7210
      https://github.com/ckan/ckan/commit/70790836026c7c9f4d40d91966291da6754a7210
  Author: Ian Ward <ian at excess.org>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

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

  Log Message:
  -----------
  Merge pull request #2848 from ckan/2848-fix-default-schema-on-package_search

Param use_default_schema does not work on package_search


  Commit: c940936964bc5e82539e1b454ec647e636fe43d4
      https://github.com/ckan/ckan/commit/c940936964bc5e82539e1b454ec647e636fe43d4
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2016-02-18 (Thu, 18 Feb 2016)

  Changed paths:
    A .github/ISSUE_TEMPLATE.md
    A .github/PULL_REQUEST_TEMPLATE.md

  Log Message:
  -----------
  Create a github issue template

Creates an issue template for Github.


  Commit: 99a1c2f6a5c953f969c4d9e97399a875857d9e20
      https://github.com/ckan/ckan/commit/99a1c2f6a5c953f969c4d9e97399a875857d9e20
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2016-02-19 (Fri, 19 Feb 2016)

  Changed paths:
    M ckan/lib/search/query.py
    M ckan/tests/controllers/test_package.py

  Log Message:
  -----------
  Add yet another potential error message.

Because we support so many 'versions' of Solr, we're encountering
different error messages as the only way of determining what went wrong.
In some cases the response is HTML :(

To fix this we explicitly check in the test if it succeeded (we get a
200 when we get an error response) and inform the dev where to go to add
their newly discovered error message.


  Commit: 592b65f2538ae88fbc3b0c3155cf9fcd77a0458c
      https://github.com/ckan/ckan/commit/592b65f2538ae88fbc3b0c3155cf9fcd77a0458c
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2016-02-19 (Fri, 19 Feb 2016)

  Changed paths:
    M bin/travis-run-tests
    M ckan/controllers/package.py
    M ckan/lib/search/query.py
    M ckan/templates/snippets/search_form.html
    M ckan/tests/controllers/test_package.py

  Log Message:
  -----------
  Merge pull request #2875 from ckan/solr-errors

Deal with a bad "sort" param better


  Commit: 7699aa2b77be6a963110222d60886d6fe28a14e1
      https://github.com/ckan/ckan/commit/7699aa2b77be6a963110222d60886d6fe28a14e1
  Author: amercader <amercadero at gmail.com>
  Date:   2016-02-22 (Mon, 22 Feb 2016)

  Changed paths:
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  [#2848] Add tests


  Commit: 5bff88e4ede976f5d807f20906a39da9f2a0b951
      https://github.com/ckan/ckan/commit/5bff88e4ede976f5d807f20906a39da9f2a0b951
  Author: amercader <amercadero at gmail.com>
  Date:   2016-02-22 (Mon, 22 Feb 2016)

  Changed paths:
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  [#2848] Make sure to unload the plugin


  Commit: 9fcfae8aa00f590b9cd9a4fcf5e3a43f4b6d884c
      https://github.com/ckan/ckan/commit/9fcfae8aa00f590b9cd9a4fcf5e3a43f4b6d884c
  Author: amercader <amercadero at gmail.com>
  Date:   2016-02-22 (Mon, 22 Feb 2016)

  Changed paths:
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  [#2484] Dammn you PEP8


  Commit: cf8a9242ed9dd6f0fb501f16e94171946dfe4e7a
      https://github.com/ckan/ckan/commit/cf8a9242ed9dd6f0fb501f16e94171946dfe4e7a
  Author: Ian Ward <ian at excess.org>
  Date:   2016-02-22 (Mon, 22 Feb 2016)

  Changed paths:
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  Merge pull request #2883 from ckan/2848-tests

[#2484] Add missing tests


  Commit: 81420dc72cf0ab550a0cfdccde546a875bd1a87b
      https://github.com/ckan/ckan/commit/81420dc72cf0ab550a0cfdccde546a875bd1a87b
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2016-02-23 (Tue, 23 Feb 2016)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md

  Log Message:
  -----------
  Add info explaining checkboxes

Add an explanation of checkboxes and make it clear that they are optional.


  Commit: 0fe167e9f4a727b966c86b5b6aa6dec88df3c29a
      https://github.com/ckan/ckan/commit/0fe167e9f4a727b966c86b5b6aa6dec88df3c29a
  Author: Ian Ward <ian at excess.org>
  Date:   2016-02-23 (Tue, 23 Feb 2016)

  Changed paths:
    A .github/ISSUE_TEMPLATE.md
    A .github/PULL_REQUEST_TEMPLATE.md

  Log Message:
  -----------
  Merge pull request #2881 from ckan/github-issue-template

Create a github issue template


  Commit: e2648ab86c0e0beab002842db972a4a6d5d1ce98
      https://github.com/ckan/ckan/commit/e2648ab86c0e0beab002842db972a4a6d5d1ce98
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    R .coveragerc
    A .github/ISSUE_TEMPLATE.md
    A .github/PULL_REQUEST_TEMPLATE.md
    M .tx/config
    M CHANGELOG.rst
    A CONDUCT.rst
    M LICENSE.txt
    M README.rst
    M bin/travis-run-tests
    A circle.yml
    M ckan/__init__.py
    M ckan/authz.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/exceptions.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/check_po_files.py
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    R ckan/i18n/dv/LC_MESSAGES/ckan.mo
    R ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    R ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    R ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    R ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    R ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    R ckan/i18n/eu/LC_MESSAGES/ckan.mo
    R ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    R ckan/i18n/lo/LC_MESSAGES/ckan.mo
    R ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    R ckan/i18n/my/LC_MESSAGES/ckan.mo
    R ckan/i18n/my/LC_MESSAGES/ckan.po
    R ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    R ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    R ckan/i18n/sw/LC_MESSAGES/ckan.mo
    R ckan/i18n/sw/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    R ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    R ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    R ckan/lib/accept.py
    M ckan/lib/activity_streams.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/dumper.py
    M ckan/lib/email_notifications.py
    M ckan/lib/extract.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/munge.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/081_set_datastore_active.py
    A ckan/migration/versions/082_create_index_creator_user_id.py
    A ckan/migration/versions/083_remove_related_items.py
    A ckan/migration/versions/084_add_metadata_created.py
    M ckan/model/__init__.py
    M ckan/model/group.py
    M ckan/model/package.py
    R ckan/model/related.py
    M ckan/model/resource.py
    M ckan/model/resource_view.py
    M ckan/model/task_status.py
    R ckan/new_authz.py
    R ckan/new_tests.py
    M ckan/pastertemplates/template/+dot+travis.yml_tmpl
    M ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckan/public/base/images/ckan-logo-white.svg
    A ckan/public/base/images/ckan-logo.svg
    R ckan/public/base/javascript/modules/related-item.js
    M ckan/public/base/javascript/resource.config
    R ckan/public/base/test/spec/modules/related-item.spec.js
    M ckan/templates/activity_streams/activity_stream_email_notifications.text
    A ckan/templates/emails/invite_user.txt
    A ckan/templates/emails/invite_user_subject.txt
    A ckan/templates/emails/reset_password.txt
    A ckan/templates/emails/reset_password_subject.txt
    M ckan/templates/package/base.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    R ckan/templates/package/related_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_info.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/snippets/organization_item.html
    R ckan/templates/snippets/related.html
    M ckan/templates/snippets/search_form.html
    M ckan/tests/__init__.py
    M ckan/tests/config/test_environment.py
    M ckan/tests/controllers/test_admin.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/factories.py
    A ckan/tests/i18n/test_check_po_files.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/functional/api/test_api.py
    M ckan/tests/legacy/functional/api/test_dashboard.py
    M ckan/tests/legacy/functional/test_group.py
    M ckan/tests/legacy/functional/test_package.py
    R ckan/tests/legacy/functional/test_related.py
    M ckan/tests/legacy/functional/test_revision.py
    M ckan/tests/legacy/functional/test_user.py
    R ckan/tests/legacy/lib/test_accept.py
    M ckan/tests/legacy/lib/test_dictization.py
    R ckan/tests/legacy/lib/test_mailer.py
    M ckan/tests/legacy/lib/test_resource_search.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/misc/test_format_text.py
    M ckan/tests/legacy/mock_mail_server.py
    M ckan/tests/legacy/models/test_package.py
    M ckan/tests/legacy/pylons_controller.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_dumper.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    M ckan/tests/lib/test_helpers.py
    A ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_munge.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/test_init.py
    M ckan/tests/logic/test_validators.py
    A ckan/tests/plugins/test_toolkit.py
    M ckan/tests/test_factories.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py
    M ckanext/example_igroupform/plugin.py
    A ckanext/example_igroupform/templates/example_igroup_form/group_form.html
    M ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/example_itranslation/setup.cfg
    M ckanext/example_itranslation/tests/test_plugin.py
    A ckanext/example_theme/custom_emails/__init__.py
    A ckanext/example_theme/custom_emails/plugin.py
    A ckanext/example_theme/custom_emails/templates/emails/invite_user.txt
    A ckanext/example_theme/custom_emails/templates/emails/invite_user_subject.txt
    A ckanext/example_theme/custom_emails/templates/emails/reset_password.txt
    A ckanext/example_theme/custom_emails/templates/emails/reset_password_subject.txt
    A ckanext/example_theme/custom_emails/tests.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/test_tag_vocab_plugin.py
    M dev-requirements.txt
    M doc/conf.py
    M doc/contributing/frontend/index.rst
    M doc/contributing/release-process.rst
    M doc/extensions/adding-custom-fields.rst
    M doc/extensions/best-practices.rst
    M doc/extensions/translating-extensions.rst
    M doc/maintaining/apps-ideas.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/installing/index.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    R doc/maintaining/installing/install-using-docker.rst
    M doc/maintaining/upgrading/index.rst
    M doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into 2681-lazy-json


Compare: https://github.com/ckan/ckan/compare/c7c0d3e6237d...e2648ab86c0e


More information about the ckan-changes mailing list