[ckan-changes] [ckan/ckan] 4309aa: Fixes #1596 by ensuring it only shows active membe...

GitHub noreply at github.com
Thu Nov 27 18:26:43 UTC 2014


  Branch: refs/heads/1852-default-resource-views
  Home:   https://github.com/ckan/ckan
  Commit: 4309aa7af0428b9d175f3da545a72b3419eebfbc
      https://github.com/ckan/ckan/commit/4309aa7af0428b9d175f3da545a72b3419eebfbc
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-04-18 (Fri, 18 Apr 2014)

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

  Log Message:
  -----------
  Fixes #1596 by ensuring it only shows active members.

Currently removing a user from a group/org (marking membership as deleted)
then it still gets returned in dataset/new as a viable organisation/group to
choose when it isn't (as the user is not actually still a member).


  Commit: d0e4ea4c221e2c865fe0cefc1e0a6f8a206c545c
      https://github.com/ckan/ckan/commit/d0e4ea4c221e2c865fe0cefc1e0a6f8a206c545c
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M ckan/pastertemplates/__init__.py
    A ckan/pastertemplates/template/+dot+coveragerc_tmpl
    A ckan/pastertemplates/template/+dot+gitignore_tmpl
    A ckan/pastertemplates/template/+dot+travis.yml_tmpl
    A ckan/pastertemplates/template/LICENSE_tmpl
    A ckan/pastertemplates/template/MANIFEST.in_tmpl
    A ckan/pastertemplates/template/README.rst_tmpl
    A ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    A ckan/pastertemplates/template/bin/travis-run.sh_tmpl
    R ckan/pastertemplates/template/ckanext/+project+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/fanstatic/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/plugin.py_tmpl
    A ckan/pastertemplates/template/ckanext/+project_shortname+/public/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/templates/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/test_plugin.py_tmpl
    M ckan/pastertemplates/template/ckanext/__init__.py
    R ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore
    A ckan/pastertemplates/template/ckanext_+project_shortname+.egg-info/.gitignore
    A ckan/pastertemplates/template/dev-requirements.txt_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    A ckan/pastertemplates/template/test.ini_tmpl

  Log Message:
  -----------
  Improve the ckanext template


  Commit: fc9561c042d2e9192c4db1db7a868b330a66cc0b
      https://github.com/ckan/ckan/commit/fc9561c042d2e9192c4db1db7a868b330a66cc0b
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M ckan/pastertemplates/template/README.rst_tmpl

  Log Message:
  -----------
  Typo in README template


  Commit: 8b34820ad2fc7c2437e451ae518a9c0b00a880f4
      https://github.com/ckan/ckan/commit/8b34820ad2fc7c2437e451ae518a9c0b00a880f4
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M ckan/pastertemplates/template/README.rst_tmpl

  Log Message:
  -----------
  Remove "deadoralive" from template README


  Commit: 8108a2c78b8cd52ea7c28fc9fc04fd0f38452742
      https://github.com/ckan/ckan/commit/8108a2c78b8cd52ea7c28fc9fc04fd0f38452742
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M ckan/pastertemplates/__init__.py

  Log Message:
  -----------
  Change example names


  Commit: be54ba88cf9f1854fa504d574ebedde238e9b2a6
      https://github.com/ckan/ckan/commit/be54ba88cf9f1854fa504d574ebedde238e9b2a6
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M ckan/pastertemplates/template/MANIFEST.in_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl

  Log Message:
  -----------
  Fix packaging of data files


  Commit: f5f0565634bb30fb215755d0386c96e150f46c72
      https://github.com/ckan/ckan/commit/f5f0565634bb30fb215755d0386c96e150f46c72
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M ckan/pastertemplates/template/setup.py_tmpl

  Log Message:
  -----------
  Add some more package metadata


  Commit: 19dd3253aba9a5771c449f04f7dc3a075cbb89b6
      https://github.com/ckan/ckan/commit/19dd3253aba9a5771c449f04f7dc3a075cbb89b6
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-10-15 (Wed, 15 Oct 2014)

  Changed paths:
    M ckan/pastertemplates/template/setup.py_tmpl

  Log Message:
  -----------
  Fix missing comma in setup.py_tmpl


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

  Changed paths:
    M ckan/config/routing.py
    R ckan/lib/field_types.py
    M ckan/logic/converters.py
    R ckan/tests/lib/test_field_types.py
    M ckan/tests/test_coding_standards.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#832] Remove FormAlchemy definitely

This includes, apart from the library requirement, the field_types module,
which has been unused for a very long time, and some unused converters
as well.


  Commit: 2c01df87ba662fedfff0fa5ce0e511d7ea1475be
      https://github.com/ckan/ckan/commit/2c01df87ba662fedfff0fa5ce0e511d7ea1475be
  Author: amercader <amercadero at gmail.com>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

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

  Log Message:
  -----------
  [#912] Display org title (if available) on dataset form field


  Commit: 7b824461407078bc30cf3d0d02a64534ae56c913
      https://github.com/ckan/ckan/commit/7b824461407078bc30cf3d0d02a64534ae56c913
  Author: amercader <amercadero at gmail.com>
  Date:   2014-10-22 (Wed, 22 Oct 2014)

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

  Log Message:
  -----------
  [#1457] Split test


  Commit: d20d5390bafb77af4ec9daeaea86a0b35b7b2bb8
      https://github.com/ckan/ckan/commit/d20d5390bafb77af4ec9daeaea86a0b35b7b2bb8
  Author: Alice Heaton <a.heaton at nhm.ac.uk>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

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

  Log Message:
  -----------
  Ensure that field names are stripped #1970


  Commit: 9c6a9a107adeb80848e73fd283a33a352e6a3730
      https://github.com/ckan/ckan/commit/9c6a9a107adeb80848e73fd283a33a352e6a3730
  Author: Alice Heaton <a.heaton at nhm.ac.uk>
  Date:   2014-10-24 (Fri, 24 Oct 2014)

  Changed paths:
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  unicode_or_json_validator should assume literals are unicode rather than json #1966


  Commit: 8df768d6a598ae54fe24c041f719020b9066c439
      https://github.com/ckan/ckan/commit/8df768d6a598ae54fe24c041f719020b9066c439
  Author: Denis Zgonjanin <deniszgonjanin at gmail.com>
  Date:   2014-10-27 (Mon, 27 Oct 2014)

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

  Log Message:
  -----------
  package patch action, for issue #1416


  Commit: 775a6a6efdd3f632f0ca34db48f8436e0178fdb7
      https://github.com/ckan/ckan/commit/775a6a6efdd3f632f0ca34db48f8436e0178fdb7
  Author: Denis Zgonjanin <deniszgonjanin at gmail.com>
  Date:   2014-10-27 (Mon, 27 Oct 2014)

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

  Log Message:
  -----------
  [#1416] improve patch method


  Commit: ed4067a67e4e0fa6574f048a06bfd2443fac9551
      https://github.com/ckan/ckan/commit/ed4067a67e4e0fa6574f048a06bfd2443fac9551
  Author: Denis Zgonjanin <deniszgonjanin at gmail.com>
  Date:   2014-10-27 (Mon, 27 Oct 2014)

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

  Log Message:
  -----------
  [#1416] add auth function to package_patch action


  Commit: 162d371cbd94ad67495cc6ee342f41be76f7ceb8
      https://github.com/ckan/ckan/commit/162d371cbd94ad67495cc6ee342f41be76f7ceb8
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-27 (Mon, 27 Oct 2014)

  Changed paths:
    M ckan/lib/base.py
    A ckan/new_tests/lib/test_base.py
    R ckan/tests/functional/test_cors.py

  Log Message:
  -----------
  [#1944] Allow CORS settings in config.

New config settings:
ckan.cors.origin_allow_all = <true|false>
ckan.cors.origin_whitelist = <space separated list of allowable domain origins>

Access-Control-Allow headers will only be set in the response if the
request contains an Origin header, the origin_allow_all setting is
present, and either:

a) the origin_allow_all setting is true, or
b) the request origin is listed in the origin_whitelist setting


  Commit: bb452421266866e826169cd6706f4c15447cae5f
      https://github.com/ckan/ckan/commit/bb452421266866e826169cd6706f4c15447cae5f
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-10-27 (Mon, 27 Oct 2014)

  Changed paths:
    M ckan/lib/cli.py
    M doc/maintaining/paster.rst

  Log Message:
  -----------
  Allows use of CKAN_INI env-var to locate config

Implements #1597

If you don't specify a config file using the -c option, CKAN defaults to
looking for development.ini in the current directory. This patch will
first check the -c parameter, and if it doesn't find it will use the
content of the CKAN_INI environment variable. If it cannot find that,
it will then default to development.ini in the current directory.


  Commit: 0413e259ce2c80925c5aadca0896f264122567e4
      https://github.com/ckan/ckan/commit/0413e259ce2c80925c5aadca0896f264122567e4
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-10-27 (Mon, 27 Oct 2014)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/model/package.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  Removal of a lot of PackageRevision queries


  Commit: 699d2265e37808ac89520419583583a41219dff4
      https://github.com/ckan/ckan/commit/699d2265e37808ac89520419583583a41219dff4
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-10-28 (Tue, 28 Oct 2014)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/logic/action/update.py
    M ckan/model/package.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  Removing more use of current flag


  Commit: f79a20ae6093776c6a73885dc7187c52b38deb58
      https://github.com/ckan/ckan/commit/f79a20ae6093776c6a73885dc7187c52b38deb58
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-10-28 (Tue, 28 Oct 2014)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/update.py
    M ckan/model/__init__.py
    M ckan/model/group.py
    M ckan/model/meta.py
    M ckan/model/user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Remove unnecessary "pending" code


  Commit: ba51a431071751e0deb9942a46116492a62a7f83
      https://github.com/ckan/ckan/commit/ba51a431071751e0deb9942a46116492a62a7f83
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-10-28 (Tue, 28 Oct 2014)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  CHange error message, hope travis retests


  Commit: 5919e43c7cde629eedfe322e4834989ee9532437
      https://github.com/ckan/ckan/commit/5919e43c7cde629eedfe322e4834989ee9532437
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-28 (Tue, 28 Oct 2014)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#1944] CORS config docs


  Commit: 78a331a1d9ea37b3a1e2dc65e1e0782f86b25859
      https://github.com/ckan/ckan/commit/78a331a1d9ea37b3a1e2dc65e1e0782f86b25859
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-28 (Tue, 28 Oct 2014)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  [#1944] Add CORS changes to CHANGELOG


  Commit: 0d97844a7d3c6be8efbdf7df9412dc2ab8bd9335
      https://github.com/ckan/ckan/commit/0d97844a7d3c6be8efbdf7df9412dc2ab8bd9335
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-28 (Tue, 28 Oct 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#1944] Add CORS settings to deployment template.

These are commented out by default.


  Commit: 1403da725788ffe00247e4d2603591fa2ff43985
      https://github.com/ckan/ckan/commit/1403da725788ffe00247e4d2603591fa2ff43985
  Author: Alice Heaton <a.heaton at nhm.ac.uk>
  Date:   2014-10-28 (Tue, 28 Oct 2014)

  Changed paths:
    M ckanext/reclineview/theme/public/recline_view.js

  Log Message:
  -----------
  Set the Recline dataset queryState value directly to avoid unnecessary API calls #2009


  Commit: 878a15bf374c07af3b94f66215c5743ac798b041
      https://github.com/ckan/ckan/commit/878a15bf374c07af3b94f66215c5743ac798b041
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/config/who.ini

  Log Message:
  -----------
  [#1943] Add timeout and reissue_time to who.ini


  Commit: 6bf47f4b898ec023ab564642be67eb9dc0fd6897
      https://github.com/ckan/ckan/commit/6bf47f4b898ec023ab564642be67eb9dc0fd6897
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M ckan/config/middleware.py

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


  Commit: 679ff0ddf52c2ea2b2c7e99e3ca6df20d631067c
      https://github.com/ckan/ckan/commit/679ff0ddf52c2ea2b2c7e99e3ca6df20d631067c
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/config/who.ini
    A ckan/new_tests/config/__init__.py
    A ckan/new_tests/config/test_middleware.py

  Log Message:
  -----------
  [#1943] Set timeout and reissue_time from config.

Can set the session timeout and reissue_time from the config file if
these aren't provided by who.ini. New config settings:

who.timeout
who.reissue_time


  Commit: cae923973a95ab4df07fc17d08de0b3e3a2159ff
      https://github.com/ckan/ckan/commit/cae923973a95ab4df07fc17d08de0b3e3a2159ff
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#1943] Add settings to development template


  Commit: f2aa14cad83679d8e9a2e7b91361796fd466a4ba
      https://github.com/ckan/ckan/commit/f2aa14cad83679d8e9a2e7b91361796fd466a4ba
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#1943] Remove who.reissue_time from dev template.

This provides too fine-grained control for most users. So leaving it out
of the template (though leaving use of the setting in the code).


  Commit: a3ff6fe2a203dce72bc7b9a7c6827f0ee22441e8
      https://github.com/ckan/ckan/commit/a3ff6fe2a203dce72bc7b9a7c6827f0ee22441e8
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#1943] Add session timeout to docs


  Commit: 5b007b6e0f50c9295c8bdb3b4df5445a96eee2e1
      https://github.com/ckan/ckan/commit/5b007b6e0f50c9295c8bdb3b4df5445a96eee2e1
  Author: Ian Ward <ian at excess.org>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/lib/base.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/plugins.py
    M ckan/lib/render.py
    M ckan/lib/search/index.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.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/074_remove_resource_groups.py
    M ckan/model/__init__.py
    M ckan/model/package.py
    M ckan/model/resource.py
    A ckan/new_tests/lib/dictization/__init__.py
    A ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/test_delete.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/scripts/application.js
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/snippets/resource_edit_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/snippets/group_item.html
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_revision.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_resource.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 2003-package-patch-simple-version


  Commit: 3ba87f8e5f9604ce20ba2c62942d46692a41f38d
      https://github.com/ckan/ckan/commit/3ba87f8e5f9604ce20ba2c62942d46692a41f38d
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#1943] Fix malformed link is docs


  Commit: 02137732ebdc0e3707d027659d128b1eab6dff4e
      https://github.com/ckan/ckan/commit/02137732ebdc0e3707d027659d128b1eab6dff4e
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M ckan/config/environment.py
    R ckan/templates_legacy/__init__.py
    R ckan/templates_legacy/_snippet/data-api-help.html
    R ckan/templates_legacy/_util.html
    R ckan/templates_legacy/activity_streams/activity_stream_items.html
    R ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/admin/index.html
    R ckan/templates_legacy/admin/layout.html
    R ckan/templates_legacy/admin/trash.html
    R ckan/templates_legacy/error_document_template.html
    R ckan/templates_legacy/facets.html
    R ckan/templates_legacy/group/__init__.py
    R ckan/templates_legacy/group/authz.html
    R ckan/templates_legacy/group/edit.html
    R ckan/templates_legacy/group/edit_form.html
    R ckan/templates_legacy/group/history.html
    R ckan/templates_legacy/group/index.html
    R ckan/templates_legacy/group/layout.html
    R ckan/templates_legacy/group/new.html
    R ckan/templates_legacy/group/new_group_form.html
    R ckan/templates_legacy/group/read.html
    R ckan/templates_legacy/home/__init__.py
    R ckan/templates_legacy/home/about.html
    R ckan/templates_legacy/home/index.html
    R ckan/templates_legacy/home/layout.html
    R ckan/templates_legacy/importer/__init__.py
    R ckan/templates_legacy/importer/importer.html
    R ckan/templates_legacy/importer/preview.html
    R ckan/templates_legacy/importer/result.html
    R ckan/templates_legacy/js_strings.html
    R ckan/templates_legacy/layout.html
    R ckan/templates_legacy/layout_base.html
    R ckan/templates_legacy/package/__init__.py
    R ckan/templates_legacy/package/authz.html
    R ckan/templates_legacy/package/comments.html
    R ckan/templates_legacy/package/edit.html
    R ckan/templates_legacy/package/edit_form.html
    R ckan/templates_legacy/package/editresources.html
    R ckan/templates_legacy/package/followers.html
    R ckan/templates_legacy/package/form.html
    R ckan/templates_legacy/package/form_extra_fields.html
    R ckan/templates_legacy/package/form_fields.html
    R ckan/templates_legacy/package/form_resources.html
    R ckan/templates_legacy/package/history.html
    R ckan/templates_legacy/package/layout.html
    R ckan/templates_legacy/package/new.html
    R ckan/templates_legacy/package/new_package_form.html
    R ckan/templates_legacy/package/read.html
    R ckan/templates_legacy/package/read.n3
    R ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/read_core.html
    R ckan/templates_legacy/package/resource_embedded_dataviewer.html
    R ckan/templates_legacy/package/resource_read.html
    R ckan/templates_legacy/package/resources.html
    R ckan/templates_legacy/package/search.html
    R ckan/templates_legacy/package/search_form.html
    R ckan/templates_legacy/package/snippets/data_preview.html
    R ckan/templates_legacy/related/add-related.html
    R ckan/templates_legacy/related/dashboard.html
    R ckan/templates_legacy/related/related_list.html
    R ckan/templates_legacy/rest/__init__.py
    R ckan/templates_legacy/revision/__init__.py
    R ckan/templates_legacy/revision/diff.html
    R ckan/templates_legacy/revision/layout.html
    R ckan/templates_legacy/revision/list.html
    R ckan/templates_legacy/revision/read.html
    R ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    R ckan/templates_legacy/snippets/data-viewer-embed-dialog.html
    R ckan/templates_legacy/snippets/follow_button.html
    R ckan/templates_legacy/snippets/internal-tracking.html
    R ckan/templates_legacy/snippets/package_list.html
    R ckan/templates_legacy/snippets/recline-extra-footer.html
    R ckan/templates_legacy/snippets/recline-extra-header.html
    R ckan/templates_legacy/snippets/revision_list.html
    R ckan/templates_legacy/storage/index.html
    R ckan/templates_legacy/storage/success.html
    R ckan/templates_legacy/tag/__init__.py
    R ckan/templates_legacy/tag/index.html
    R ckan/templates_legacy/tag/layout.html
    R ckan/templates_legacy/tag/read.html
    R ckan/templates_legacy/user/__init__.py
    R ckan/templates_legacy/user/dashboard.html
    R ckan/templates_legacy/user/edit.html
    R ckan/templates_legacy/user/edit_user_form.html
    R ckan/templates_legacy/user/followers.html
    R ckan/templates_legacy/user/layout.html
    R ckan/templates_legacy/user/list.html
    R ckan/templates_legacy/user/login.html
    R ckan/templates_legacy/user/logout.html
    R ckan/templates_legacy/user/logout_first.html
    R ckan/templates_legacy/user/new.html
    R ckan/templates_legacy/user/new_user_form.html
    R ckan/templates_legacy/user/perform_reset.html
    R ckan/templates_legacy/user/read.html
    R ckan/templates_legacy/user/request_reset.html
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_relationships.py
    M ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tag_vocab.py
    R ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/test_coding_standards.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/stats/tests/test_stats_plugin.py

  Log Message:
  -----------
  Removes templates_legacy and broken tests

- Removes the entire templates_legacy folder
- Removed any tests that depended on the legacy templates, these are
  mostly in functional.
- Added a warning to update_config() that genshi support is deprecated


  Commit: 3b478e58d6d82c87abe6aa5de04ce7db5ba3e877
      https://github.com/ckan/ckan/commit/3b478e58d6d82c87abe6aa5de04ce7db5ba3e877
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M ckan/pastertemplates/template/README.rst_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl

  Log Message:
  -----------
  Add pypip.in README badges to extension template


  Commit: 7c79bde0b83ecb5398c94129764dd5d8ecc45ab8
      https://github.com/ckan/ckan/commit/7c79bde0b83ecb5398c94129764dd5d8ecc45ab8
  Author: Alice Heaton <a.heaton at nhm.ac.uk>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  Ensure that numeric and date fields are added to the full text index #1966


  Commit: 70ca1e60e62f65624f43b8f07d6c581ac1169c0a
      https://github.com/ckan/ckan/commit/70ca1e60e62f65624f43b8f07d6c581ac1169c0a
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/who.ini
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#1943] Inactive by default (non-expiring)


  Commit: 4a6f1ab20301658291772b76b772a1c0f0358cb4
      https://github.com/ckan/ckan/commit/4a6f1ab20301658291772b76b772a1c0f0358cb4
  Author: Alice Heaton <a.heaton at nhm.ac.uk>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

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

  Log Message:
  -----------
  Do not test the implementation of ts_vector, only that expected lexemes are present


  Commit: b9c98d960899f7ff8756771ba571333737166139
      https://github.com/ckan/ckan/commit/b9c98d960899f7ff8756771ba571333737166139
  Author: amercader <amercadero at gmail.com>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M ckan/public/base/css/main.css

  Log Message:
  -----------
  Rebuild main.css (forgot to do it after merging #1920)


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

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

  Log Message:
  -----------
  Merge pull request #1971 from aliceh75/1970-ensure-field-names-are-stripped

Ensure that field names are stripped


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

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

  Log Message:
  -----------
  Merge pull request #1967 from aliceh75/1966-full-text-search-on-integer-fails

unicode_or_json_validator should assume literals are unicode rather than json


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

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

  Log Message:
  -----------
  [#2003] separate context for package_show


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

  Changed paths:
    M ckan/logic/__init__.py
    A ckan/logic/action/patch.py
    M ckan/logic/action/update.py
    A ckan/logic/auth/patch.py
    M ckan/logic/auth/update.py
    M ckan/new_authz.py

  Log Message:
  -----------
  [#2003] start separate file for patch actions


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

  Changed paths:
    A ckan/new_tests/logic/action/test_patch.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#2003] smaller, simpler, new_test for package_patch


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

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

  Log Message:
  -----------
  [#2003] fix missing symbol


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

  Changed paths:
    M ckan/logic/action/patch.py
    M ckan/new_tests/logic/action/test_patch.py

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


  Commit: 2a28fbae5e17b453d2776512bf5a6cd0d4a56b49
      https://github.com/ckan/ckan/commit/2a28fbae5e17b453d2776512bf5a6cd0d4a56b49
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M doc/maintaining/getting-started.rst

  Log Message:
  -----------
  [#1872] Correct ini file name in docs


  Commit: 3e230e8e5603bed88a43184708bcd98e107a938b
      https://github.com/ckan/ckan/commit/3e230e8e5603bed88a43184708bcd98e107a938b
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M doc/maintaining/datastore.rst

  Log Message:
  -----------
  [#1763] Update datastore API call in docs

To avoid a "use force=True" message, create a datastore only resource.


  Commit: 852aaaa4d95f35293e76e7ce3f24e41986ec52f9
      https://github.com/ckan/ckan/commit/852aaaa4d95f35293e76e7ce3f24e41986ec52f9
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/lib/base.py
    A ckan/new_tests/lib/test_base.py
    R ckan/tests/functional/test_cors.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch 'brew-1944-cors-in-config'


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

  Changed paths:
    M doc/maintaining/getting-started.rst

  Log Message:
  -----------
  Merge pull request #1872 from ckan/1872-correct-ini-file

Getting Start docs specify nonexistent development.ini


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

  Changed paths:
    M ckan/logic/action/patch.py
    M ckan/new_tests/logic/action/test_patch.py

  Log Message:
  -----------
  [#2003] test package_patch: get by original id


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

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/package_saver.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/new_tests/lib/dictization/test_model_dictize.py
    M ckan/templates/package/read_base.html
    M ckan/templates_legacy/package/read.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#2006] package_dictize should not have to dig into revisions unless you ask for an old version. Add new_tests. In the process we lose the "revision_timestamp" property when you package_show, resource_show etc, but that is not particularly useful info as the package revision stays the same if you edit its extras or tags, for example. And we lose the revision_id on resources too - revisions are out of favour anyway. When displaying old version of the dataset, the date was wrong - it was package_revision date, ignoring extra changes - this is now fixed.


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

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/update.py
    M ckan/model/__init__.py
    M ckan/model/core.py
    M ckan/model/resource.py
    M ckan/model/tag.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [#2006] Deleted more parts related to the current column and pending state.


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

  Changed paths:
    M ckan/model/meta.py

  Log Message:
  -----------
  [#2006] Tidy up on the writing to the deprecated columns.


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

  Changed paths:
    M ckan/lib/dictization/__init__.py
    M ckan/tests/models/test_package.py

  Log Message:
  -----------
  [#2006] Tidy up.


  Commit: f6b2d10fbd6fab695c108ea789db11e9b1452f31
      https://github.com/ckan/ckan/commit/f6b2d10fbd6fab695c108ea789db11e9b1452f31
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

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

  Log Message:
  -----------
  Merge pull request #912 from ckan/912-org-title-dataset-form

Display title of organisations on the add dataset form


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

  Changed paths:
    M doc/maintaining/datastore.rst

  Log Message:
  -----------
  Merge pull request #1763 from ckan/1763-update-datastore-docs

can not edit read-only resources -- datastore test problem


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

  Changed paths:
    M ckanext/reclineview/theme/public/recline_view.js

  Log Message:
  -----------
  Merge pull request #2010 from aliceh75/2009-recline-unneeded-queries

Remove redundant API call in Recline grid preview


  Commit: 808bc49ae77a1c377330fe830719525f939e72a7
      https://github.com/ckan/ckan/commit/808bc49ae77a1c377330fe830719525f939e72a7
  Author: Sean Hammond <seanh at users.noreply.github.com>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    M ckan/config/routing.py
    R ckan/lib/field_types.py
    M ckan/logic/converters.py
    R ckan/tests/lib/test_field_types.py
    M ckan/tests/test_coding_standards.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge pull request #832 from ckan/832-get-rid-of-formalchemy

Get rid of the last remnants of FormAlchemy


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

  Changed paths:
    M ckan/new_authz.py
    A ckan/new_tests/test_authz.py

  Log Message:
  -----------
  [#2035] Refactor new_authz.check_config_permission to not cache things

Otherwise the values can not be overriden from tests


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

  Changed paths:
    M ckan/new_tests/helpers.py
    M ckan/tests/functional/api/test_user.py

  Log Message:
  -----------
  [#2035] Remove uneeded calls to clear_auth_functions_cache()


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

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

  Log Message:
  -----------
  [#2035] Fix old auth tests


  Commit: 96c1d9d1669ebec7ce49c395bf5383f3c0d6d910
      https://github.com/ckan/ckan/commit/96c1d9d1669ebec7ce49c395bf5383f3c0d6d910
  Author: george <george.sattler at xvt.com.au>
  Date:   2014-11-08 (Sat, 08 Nov 2014)

  Changed paths:
    M ckan/config/solr/schema.xml
    M ckan/lib/search/index.py

  Log Message:
  -----------
  [#1905] Allow search on resource name field.

Currently a package search will not search on the resource name field. With this change resource names are indexed so that package search will return dataset(s) where user searches for a resource by name.


  Commit: 1c30fd37195ffaa38ce0179897b62440e4eb63b4
      https://github.com/ckan/ckan/commit/1c30fd37195ffaa38ce0179897b62440e4eb63b4
  Author: george <george.sattler at xvt.com.au>
  Date:   2014-11-08 (Sat, 08 Nov 2014)

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

  Log Message:
  -----------
  [#1905] Allow search on resource name field.

Adds test to new_tests.


  Commit: 67edefda58a2a1e4b0920f47f27d9852f344f13a
      https://github.com/ckan/ckan/commit/67edefda58a2a1e4b0920f47f27d9852f344f13a
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M ckan/lib/datapreview.py

  Log Message:
  -----------
  Fix typo in log message.


  Commit: 6fab4fa3a2fcb3cc2951543c1acd063fc42079af
      https://github.com/ckan/ckan/commit/6fab4fa3a2fcb3cc2951543c1acd063fc42079af
  Author: Sean Hammond <seanh at users.noreply.github.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

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

  Log Message:
  -----------
  Merge pull request #1457 from ckan/1457-super-important-fix

Fix incompatible test in new_tests/logic/action/test_get.py


  Commit: 32dc61b6bd9ebf2eddc430e709d46062820da0a9
      https://github.com/ckan/ckan/commit/32dc61b6bd9ebf2eddc430e709d46062820da0a9
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/revision.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    R ckan/lib/field_types.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    A ckan/migration/versions/074_remove_resource_groups.py
    M ckan/model/__init__.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/dictization/__init__.py
    M ckan/new_tests/lib/dictization/test_model_dictize.py
    A ckan/new_tests/lib/test_base.py
    A ckan/new_tests/logic/action/test_delete.py
    A ckan/new_tests/logic/auth/test_delete.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/resource-view-embed.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    R ckan/public/base/less/resource-view-embed.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/scripts/application.js
    M ckan/templates/macros/form.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    R ckan/tests/functional/test_cors.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_revision.py
    M ckan/tests/lib/test_dictization.py
    R ckan/tests/lib/test_field_types.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_resource.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/reclineview/theme/public/recline_view.js
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/getting-started.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 1772-delete-legacy-templates

Conflicts:
	ckan/tests/functional/test_package.py


  Commit: 6da6073864fc7eb0e479703100c156fc488528c1
      https://github.com/ckan/ckan/commit/6da6073864fc7eb0e479703100c156fc488528c1
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M ckan/config/environment.py
    R ckan/templates_legacy/__init__.py
    R ckan/templates_legacy/_snippet/data-api-help.html
    R ckan/templates_legacy/_util.html
    R ckan/templates_legacy/activity_streams/activity_stream_items.html
    R ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/admin/index.html
    R ckan/templates_legacy/admin/layout.html
    R ckan/templates_legacy/admin/trash.html
    R ckan/templates_legacy/error_document_template.html
    R ckan/templates_legacy/facets.html
    R ckan/templates_legacy/group/__init__.py
    R ckan/templates_legacy/group/authz.html
    R ckan/templates_legacy/group/edit.html
    R ckan/templates_legacy/group/edit_form.html
    R ckan/templates_legacy/group/history.html
    R ckan/templates_legacy/group/index.html
    R ckan/templates_legacy/group/layout.html
    R ckan/templates_legacy/group/new.html
    R ckan/templates_legacy/group/new_group_form.html
    R ckan/templates_legacy/group/read.html
    R ckan/templates_legacy/home/__init__.py
    R ckan/templates_legacy/home/about.html
    R ckan/templates_legacy/home/index.html
    R ckan/templates_legacy/home/layout.html
    R ckan/templates_legacy/importer/__init__.py
    R ckan/templates_legacy/importer/importer.html
    R ckan/templates_legacy/importer/preview.html
    R ckan/templates_legacy/importer/result.html
    R ckan/templates_legacy/js_strings.html
    R ckan/templates_legacy/layout.html
    R ckan/templates_legacy/layout_base.html
    R ckan/templates_legacy/package/__init__.py
    R ckan/templates_legacy/package/authz.html
    R ckan/templates_legacy/package/comments.html
    R ckan/templates_legacy/package/edit.html
    R ckan/templates_legacy/package/edit_form.html
    R ckan/templates_legacy/package/editresources.html
    R ckan/templates_legacy/package/followers.html
    R ckan/templates_legacy/package/form.html
    R ckan/templates_legacy/package/form_extra_fields.html
    R ckan/templates_legacy/package/form_fields.html
    R ckan/templates_legacy/package/form_resources.html
    R ckan/templates_legacy/package/history.html
    R ckan/templates_legacy/package/layout.html
    R ckan/templates_legacy/package/new.html
    R ckan/templates_legacy/package/new_package_form.html
    R ckan/templates_legacy/package/read.html
    R ckan/templates_legacy/package/read.n3
    R ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/read_core.html
    R ckan/templates_legacy/package/resource_embedded_dataviewer.html
    R ckan/templates_legacy/package/resource_read.html
    R ckan/templates_legacy/package/resources.html
    R ckan/templates_legacy/package/search.html
    R ckan/templates_legacy/package/search_form.html
    R ckan/templates_legacy/package/snippets/data_preview.html
    R ckan/templates_legacy/related/add-related.html
    R ckan/templates_legacy/related/dashboard.html
    R ckan/templates_legacy/related/related_list.html
    R ckan/templates_legacy/rest/__init__.py
    R ckan/templates_legacy/revision/__init__.py
    R ckan/templates_legacy/revision/diff.html
    R ckan/templates_legacy/revision/layout.html
    R ckan/templates_legacy/revision/list.html
    R ckan/templates_legacy/revision/read.html
    R ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    R ckan/templates_legacy/snippets/data-viewer-embed-dialog.html
    R ckan/templates_legacy/snippets/follow_button.html
    R ckan/templates_legacy/snippets/internal-tracking.html
    R ckan/templates_legacy/snippets/package_list.html
    R ckan/templates_legacy/snippets/recline-extra-footer.html
    R ckan/templates_legacy/snippets/recline-extra-header.html
    R ckan/templates_legacy/snippets/revision_list.html
    R ckan/templates_legacy/storage/index.html
    R ckan/templates_legacy/storage/success.html
    R ckan/templates_legacy/tag/__init__.py
    R ckan/templates_legacy/tag/index.html
    R ckan/templates_legacy/tag/layout.html
    R ckan/templates_legacy/tag/read.html
    R ckan/templates_legacy/user/__init__.py
    R ckan/templates_legacy/user/dashboard.html
    R ckan/templates_legacy/user/edit.html
    R ckan/templates_legacy/user/edit_user_form.html
    R ckan/templates_legacy/user/followers.html
    R ckan/templates_legacy/user/layout.html
    R ckan/templates_legacy/user/list.html
    R ckan/templates_legacy/user/login.html
    R ckan/templates_legacy/user/logout.html
    R ckan/templates_legacy/user/logout_first.html
    R ckan/templates_legacy/user/new.html
    R ckan/templates_legacy/user/new_user_form.html
    R ckan/templates_legacy/user/perform_reset.html
    R ckan/templates_legacy/user/read.html
    R ckan/templates_legacy/user/request_reset.html
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_relationships.py
    M ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tag_vocab.py
    R ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/test_coding_standards.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/stats/tests/test_stats_plugin.py

  Log Message:
  -----------
  Merge branch '1772-delete-legacy-templates'


  Commit: 814edd86c6c6f3dedd9bfd163e87b0fb1925641e
      https://github.com/ckan/ckan/commit/814edd86c6c6f3dedd9bfd163e87b0fb1925641e
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

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

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


  Commit: 00b192d489f1f680e8bb8372a23b3e3caf7f689c
      https://github.com/ckan/ckan/commit/00b192d489f1f680e8bb8372a23b3e3caf7f689c
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

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

  Log Message:
  -----------
  [#2035] Further fixes to auth tests

The old auth tests are terrible in that they depend on each other to
run. Also the auth cache thing masked some bad assumptions.

The whole file should be rewritten as new tests.


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

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

  Log Message:
  -----------
  [#2035] Don't use http://foo.bar as a test url

Because `.bar` is being recognized as a gTLD, it points to
`127.0.53.53`, which if you have a web server running will return
localhost (and a 200 status).

More details:

https://stackoverflow.com/questions/25662590/domain-foo-bar-points-127-0-53-53-why


  Commit: 69883390a99590d5ef0305a0faf527ab24958c47
      https://github.com/ckan/ckan/commit/69883390a99590d5ef0305a0faf527ab24958c47
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M ckan/logic/auth/create.py
    M ckan/new_tests/logic/auth/test_create.py

  Log Message:
  -----------
  [#2037] Make resource_create auth work against package_update

Right now it was deferring to package_create, which doesn't make much
sense. Basically if you can update this particular dataset, you should
be able to add a resource to it. Added auth tests.

Also fixed the authorization for resource views creation. This is being
fully tested on #1852


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

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

  Log Message:
  -----------
  [#2037] Fix logger call to allow warning on tests


  Commit: 8b051f54f1e749dbe2903199984af8b5b55981ee
      https://github.com/ckan/ckan/commit/8b051f54f1e749dbe2903199984af8b5b55981ee
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M ckan/new_tests/logic/auth/test_create.py

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


  Commit: 424bd37b806ebf7eaf8cbd83cdc0575798921aff
      https://github.com/ckan/ckan/commit/424bd37b806ebf7eaf8cbd83cdc0575798921aff
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

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

  Log Message:
  -----------
  [#2037] Don't remove package_id before resource_create auth check

I didn't find any good reason as to why it was being done, and it
prevents `resource_create` auth to check authorization against the
dataset.

Added action tests


  Commit: a8870394df52d91d6b7b36759f21ff987100011e
      https://github.com/ckan/ckan/commit/a8870394df52d91d6b7b36759f21ff987100011e
  Author: jqnatividad <joel.natividad at ontodia.com>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M ckan/templates/ajax_snippets/api_info.html

  Log Message:
  -----------
  Fix python example in Data API window

Fixes #20146


  Commit: 31c08189ae20865653e129f698bb5e4562a34a1d
      https://github.com/ckan/ckan/commit/31c08189ae20865653e129f698bb5e4562a34a1d
  Author: george <george.sattler at xvt.com.au>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

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

  Log Message:
  -----------
  [#1905] Allow search on resource name field.

Changed 'assert' to 'eq' to make test pass okay.


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

  Changed paths:
    M ckan/config/who.ini
    M ckan/new_tests/lib/test_base.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#2048] Upgrade repoze.who to 2.0


  Commit: 3c298bb91be8f6420c07c1153c4ac88ad7963f80
      https://github.com/ckan/ckan/commit/3c298bb91be8f6420c07c1153c4ac88ad7963f80
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M ckanext/datapusher/logic/action.py
    A ckanext/datapusher/tests/test_default_views.py
    M ckanext/reclineview/plugin.py

  Log Message:
  -----------
  [#1852] Create default views on end of DataPusher submit

Similarly to d1516e4859, we call the relevant functions on datapreview
to explicitly create the default resource views when the process of
uploading data to the DataStore via the DataPusher ends.

Marked the Recline based plugins as requiring data in the DataStore.

Added tests in ckanext/datapusher


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

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#1597] Refactored for code clarity and improved error message.


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

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/lib/base.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    R ckan/lib/field_types.py
    M ckan/logic/converters.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/lib/dictization/test_model_dictize.py
    A ckan/new_tests/lib/test_base.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/resource-view-embed.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    R ckan/public/base/less/resource-view-embed.less
    M ckan/public/base/less/toolbar.less
    M ckan/templates/macros/form.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    R ckan/templates_legacy/__init__.py
    R ckan/templates_legacy/_snippet/data-api-help.html
    R ckan/templates_legacy/_util.html
    R ckan/templates_legacy/activity_streams/activity_stream_items.html
    R ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/admin/index.html
    R ckan/templates_legacy/admin/layout.html
    R ckan/templates_legacy/admin/trash.html
    R ckan/templates_legacy/error_document_template.html
    R ckan/templates_legacy/facets.html
    R ckan/templates_legacy/group/__init__.py
    R ckan/templates_legacy/group/authz.html
    R ckan/templates_legacy/group/edit.html
    R ckan/templates_legacy/group/edit_form.html
    R ckan/templates_legacy/group/history.html
    R ckan/templates_legacy/group/index.html
    R ckan/templates_legacy/group/layout.html
    R ckan/templates_legacy/group/new.html
    R ckan/templates_legacy/group/new_group_form.html
    R ckan/templates_legacy/group/read.html
    R ckan/templates_legacy/home/__init__.py
    R ckan/templates_legacy/home/about.html
    R ckan/templates_legacy/home/index.html
    R ckan/templates_legacy/home/layout.html
    R ckan/templates_legacy/importer/__init__.py
    R ckan/templates_legacy/importer/importer.html
    R ckan/templates_legacy/importer/preview.html
    R ckan/templates_legacy/importer/result.html
    R ckan/templates_legacy/js_strings.html
    R ckan/templates_legacy/layout.html
    R ckan/templates_legacy/layout_base.html
    R ckan/templates_legacy/package/__init__.py
    R ckan/templates_legacy/package/authz.html
    R ckan/templates_legacy/package/comments.html
    R ckan/templates_legacy/package/edit.html
    R ckan/templates_legacy/package/edit_form.html
    R ckan/templates_legacy/package/editresources.html
    R ckan/templates_legacy/package/followers.html
    R ckan/templates_legacy/package/form.html
    R ckan/templates_legacy/package/form_extra_fields.html
    R ckan/templates_legacy/package/form_fields.html
    R ckan/templates_legacy/package/form_resources.html
    R ckan/templates_legacy/package/history.html
    R ckan/templates_legacy/package/layout.html
    R ckan/templates_legacy/package/new.html
    R ckan/templates_legacy/package/new_package_form.html
    R ckan/templates_legacy/package/read.html
    R ckan/templates_legacy/package/read.n3
    R ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/read_core.html
    R ckan/templates_legacy/package/resource_embedded_dataviewer.html
    R ckan/templates_legacy/package/resource_read.html
    R ckan/templates_legacy/package/resources.html
    R ckan/templates_legacy/package/search.html
    R ckan/templates_legacy/package/search_form.html
    R ckan/templates_legacy/package/snippets/data_preview.html
    R ckan/templates_legacy/related/add-related.html
    R ckan/templates_legacy/related/dashboard.html
    R ckan/templates_legacy/related/related_list.html
    R ckan/templates_legacy/rest/__init__.py
    R ckan/templates_legacy/revision/__init__.py
    R ckan/templates_legacy/revision/diff.html
    R ckan/templates_legacy/revision/layout.html
    R ckan/templates_legacy/revision/list.html
    R ckan/templates_legacy/revision/read.html
    R ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    R ckan/templates_legacy/snippets/data-viewer-embed-dialog.html
    R ckan/templates_legacy/snippets/follow_button.html
    R ckan/templates_legacy/snippets/internal-tracking.html
    R ckan/templates_legacy/snippets/package_list.html
    R ckan/templates_legacy/snippets/recline-extra-footer.html
    R ckan/templates_legacy/snippets/recline-extra-header.html
    R ckan/templates_legacy/snippets/revision_list.html
    R ckan/templates_legacy/storage/index.html
    R ckan/templates_legacy/storage/success.html
    R ckan/templates_legacy/tag/__init__.py
    R ckan/templates_legacy/tag/index.html
    R ckan/templates_legacy/tag/layout.html
    R ckan/templates_legacy/tag/read.html
    R ckan/templates_legacy/user/__init__.py
    R ckan/templates_legacy/user/dashboard.html
    R ckan/templates_legacy/user/edit.html
    R ckan/templates_legacy/user/edit_user_form.html
    R ckan/templates_legacy/user/followers.html
    R ckan/templates_legacy/user/layout.html
    R ckan/templates_legacy/user/list.html
    R ckan/templates_legacy/user/login.html
    R ckan/templates_legacy/user/logout.html
    R ckan/templates_legacy/user/logout_first.html
    R ckan/templates_legacy/user/new.html
    R ckan/templates_legacy/user/new_user_form.html
    R ckan/templates_legacy/user/perform_reset.html
    R ckan/templates_legacy/user/read.html
    R ckan/templates_legacy/user/request_reset.html
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_cors.py
    R ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_relationships.py
    M ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tag_vocab.py
    R ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    R ckan/tests/lib/test_field_types.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/stats/tests/test_stats_plugin.py
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/getting-started.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 2003-package-patch-simple-version


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

  Changed paths:
    M ckan/logic/action/patch.py
    M ckan/logic/auth/patch.py
    M ckan/new_tests/logic/action/test_patch.py

  Log Message:
  -----------
  [#2003] resource_patch


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

  Changed paths:
    M ckan/logic/action/patch.py
    M ckan/logic/auth/patch.py
    M ckan/new_tests/logic/action/test_patch.py

  Log Message:
  -----------
  [#2003] group_patch and organization_patch


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

  Changed paths:
    M doc/api/index.rst

  Log Message:
  -----------
  [#2003] reference docs


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

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

  Log Message:
  -----------
  [#2035] Improve non-existent URL added on 7d30f7c


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

  Changed paths:
    M ckan/new_authz.py

  Log Message:
  -----------
  [#2035] Split all whitespace when parsing roles_that_cascade_to_sub_groups

Use split() rather than split(' ')


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

  Changed paths:
    M CHANGELOG.rst
    A Dockerfile
    M README.rst
    M bin/travis-install-dependencies
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/config/who.ini
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/exceptions.py
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/lib/base.py
    M ckan/lib/cli.py
    A ckan/lib/config_tool.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    R ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/lib/uploader.py
    A ckan/lib/util.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/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/072_add_resource_view.py
    A ckan/migration/versions/073_update_resource_view_resource_id_constraint.py
    A ckan/migration/versions/074_remove_resource_groups.py
    M ckan/model/__init__.py
    M ckan/model/modification.py
    M ckan/model/package.py
    M ckan/model/resource.py
    A ckan/model/resource_view.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests/controllers/test_group.py
    A ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/controllers/test_util.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/dictization/__init__.py
    A ckan/new_tests/lib/dictization/test_model_dictize.py
    A ckan/new_tests/lib/navl/test_dictization_functions.py
    A ckan/new_tests/lib/search/__init__.py
    A ckan/new_tests/lib/search/test_index.py
    A ckan/new_tests/lib/test_base.py
    A ckan/new_tests/lib/test_config_tool.py
    M ckan/new_tests/lib/test_helpers.py
    M ckan/new_tests/logic/action/test_create.py
    A ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_create.py
    A ckan/new_tests/logic/auth/test_delete.py
    M ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_conversion.py
    M ckan/new_tests/logic/test_converters.py
    M ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/model/test_resource.py
    A ckan/new_tests/model/test_resource_view.py
    A ckan/new_tests/model/test_user.py
    A ckan/new_tests/test_coding_standards.py
    A ckan/new_tests/test_factories.py
    M ckan/plugins/__init__.py
    M ckan/plugins/core.py
    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/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/image-upload.js
    A ckan/public/base/javascript/modules/resource-view-embed.js
    A ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/main.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/jquery.min.js
    A ckan/public/base/vendor/select2/.gitignore
    A ckan/public/base/vendor/select2/LICENSE
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/bower.json
    A ckan/public/base/vendor/select2/component.json
    A ckan/public/base/vendor/select2/composer.json
    A ckan/public/base/vendor/select2/package.json
    A ckan/public/base/vendor/select2/release.sh
    A ckan/public/base/vendor/select2/select2-bootstrap.css
    M ckan/public/base/vendor/select2/select2.css
    A ckan/public/base/vendor/select2/select2.jquery.json
    M ckan/public/base/vendor/select2/select2.js
    M ckan/public/base/vendor/select2/select2.min.js
    A ckan/public/base/vendor/select2/select2_locale_ar.js
    A ckan/public/base/vendor/select2/select2_locale_bg.js
    A ckan/public/base/vendor/select2/select2_locale_ca.js
    A ckan/public/base/vendor/select2/select2_locale_cs.js
    A ckan/public/base/vendor/select2/select2_locale_da.js
    A ckan/public/base/vendor/select2/select2_locale_de.js
    A ckan/public/base/vendor/select2/select2_locale_el.js
    A ckan/public/base/vendor/select2/select2_locale_en.js.template
    A ckan/public/base/vendor/select2/select2_locale_es.js
    A ckan/public/base/vendor/select2/select2_locale_et.js
    A ckan/public/base/vendor/select2/select2_locale_eu.js
    A ckan/public/base/vendor/select2/select2_locale_fa.js
    A ckan/public/base/vendor/select2/select2_locale_fi.js
    A ckan/public/base/vendor/select2/select2_locale_fr.js
    A ckan/public/base/vendor/select2/select2_locale_gl.js
    A ckan/public/base/vendor/select2/select2_locale_he.js
    A ckan/public/base/vendor/select2/select2_locale_hr.js
    A ckan/public/base/vendor/select2/select2_locale_hu.js
    A ckan/public/base/vendor/select2/select2_locale_id.js
    A ckan/public/base/vendor/select2/select2_locale_is.js
    A ckan/public/base/vendor/select2/select2_locale_it.js
    A ckan/public/base/vendor/select2/select2_locale_ja.js
    A ckan/public/base/vendor/select2/select2_locale_ka.js
    A ckan/public/base/vendor/select2/select2_locale_ko.js
    A ckan/public/base/vendor/select2/select2_locale_lt.js
    A ckan/public/base/vendor/select2/select2_locale_lv.js
    A ckan/public/base/vendor/select2/select2_locale_mk.js
    A ckan/public/base/vendor/select2/select2_locale_ms.js
    A ckan/public/base/vendor/select2/select2_locale_nl.js
    A ckan/public/base/vendor/select2/select2_locale_no.js
    A ckan/public/base/vendor/select2/select2_locale_pl.js
    A ckan/public/base/vendor/select2/select2_locale_pt-BR.js
    A ckan/public/base/vendor/select2/select2_locale_pt-PT.js
    A ckan/public/base/vendor/select2/select2_locale_ro.js
    A ckan/public/base/vendor/select2/select2_locale_rs.js
    A ckan/public/base/vendor/select2/select2_locale_ru.js
    A ckan/public/base/vendor/select2/select2_locale_sk.js
    A ckan/public/base/vendor/select2/select2_locale_sv.js
    A ckan/public/base/vendor/select2/select2_locale_th.js
    A ckan/public/base/vendor/select2/select2_locale_tr.js
    A ckan/public/base/vendor/select2/select2_locale_uk.js
    A ckan/public/base/vendor/select2/select2_locale_vi.js
    A ckan/public/base/vendor/select2/select2_locale_zh-CN.js
    A ckan/public/base/vendor/select2/select2_locale_zh-TW.js
    M ckan/public/scripts/application.js
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    A ckan/templates/admin/trash.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/base.html
    M ckan/templates/dataviewer/base.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/footer.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    A ckan/templates/package/edit_view.html
    M ckan/templates/package/new_package_form.html
    R ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    A ckan/templates/package/new_view.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    A ckan/templates/package/resource_views.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/package_form.html
    R ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_edit_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    A ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_embed.html
    A ckan/templates/package/snippets/resource_views_list.html
    A ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/stages.html
    A ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_help.html
    A ckan/templates/package/view_edit_base.html
    M ckan/templates/page.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/login.html
    M ckan/templates/user/snippets/recaptcha.html
    R ckan/templates_legacy/__init__.py
    R ckan/templates_legacy/_snippet/data-api-help.html
    R ckan/templates_legacy/_util.html
    R ckan/templates_legacy/activity_streams/activity_stream_items.html
    R ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/admin/index.html
    R ckan/templates_legacy/admin/layout.html
    R ckan/templates_legacy/admin/trash.html
    R ckan/templates_legacy/error_document_template.html
    R ckan/templates_legacy/facets.html
    R ckan/templates_legacy/group/__init__.py
    R ckan/templates_legacy/group/authz.html
    R ckan/templates_legacy/group/edit.html
    R ckan/templates_legacy/group/edit_form.html
    R ckan/templates_legacy/group/history.html
    R ckan/templates_legacy/group/index.html
    R ckan/templates_legacy/group/layout.html
    R ckan/templates_legacy/group/new.html
    R ckan/templates_legacy/group/new_group_form.html
    R ckan/templates_legacy/group/read.html
    R ckan/templates_legacy/home/__init__.py
    R ckan/templates_legacy/home/about.html
    R ckan/templates_legacy/home/index.html
    R ckan/templates_legacy/home/layout.html
    R ckan/templates_legacy/importer/__init__.py
    R ckan/templates_legacy/importer/importer.html
    R ckan/templates_legacy/importer/preview.html
    R ckan/templates_legacy/importer/result.html
    R ckan/templates_legacy/js_strings.html
    R ckan/templates_legacy/layout.html
    R ckan/templates_legacy/layout_base.html
    R ckan/templates_legacy/package/__init__.py
    R ckan/templates_legacy/package/authz.html
    R ckan/templates_legacy/package/comments.html
    R ckan/templates_legacy/package/edit.html
    R ckan/templates_legacy/package/edit_form.html
    R ckan/templates_legacy/package/editresources.html
    R ckan/templates_legacy/package/followers.html
    R ckan/templates_legacy/package/form.html
    R ckan/templates_legacy/package/form_extra_fields.html
    R ckan/templates_legacy/package/form_fields.html
    R ckan/templates_legacy/package/form_resources.html
    R ckan/templates_legacy/package/history.html
    R ckan/templates_legacy/package/layout.html
    R ckan/templates_legacy/package/new.html
    R ckan/templates_legacy/package/new_package_form.html
    R ckan/templates_legacy/package/read.html
    R ckan/templates_legacy/package/read.n3
    R ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/read_core.html
    R ckan/templates_legacy/package/resource_embedded_dataviewer.html
    R ckan/templates_legacy/package/resource_read.html
    R ckan/templates_legacy/package/resources.html
    R ckan/templates_legacy/package/search.html
    R ckan/templates_legacy/package/search_form.html
    R ckan/templates_legacy/package/snippets/data_preview.html
    R ckan/templates_legacy/related/add-related.html
    R ckan/templates_legacy/related/dashboard.html
    R ckan/templates_legacy/related/related_list.html
    R ckan/templates_legacy/rest/__init__.py
    R ckan/templates_legacy/revision/__init__.py
    R ckan/templates_legacy/revision/diff.html
    R ckan/templates_legacy/revision/layout.html
    R ckan/templates_legacy/revision/list.html
    R ckan/templates_legacy/revision/read.html
    R ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    R ckan/templates_legacy/snippets/data-viewer-embed-dialog.html
    R ckan/templates_legacy/snippets/follow_button.html
    R ckan/templates_legacy/snippets/internal-tracking.html
    R ckan/templates_legacy/snippets/package_list.html
    R ckan/templates_legacy/snippets/recline-extra-footer.html
    R ckan/templates_legacy/snippets/recline-extra-header.html
    R ckan/templates_legacy/snippets/revision_list.html
    R ckan/templates_legacy/storage/index.html
    R ckan/templates_legacy/storage/success.html
    R ckan/templates_legacy/tag/__init__.py
    R ckan/templates_legacy/tag/index.html
    R ckan/templates_legacy/tag/layout.html
    R ckan/templates_legacy/tag/read.html
    R ckan/templates_legacy/user/__init__.py
    R ckan/templates_legacy/user/dashboard.html
    R ckan/templates_legacy/user/edit.html
    R ckan/templates_legacy/user/edit_user_form.html
    R ckan/templates_legacy/user/followers.html
    R ckan/templates_legacy/user/layout.html
    R ckan/templates_legacy/user/list.html
    R ckan/templates_legacy/user/login.html
    R ckan/templates_legacy/user/logout.html
    R ckan/templates_legacy/user/logout_first.html
    R ckan/templates_legacy/user/new.html
    R ckan/templates_legacy/user/new_user_form.html
    R ckan/templates_legacy/user/perform_reset.html
    R ckan/templates_legacy/user/read.html
    R ckan/templates_legacy/user/request_reset.html
    M ckan/tests/functional/api/test_package_search.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_cors.py
    R ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_relationships.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tag_vocab.py
    M ckan/tests/functional/test_tracking.py
    R ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    R ckan/tests/lib/test_field_types.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/lib/test_solr_search_index.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_resource.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_plugins.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    R ckanext/datastore/bin/__init__.py
    R ckanext/datastore/bin/datastore_setup.py
    R ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    A ckanext/datastore/helpers.py
    A ckanext/datastore/interfaces.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/set_permissions.sql
    A ckanext/datastore/tests/sample_datastore_plugin.py
    M ckanext/datastore/tests/test_create.py
    A ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_delete.py
    A ckanext/datastore/tests/test_helpers.py
    A ckanext/datastore/tests/test_interface.py
    A 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_idatasetform/plugin.py
    A ckanext/example_idatasetform/plugin_v1.py
    A ckanext/example_idatasetform/plugin_v2.py
    A ckanext/example_idatasetform/plugin_v3.py
    A ckanext/example_idatasetform/plugin_v4.py
    A ckanext/example_idatasetform/templates/package/search.html
    A ckanext/example_idatasetform/templates/package/snippets/additional_info.html
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/templates/package/snippets/resource_form.html
    A ckanext/example_idatasetform/tests/__init__.py
    A ckanext/example_idatasetform/tests/test_example_idatasetform.py
    A ckanext/example_iresourcecontroller/__init__.py
    A ckanext/example_iresourcecontroller/plugin.py
    A ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    A ckanext/example_ivalidators/__init__.py
    A ckanext/example_ivalidators/plugin.py
    A ckanext/example_ivalidators/tests/__init__.py
    A ckanext/example_ivalidators/tests/test_ivalidators.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    M ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    A ckanext/imageview/__init__.py
    A ckanext/imageview/plugin.py
    A ckanext/imageview/tests/__init__.py
    A ckanext/imageview/tests/test_view.py
    A ckanext/imageview/theme/templates/image_form.html
    A ckanext/imageview/theme/templates/image_view.html
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    R ckanext/pdfpreview/__init__.py
    R ckanext/pdfpreview/plugin.py
    R ckanext/pdfpreview/tests/__init__.py
    R ckanext/pdfpreview/tests/test_preview.py
    R ckanext/pdfpreview/theme/public/css/pdf.css
    R ckanext/pdfpreview/theme/public/css/recline.css
    R ckanext/pdfpreview/theme/public/img/ajaxload-circle.gif
    R ckanext/pdfpreview/theme/public/preview_pdf.js
    R ckanext/pdfpreview/theme/public/resource.config
    R ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    R ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/texture.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/README.md
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/pdfpreview/theme/templates/pdf.html
    A ckanext/pdfview/__init__.py
    A ckanext/pdfview/plugin.py
    A ckanext/pdfview/tests/__init__.py
    A ckanext/pdfview/tests/test_view.py
    A ckanext/pdfview/theme/public/css/pdf.css
    A ckanext/pdfview/theme/public/css/recline.css
    A ckanext/pdfview/theme/public/img/ajaxload-circle.gif
    A ckanext/pdfview/theme/public/pdf_view.js
    A ckanext/pdfview/theme/public/resource.config
    A ckanext/pdfview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/zh-TW/viewer.properties
    A ckanext/pdfview/theme/public/vendor/pdfjs/pdf.js
    A ckanext/pdfview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.js
    A ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.min.js
    A ckanext/pdfview/theme/public/vendor/pdfviewer/debugger.js
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/texture.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.css
    A ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.js
    A ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.css
    A ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.js
    A ckanext/pdfview/theme/public/vendor/webL10n/README.md
    A ckanext/pdfview/theme/public/vendor/webL10n/l10n.js
    A ckanext/pdfview/theme/public/vendor/webL10n/l10n.min.js
    A ckanext/pdfview/theme/templates/pdf.html
    R ckanext/reclinepreview/__init__.py
    R ckanext/reclinepreview/plugin.py
    R ckanext/reclinepreview/tests/__init__.py
    R ckanext/reclinepreview/tests/test_preview.py
    R ckanext/reclinepreview/theme/public/css/recline.css
    R ckanext/reclinepreview/theme/public/img/ajaxload-circle.gif
    R ckanext/reclinepreview/theme/public/preview_recline.js
    R ckanext/reclinepreview/theme/public/resource.config
    R ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.js
    R ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.min.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.min.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.min.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.min.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings-white.png
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings.png
    R ckanext/reclinepreview/theme/public/vendor/flot/excanvas.js
    R ckanext/reclinepreview/theme/public/vendor/flot/excanvas.min.js
    R ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.js
    R ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.min.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
    R ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.js
    R ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.min.js
    R ckanext/reclinepreview/theme/public/vendor/json/json2.js
    R ckanext/reclinepreview/theme/public/vendor/json/json2.min.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    R ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.js
    R ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.min.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    R ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.js
    R ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/README.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.css
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.png
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.js
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    R ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.js
    R ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.min.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    R ckanext/reclinepreview/theme/templates/recline.html
    A ckanext/reclineview/__init__.py
    A ckanext/reclineview/plugin.py
    A ckanext/reclineview/tests/__init__.py
    A ckanext/reclineview/tests/test_view.py
    A ckanext/reclineview/theme/public/css/recline.css
    A ckanext/reclineview/theme/public/img/ajaxload-circle.gif
    A ckanext/reclineview/theme/public/recline_view.js
    A ckanext/reclineview/theme/public/resource.config
    A ckanext/reclineview/theme/public/vendor/backbone/1.0.0/backbone.js
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/bootstrap.js
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap-responsive.css
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap.css
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings-white.png
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings.png
    A ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    A ckanext/reclineview/theme/public/vendor/flot/excanvas.js
    A ckanext/reclineview/theme/public/vendor/flot/excanvas.min.js
    A ckanext/reclineview/theme/public/vendor/flot/jquery.flot.js
    A ckanext/reclineview/theme/public/vendor/flotr2/flotr2.js
    A ckanext/reclineview/theme/public/vendor/flotr2/flotr2.min.js
    A ckanext/reclineview/theme/public/vendor/jquery/1.7.1/jquery.js
    A ckanext/reclineview/theme/public/vendor/jquery/1.7.1/jquery.min.js
    A ckanext/reclineview/theme/public/vendor/json/json2.js
    A ckanext/reclineview/theme/public/vendor/json/json2.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    A ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.js
    A ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.min.js
    A ckanext/reclineview/theme/public/vendor/mustache/0.5.0-dev/mustache.js
    A ckanext/reclineview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.js
    A ckanext/reclineview/theme/public/vendor/recline/recline.css
    A ckanext/reclineview/theme/public/vendor/recline/recline.dataset.js
    A ckanext/reclineview/theme/public/vendor/recline/recline.dataset.min.js
    A ckanext/reclineview/theme/public/vendor/recline/recline.js
    A ckanext/reclineview/theme/public/vendor/recline/recline.min.css
    A ckanext/reclineview/theme/public/vendor/recline/recline.min.js
    A ckanext/reclineview/theme/public/vendor/showdown/20120615/showdown.js
    A ckanext/reclineview/theme/public/vendor/showdown/20120615/showdown.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/README.txt
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowmovemanager.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowselectionmodel.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.js
    A ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.css
    A ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    A ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.png
    A ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.js
    A ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    A ckanext/reclineview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.js
    A ckanext/reclineview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.min.js
    A ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.js
    A ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    A ckanext/reclineview/theme/public/widget.recordcount.js
    A ckanext/reclineview/theme/templates/recline_graph_form.html
    A ckanext/reclineview/theme/templates/recline_map_form.html
    A ckanext/reclineview/theme/templates/recline_view.html
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/plugin.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/__init__.py
    M ckanext/stats/tests/test_stats_plugin.py
    R ckanext/textpreview/__init__.py
    R ckanext/textpreview/plugin.py
    R ckanext/textpreview/tests/__init__.py
    R ckanext/textpreview/tests/test_preview.py
    R ckanext/textpreview/theme/public/LICENSE
    R ckanext/textpreview/theme/public/css/text.css
    R ckanext/textpreview/theme/public/preview_text.js
    R ckanext/textpreview/theme/public/resource.config
    R ckanext/textpreview/theme/public/styles/default.css
    R ckanext/textpreview/theme/public/styles/github.css
    R ckanext/textpreview/theme/public/vendor/highlight.pack.js
    R ckanext/textpreview/theme/templates/text.html
    A ckanext/textview/__init__.py
    A ckanext/textview/plugin.py
    A ckanext/textview/tests/__init__.py
    A ckanext/textview/tests/test_view.py
    A ckanext/textview/theme/public/LICENSE
    A ckanext/textview/theme/public/css/text.css
    A ckanext/textview/theme/public/resource.config
    A ckanext/textview/theme/public/styles/default.css
    A ckanext/textview/theme/public/styles/github.css
    A ckanext/textview/theme/public/text_view.js
    A ckanext/textview/theme/public/vendor/highlight.pack.js
    A ckanext/textview/theme/templates/text_form.html
    A ckanext/textview/theme/templates/text_view.html
    A ckanext/webpageview/__init__.py
    A ckanext/webpageview/plugin.py
    A ckanext/webpageview/tests/__init__.py
    A ckanext/webpageview/tests/test_view.py
    A ckanext/webpageview/theme/templates/webpage_form.html
    A ckanext/webpageview/theme/templates/webpage_view.html
    A contrib/docker/apache.conf
    A contrib/docker/apache.wsgi
    A contrib/docker/main.cf
    A contrib/docker/my_init.d/50_configure
    A contrib/docker/my_init.d/70_initdb
    A contrib/docker/nginx.conf
    A contrib/docker/postgresql/Dockerfile
    A contrib/docker/solr/Dockerfile
    A contrib/docker/solr/schema.xml
    A contrib/docker/svc/ckan/run
    A contrib/docker/svc/nginx/run
    A contrib/docker/svc/postfix/run
    M dev-requirements.txt
    M doc/api.rst
    M doc/api/index.rst
    M doc/conf.py
    M doc/contributing/architecture.rst
    M doc/contributing/documentation.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/html.rst
    M doc/contributing/i18n.rst
    M doc/contributing/pull-requests.rst
    M doc/contributing/python.rst
    M doc/contributing/reviewing.rst
    M doc/contributing/test.rst
    M doc/contributing/testing.rst
    A doc/extensions/adding-custom-fields.rst
    R doc/extensions/converters.rst
    M doc/extensions/index.rst
    M doc/extensions/tutorial.rst
    M doc/extensions/validators.rst
    M doc/images/add_dataset_3.jpg
    A doc/images/ckan_importing_diagram.graphml
    A doc/images/ckan_importing_diagram.png
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/form-integration.rst
    M doc/maintaining/getting-started.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/installing/index.rst
    M doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/installing/install-using-docker.rst
    M doc/maintaining/paster.rst
    M doc/maintaining/solr-multicore.rst
    M doc/theming/best-practices.rst
    M doc/theming/css.rst
    M doc/theming/fanstatic.rst
    M doc/theming/javascript.rst
    M doc/theming/static-files.rst
    M doc/theming/templates.rst
    M doc/user-guide.rst
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 1596-dont-show-deleted-members


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

  Log Message:
  -----------
  Merge branch '1596-dont-show-deleted-members'


  Commit: 6623a73290660418c9dea792712d1b60724fae4b
      https://github.com/ckan/ckan/commit/6623a73290660418c9dea792712d1b60724fae4b
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M ckan/config/middleware.py
    A ckan/lib/auth_tkt.py
    A ckan/new_tests/lib/test_auth_tkt.py

  Log Message:
  -----------
  [#1941] Subclass repoze.who AuthTktCookiePlugin.

Override _get_cookies to ensure the presence or absence of the HttpOnly
flag in each cookie value based on a new httponly property of the class.


  Commit: 53e76cb94f0c8f47f51b21780b7200e15fc9a868
      https://github.com/ckan/ckan/commit/53e76cb94f0c8f47f51b21780b7200e15fc9a868
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M ckan/new_tests/lib/test_auth_tkt.py

  Log Message:
  -----------
  [#1941] More robust get_cookies test


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

  Changed paths:
    M ckan/config/middleware.py
    M ckan/config/who.ini
    M ckan/lib/auth_tkt.py

  Log Message:
  -----------
  [#1941] Move middleware auth_tkt code to lib.

This puts the auth_tkt related code in the same place.


  Commit: 629e46671d2eb742c5b7131a1cbe033fc941d479
      https://github.com/ckan/ckan/commit/629e46671d2eb742c5b7131a1cbe033fc941d479
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M ckan/lib/auth_tkt.py
    M ckan/new_tests/lib/test_auth_tkt.py

  Log Message:
  -----------
  [#1941] Can set HttpOnly flag from config


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

  Changed paths:
    M ckan/config/who.ini
    M ckan/new_tests/lib/test_base.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge branch '2048-upgrade-repoze' of https://github.com/brew/ckan into brew-2048-upgrade-repoze


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

  Changed paths:
    M ckan/config/who.ini
    M ckan/new_tests/lib/test_base.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'brew-2048-upgrade-repoze'


  Commit: 33ac02400a74238e8f35638f20f989940ea107b8
      https://github.com/ckan/ckan/commit/33ac02400a74238e8f35638f20f989940ea107b8
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M CHANGELOG.rst
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#1941] Docs and changelog for HttpOnly flag


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

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Make help doc pass test


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

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/config/who.ini
    M ckan/controllers/revision.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    R ckan/lib/field_types.py
    M ckan/logic/action/create.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/converters.py
    M ckan/logic/schema.py
    A ckan/migration/versions/074_remove_resource_groups.py
    M ckan/model/__init__.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/dictization/__init__.py
    M ckan/new_tests/lib/dictization/test_model_dictize.py
    A ckan/new_tests/lib/test_base.py
    M ckan/new_tests/logic/action/test_create.py
    A ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/auth/test_create.py
    A ckan/new_tests/logic/auth/test_delete.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/resource-view-embed.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    R ckan/public/base/less/resource-view-embed.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/scripts/application.js
    M ckan/templates/macros/form.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/snippets/group_item.html
    R ckan/templates_legacy/__init__.py
    R ckan/templates_legacy/_snippet/data-api-help.html
    R ckan/templates_legacy/_util.html
    R ckan/templates_legacy/activity_streams/activity_stream_items.html
    R ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/admin/index.html
    R ckan/templates_legacy/admin/layout.html
    R ckan/templates_legacy/admin/trash.html
    R ckan/templates_legacy/error_document_template.html
    R ckan/templates_legacy/facets.html
    R ckan/templates_legacy/group/__init__.py
    R ckan/templates_legacy/group/authz.html
    R ckan/templates_legacy/group/edit.html
    R ckan/templates_legacy/group/edit_form.html
    R ckan/templates_legacy/group/history.html
    R ckan/templates_legacy/group/index.html
    R ckan/templates_legacy/group/layout.html
    R ckan/templates_legacy/group/new.html
    R ckan/templates_legacy/group/new_group_form.html
    R ckan/templates_legacy/group/read.html
    R ckan/templates_legacy/home/__init__.py
    R ckan/templates_legacy/home/about.html
    R ckan/templates_legacy/home/index.html
    R ckan/templates_legacy/home/layout.html
    R ckan/templates_legacy/importer/__init__.py
    R ckan/templates_legacy/importer/importer.html
    R ckan/templates_legacy/importer/preview.html
    R ckan/templates_legacy/importer/result.html
    R ckan/templates_legacy/js_strings.html
    R ckan/templates_legacy/layout.html
    R ckan/templates_legacy/layout_base.html
    R ckan/templates_legacy/package/__init__.py
    R ckan/templates_legacy/package/authz.html
    R ckan/templates_legacy/package/comments.html
    R ckan/templates_legacy/package/edit.html
    R ckan/templates_legacy/package/edit_form.html
    R ckan/templates_legacy/package/editresources.html
    R ckan/templates_legacy/package/followers.html
    R ckan/templates_legacy/package/form.html
    R ckan/templates_legacy/package/form_extra_fields.html
    R ckan/templates_legacy/package/form_fields.html
    R ckan/templates_legacy/package/form_resources.html
    R ckan/templates_legacy/package/history.html
    R ckan/templates_legacy/package/layout.html
    R ckan/templates_legacy/package/new.html
    R ckan/templates_legacy/package/new_package_form.html
    R ckan/templates_legacy/package/read.html
    R ckan/templates_legacy/package/read.n3
    R ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/read_core.html
    R ckan/templates_legacy/package/resource_embedded_dataviewer.html
    R ckan/templates_legacy/package/resource_read.html
    R ckan/templates_legacy/package/resources.html
    R ckan/templates_legacy/package/search.html
    R ckan/templates_legacy/package/search_form.html
    R ckan/templates_legacy/package/snippets/data_preview.html
    R ckan/templates_legacy/related/add-related.html
    R ckan/templates_legacy/related/dashboard.html
    R ckan/templates_legacy/related/related_list.html
    R ckan/templates_legacy/rest/__init__.py
    R ckan/templates_legacy/revision/__init__.py
    R ckan/templates_legacy/revision/diff.html
    R ckan/templates_legacy/revision/layout.html
    R ckan/templates_legacy/revision/list.html
    R ckan/templates_legacy/revision/read.html
    R ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    R ckan/templates_legacy/snippets/data-viewer-embed-dialog.html
    R ckan/templates_legacy/snippets/follow_button.html
    R ckan/templates_legacy/snippets/internal-tracking.html
    R ckan/templates_legacy/snippets/package_list.html
    R ckan/templates_legacy/snippets/recline-extra-footer.html
    R ckan/templates_legacy/snippets/recline-extra-header.html
    R ckan/templates_legacy/snippets/revision_list.html
    R ckan/templates_legacy/storage/index.html
    R ckan/templates_legacy/storage/success.html
    R ckan/templates_legacy/tag/__init__.py
    R ckan/templates_legacy/tag/index.html
    R ckan/templates_legacy/tag/layout.html
    R ckan/templates_legacy/tag/read.html
    R ckan/templates_legacy/user/__init__.py
    R ckan/templates_legacy/user/dashboard.html
    R ckan/templates_legacy/user/edit.html
    R ckan/templates_legacy/user/edit_user_form.html
    R ckan/templates_legacy/user/followers.html
    R ckan/templates_legacy/user/layout.html
    R ckan/templates_legacy/user/list.html
    R ckan/templates_legacy/user/login.html
    R ckan/templates_legacy/user/logout.html
    R ckan/templates_legacy/user/logout_first.html
    R ckan/templates_legacy/user/new.html
    R ckan/templates_legacy/user/new_user_form.html
    R ckan/templates_legacy/user/perform_reset.html
    R ckan/templates_legacy/user/read.html
    R ckan/templates_legacy/user/request_reset.html
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_cors.py
    R ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_relationships.py
    M ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tag_vocab.py
    R ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    R ckan/tests/lib/test_field_types.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_resource.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/stats/tests/test_stats_plugin.py
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/getting-started.rst
    M requirements.in
    M requirements.txt

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

... into 1943-session-timeout

Conflicts:
	ckan/config/who.ini


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

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/auth/test_create.py

  Log Message:
  -----------
  Merge branch 'master' into 1941-httponly


  Commit: 6d6c6774bb0f07edd067d802f7c543775853eebe
      https://github.com/ckan/ckan/commit/6d6c6774bb0f07edd067d802f7c543775853eebe
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-16 (Sun, 16 Nov 2014)

  Changed paths:
    M ckan/lib/auth_tkt.py
    M ckan/new_tests/lib/test_auth_tkt.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#1942] secure flag for auth cookies


  Commit: 32ae210b93dcaf60a4691b7330a2c7e24fd8fb3a
      https://github.com/ckan/ckan/commit/32ae210b93dcaf60a4691b7330a2c7e24fd8fb3a
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-16 (Sun, 16 Nov 2014)

  Changed paths:
    M ckan/new_tests/lib/test_auth_tkt.py

  Log Message:
  -----------
  [#1942] Fix test comment


  Commit: 378851a8160d97d578dd4cb845190f57cbcae210
      https://github.com/ckan/ckan/commit/378851a8160d97d578dd4cb845190f57cbcae210
  Author: george <george.sattler at xvt.com.au>
  Date:   2014-11-17 (Mon, 17 Nov 2014)

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

  Log Message:
  -----------
  fixes PEP8 issue (too many spaces after ',')


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

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    R ckan/lib/field_types.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/search/index.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    A ckan/migration/versions/074_remove_resource_groups.py
    M ckan/model/__init__.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/dictization/__init__.py
    M ckan/new_tests/lib/dictization/test_model_dictize.py
    A ckan/new_tests/lib/test_base.py
    A ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/test_delete.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/resource-view-embed.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    R ckan/public/base/less/resource-view-embed.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/scripts/application.js
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_edit_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/snippets/group_item.html
    R ckan/templates_legacy/__init__.py
    R ckan/templates_legacy/_snippet/data-api-help.html
    R ckan/templates_legacy/_util.html
    R ckan/templates_legacy/activity_streams/activity_stream_items.html
    R ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/admin/index.html
    R ckan/templates_legacy/admin/layout.html
    R ckan/templates_legacy/admin/trash.html
    R ckan/templates_legacy/error_document_template.html
    R ckan/templates_legacy/facets.html
    R ckan/templates_legacy/group/__init__.py
    R ckan/templates_legacy/group/authz.html
    R ckan/templates_legacy/group/edit.html
    R ckan/templates_legacy/group/edit_form.html
    R ckan/templates_legacy/group/history.html
    R ckan/templates_legacy/group/index.html
    R ckan/templates_legacy/group/layout.html
    R ckan/templates_legacy/group/new.html
    R ckan/templates_legacy/group/new_group_form.html
    R ckan/templates_legacy/group/read.html
    R ckan/templates_legacy/home/__init__.py
    R ckan/templates_legacy/home/about.html
    R ckan/templates_legacy/home/index.html
    R ckan/templates_legacy/home/layout.html
    R ckan/templates_legacy/importer/__init__.py
    R ckan/templates_legacy/importer/importer.html
    R ckan/templates_legacy/importer/preview.html
    R ckan/templates_legacy/importer/result.html
    R ckan/templates_legacy/js_strings.html
    R ckan/templates_legacy/layout.html
    R ckan/templates_legacy/layout_base.html
    R ckan/templates_legacy/package/__init__.py
    R ckan/templates_legacy/package/authz.html
    R ckan/templates_legacy/package/comments.html
    R ckan/templates_legacy/package/edit.html
    R ckan/templates_legacy/package/edit_form.html
    R ckan/templates_legacy/package/editresources.html
    R ckan/templates_legacy/package/followers.html
    R ckan/templates_legacy/package/form.html
    R ckan/templates_legacy/package/form_extra_fields.html
    R ckan/templates_legacy/package/form_fields.html
    R ckan/templates_legacy/package/form_resources.html
    R ckan/templates_legacy/package/history.html
    R ckan/templates_legacy/package/layout.html
    R ckan/templates_legacy/package/new.html
    R ckan/templates_legacy/package/new_package_form.html
    R ckan/templates_legacy/package/read.html
    R ckan/templates_legacy/package/read.n3
    R ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/read_core.html
    R ckan/templates_legacy/package/resource_embedded_dataviewer.html
    R ckan/templates_legacy/package/resource_read.html
    R ckan/templates_legacy/package/resources.html
    R ckan/templates_legacy/package/search.html
    R ckan/templates_legacy/package/search_form.html
    R ckan/templates_legacy/package/snippets/data_preview.html
    R ckan/templates_legacy/related/add-related.html
    R ckan/templates_legacy/related/dashboard.html
    R ckan/templates_legacy/related/related_list.html
    R ckan/templates_legacy/rest/__init__.py
    R ckan/templates_legacy/revision/__init__.py
    R ckan/templates_legacy/revision/diff.html
    R ckan/templates_legacy/revision/layout.html
    R ckan/templates_legacy/revision/list.html
    R ckan/templates_legacy/revision/read.html
    R ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    R ckan/templates_legacy/snippets/data-viewer-embed-dialog.html
    R ckan/templates_legacy/snippets/follow_button.html
    R ckan/templates_legacy/snippets/internal-tracking.html
    R ckan/templates_legacy/snippets/package_list.html
    R ckan/templates_legacy/snippets/recline-extra-footer.html
    R ckan/templates_legacy/snippets/recline-extra-header.html
    R ckan/templates_legacy/snippets/revision_list.html
    R ckan/templates_legacy/storage/index.html
    R ckan/templates_legacy/storage/success.html
    R ckan/templates_legacy/tag/__init__.py
    R ckan/templates_legacy/tag/index.html
    R ckan/templates_legacy/tag/layout.html
    R ckan/templates_legacy/tag/read.html
    R ckan/templates_legacy/user/__init__.py
    R ckan/templates_legacy/user/dashboard.html
    R ckan/templates_legacy/user/edit.html
    R ckan/templates_legacy/user/edit_user_form.html
    R ckan/templates_legacy/user/followers.html
    R ckan/templates_legacy/user/layout.html
    R ckan/templates_legacy/user/list.html
    R ckan/templates_legacy/user/login.html
    R ckan/templates_legacy/user/logout.html
    R ckan/templates_legacy/user/logout_first.html
    R ckan/templates_legacy/user/new.html
    R ckan/templates_legacy/user/new_user_form.html
    R ckan/templates_legacy/user/perform_reset.html
    R ckan/templates_legacy/user/read.html
    R ckan/templates_legacy/user/request_reset.html
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_cors.py
    R ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_relationships.py
    M ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tag_vocab.py
    R ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    R ckan/tests/lib/test_field_types.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_resource.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/stats/tests/test_stats_plugin.py
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/getting-started.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 1414-remove-moderated-edits

Conflicts:
	ckan/lib/dictization/model_dictize.py
	ckan/lib/dictization/model_save.py
	ckan/logic/action/get.py
	ckan/logic/action/update.py
	ckan/model/package.py
	ckan/model/resource.py
	ckan/templates_legacy/package/read.html
	ckan/tests/functional/test_package.py
	ckan/tests/lib/test_dictization.py


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

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

  Log Message:
  -----------
  [#2006] Fix comment.


  Commit: 185b246934191305ac9f0849bf6eae5d4c4deeed
      https://github.com/ckan/ckan/commit/185b246934191305ac9f0849bf6eae5d4c4deeed
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-11-17 (Mon, 17 Nov 2014)

  Changed paths:
    M ckan/model/core.py
    M ckan/model/meta.py

  Log Message:
  -----------
  [#2006] Add useful comments.


  Commit: 5a3cd397408719c6a2a80409366cb9eac806f3c6
      https://github.com/ckan/ckan/commit/5a3cd397408719c6a2a80409366cb9eac806f3c6
  Author: jqnatividad <joel.natividad at ontodia.com>
  Date:   2014-11-17 (Mon, 17 Nov 2014)

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

  Log Message:
  -----------
  2054-fix meta property og:description

fixes #2054 by trimming whitespace


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

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

  Log Message:
  -----------
  Merge pull request #2055 from jqnatividad/master

2054-fix meta property og:description


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

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

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


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

  Changed paths:
    M ckan/lib/cli.py
    M doc/maintaining/paster.rst

  Log Message:
  -----------
  Merge pull request #2005 from ckan/1597-config

Allows use of CKAN_INI env-var to locate config


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

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

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


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

  Changed paths:
    M requirements.txt

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


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

  Changed paths:
    M CHANGELOG.rst

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


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

  Changed paths:
    M test-core.ini

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


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

  Changed paths:
    M ckan/lib/base.py

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


  Commit: 3b87cc0ecf9213c43f7e2a02bf8203ab51d0a0ec
      https://github.com/ckan/ckan/commit/3b87cc0ecf9213c43f7e2a02bf8203ab51d0a0ec
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Fixes #2007

In the plugins before_show the datastore_active flag in the resource
dict would not be set if the sql query generated an exception.  This had
implications with pg 8.4 where the flag was not present because of a
query failure, but it was checked for in tests.

Have set the default to false and just overwrite it if the query does
not explode and if it returns a result.


  Commit: 830032e54bb6a391c215807e20663d770a92cc08
      https://github.com/ckan/ckan/commit/830032e54bb6a391c215807e20663d770a92cc08
  Author: Matt Fullerton <mattfullerton at users.noreply.github.com>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ckan/templates/footer.html

  Log Message:
  -----------
  Added missing </div>


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    R ckan/lib/package_saver.py
    M ckan/lib/plugins.py

  Log Message:
  -----------
  Removes package saver to close #2040

Only formatted notes and revision info generated for c by package_saver
were actually used, so they have been moved to the
setup_template_variables for the default dataset form.

A handful of private and unused methods from group controller at the
same time.


  Commit: 948586d7fb2749ebb359d20c338a8b53cf705474
      https://github.com/ckan/ckan/commit/948586d7fb2749ebb359d20c338a8b53cf705474
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Does not load site_user during db upgrade

Fixes #2029 by ensuring we do not attempt to load site_user during a db
upgrade.  This is a workaround because loading the site_user will fail
because of a failed user change.  Should also avoid the problem in
future.


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

  Changed paths:
    M ckan/controllers/group.py

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


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

  Changed paths:
    M ckan/new_authz.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/test_authz.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/logic/test_auth.py
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  Merge branch '2035-remove-auth-permissions-cache'


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

  Changed paths:
    M ckan/lib/auth_tkt.py
    M ckan/new_tests/lib/test_auth_tkt.py

  Log Message:
  -----------
  [#1941] More concise way to ensure HttpOnly


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

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#1941] Warn against setting httponly to False


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

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  [#1941] Tweak changelog for CORS and HttpOnly


  Commit: 0f7662e2aaa1f80f30bc43626a774dbd5c042616
      https://github.com/ckan/ckan/commit/0f7662e2aaa1f80f30bc43626a774dbd5c042616
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/middleware.py
    M ckan/config/who.ini
    A ckan/lib/auth_tkt.py
    A ckan/new_tests/lib/test_auth_tkt.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch 'brew-1941-httponly'


  Commit: 593a42eb16c5b56a09672100c925c133ac92dbb9
      https://github.com/ckan/ckan/commit/593a42eb16c5b56a09672100c925c133ac92dbb9
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/new_authz.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/test_authz.py
    M ckan/templates/package/read_base.html
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/logic/test_auth.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M doc/maintaining/paster.rst

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


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

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/auth_tkt.py
    M ckan/lib/cli.py
    M ckan/new_authz.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/lib/test_auth_tkt.py
    A ckan/new_tests/test_authz.py
    M ckan/templates/package/read_base.html
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/logic/test_auth.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M doc/maintaining/configuration.rst
    M doc/maintaining/paster.rst

  Log Message:
  -----------
  Merge branch 'master'into 1942-secure-cookie


  Commit: 338d93ecc32cd4ccb1d5b45f7ed801938bb76ae6
      https://github.com/ckan/ckan/commit/338d93ecc32cd4ccb1d5b45f7ed801938bb76ae6
  Author: David Lemayian <dlemayian at gmail.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M ckan/controllers/home.py

  Log Message:
  -----------
  Fix spelling in home controller comments


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    R ckan/lib/package_saver.py
    M ckan/lib/plugins.py

  Log Message:
  -----------
  Merge pull request #2061 from ckan/2040-remove-packagesaver

Removes package saver to close #2040


  Commit: 232634d6681eabd5f8fa70cdc468dca5b1c0197b
      https://github.com/ckan/ckan/commit/232634d6681eabd5f8fa70cdc468dca5b1c0197b
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M ckan/pastertemplates/__init__.py
    A ckan/pastertemplates/template/+dot+coveragerc_tmpl
    A ckan/pastertemplates/template/+dot+gitignore_tmpl
    A ckan/pastertemplates/template/+dot+travis.yml_tmpl
    A ckan/pastertemplates/template/LICENSE_tmpl
    A ckan/pastertemplates/template/MANIFEST.in_tmpl
    A ckan/pastertemplates/template/README.rst_tmpl
    A ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    A ckan/pastertemplates/template/bin/travis-run.sh_tmpl
    R ckan/pastertemplates/template/ckanext/+project+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/fanstatic/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/plugin.py_tmpl
    A ckan/pastertemplates/template/ckanext/+project_shortname+/public/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/templates/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/test_plugin.py_tmpl
    M ckan/pastertemplates/template/ckanext/__init__.py
    R ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore
    A ckan/pastertemplates/template/ckanext_+project_shortname+.egg-info/.gitignore
    A ckan/pastertemplates/template/dev-requirements.txt_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    A ckan/pastertemplates/template/test.ini_tmpl

  Log Message:
  -----------
  Merge branch 'improve-ckanext-template'


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

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#2068] Remove remnant of formalchemy. And some tidying.


  Commit: 10d737f67e45e3132122b057cf8a43f7cfb798aa
      https://github.com/ckan/ckan/commit/10d737f67e45e3132122b057cf8a43f7cfb798aa
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M ckan/lib/auth_tkt.py
    M ckan/new_tests/lib/test_auth_tkt.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch 'brew-1942-secure-cookie'


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

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

  Log Message:
  -----------
  Merge branch 'master' into 1943-session-timeout

Conflicts:
	ckan/config/middleware.py
	doc/maintaining/configuration.rst


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

  Changed paths:
    M ckan/config/who.ini

  Log Message:
  -----------
  [#1943] Removed example config from who.ini.

All config should be centralized to the .ini files.


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

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/model/__init__.py
    M ckan/model/package.py
    M ckan/model/rating.py
    R ckan/rating.py

  Log Message:
  -----------
  [#2070] Move rating.py into model.


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

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

  Log Message:
  -----------
  [#2072] Fix resource_status test that fails second time without --reset-db. celery_taskmeta not needed.


  Commit: 7aea7a022f7ec297b0c770a7ed0987fd797ea5e0
      https://github.com/ckan/ckan/commit/7aea7a022f7ec297b0c770a7ed0987fd797ea5e0
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M ckan/config/solr/schema.xml
    M ckan/lib/search/index.py
    M ckan/new_tests/logic/action/test_get.py

  Log Message:
  -----------
  Merge branch '1905-package-search-on-resource-name-field' of https://github.com/george-sattler/ckan into george-sattler-1905-package-search-on-resource-name-field


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

  Changed paths:
    M ckan/config/solr/schema.xml
    M ckan/lib/search/index.py
    M ckan/new_tests/logic/action/test_get.py

  Log Message:
  -----------
  Merge branch 'george-sattler-1905-package-search-on-resource-name-field'


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

  Changed paths:
    M ckan/controllers/home.py

  Log Message:
  -----------
  Merge pull request #2067 from DavidLemayian/patch-3

Fix spelling in home controller comments


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

  Changed paths:
    M ckan/lib/auth_tkt.py
    R ckan/new_tests/config/test_middleware.py
    M ckan/new_tests/lib/test_auth_tkt.py

  Log Message:
  -----------
  [#1943] Move session config to lib/auth_tkt


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

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

  Log Message:
  -----------
  Merge branch '2072-resource-status-test'


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

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge branch '2068-remove-remnant'


  Commit: 7877ba6cb13b4c11bed0582dbd29a2639b415bb6
      https://github.com/ckan/ckan/commit/7877ba6cb13b4c11bed0582dbd29a2639b415bb6
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/model/__init__.py
    M ckan/model/package.py
    M ckan/model/rating.py
    R ckan/rating.py

  Log Message:
  -----------
  Merge branch '2070-rating-moved'


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

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

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


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

  Changed paths:
    M CHANGELOG.rst

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


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

  Changed paths:
    M ckan/templates/footer.html

  Log Message:
  -----------
  Merge branch 'patch-1' of https://github.com/mattfullerton/ckan into mattfullerton-patch-1


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

  Changed paths:
    M ckan/templates/footer.html

  Log Message:
  -----------
  Merge branch 'mattfullerton-patch-1'


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

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/accept.py
    M ckan/plugins/interfaces.py
    A ckan/templates/package/read.n3
    A ckan/templates/package/read.rdf
    M ckan/tests/functional/test_package.py
    M ckan/tests/lib/test_accept.py

  Log Message:
  -----------
  Reimplement the read.rdf template lost in genshi purge

Fixes #2063 by re-adding the missing template, but implemented with
jinja instead.  The accept-header checks have been simplified as the
different loaders are no longer required.

N3 template is still broken but is included for completeness


  Commit: 39132e3a34c6c9e770ff2ff8525e42919dd67142
      https://github.com/ckan/ckan/commit/39132e3a34c6c9e770ff2ff8525e42919dd67142
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/base.py
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  Ensure page parameters are valid.

Fixes #2042 by ensuring that:

- Invalid numbers aren't passed through to logic layer or paginator
- There is a default should an invalid number is passed. Numbers less
  than 1 will raise a 400.

Adds a _get_page_number() to the BaseController for re-use in all the
subclasses.


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

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#2075] Upgrade zope.interface to 4.1.1


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

  Changed paths:
    M ckan/new_tests/controllers/test_package.py
    M ckan/templates/package/read.rdf
    M ckan/tests/functional/test_package.py

  Log Message:
  -----------
  [#2063] Fix template to be detected as jinja. Convert to new tests.


  Commit: 133219b4502adcc692403315d87353099625c296
      https://github.com/ckan/ckan/commit/133219b4502adcc692403315d87353099625c296
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#2063] Mention reinstated n3 format in docstring.


  Commit: 36718f2fecfa758ddaec3704c62bfc729b4da733
      https://github.com/ckan/ckan/commit/36718f2fecfa758ddaec3704c62bfc729b4da733
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/accept.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/plugins/interfaces.py
    A ckan/templates/package/read.n3
    A ckan/templates/package/read.rdf
    M ckan/tests/lib/test_accept.py

  Log Message:
  -----------
  Merge pull request #2066 from ckan/2063-reimpl-rdf-template

Reimplement the read.rdf template lost in genshi purge


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

  Changed paths:
    M ckan/logic/__init__.py
    A ckan/logic/action/patch.py
    A ckan/logic/auth/patch.py
    M ckan/new_authz.py
    A ckan/new_tests/logic/action/test_patch.py
    M doc/api/index.rst

  Log Message:
  -----------
  Merge pull request #2003 from wardi/2003-package-patch-simple-version

package_patch (simple version)


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

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

  Log Message:
  -----------
  Merge branch 'master' into 1414-remove-moderated-edits

Conflicts:
	ckan/lib/package_saver.py


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

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Merge branch '2029-no-site-user-during-migration'


  Commit: 8a77df49f664cc5dc836891b0ce77269a055ff8a
      https://github.com/ckan/ckan/commit/8a77df49f664cc5dc836891b0ce77269a055ff8a
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Fixes the problem finding development.ini

Unfortunately the code forgot to use os.cwd() to  ensure config was
loaded with an absolute path, and was trying to load it relative without
knowing from where.


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

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Merge branch '1597-fix-using-development-ini'


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

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge branch '2075-upgrade-zope-interfaces' of https://github.com/brew/ckan into brew-2075-upgrade-zope-interfaces


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

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'brew-2075-upgrade-zope-interfaces'


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

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/config/who.ini
    M ckan/lib/auth_tkt.py
    A ckan/new_tests/config/__init__.py
    M ckan/new_tests/lib/test_auth_tkt.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch '1943-session-timeout' of https://github.com/brew/ckan into brew-1943-session-timeout


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

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/config/who.ini
    M ckan/lib/auth_tkt.py
    A ckan/new_tests/config/__init__.py
    M ckan/new_tests/lib/test_auth_tkt.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch 'brew-1943-session-timeout'


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

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Merge branch '2007-datastore-active-fix'


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

  Changed paths:
    M ckan/templates/ajax_snippets/api_info.html

  Log Message:
  -----------
  Merge branch '2046-python-example' of https://github.com/jqnatividad/ckan into jqnatividad-2046-python-example


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

  Changed paths:
    M ckan/templates/ajax_snippets/api_info.html

  Log Message:
  -----------
  Merge branch 'jqnatividad-2046-python-example'


  Commit: 737c4bd2ddf4dd6e836ec3901d3c44844b14fd42
      https://github.com/ckan/ckan/commit/737c4bd2ddf4dd6e836ec3901d3c44844b14fd42
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    A ckan/new_tests/controllers/test_feed.py
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  [#2042] Move related tests to new_tests.


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

  Changed paths:
    M ckan/new_tests/controllers/test_feed.py

  Log Message:
  -----------
  [#2042] Add extra test for completeness.


  Commit: 1176e0332efce02943c1139319f6ce64bfaad1bb
      https://github.com/ckan/ckan/commit/1176e0332efce02943c1139319f6ce64bfaad1bb
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-23 (Sun, 23 Nov 2014)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  [#2006] apply package_saver.py change to plugins.py (fix merge conflict)


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

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  [#2006] adjust for different model import


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

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/plugins.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/model/__init__.py
    M ckan/model/core.py
    M ckan/model/group.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/tag.py
    M ckan/model/user.py
    M ckan/new_tests/lib/dictization/test_model_dictize.py
    M ckan/templates/package/read_base.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_package.py

  Log Message:
  -----------
  Merge branch '1414-remove-moderated-edits'


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

  Changed paths:
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/base.py
    A ckan/new_tests/controllers/test_feed.py
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  Merge pull request #2062 from ckan/2042-invalid-page-numbers

Ensure page parameters are valid.


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

  Changed paths:
    M ckan/controllers/package.py

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

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

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

This should close #2080


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

  Changed paths:
    M ckan/controllers/group.py

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


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

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

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

Conflicts:
	ckan/config/middleware.py


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

  Changed paths:
    M ckan/controllers/package.py

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

Reduces the number of calls to get_package_type.


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

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

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


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

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

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

Fixes #2089 by updating the docstring.


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

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/config/who.ini
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/lib/accept.py
    A ckan/lib/auth_tkt.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    R ckan/lib/field_types.py
    R ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    A ckan/logic/action/patch.py
    M ckan/logic/auth/create.py
    A ckan/logic/auth/patch.py
    M ckan/logic/converters.py
    M ckan/model/__init__.py
    M ckan/model/package.py
    M ckan/model/rating.py
    M ckan/new_authz.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/test_auth_tkt.py
    A ckan/new_tests/lib/test_base.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_get.py
    A ckan/new_tests/logic/action/test_patch.py
    M ckan/new_tests/logic/auth/test_create.py
    A ckan/new_tests/test_authz.py
    M ckan/pastertemplates/__init__.py
    A ckan/pastertemplates/template/+dot+coveragerc_tmpl
    A ckan/pastertemplates/template/+dot+gitignore_tmpl
    A ckan/pastertemplates/template/+dot+travis.yml_tmpl
    A ckan/pastertemplates/template/LICENSE_tmpl
    A ckan/pastertemplates/template/MANIFEST.in_tmpl
    A ckan/pastertemplates/template/README.rst_tmpl
    A ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    A ckan/pastertemplates/template/bin/travis-run.sh_tmpl
    R ckan/pastertemplates/template/ckanext/+project+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/fanstatic/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/plugin.py_tmpl
    A ckan/pastertemplates/template/ckanext/+project_shortname+/public/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/templates/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/test_plugin.py_tmpl
    M ckan/pastertemplates/template/ckanext/__init__.py
    R ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore
    A ckan/pastertemplates/template/ckanext_+project_shortname+.egg-info/.gitignore
    A ckan/pastertemplates/template/dev-requirements.txt_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    A ckan/pastertemplates/template/test.ini_tmpl
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    R ckan/rating.py
    M ckan/templates/footer.html
    A ckan/templates/package/read.n3
    A ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/snippets/package_basic_fields.html
    R ckan/templates_legacy/__init__.py
    R ckan/templates_legacy/_snippet/data-api-help.html
    R ckan/templates_legacy/_util.html
    R ckan/templates_legacy/activity_streams/activity_stream_items.html
    R ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/admin/index.html
    R ckan/templates_legacy/admin/layout.html
    R ckan/templates_legacy/admin/trash.html
    R ckan/templates_legacy/error_document_template.html
    R ckan/templates_legacy/facets.html
    R ckan/templates_legacy/group/__init__.py
    R ckan/templates_legacy/group/authz.html
    R ckan/templates_legacy/group/edit.html
    R ckan/templates_legacy/group/edit_form.html
    R ckan/templates_legacy/group/history.html
    R ckan/templates_legacy/group/index.html
    R ckan/templates_legacy/group/layout.html
    R ckan/templates_legacy/group/new.html
    R ckan/templates_legacy/group/new_group_form.html
    R ckan/templates_legacy/group/read.html
    R ckan/templates_legacy/home/__init__.py
    R ckan/templates_legacy/home/about.html
    R ckan/templates_legacy/home/index.html
    R ckan/templates_legacy/home/layout.html
    R ckan/templates_legacy/importer/__init__.py
    R ckan/templates_legacy/importer/importer.html
    R ckan/templates_legacy/importer/preview.html
    R ckan/templates_legacy/importer/result.html
    R ckan/templates_legacy/js_strings.html
    R ckan/templates_legacy/layout.html
    R ckan/templates_legacy/layout_base.html
    R ckan/templates_legacy/package/__init__.py
    R ckan/templates_legacy/package/authz.html
    R ckan/templates_legacy/package/comments.html
    R ckan/templates_legacy/package/edit.html
    R ckan/templates_legacy/package/edit_form.html
    R ckan/templates_legacy/package/editresources.html
    R ckan/templates_legacy/package/followers.html
    R ckan/templates_legacy/package/form.html
    R ckan/templates_legacy/package/form_extra_fields.html
    R ckan/templates_legacy/package/form_fields.html
    R ckan/templates_legacy/package/form_resources.html
    R ckan/templates_legacy/package/history.html
    R ckan/templates_legacy/package/layout.html
    R ckan/templates_legacy/package/new.html
    R ckan/templates_legacy/package/new_package_form.html
    R ckan/templates_legacy/package/read.html
    R ckan/templates_legacy/package/read.n3
    R ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/read_core.html
    R ckan/templates_legacy/package/resource_embedded_dataviewer.html
    R ckan/templates_legacy/package/resource_read.html
    R ckan/templates_legacy/package/resources.html
    R ckan/templates_legacy/package/search.html
    R ckan/templates_legacy/package/search_form.html
    R ckan/templates_legacy/package/snippets/data_preview.html
    R ckan/templates_legacy/related/add-related.html
    R ckan/templates_legacy/related/dashboard.html
    R ckan/templates_legacy/related/related_list.html
    R ckan/templates_legacy/rest/__init__.py
    R ckan/templates_legacy/revision/__init__.py
    R ckan/templates_legacy/revision/diff.html
    R ckan/templates_legacy/revision/layout.html
    R ckan/templates_legacy/revision/list.html
    R ckan/templates_legacy/revision/read.html
    R ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    R ckan/templates_legacy/snippets/data-viewer-embed-dialog.html
    R ckan/templates_legacy/snippets/follow_button.html
    R ckan/templates_legacy/snippets/internal-tracking.html
    R ckan/templates_legacy/snippets/package_list.html
    R ckan/templates_legacy/snippets/recline-extra-footer.html
    R ckan/templates_legacy/snippets/recline-extra-header.html
    R ckan/templates_legacy/snippets/revision_list.html
    R ckan/templates_legacy/storage/index.html
    R ckan/templates_legacy/storage/success.html
    R ckan/templates_legacy/tag/__init__.py
    R ckan/templates_legacy/tag/index.html
    R ckan/templates_legacy/tag/layout.html
    R ckan/templates_legacy/tag/read.html
    R ckan/templates_legacy/user/__init__.py
    R ckan/templates_legacy/user/dashboard.html
    R ckan/templates_legacy/user/edit.html
    R ckan/templates_legacy/user/edit_user_form.html
    R ckan/templates_legacy/user/followers.html
    R ckan/templates_legacy/user/layout.html
    R ckan/templates_legacy/user/list.html
    R ckan/templates_legacy/user/login.html
    R ckan/templates_legacy/user/logout.html
    R ckan/templates_legacy/user/logout_first.html
    R ckan/templates_legacy/user/new.html
    R ckan/templates_legacy/user/new_user_form.html
    R ckan/templates_legacy/user/perform_reset.html
    R ckan/templates_legacy/user/read.html
    R ckan/templates_legacy/user/request_reset.html
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_cors.py
    R ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_relationships.py
    M ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tag_vocab.py
    R ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_accept.py
    R ckan/tests/lib/test_field_types.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/tests/test_stats_plugin.py
    M doc/api/index.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/getting-started.rst
    M doc/maintaining/paster.rst
    M requirements.in
    M requirements.txt

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

Conflicts:
	ckan/new_tests/logic/auth/test_create.py


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

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/config/who.ini
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    M ckan/lib/auth_tkt.py
    M ckan/lib/authenticator.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/plugins.py
    R ckan/lib/repoze_patch.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/model/__init__.py
    M ckan/model/core.py
    M ckan/model/group.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/tag.py
    M ckan/model/user.py
    A ckan/new_tests/config/__init__.py
    A ckan/new_tests/controllers/test_feed.py
    M ckan/new_tests/lib/dictization/test_model_dictize.py
    M ckan/new_tests/lib/test_auth_tkt.py
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/package/read_base.html
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_authenticator.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_package.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/plugin.py
    M doc/maintaining/configuration.rst
    M requirements.in
    M requirements.txt
    M test-core.ini

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


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

  Changed paths:
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/auth/test_create.py

  Log Message:
  -----------
  [#1852] Fix PEP8 and reenable auth test


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

  Changed paths:
    M ckanext/imageview/tests/test_view.py
    M ckanext/webpageview/tests/test_view.py

  Log Message:
  -----------
  [#1852] Fix tests for image and webpage plugins


Compare: https://github.com/ckan/ckan/compare/41ad38d7c88f...d982e4c90447


More information about the ckan-changes mailing list