[ckan-changes] [ckan/ckan] 952997: PEP8 before changes

GitHub noreply at github.com
Thu Mar 12 21:14:59 UTC 2015


  Branch: refs/heads/1753-rename-legacy-tests
  Home:   https://github.com/ckan/ckan
  Commit: 9529970762612d697c3cb0d7cc87806883b6fcd0
      https://github.com/ckan/ckan/commit/9529970762612d697c3cb0d7cc87806883b6fcd0
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-05 (Sun, 05 Oct 2014)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  PEP8 before changes


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

  Changed paths:
    M ckan/lib/cli.py
    A ckan/new_tests/lib/test_cli.py

  Log Message:
  -----------
  [#1244] Fix UnicodeEncodeError when adding user.

When using the paster user add command, if a user is added with a
fullname arg that contains non-ascii characters, a UnicodeEncodeError is
raised. This change allows non-ascii characters to be used in the
fullname, providing parity with the web interface.


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

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

  Log Message:
  -----------
  Fix test for python2.6


  Commit: ff9827a81afa85f023b570b2935232ec12f265a3
      https://github.com/ckan/ckan/commit/ff9827a81afa85f023b570b2935232ec12f265a3
  Author: groundrace <groundrace at me.com>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M ckanext/multilingual/plugin.py

  Log Message:
  -----------
  added resource and orgs in sidebar translation

added translation support of the organization strings when it's embedded in the package dict, used in the package/read.html and the snippets/organization.html that is included when a package is member of an organization. Furthermore it include a new plugin class for providing translations of the resource dict used in the package/resource_read.html view


  Commit: e3fd93599275c12eac3331ea6fa04e93353de63f
      https://github.com/ckan/ckan/commit/e3fd93599275c12eac3331ea6fa04e93353de63f
  Author: groundrace <groundrace at me.com>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  added multilingual_resource translation support

Added entry point for the multilingual resource support


  Commit: 466746ffb6c9b074649b8a773e4411cc82242ea4
      https://github.com/ckan/ckan/commit/466746ffb6c9b074649b8a773e4411cc82242ea4
  Author: groundrace <groundrace at me.com>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  resource_read multilingual support

added multingual support for the embedded package_dict marking explicitelly it in the context to be "for_view"


  Commit: 0d3ae0f65ce2f29282633d6eb4ef2f36173c4358
      https://github.com/ckan/ckan/commit/0d3ae0f65ce2f29282633d6eb4ef2f36173c4358
  Author: Jari Voutilainen <jari.voutilainen at iki.fi>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Do not include datasets in function that dont need them


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

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

  Log Message:
  -----------
  [#1852] Remove unused code and add docstrings in datapreview


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

  Changed paths:
    M ckan/lib/datapreview.py
    A ckan/new_tests/lib/test_datapreview.py
    R ckan/tests/lib/test_datapreview.py
    M doc/maintaining/configuration.rst
    M setup.py

  Log Message:
  -----------
  [#1852] Add a function to get default views on new resources

The default view types are defined via the `ckan.views.default_views`
configuration option. If this is not set (as opposed to empty, which means
no default views), the value of DEFAULT_RESOURCE_VIEW_TYPES is used to
look up the plugins.

If `get_datastore_views` is False, only the ones not requiring data to be in
the DataStore are returned, and if True, only the ones requiring it are.

To flag a view plugin as requiring the DataStore, it must have the
`requires_datastore` key set to True in the dict returned by its `info()`
method


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

  Changed paths:
    M ckan/lib/datapreview.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/new_tests/lib/test_datapreview.py

  Log Message:
  -----------
  [#1852] Create default views on dataset creation and update

Rather than relying on system plugins implementing `after_update` and
`after_create` to create default views, we now call the necessary
functions in `datapreview` to create them depeding on the default views
configuration setting.

The resources on the dataset dict that need to be passed to this
function on `package_create` and `package_update` didn't originally have
the ids, as the commit hadn't take place yet. We now do a flush just
before passing the dicts and add the ids so they can be used to create
the resource views.

There is no need to specifically create the default views on
`resource_create` and `resource_update`, as these call `package_update`
anyway.


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

  Changed paths:
    M ckanext/imageview/plugin.py
    M ckanext/webpageview/plugin.py
    M setup.py

  Log Message:
  -----------
  [#1852] Update image and web view plugins

Refactor them to work under the new default views behaviour. Basically
remove all `IPackageController` stuff and move the logic to `can_view`
for deciding if a view should be created.


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

  Changed paths:
    M ckanext/imageview/theme/templates/image_view.html

  Log Message:
  -----------
  [#1852] No need to proxy images when used on a img tag


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

  Changed paths:
    M ckan/lib/datapreview.py

  Log Message:
  -----------
  [#1852] Fix typo


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

  Changed paths:
    M ckan/lib/datapreview.py
    M ckan/logic/action/get.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/model/test_resource.py
    M ckan/new_tests/model/test_resource_view.py
    M ckan/new_tests/test_factories.py
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  [#1852] Multiple test fixes

Basically the `image_view` and `webpage_view` are no longer loaded by
default so you need to load them explicitly on your test class if
needed.

Also fixed log warnings and sphinx errors.


  Commit: 87fd74cdc3fec9b3882dca79d3a2d5c21b4ab581
      https://github.com/ckan/ckan/commit/87fd74cdc3fec9b3882dca79d3a2d5c21b4ab581
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    A ckan/new_tests/lib/test_munge.py

  Log Message:
  -----------
  [#2041] Test for munge_filename idempotence


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

  Changed paths:
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/update.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_delete.py
    M ckan/new_tests/logic/auth/test_update.py

  Log Message:
  -----------
  [#1852] Fix resource view auhtorization functions

The auth functions correctly forward to the relevant `resource_*` ones,
but they were passing the data_dict as is, so `id` referred to the
resource view, not the resource.

Added new auth tests. There is a failing one that depends on #2037


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

  Changed paths:
    M 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/tests/logic/test_action.py

  Log Message:
  -----------
  [#1852] Move rest of resource views tests from old to new ones


  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: eddd090859d16e4c543af9b30664b950bd23254f
      https://github.com/ckan/ckan/commit/eddd090859d16e4c543af9b30664b950bd23254f
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/who.ini
    M ckan/lib/cli.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.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
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/templates/package/read_base.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_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
    M doc/maintaining/paster.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 2041-munge-filename


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

  Changed paths:
    M ckan/lib/munge.py

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


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

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

  Log Message:
  -----------
  [#2041] Move old munge tests to new_tests


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

  Changed paths:
    M ckan/lib/munge.py

  Log Message:
  -----------
  [#2041] Not 'foreign', just non-ascii


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

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

  Log Message:
  -----------
  [#2041] munge_filename and munge_tag allow hyphens


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

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#2041] Remove munge.py from pep8 blacklist


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

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

  Log Message:
  -----------
  [#2095] Allow partial update documented for 2 action funcs. Not in docstring to stop it showing over the API where it cannot be set - it is just for internal callers.


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

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

  Log Message:
  -----------
  [#2041] Tweak title to name test


  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


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

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

  Log Message:
  -----------
  [#2095] Fix typo.


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

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

  Log Message:
  -----------
  [#2095] Fix another typo.


  Commit: 32f40c9eaeb7cd4f668931c1089bfc5889e74e8a
      https://github.com/ckan/ckan/commit/32f40c9eaeb7cd4f668931c1089bfc5889e74e8a
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2014-12-01 (Mon, 01 Dec 2014)

  Changed paths:
    M ckanext/resourceproxy/controller.py

  Log Message:
  -----------
  resourceproxy controller gets max_file_size from config or defaults to 1MB


  Commit: bf6859f0a60b5b5998aa524e59fb58181b8f6031
      https://github.com/ckan/ckan/commit/bf6859f0a60b5b5998aa524e59fb58181b8f6031
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2014-12-01 (Mon, 01 Dec 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  added resource_proxy max_file_size to config template


  Commit: 3a9ee14902d13fe7b32e8689d6ada411cc710a7f
      https://github.com/ckan/ckan/commit/3a9ee14902d13fe7b32e8689d6ada411cc710a7f
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2014-12-01 (Mon, 01 Dec 2014)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Updated docs, explain new config setting ckan.resource_proxy.max_file_size


  Commit: 3897c3fb40c42e5aee2aeda8543dd669988bde2c
      https://github.com/ckan/ckan/commit/3897c3fb40c42e5aee2aeda8543dd669988bde2c
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2014-12-01 (Mon, 01 Dec 2014)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Updated docs, explained fallback behaviour.


  Commit: 5e7bf19845af742083d44a66c0caac811c573426
      https://github.com/ckan/ckan/commit/5e7bf19845af742083d44a66c0caac811c573426
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2014-12-01 (Mon, 01 Dec 2014)

  Changed paths:
    M ckanext/resourceproxy/controller.py

  Log Message:
  -----------
  reindented lines to satisfy pep8


  Commit: ca8d5f84cdb47f21264b705a605078717ef83edc
      https://github.com/ckan/ckan/commit/ca8d5f84cdb47f21264b705a605078717ef83edc
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M MANIFEST.in

  Log Message:
  -----------
  added ckanext/datastore/set_permissions.sql template to manifest


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

  Changed paths:
    M ckan/lib/datapreview.py
    M ckanext/imageview/plugin.py
    M ckanext/webpageview/plugin.py

  Log Message:
  -----------
  [#1852] Allow some views to be always available

Some views like the image and website one were always available as an
option when creating a new view against a resource. With the new
handling of default views this was no longer possible, so to support
this use case a new `always_available` key has been added to the plugin
info.


  Commit: 1597a4d5ca989b9265bad09eb18cf5ef724a7096
      https://github.com/ckan/ckan/commit/1597a4d5ca989b9265bad09eb18cf5ef724a7096
  Author: amercader <amercadero at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    A ckan/migration/versions/075_rename_view_plugins.py
    M ckanext/imageview/plugin.py
    M ckanext/webpageview/plugin.py

  Log Message:
  -----------
  [#1852] Rename image and webapage views

Add the _view suffix to be consistent with the plugin name.


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

  Changed paths:
    M ckanext/imageview/plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/webpageview/plugin.py

  Log Message:
  -----------
  [#1852] Set default titles for core view plugins


  Commit: 21e8204fbd3d1042ad3a622b75c70658658315de
      https://github.com/ckan/ckan/commit/21e8204fbd3d1042ad3a622b75c70658658315de
  Author: amercader <amercadero at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/model/test_resource_view.py
    M ckan/plugins/interfaces.py
    M ckanext/webpageview/tests/test_view.py

  Log Message:
  -----------
  [#1852] Update plugin names after 1597a4d


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

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Adds auth for vocabulary_list and vocabulary_show.

Fixes #2104, with other relevant detail at #2128


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

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

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

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


  Commit: d49fad4afa3728855ddec994f46632cfe8570088
      https://github.com/ckan/ckan/commit/d49fad4afa3728855ddec994f46632cfe8570088
  Author: EnxEng <vin.schiano.eng at gmail.com>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

  Changed paths:
    M ckan/templates/user/new_user_form.html

  Log Message:
  -----------
  2138-palceholders-not-transatable 

Really quick fix


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

  Changed paths:
    M ckan/controllers/package.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/new_tests/controllers/test_package.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.js
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.min.js
    M ckanext/reclineview/theme/public/vendor/flot/jquery.flot.js
    A ckanext/reclineview/theme/public/vendor/flot/jquery.flot.time.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet-src.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.min.js
    A ckanext/reclineview/theme/public/vendor/moment/2.0.0/moment.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.css
    M ckanext/reclineview/theme/public/vendor/recline/recline.dataset.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.css
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.png
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    A ckanext/reclineview/theme/public/vendor/timeline/css/loading.gif
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.css
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    A ckanext/reclineview/theme/public/vendor/timeline/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    A ckanext/reclineview/theme/public/vendor/underscore/1.4.4/underscore.js
    M doc/contributing/upgrading-dependencies.rst
    M requirements.in
    M requirements.txt

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


  Commit: decb4e69a7888276a53b1890705fff2f38edd4b7
      https://github.com/ckan/ckan/commit/decb4e69a7888276a53b1890705fff2f38edd4b7
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-12-12 (Fri, 12 Dec 2014)

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

  Log Message:
  -----------
  Show Upload Log even when the job has errored

Show the datapusher Upload Log on the resource_data page even when the
datapusher job has errored.


  Commit: 9a05dbcf9cce6d92f16abe067f0572d946cf3e03
      https://github.com/ckan/ckan/commit/9a05dbcf9cce6d92f16abe067f0572d946cf3e03
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-12-12 (Fri, 12 Dec 2014)

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

  Log Message:
  -----------
  Use the string error message from datapusher error dicts

Rather than showing the whole dict as a string.


  Commit: 9ff14ece784a52b6b37e408c91cbc5364acda4df
      https://github.com/ckan/ckan/commit/9ff14ece784a52b6b37e408c91cbc5364acda4df
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-12-12 (Fri, 12 Dec 2014)

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

  Log Message:
  -----------
  Display all keys from datapusher job errors

The "error" dicts in CKAN Service Provider job dicts always contain a
"message" key with a string error message, but may also contain any
other keys (depending on the type of error) - show those other keys on
the resource data page as well.


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

  Changed paths:
    M ckan/lib/datapreview.py
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  [#1852] Remove web view from defaults, fix docs


  Commit: dd4d33d874e63711b6b8a33e1b45d3ab4eb53783
      https://github.com/ckan/ckan/commit/dd4d33d874e63711b6b8a33e1b45d3ab4eb53783
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

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

  Log Message:
  -----------
  Improve DataStore's error message on invalid data

When adding data to the datastore it may come across an invalid data value
(e.g. a non-numeric string, when the column has a numeric type).

Sqlalchemy will raise its DataError. Catch this and raise a custom
InvalidDataError. The datastore_create() action then catches this and raises
toolkit.ValidationError which ends up returning an error dict to the API
caller.

I'm not sure if this commit covers all cases - e.g. create vs updating a
datastore resource.


  Commit: 75957ff72fb60538ff0b4e0dd222135729d58abe
      https://github.com/ckan/ckan/commit/75957ff72fb60538ff0b4e0dd222135729d58abe
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

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

  Log Message:
  -----------
  Change a DataStore error message

Make it a little more human-friendly


  Commit: 61faa2761a3e45af6a63dd82b087d6c59889dc3e
      https://github.com/ckan/ckan/commit/61faa2761a3e45af6a63dd82b087d6c59889dc3e
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  PEP8


  Commit: 9caf03750f4998e5d6ed70135898b9e5ac64fae2
      https://github.com/ckan/ckan/commit/9caf03750f4998e5d6ed70135898b9e5ac64fae2
  Author: tobes <toby.junk at gmail.com>
  Date:   2014-12-17 (Wed, 17 Dec 2014)

  Changed paths:
    M ckan/lib/munge.py
    M ckan/lib/uploader.py

  Log Message:
  -----------
  [#2057] Fix filename munging


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

  Changed paths:
    M CHANGELOG.rst
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/user.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/templates/organization/index.html
    M ckan/templates/organization/snippets/help.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/snippets/context.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_user.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/stats/stats.py
    M ckanext/stats/tests/test_stats_lib.py
    R doc/_themes/sphinx-theme-okfn
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-package-to-patch-release.rst

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


  Commit: 60465cf744fd8d539f77ef403ba385b9761dd17f
      https://github.com/ckan/ckan/commit/60465cf744fd8d539f77ef403ba385b9761dd17f
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-23 (Tue, 23 Dec 2014)

  Changed paths:
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/model/test_resource.py

  Log Message:
  -----------
  [2158] Added tests to show the issue.


  Commit: 8efa0ce793159ab35239a56ac7d263820c4cd761
      https://github.com/ckan/ckan/commit/8efa0ce793159ab35239a56ac7d263820c4cd761
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-30 (Tue, 30 Dec 2014)

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

  Log Message:
  -----------
  [#2175] Validate package_show when using a custom schema.


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

  Changed paths:
    M ckan/templates/package/snippets/resources_list.html
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py

  Log Message:
  -----------
  [#2180] Tests for IDatasetForm. Includes fix for bug in package template when there are 0 resources (although at least 1 is required by default).


  Commit: 093a168a761b3b47ad90b5229958faa4c26714d8
      https://github.com/ckan/ckan/commit/093a168a761b3b47ad90b5229958faa4c26714d8
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/get.py
    A ckan/new_tests/logic/auth/test_get.py
    M ckan/templates/group/snippets/info.html
    M ckan/templates/package/read.html
    M ckan/templates/snippets/organization.html

  Log Message:
  -----------
  [#2188] Do not allow public to view deleted groups. Show in template when pkg/group/org is deleted.


  Commit: 12ccd3f7c872b48205ebff5c1c0e883d49e57725
      https://github.com/ckan/ckan/commit/12ccd3f7c872b48205ebff5c1c0e883d49e57725
  Author: Matthew Moore <matt at edward>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    M doc/maintaining/installing/deployment.rst

  Log Message:
  -----------
  Added commands for removing nginx and apache default sites


  Commit: 2a5164d8b8e1571773ef3d22a1bca2315861b4f9
      https://github.com/ckan/ckan/commit/2a5164d8b8e1571773ef3d22a1bca2315861b4f9
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    M ckan/tests/functional/api/test_activity.py

  Log Message:
  -----------
  [#2188] Fix test


  Commit: 4a64545f1f0c4f12ed0d1a3d72468a7aef776626
      https://github.com/ckan/ckan/commit/4a64545f1f0c4f12ed0d1a3d72468a7aef776626
  Author: jqnatividad <joel.natividad at ontodia.com>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    M ckan/controllers/related.py

  Log Message:
  -----------
  [#2194] Fixes NameError for related page number handling

Fixes #2194


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

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/new_tests/controllers/test_api.py
    M ckan/new_tests/controllers/test_group.py
    M ckan/new_tests/lib/test_helpers.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_update.py
    A ckan/public/base/javascript/modules/resource-view-filters-form.js
    A ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/view-filters.js
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/resource-view.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/view-filters.spec.js
    A ckan/public/base/vendor/polyfill-object-keys.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/organization/index.html
    M ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_filters.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_form_filters.html
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/schema/test_schema.py
    A ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/multilingual/plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    M doc/contributing/frontend/index.rst
    M doc/contributing/test.rst
    M doc/maintaining/configuration.rst
    M setup.py

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

Conflicts:
	ckan/new_tests/logic/action/test_delete.py
	ckan/new_tests/logic/action/test_update.py
	ckanext/reclineview/plugin.py


  Commit: 2da53f76d2f61b9c2a6e2ebddad707967f643e8e
      https://github.com/ckan/ckan/commit/2da53f76d2f61b9c2a6e2ebddad707967f643e8e
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  [#1852] Fix sphinx errors, add temp notice


  Commit: 09b0b5b07c2385e0d57006a3e8e56c37abf33f75
      https://github.com/ckan/ckan/commit/09b0b5b07c2385e0d57006a3e8e56c37abf33f75
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M ckan/controllers/related.py

  Log Message:
  -----------
  Merge pull request #2195 from jqnatividad/2194-related-invalid-page-numbers

[#2194] Fixes NameError for related page number handling


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

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

  Log Message:
  -----------
  [#1852] Fix merge error that was causing failures


  Commit: 54a0bb912c72b87d56288981397c03c62f1b38e1
      https://github.com/ckan/ckan/commit/54a0bb912c72b87d56288981397c03c62f1b38e1
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

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

  Log Message:
  -----------
  [#1852] Fix PEP8


  Commit: 2052628c4a450078d58fb26bd6dc239f3cc68c3e
      https://github.com/ckan/ckan/commit/2052628c4a450078d58fb26bd6dc239f3cc68c3e
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/update.py
    A ckan/migration/versions/075_rename_view_plugins.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/factories.py
    A ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_delete.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/model/test_resource.py
    M ckan/new_tests/model/test_resource_view.py
    M ckan/new_tests/test_factories.py
    M ckan/plugins/interfaces.py
    R ckan/tests/lib/test_datapreview.py
    M ckan/tests/logic/test_action.py
    M ckanext/datapusher/logic/action.py
    A ckanext/datapusher/tests/test_default_views.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/imageview/theme/templates/image_view.html
    M ckanext/reclineview/plugin.py
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M setup.py

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


  Commit: 8ef77ae4e4f0335c8151700e7bdd55e51804dfe1
      https://github.com/ckan/ckan/commit/8ef77ae4e4f0335c8151700e7bdd55e51804dfe1
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#2207] package_show: exclude tracking summary by default


  Commit: 4619800f9790d8bd4e3872653753c932f5e7c5a2
      https://github.com/ckan/ckan/commit/4619800f9790d8bd4e3872653753c932f5e7c5a2
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/tests/functional/test_tracking.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#2207] fix most tests, add include_tracking to resource_show


  Commit: 27bbda1ddc317f2a96e76098e33986d94cb701f4
      https://github.com/ckan/ckan/commit/27bbda1ddc317f2a96e76098e33986d94cb701f4
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

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

  Log Message:
  -----------
  [#2207] solr always needs tracking info


  Commit: 43379b14b4687ca788b463e16702b9dd07104c4b
      https://github.com/ckan/ckan/commit/43379b14b4687ca788b463e16702b9dd07104c4b
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M ckan/new_tests/lib/search/test_index.py

  Log Message:
  -----------
  [#2208] fix test for #1764 regression


  Commit: 573d6f146f323a863bd7a091ad95654eb7f94265
      https://github.com/ckan/ckan/commit/573d6f146f323a863bd7a091ad95654eb7f94265
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M ckan/lib/search/index.py
    M ckan/new_tests/lib/search/test_index.py

  Log Message:
  -----------
  [#2208] separately test both regressions, fix indexing


  Commit: 4e537fbf1955b589c9ef4904ce149faf2c076824
      https://github.com/ckan/ckan/commit/4e537fbf1955b589c9ef4904ce149faf2c076824
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

  Changed paths:
    M ckan/lib/munge.py
    A ckan/new_tests/lib/test_munge.py
    R ckan/tests/lib/test_munge.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Merge branch '2041-munge-filename'


  Commit: 0c167cb760c550b48f62ac0e9f78a7b7a2c0bb97
      https://github.com/ckan/ckan/commit/0c167cb760c550b48f62ac0e9f78a7b7a2c0bb97
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/2095-allow-partial-update-docs'


  Commit: 34b6a16dbba627bbba1f4e036d478d7250e00541
      https://github.com/ckan/ckan/commit/34b6a16dbba627bbba1f4e036d478d7250e00541
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

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

  Log Message:
  -----------
  Merge branch 'ideas-31-resourceproxy-max-file-size-configurable'


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

  Changed paths:
    M ckan/controllers/package.py
    M ckan/templates/package/new_view.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/view_form.html
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js

  Log Message:
  -----------
  MERGE from brew:2140-resource-views


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

  Changed paths:
    M ckan/controllers/package.py
    M ckan/templates/package/new_view.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/view_form.html
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js

  Log Message:
  -----------
  Merge branch 'brew-2140-resource-views'


  Commit: 290850554bfff7e22e8cd0410074eb41b68b3563
      https://github.com/ckan/ckan/commit/290850554bfff7e22e8cd0410074eb41b68b3563
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

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

  Log Message:
  -----------
  Support error message from older datapusher versions


  Commit: 910717be664c7e20c189d89ce659a7ccb7926614
      https://github.com/ckan/ckan/commit/910717be664c7e20c189d89ce659a7ccb7926614
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

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

  Log Message:
  -----------
  [#2107] Don't create a source link if not a valid url


  Commit: 59975ba0a23cd26bc72c096bdbe381feb34ea3b5
      https://github.com/ckan/ckan/commit/59975ba0a23cd26bc72c096bdbe381feb34ea3b5
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Add another common example to error message

Inserting a value with a different type from the field one is a common
error, so hopefully this will give more clues (see #1964, #1963)


  Commit: a08e39423c4128d968976ecbd3682ab03d44217c
      https://github.com/ckan/ckan/commit/a08e39423c4128d968976ecbd3682ab03d44217c
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

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

  Log Message:
  -----------
  [#2212] Fix normal user's resource view.

Pass resource_id to resource_view_create access check.


  Commit: ae920930e447ea4d287852beaaeabca7da756444
      https://github.com/ckan/ckan/commit/ae920930e447ea4d287852beaaeabca7da756444
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

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

  Log Message:
  -----------
  [#2212] Test all user types can view resource page


  Commit: 8cb3133033f11ea3845b299a89e7846bc675d895
      https://github.com/ckan/ckan/commit/8cb3133033f11ea3845b299a89e7846bc675d895
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/get.py
    A ckan/new_tests/logic/auth/test_get.py
    M ckan/templates/group/snippets/info.html
    M ckan/templates/package/read.html
    M ckan/templates/snippets/organization.html
    M ckan/tests/functional/api/test_activity.py

  Log Message:
  -----------
  Merge pull request #2190 from ckan/2188-deleted-groups-visible

[#2188] Do not allow public to view deleted groups.


  Commit: 9bf0300c76d6439d84c5f77af5d40c929179ce01
      https://github.com/ckan/ckan/commit/9bf0300c76d6439d84c5f77af5d40c929179ce01
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ckan/new_tests/controllers/test_package.py
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  Merge branch '2212-resourceid-check' of https://github.com/brew/ckan into brew-2212-resourceid-check


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

  Changed paths:
    M ckan/new_tests/controllers/test_package.py
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  Merge branch 'brew-2212-resourceid-check'


  Commit: 842d9dd6552aeed7e86c2066368a35e5cd5f3c58
      https://github.com/ckan/ckan/commit/842d9dd6552aeed7e86c2066368a35e5cd5f3c58
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Merge branch '2104-vocab-auth'


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

  Changed paths:
    M ckan/templates/user/new_user_form.html

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


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

  Changed paths:
    M ckan/templates/user/new_user_form.html

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


  Commit: fdb8eab08f9c0022a6cc65074cb26e4df31472c5
      https://github.com/ckan/ckan/commit/fdb8eab08f9c0022a6cc65074cb26e4df31472c5
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

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

  Log Message:
  -----------
  Merge pull request #2107 from ckan/2107-linkify-source-field

Source field linkifies even if not a URI scheme


  Commit: e9e56ddf44d22f63c1eb4667f1a4f4efc0541215
      https://github.com/ckan/ckan/commit/e9e56ddf44d22f63c1eb4667f1a4f4efc0541215
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/2175-package-show-validate-custom-schema'


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

  Changed paths:
    M ckan/templates/package/snippets/resources_list.html
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/2180-idataset-form-functional-tests'


  Commit: a340a0424672a3289ab3513d17e20f53ae3e5476
      https://github.com/ckan/ckan/commit/a340a0424672a3289ab3513d17e20f53ae3e5476
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ckan/public/base/less/ckan.less

  Log Message:
  -----------
  [#2197] Remove redundant less import


  Commit: 3d0634a08ba44bf66b057c048484798b33f9900c
      https://github.com/ckan/ckan/commit/3d0634a08ba44bf66b057c048484798b33f9900c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.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/075_rename_view_plugins.py
    M ckan/model/user.py
    A ckan/new_tests/controllers/test_api.py
    M ckan/new_tests/controllers/test_group.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/factories.py
    A ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/lib/test_helpers.py
    A ckan/new_tests/lib/test_munge.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_delete.py
    A ckan/new_tests/logic/auth/test_get.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/model/test_resource.py
    M ckan/new_tests/model/test_resource_view.py
    M ckan/new_tests/test_factories.py
    M ckan/plugins/interfaces.py
    A ckan/public/base/javascript/modules/resource-view-filters-form.js
    A ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/view-filters.js
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/resource-view.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/view-filters.spec.js
    A ckan/public/base/vendor/polyfill-object-keys.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/group/snippets/info.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/snippets/help.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_filters.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/snippets/context.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    R ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization_schema.py
    R ckan/tests/lib/test_munge.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    A ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/tests/test.py
    A ckanext/datapusher/tests/test_default_views.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/imageview/theme/templates/image_view.html
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    M ckanext/resourceproxy/controller.py
    M ckanext/stats/stats.py
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    M doc/contributing/frontend/index.rst
    M doc/contributing/test.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into improve-datapusher-error-messages

Conflicts:
	ckanext/datastore/tests/test_db.py


  Commit: 68dba74b7f06d4c9f250b7a7bf3188e90be881a0
      https://github.com/ckan/ckan/commit/68dba74b7f06d4c9f250b7a7bf3188e90be881a0
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ckan/templates/package/resource_data.html
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py

  Log Message:
  -----------
  Merge branch 'improve-datapusher-error-messages'


  Commit: ba235180d41a5edaab97287efd5a5a177ca7b983
      https://github.com/ckan/ckan/commit/ba235180d41a5edaab97287efd5a5a177ca7b983
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ckan/public/base/less/ckan.less

  Log Message:
  -----------
  Merge branch '2197-less-import-error' of https://github.com/brew/ckan into brew-2197-less-import-error


  Commit: 663bf9ac1f72f3899c511706443c9c5a7b994b5e
      https://github.com/ckan/ckan/commit/663bf9ac1f72f3899c511706443c9c5a7b994b5e
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ckan/public/base/less/ckan.less

  Log Message:
  -----------
  Merge branch 'brew-2197-less-import-error'


  Commit: b7905a6a776aa4d161dd323c7564cb1fe49d8855
      https://github.com/ckan/ckan/commit/b7905a6a776aa4d161dd323c7564cb1fe49d8855
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ckan/lib/search/index.py
    M ckan/new_tests/lib/search/test_index.py

  Log Message:
  -----------
  Merge branch '2208-remove-redundant-validated-data-dict' of https://github.com/wardi/ckan into wardi-2208-remove-redundant-validated-data-dict


  Commit: 5afd4afc1ab6a055e2336e13a4741908646975fb
      https://github.com/ckan/ckan/commit/5afd4afc1ab6a055e2336e13a4741908646975fb
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ckan/lib/search/index.py
    M ckan/new_tests/lib/search/test_index.py

  Log Message:
  -----------
  Merge branch 'wardi-2208-remove-redundant-validated-data-dict'


  Commit: 1260dd9d998ed037bc3f353e0ca8af619f04e061
      https://github.com/ckan/ckan/commit/1260dd9d998ed037bc3f353e0ca8af619f04e061
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M doc/maintaining/installing/deployment.rst

  Log Message:
  -----------
  Merge branch 'deployment-doc-fix' of https://github.com/mattrm/ckan into mattrm-deployment-doc-fix


  Commit: d9142fdd28b271050bf1dd8ce92356f5a7dbf5c5
      https://github.com/ckan/ckan/commit/d9142fdd28b271050bf1dd8ce92356f5a7dbf5c5
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M doc/maintaining/installing/deployment.rst

  Log Message:
  -----------
  Merge branch 'mattrm-deployment-doc-fix'


  Commit: 19134abfa9298d5a238bfa79fa2a1efc6f5a9c1d
      https://github.com/ckan/ckan/commit/19134abfa9298d5a238bfa79fa2a1efc6f5a9c1d
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M MANIFEST.in

  Log Message:
  -----------
  Merge branch '2112-add-set-permissions-template-to-manifest.in' of https://github.com/florianm/ckan into florianm-2112-add-set-permissions-template-to-manifest.in


  Commit: b24f1fee55190f23be83bc9762fe6894af5a3260
      https://github.com/ckan/ckan/commit/b24f1fee55190f23be83bc9762fe6894af5a3260
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M MANIFEST.in

  Log Message:
  -----------
  Merge branch 'florianm-2112-add-set-permissions-template-to-manifest.in'


  Commit: b1fed38c28a3b09aaba0edc6840fad4445efc6d2
      https://github.com/ckan/ckan/commit/b1fed38c28a3b09aaba0edc6840fad4445efc6d2
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ckan/__init__.py

  Log Message:
  -----------
  Update version number for 2.4a (and remove whitespace)


  Commit: 3c5e3fa41d043e6be5ac863324f5663531b6d01e
      https://github.com/ckan/ckan/commit/3c5e3fa41d043e6be5ac863324f5663531b6d01e
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

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

  Log Message:
  -----------
  [#2222] Fix resource views list format, lost in a bad merge


  Commit: a7f6182e88bdeb8629622ad8e4f662a3839c3305
      https://github.com/ckan/ckan/commit/a7f6182e88bdeb8629622ad8e4f662a3839c3305
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

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

  Log Message:
  -----------
  Merge pull request #2222 from ckan/2222-fix-resource-views-format

Resource views formatting lost on master and 2.3


  Commit: 62dc5be5ff0446bf81ce59a2d125b722cec368c2
      https://github.com/ckan/ckan/commit/62dc5be5ff0446bf81ce59a2d125b722cec368c2
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2204] First implementation of the create views command

Uses the search to retrieve the dataset dicts and passes them to the
function that adds default views to datasets.

User is prompt with the total count of datasets and the view plugins
which will be checked so she can abort if needed.


  Commit: d6e3f617a1aeedc554a994ddf9ff10dc48cafae5
      https://github.com/ckan/ckan/commit/d6e3f617a1aeedc554a994ddf9ff10dc48cafae5
  Author: Jari Voutilainen <jari.voutilainen at iki.fi>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    M CHANGELOG.rst
    M MANIFEST.in
    M ckan/__init__.py
    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/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/accept.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    A ckan/lib/auth_tkt.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/fanstatic_resources.py
    R ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    R ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    R ckan/lib/repoze_patch.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    A ckan/logic/action/patch.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    A ckan/logic/auth/patch.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/075_rename_view_plugins.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/core.py
    M ckan/model/group.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/rating.py
    M ckan/model/tag.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests/config/__init__.py
    A ckan/new_tests/controllers/test_api.py
    A ckan/new_tests/controllers/test_feed.py
    M ckan/new_tests/controllers/test_group.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/lib/dictization/test_model_dictize.py
    M ckan/new_tests/lib/search/test_index.py
    A ckan/new_tests/lib/test_auth_tkt.py
    A ckan/new_tests/lib/test_base.py
    A ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/lib/test_helpers.py
    A ckan/new_tests/lib/test_munge.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    A ckan/new_tests/logic/action/test_patch.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_delete.py
    A ckan/new_tests/logic/auth/test_get.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/model/test_resource.py
    M ckan/new_tests/model/test_resource_view.py
    A ckan/new_tests/test_authz.py
    M ckan/new_tests/test_factories.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
    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/core.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    A ckan/public/base/images/od_80x15_blue.png
    A ckan/public/base/images/placeholder-200x125.png
    A ckan/public/base/images/placeholder-420x220.png
    A ckan/public/base/images/placeholder-680x400.png
    M ckan/public/base/javascript/modules/resource-view-embed.js
    A ckan/public/base/javascript/modules/resource-view-filters-form.js
    A ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/view-filters.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    R ckan/public/base/less/resource-view-embed.less
    A ckan/public/base/less/resource-view.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/view-filters.spec.js
    A ckan/public/base/vendor/polyfill-object-keys.js
    M ckan/public/base/vendor/resource.config
    R ckan/rating.py
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/development/snippets/markup.html
    M ckan/templates/footer.html
    M ckan/templates/group/index.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/snippets/help.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    A ckan/templates/package/read.n3
    A ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_filters.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/snippets/context.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/related.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.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/__init__.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    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
    M ckan/tests/lib/test_authenticator.py
    R ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    R ckan/tests/lib/test_field_types.py
    R ckan/tests/lib/test_munge.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    A ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/tests/test.py
    A ckanext/datapusher/tests/test_default_views.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/imageview/theme/templates/image_view.html
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.js
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.min.js
    M ckanext/reclineview/theme/public/vendor/flot/jquery.flot.js
    A ckanext/reclineview/theme/public/vendor/flot/jquery.flot.time.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet-src.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.min.js
    A ckanext/reclineview/theme/public/vendor/moment/2.0.0/moment.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.css
    M ckanext/reclineview/theme/public/vendor/recline/recline.dataset.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.css
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.png
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    A ckanext/reclineview/theme/public/vendor/timeline/css/loading.gif
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.css
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    A ckanext/reclineview/theme/public/vendor/timeline/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    A ckanext/reclineview/theme/public/vendor/underscore/1.4.4/underscore.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/textview/theme/public/css/text.css
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    R doc/_themes/sphinx-theme-okfn
    M doc/api/index.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/test.rst
    M doc/contributing/upgrading-dependencies.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/getting-started.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/paster.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into fix-slow-organization-pages


  Commit: 7512f3e25d312eead3adefacadc90b5072b0d581
      https://github.com/ckan/ckan/commit/7512f3e25d312eead3adefacadc90b5072b0d581
  Author: Jari Voutilainen <jari.voutilainen at iki.fi>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  remove dataset also from other org pages that do not need them


  Commit: 6e57d3e407fccccfcbb18c5b42f573eccecf2eb0
      https://github.com/ckan/ckan/commit/6e57d3e407fccccfcbb18c5b42f573eccecf2eb0
  Author: andreivicentiuhincu <andreivicentiuhincu at gmail.com>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

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

  Log Message:
  -----------
  Fixed dataset state translation

The dataset state was not translated on the dataset details
page....Fixed it.


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

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

  Log Message:
  -----------
  Update translations from Transifex ahead of 2.2.1 release

Conflicts:
	ckan/i18n/fr/LC_MESSAGES/ckan.mo
	ckan/i18n/sk/LC_MESSAGES/ckan.mo


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

  Changed paths:
    M ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Last translations update before 2.2.1

Translations for km, mn_MN and vi are not included as they contain
format specifiers errors.


  Commit: 8c674261e58fd0688ee5d4418319f9937d31036c
      https://github.com/ckan/ckan/commit/8c674261e58fd0688ee5d4418319f9937d31036c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/sw/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po

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

Khmer and Nepalese translation excluded for now as they have format
issues


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

  Changed paths:
    M ckan/i18n/ckan.pot

  Log Message:
  -----------
  Extract new messages to pot file


  Commit: 92a12743606255a7358141c0352b88613d04a8e4
      https://github.com/ckan/ckan/commit/92a12743606255a7358141c0352b88613d04a8e4
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

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

  Log Message:
  -----------
  Update latest translation po files and compile


  Commit: 9439d5e8ea4b3da85ab5c340672d61bedfbeb443
      https://github.com/ckan/ckan/commit/9439d5e8ea4b3da85ab5c340672d61bedfbeb443
  Author: tanmayAccela <tthakur at accela.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M doc/maintaining/filestore.rst

  Log Message:
  -----------
  Update filestore.rst


  Commit: e7f60a3f62e13ded629654b31521e9de28f26a16
      https://github.com/ckan/ckan/commit/e7f60a3f62e13ded629654b31521e9de28f26a16
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

  Changed paths:
    M doc/maintaining/filestore.rst

  Log Message:
  -----------
  Merge pull request #2241 from tanmayAccela/patch-1

Update filestore.rst


  Commit: 5eb8d03b2ae10ad330eb1d57d086a2d172c6e2d4
      https://github.com/ckan/ckan/commit/5eb8d03b2ae10ad330eb1d57d086a2d172c6e2d4
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

  Changed paths:
    M ckan/lib/datapreview.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/public/recline_view.js

  Log Message:
  -----------
  [#2242] Add recline_view to the default view types

As part of #2140 DataProxy was reenabled, so to keep the old behaviour
of showing a Recline data explorer when uploading or linking to a
csv/excel we added it to the default view types. The data explorer view
plugin no longer requires the DataStore, as it can use DataProxy.

Also tweaked the client side error message to reflect if the error came
from the DataStore or the DataProxy.


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

  Changed paths:
    M ckanext/imageview/plugin.py
    M ckanext/pdfview/plugin.py
    M ckanext/textview/plugin.py
    M ckanext/webpageview/plugin.py

  Log Message:
  -----------
  [#2242] Remove auto creation logic from text and pdf view plugins

There is no need to implement `IPackageController` on the plugin as
default views are handled differently since #1852.

Made title translatable on image and web plugins


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

  Changed paths:
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckanext/pdfview/plugin.py
    M ckanext/textview/plugin.py

  Log Message:
  -----------
  [#2242] Rename text and pdf view plugins for consistency


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

  Changed paths:
    M ckan/lib/datapreview.py
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  [#2242] Remove no longer used `get_new_resources` function

Better not to mess with low level session caches etc. It is no longer
relevant after #1852


  Commit: 1663c5f19b7065142bf0a967b75c39d8fb71ac32
      https://github.com/ckan/ckan/commit/1663c5f19b7065142bf0a967b75c39d8fb71ac32
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

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

  Log Message:
  -----------
  [#2242] Remove redundant title from view page

As it is already shown on the tab (http://i.imgur.com/IopLCyq.png)


  Commit: 9b828aabe9373913acb86ebba8dd392715dc952f
      https://github.com/ckan/ckan/commit/9b828aabe9373913acb86ebba8dd392715dc952f
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

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

  Log Message:
  -----------
  Merge branch '2236---Dataset-state-translation' of https://github.com/andreivicentiuhincu/ckan into andreivicentiuhincu-2236---Dataset-state-translation


  Commit: 21c0db517bf9224e6d3ba35a563245a46086963c
      https://github.com/ckan/ckan/commit/21c0db517bf9224e6d3ba35a563245a46086963c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

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

  Log Message:
  -----------
  Merge branch 'andreivicentiuhincu-2236---Dataset-state-translation'


  Commit: 07459d32eb2b05c459f29b0c4e9e952ea7007ab4
      https://github.com/ckan/ckan/commit/07459d32eb2b05c459f29b0c4e9e952ea7007ab4
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

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

  Log Message:
  -----------
  Fixes a direct import in action/delete

Direct imports in action modules are bad because it generates
documentation for them.


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

  Changed paths:
    M ckan/lib/datapreview.py
    M ckan/new_tests/lib/test_datapreview.py

  Log Message:
  -----------
  [#2204] Refactor view creation fuctions

To allow creating specific view types on resources rather than all the
default ones. Basically there are a pair of `add_view_` and
`add_default_view` functions for datasets and resources. Added some more
tests.


  Commit: 654d4cf23c87b4b862e6e412693dc6dbd1da3cc7
      https://github.com/ckan/ckan/commit/654d4cf23c87b4b862e6e412693dc6dbd1da3cc7
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M ckan/lib/datapreview.py

  Log Message:
  -----------
  [#2204] Add clarification to docstrings


  Commit: 8c00319438e4a10b72c1f5e1b1e648a89f968487
      https://github.com/ckan/ckan/commit/8c00319438e4a10b72c1f5e1b1e648a89f968487
  Author: pstarace <paolo at sciamlab.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Update db.py

That change enables the user to provide custom sqlalchemy properties through the config file using the 'ckan.datastore.sqlalchemy.' prefix.
Example:
ckan.datastore.sqlalchemy.pool_size=10
ckan.datastore.sqlalchemy.max_overflow=20

The 'url' property is passed as param in the 'extras' map to avoid changing the structure of the current config file.

For further details please look at https://github.com/ckan/ckan/issues/2232


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

  Changed paths:
    M ckanext/datapusher/plugin.py

  Log Message:
  -----------
  Enables extension to send ODS files for pushing to datastore


  Commit: 997400c0152a27fabb94b66f00eb74e440fe8b2a
      https://github.com/ckan/ckan/commit/997400c0152a27fabb94b66f00eb74e440fe8b2a
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2204] Refactor create views command to allow explicit types

You can now pass specific view types on the command line to limit the
view types that will be created, eg:

    paster views create image_view recline_view my_custom_view

If the relevant plugins are not loaded on your ini file the command will
stop.

Improved usage docs, PEP8.


  Commit: 810f76459944504c88ba85adad3e44dcc82323d8
      https://github.com/ckan/ckan/commit/810f76459944504c88ba85adad3e44dcc82323d8
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M MANIFEST.in
    M ckan/__init__.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    A ckan/i18n/eu/LC_MESSAGES/ckan.mo
    A ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    A ckan/i18n/hr/LC_MESSAGES/ckan.mo
    A ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    A ckan/i18n/lo/LC_MESSAGES/ckan.mo
    A ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    A ckan/i18n/my/LC_MESSAGES/ckan.mo
    A ckan/i18n/my/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/sw/LC_MESSAGES/ckan.mo
    A ckan/i18n/sw/LC_MESSAGES/ckan.po
    A ckan/i18n/th/LC_MESSAGES/ckan.mo
    A ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py
    M ckan/new_tests/lib/search/test_index.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/public/base/less/ckan.less
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py
    M doc/maintaining/filestore.rst
    M doc/maintaining/installing/deployment.rst

  Log Message:
  -----------
  Merge branch 'master' into 2204-resource-views-cli


  Commit: 73e4e43b8438cf3b18fc581603ffda17bc532b74
      https://github.com/ckan/ckan/commit/73e4e43b8438cf3b18fc581603ffda17bc532b74
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M ckanext/datapusher/cli.py

  Log Message:
  -----------
  Fixes up the CLI command to be more useful

- Renames submit (which resubmits all current datastore resources) to
  resubmit.
- Adds submit, which takes a package name and pushes all the resources
  for that package - this should hopefully close #937 although is uses
  datapusher rather than datastore mentioned in the ticket.


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

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

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


  Commit: c1dd95162d6e5050b5feb3e216be53f4a7d3e5e2
      https://github.com/ckan/ckan/commit/c1dd95162d6e5050b5feb3e216be53f4a7d3e5e2
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M ckan/new_tests/controllers/test_package.py
    M ckan/templates/package/snippets/package_basic_fields.html

  Log Message:
  -----------
  [#2218] Organization dropdown available to user.

The Organization dropdown is now visible to normal users when
creating/editing a dataset when they have organizations available to
them. Previously owner_org editing was only available to sysadmins,
draft datasets or through the API. Fixes #2218.


  Commit: 5412be2d6c1fc9898b0fd57c6fb9d49884ff3ed5
      https://github.com/ckan/ckan/commit/5412be2d6c1fc9898b0fd57c6fb9d49884ff3ed5
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#2218] Non-sysadmins can remove datasets from org


  Commit: f0fbaf5039b7f601130d9645e8921686f1ad349f
      https://github.com/ckan/ckan/commit/f0fbaf5039b7f601130d9645e8921686f1ad349f
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

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

  Log Message:
  -----------
  [#2218] Test normal user can remove org


  Commit: ca2f1cef2bce1b2b8a00c05992b8c08550aabd18
      https://github.com/ckan/ckan/commit/ca2f1cef2bce1b2b8a00c05992b8c08550aabd18
  Author: pstarace <paolo at sciamlab.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Update db.py


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

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_info.py

  Log Message:
  -----------
  Adds a new datastore action to return info on tables.

When called with a resource id, provides the names and types of the
fields stored in the datastore, and a count of the total number of
rows.  This might be useful in providing info to people who want to call
the search apis.


  Commit: ea4c9a17869fae13a91e1cc3f0d47a4c10d0f226
      https://github.com/ckan/ckan/commit/ea4c9a17869fae13a91e1cc3f0d47a4c10d0f226
  Author: Motornyuk Sergey <tonnydexter at gmail.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckanext/stats/templates/ckanext/stats/index.html

  Log Message:
  -----------
  [#1647] Stats extension. 'Largest Groups' links lead either to organizations or to groups page

Currently all links under the 'Largest Groups' refer to groups page.

After this change links refer to group page for groups and to organization page for organizations


  Commit: a62b3fe009ef98a07a5ad5fd8408d520d8d25687
      https://github.com/ckan/ckan/commit/a62b3fe009ef98a07a5ad5fd8408d520d8d25687
  Author: Motornyuk Sergey <tonnydexter at gmail.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckanext/stats/stats.py

  Log Message:
  -----------
  [#1649] Stats extension. Tag counter works properly

Currently on 'Top Tags' tab displayed total amount of tags which includes deleted ones, private and deleted packages

After this change, tags with state=deleted, deleted packages, private packages are filtered out


  Commit: a900c119119742665a270b9d46e0515789d8901d
      https://github.com/ckan/ckan/commit/a900c119119742665a270b9d46e0515789d8901d
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckanext/textview/plugin.py

  Log Message:
  -----------
  [#2204] Modify default formats for text preview

Do not render geojson and csv, tsv files on text view by default

Most users / publishers would expect to see a map or table respectivlely.

It can be reenabled by adding `csv tsv` to `ckan.preview.text_formats` and
`geojson` to `ckan.preview.json_formats` config options.

Also fix typo in rdf+xml.


  Commit: 3626712a2c9140ba17ad84fcf84e404365a01e3a
      https://github.com/ckan/ckan/commit/3626712a2c9140ba17ad84fcf84e404365a01e3a
  Author: Motornyuk Sergey <tonnydexter at gmail.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckanext/stats/tests/test_stats_lib.py

  Log Message:
  -----------
  [#1649] Stats extension. Changed tests

Currently tests failed because tags from private datasets not counted but in test expected that they will be counted(wrong behaviour)

After this change test won't expect tags from private datasets


  Commit: 609ad36abf7b0a5dd27c42cb1901742cee7b3464
      https://github.com/ckan/ckan/commit/609ad36abf7b0a5dd27c42cb1901742cee7b3464
  Author: Sean Hammond <seanh at users.noreply.github.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

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

  Log Message:
  -----------
  Merge pull request #2243 from ckan/fix-direct-import-doc-issue

Fixes a direct import in action/delete


  Commit: 31750bf89d2426ae071790f59014d6ecd1026b0d
      https://github.com/ckan/ckan/commit/31750bf89d2426ae071790f59014d6ecd1026b0d
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

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

  Log Message:
  -----------
  * user_show now returns draft and private datasets if asked by the same
  user as is being viewed, or a sysadmin.
* Standardize number_created_packages to mean excluding private datasets
  (changes behaviour in user_list)
* Improved docs and new_tests for user_list and user_show


  Commit: 632ccbe999036a002da4e349f4bd026cb0aeb9db
      https://github.com/ckan/ckan/commit/632ccbe999036a002da4e349f4bd026cb0aeb9db
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckan/lib/cli.py
    M ckanext/textview/plugin.py

  Log Message:
  -----------
  [#2204] Add filters for more common view types

If the view types that need to be checked are some of the core ones we
can filter the dataset search to only return the relevant ones, which
will reduce the number of datasets to be checked.

Refactored the text view plugin to allow importing the formats used.


  Commit: 584665c9b9e7a649c5c384efdeaedda021ddd258
      https://github.com/ckan/ckan/commit/584665c9b9e7a649c5c384efdeaedda021ddd258
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckanext/pdfview/tests/test_view.py
    M ckanext/textview/tests/test_view.py

  Log Message:
  -----------
  [#2242] Fix pdf and text view tests


  Commit: cc4aa68a5a48fa03761c2e61b4fc4c42878ff6dd
      https://github.com/ckan/ckan/commit/cc4aa68a5a48fa03761c2e61b4fc4c42878ff6dd
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/model/user.py
    M ckan/new_tests/logic/action/test_get.py

  Log Message:
  -----------
  [#2216] number_created_packages includes draft and private when viewed by the user or sysadmin.


  Commit: 5a2331b8a1e7c83fe752219ec2cdb969601212bb
      https://github.com/ckan/ckan/commit/5a2331b8a1e7c83fe752219ec2cdb969601212bb
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

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

  Log Message:
  -----------
  [#2242] Load recline_view in tests as it is now a default view


  Commit: c7f62b63d3a84a5d6d83ef7dcfc45b5d4524d5e5
      https://github.com/ckan/ckan/commit/c7f62b63d3a84a5d6d83ef7dcfc45b5d4524d5e5
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckan/logic/validators.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/templates/package/snippets/package_basic_fields.html

  Log Message:
  -----------
  Merge branch '2218-organization-change' of https://github.com/brew/ckan into brew-2218-organization-change


  Commit: 088638a6ff2f3549da91c1b670272823a0086613
      https://github.com/ckan/ckan/commit/088638a6ff2f3549da91c1b670272823a0086613
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

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

  Log Message:
  -----------
  [#2218] Mild improvement in test brittleness, using library for the form rather than grepping exact strings.


  Commit: 622cb25d93ea5e96300e038e9321e2e5862f697c
      https://github.com/ckan/ckan/commit/622cb25d93ea5e96300e038e9321e2e5862f697c
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_info.py

  Log Message:
  -----------
  Merge pull request #2247 from ckan/datastore_info_action

Adds a new datastore action to return info on tables.


  Commit: f4eb39cb41a6154d3ebf92618472ba530ded8920
      https://github.com/ckan/ckan/commit/f4eb39cb41a6154d3ebf92618472ba530ded8920
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

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

  Log Message:
  -----------
  [#2216] Small fixes.


  Commit: 7d4de4a5846dbc51e7f33ddc09b5c01b8b11704f
      https://github.com/ckan/ckan/commit/7d4de4a5846dbc51e7f33ddc09b5c01b8b11704f
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckanext/datapusher/cli.py

  Log Message:
  -----------
  Merge pull request #2246 from ckan/937-datapusher-paster-command

Lets datapusher CLI command push a single package


  Commit: 8f298cd9e658d788b031a4059271210aff6a3d94
      https://github.com/ckan/ckan/commit/8f298cd9e658d788b031a4059271210aff6a3d94
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckanext/datapusher/plugin.py

  Log Message:
  -----------
  Merge pull request #2245 from ckan/add-ods-to-datapusher

Enables datapusher extension to send ODS files to datapusher service


  Commit: 40079f2196c21121e2afa0463facaf6d8df43cef
      https://github.com/ckan/ckan/commit/40079f2196c21121e2afa0463facaf6d8df43cef
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/munge.py
    M ckan/lib/uploader.py
    M ckan/new_tests/lib/test_munge.py

  Log Message:
  -----------
  [#2057] Rename legacy method as discussed. Fix idempotent issue with "-". Add tests.


  Commit: 9eb88589166db62cb4f229b7a56ad5da6d5dcad9
      https://github.com/ckan/ckan/commit/9eb88589166db62cb4f229b7a56ad5da6d5dcad9
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-30 (Fri, 30 Jan 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2204] Add option to turn default filters off

Default filters can be explicitly turned off, and they also won't be
applied if the user passes extra search parameters (still no
implemented)


  Commit: 2773faaed2ef9676ea478c32c09a609cf063c245
      https://github.com/ckan/ckan/commit/2773faaed2ef9676ea478c32c09a609cf063c245
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-30 (Fri, 30 Jan 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2204] Allow users to modify the search parameters to get datasets

Users can pass the `-s` option to provide a JSON object with parameters
like the ones used in `package_search`. Supported parameters are `q`,
`fq` and `fq_list`.


  Commit: 774d765a27d0f725cbf4785d6d9edcff3900d023
      https://github.com/ckan/ckan/commit/774d765a27d0f725cbf4785d6d9edcff3900d023
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-30 (Fri, 30 Jan 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2204] Add option to create views on particular datasets


  Commit: 8020238c080ca81ebd236592c213bf47d8e1ec4b
      https://github.com/ckan/ckan/commit/8020238c080ca81ebd236592c213bf47d8e1ec4b
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-30 (Fri, 30 Jan 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2204] Stop if no more records


  Commit: f31538d176da5d09f79546179c1e52262c749fc1
      https://github.com/ckan/ckan/commit/f31538d176da5d09f79546179c1e52262c749fc1
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-30 (Fri, 30 Jan 2015)

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

  Log Message:
  -----------
  Minor but important fix on custom fields tutorial

The ability to combine free extras and custom fields was added on 2.3,
not 2.2.1


  Commit: 3e51f4519d1dc148adf8b44a644e06b01c935d62
      https://github.com/ckan/ckan/commit/3e51f4519d1dc148adf8b44a644e06b01c935d62
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-30 (Fri, 30 Jan 2015)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/munge.py
    M ckan/lib/uploader.py
    M ckan/new_tests/lib/test_munge.py

  Log Message:
  -----------
  [#2057] Use munge_filename_legacy in the correct place. PEP8.


  Commit: 80f1ec090f7f2c5544e93178c87ceb867783bf06
      https://github.com/ckan/ckan/commit/80f1ec090f7f2c5544e93178c87ceb867783bf06
  Author: Benjamin Laot <blaot35 at gmail.com>
  Date:   2015-01-31 (Sat, 31 Jan 2015)

  Changed paths:
    M MANIFEST.in
    M ckan/__init__.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    A ckan/i18n/eu/LC_MESSAGES/ckan.mo
    A ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    A ckan/i18n/hr/LC_MESSAGES/ckan.mo
    A ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    A ckan/i18n/lo/LC_MESSAGES/ckan.mo
    A ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    A ckan/i18n/my/LC_MESSAGES/ckan.mo
    A ckan/i18n/my/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/sw/LC_MESSAGES/ckan.mo
    A ckan/i18n/sw/LC_MESSAGES/ckan.po
    A ckan/i18n/th/LC_MESSAGES/ckan.mo
    A ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/search/index.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/validators.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/lib/search/test_index.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/public/base/less/ckan.less
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/tests/logic/test_action.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/plugin.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    A ckanext/datastore/tests/test_info.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py
    M doc/maintaining/filestore.rst
    M doc/maintaining/installing/deployment.rst

  Log Message:
  -----------
  Merge pull request #1 from ckan/master

Pull of ckan master in this branch


  Commit: cf63aa0654f4ae583d9cf1437bf08b5507936ad5
      https://github.com/ckan/ckan/commit/cf63aa0654f4ae583d9cf1437bf08b5507936ad5
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-02-02 (Mon, 02 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #2259 from ckan/minor-docs-fix

Minor but important fix on custom fields tutorial


  Commit: 715fd88fe59005ddf6e831ca4fe3c4a73b28c62d
      https://github.com/ckan/ckan/commit/715fd88fe59005ddf6e831ca4fe3c4a73b28c62d
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

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

  Log Message:
  -----------
  [#2057] Legacy munge also needed in group_dictize.


  Commit: dab0ffac10c2a17a19c3136431d3d1e68347a2cc
      https://github.com/ckan/ckan/commit/dab0ffac10c2a17a19c3136431d3d1e68347a2cc
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

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

  Log Message:
  -----------
  [#2216] Allow a user to see his datasets that are in a custom state, as long as it is not deleted.


  Commit: 23011aa73cfc787b0d51d8ad206427e5fd35303b
      https://github.com/ckan/ckan/commit/23011aa73cfc787b0d51d8ad206427e5fd35303b
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Merge branch 'fix-slow-organization-pages' of https://github.com/yhteentoimivuuspalvelut/ckan into yhteentoimivuuspalvelut-fix-slow-organization-pages


  Commit: 117ca0df089d474a912beab9723cc9c199c8c63c
      https://github.com/ckan/ckan/commit/117ca0df089d474a912beab9723cc9c199c8c63c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Merge branch 'yhteentoimivuuspalvelut-fix-slow-organization-pages'


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

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/model/user.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch '2216-user-show-fix'


  Commit: bfab554772b7530fe18ceca8681c1db55386e547
      https://github.com/ckan/ckan/commit/bfab554772b7530fe18ceca8681c1db55386e547
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M ckan/lib/datapreview.py
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/new_tests/lib/test_datapreview.py
    M ckan/plugins/toolkit.py
    M ckan/templates/package/snippets/resource_view.html
    M ckanext/imageview/plugin.py
    M ckanext/pdfview/plugin.py
    M ckanext/pdfview/tests/test_view.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/plugin.py

  Log Message:
  -----------
  Merge branch '2242-resource-views-fixes'


  Commit: 59c11f1754a6b25771622d61fb6c923558a4a70f
      https://github.com/ckan/ckan/commit/59c11f1754a6b25771622d61fb6c923558a4a70f
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

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

  Log Message:
  -----------
  [#2266] Update deployment.ini_tmpl to reflect changes in resource views


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

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    R ckanext/pdfview/__init__.py
    R ckanext/pdfview/plugin.py
    R ckanext/pdfview/tests/__init__.py
    R ckanext/pdfview/tests/test_view.py
    R ckanext/pdfview/theme/public/css/pdf.css
    R ckanext/pdfview/theme/public/css/recline.css
    R ckanext/pdfview/theme/public/img/ajaxload-circle.gif
    R ckanext/pdfview/theme/public/pdf_view.js
    R ckanext/pdfview/theme/public/resource.config
    R ckanext/pdfview/theme/public/vendor/l10n/ar/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ar/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ca/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/cs/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/cs/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/da/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/de/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/de/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/el/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/es/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/he/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/he/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/it/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/it/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ja/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ko/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/locale.properties.js
    R ckanext/pdfview/theme/public/vendor/l10n/lt/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/lt/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/lt/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/nl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ro/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ro/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ru/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ru/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sv/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/tr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/vi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/viewer.properties
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-small.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/shadow.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/texture.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.js
    R ckanext/pdfview/theme/public/vendor/webL10n/README.md
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/pdfview/theme/templates/pdf.html
    M doc/maintaining/data-viewer.rst
    M setup.py

  Log Message:
  -----------
  [#2270] Remove PDF viewer

As it will be moved to a separate extension
(https://github.com/ckan/ckanext-pdfview)


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

  Changed paths:
    A doc/images/manage_views.png
    A doc/images/views_overview.png
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  [#2205] First round of resource views docs


  Commit: 6a94e20201e09942d5435cbb640763cee8013052
      https://github.com/ckan/ckan/commit/6a94e20201e09942d5435cbb640763cee8013052
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2015-02-08 (Sun, 08 Feb 2015)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#2273] Do not provide a default email address


  Commit: 78e8aeffc74a8e71a4e1c8993701f9482a1f705e
      https://github.com/ckan/ckan/commit/78e8aeffc74a8e71a4e1c8993701f9482a1f705e
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  [#2205] Sort resource proxy section


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

  Changed paths:
    M ckan/public/base/less/module.less

  Log Message:
  -----------
  [#2269] Fix embed button when no view description


  Commit: 3ba9c3d529e02647e00a98f039795cb3ec6b5822
      https://github.com/ckan/ckan/commit/3ba9c3d529e02647e00a98f039795cb3ec6b5822
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/validators.py
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/model/user.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/plugins/toolkit.py
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/tests/logic/test_action.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/plugin.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_info.py
    M ckanext/imageview/plugin.py
    M ckanext/pdfview/plugin.py
    M ckanext/pdfview/tests/test_view.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/plugin.py
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  Merge branch 'master' into 2204-resource-views-cli

Conflicts:
	ckanext/textview/plugin.py


  Commit: e96f492de9621bbc8ff95188cffdaf07dde54426
      https://github.com/ckan/ckan/commit/e96f492de9621bbc8ff95188cffdaf07dde54426
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/search.less

  Log Message:
  -----------
  [#2267] Fix search layout in org bulk edit page


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

  Changed paths:
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  [#2205] Add docs on resource views migration


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

  Changed paths:
    M ckan/public/base/less/module.less

  Log Message:
  -----------
  Merge branch 'brew-2269-embed-view-button'


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

  Changed paths:
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/search.less

  Log Message:
  -----------
  Merge branch '2267-org-search-layout' of https://github.com/brew/ckan into brew-2267-org-search-layout


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

  Changed paths:
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/search.less

  Log Message:
  -----------
  Merge branch 'brew-2267-org-search-layout'


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

  Changed paths:
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css

  Log Message:
  -----------
  Recompile CSS


  Commit: 53a117b5629b8e9de556cf7d8c03b2cf4d30b14c
      https://github.com/ckan/ckan/commit/53a117b5629b8e9de556cf7d8c03b2cf4d30b14c
  Author: Ian Ward <ian at excess.org>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  Merge pull request #2273 from nigelbabu/2273-default-config-email

Do not provide email configuration in default config file


  Commit: b228308059e77074262acb44eb56f2f6eeac5d09
      https://github.com/ckan/ckan/commit/b228308059e77074262acb44eb56f2f6eeac5d09
  Author: Tom Mortimer-Jones <tom at morty.co.uk>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M doc/maintaining/background-tasks.rst

  Log Message:
  -----------
  [#2272] Fix docs that say Celery will be be installed

Fixes #2272


  Commit: 72f91d7bbaabbfdea7d549660856ce1af08adbb0
      https://github.com/ckan/ckan/commit/72f91d7bbaabbfdea7d549660856ce1af08adbb0
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M ckan/plugins/interfaces.py
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  [#2205] Document properly the IResourceView interface


  Commit: 8b653bc9eee252df230223e72f730210aa0ee7d8
      https://github.com/ckan/ckan/commit/8b653bc9eee252df230223e72f730210aa0ee7d8
  Author: pstarace <paolo at sciamlab.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Adding custom datastore sqlalchemy properties


  Commit: 8d16ac70cc289a72ab6c8b15181f8966ea5eb509
      https://github.com/ckan/ckan/commit/8d16ac70cc289a72ab6c8b15181f8966ea5eb509
  Author: pstarace <paolo at sciamlab.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Update db.py


  Commit: 7cd31c8b824b338ab7c6ed9d4fef1348ac0768d1
      https://github.com/ckan/ckan/commit/7cd31c8b824b338ab7c6ed9d4fef1348ac0768d1
  Author: Krzysiek Madejski <krzysztof at madejscy.pl>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

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

  Log Message:
  -----------
  attrs and is_required options

It would be best in fact to extract common macro options


  Commit: 52ba2fe90f52d846c6bfa70909e26787f96862e9
      https://github.com/ckan/ckan/commit/52ba2fe90f52d846c6bfa70909e26787f96862e9
  Author: Sean Hammond <seanh at users.noreply.github.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #2266 from ckan/2266-update-deployment-template

Update deployment.ini_tmpl to reflect changes in resource views


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

  Changed paths:
    M ckan/plugins/interfaces.py
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  [#2205] Small fixes after review


  Commit: 98d7dcffa2c070051ba1cf1c29b14b5febeaabb2
      https://github.com/ckan/ckan/commit/98d7dcffa2c070051ba1cf1c29b14b5febeaabb2
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    A doc/images/image_view.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/webpage_view.png
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  [#2205] Added screenshots for view types


  Commit: 2ce601ec903b9e81a5e7e9a144f2b9914dcd37f9
      https://github.com/ckan/ckan/commit/2ce601ec903b9e81a5e7e9a144f2b9914dcd37f9
  Author: Sean Hammond <seanh at users.noreply.github.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M ckan/plugins/interfaces.py
    A doc/images/image_view.png
    A doc/images/manage_views.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/views_overview.png
    A doc/images/webpage_view.png
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  Merge pull request #2205 from ckan/2205-resource-views-docs

Documentation for resource views


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

  Changed paths:
    M ckanext/stats/templates/ckanext/stats/index.html

  Log Message:
  -----------
  Merge branch '1647-stats-extension-links-to-groups' of https://github.com/serkostyx/ckan into serkostyx-1647-stats-extension-links-to-groups


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

  Changed paths:
    M ckanext/stats/templates/ckanext/stats/index.html

  Log Message:
  -----------
  Merge branch 'serkostyx-1647-stats-extension-links-to-groups'


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

  Changed paths:
    M ckanext/stats/stats.py
    M ckanext/stats/tests/test_stats_lib.py

  Log Message:
  -----------
  Merge branch '1649-stats-extension-tag-counts-are-incorrect' of https://github.com/serkostyx/ckan into serkostyx-1649-stats-extension-tag-counts-are-incorrect


  Commit: 7daa4ab0f43e2d1901e0c2dcf180c9d6ef6fb8ac
      https://github.com/ckan/ckan/commit/7daa4ab0f43e2d1901e0c2dcf180c9d6ef6fb8ac
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M ckanext/stats/stats.py
    M ckanext/stats/tests/test_stats_lib.py

  Log Message:
  -----------
  Merge branch 'serkostyx-1649-stats-extension-tag-counts-are-incorrect'


  Commit: 925553ffafa1585b754fc6b6e8ebf2b8fb09fbc5
      https://github.com/ckan/ckan/commit/925553ffafa1585b754fc6b6e8ebf2b8fb09fbc5
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M ckanext/datastore/db.py

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


  Commit: 22be0462d60a0ec0138dd42ed3f9d4598b95416c
      https://github.com/ckan/ckan/commit/22be0462d60a0ec0138dd42ed3f9d4598b95416c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M ckanext/datastore/db.py

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


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

  Changed paths:
    M doc/maintaining/configuration.rst

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


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

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#2279] Minor doc tweaks


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

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch 'pstarace-patch-2'


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

  Changed paths:
    M doc/maintaining/background-tasks.rst

  Log Message:
  -----------
  Merge branch '2272-fix-celery-docs' of https://github.com/morty/ckan into morty-2272-fix-celery-docs


  Commit: 2215bd9733d3a84035ec8f2c8988e035ce6f15c1
      https://github.com/ckan/ckan/commit/2215bd9733d3a84035ec8f2c8988e035ce6f15c1
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M doc/maintaining/background-tasks.rst

  Log Message:
  -----------
  Merge branch 'morty-2272-fix-celery-docs'


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

  Changed paths:
    M CHANGELOG.rst
    M ckan/controllers/package.py
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/tests/functional/test_tracking.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch '2207-package-show-exclude-tracking' of https://github.com/wardi/ckan into wardi-2207-package-show-exclude-tracking

Conflicts:
	ckan/lib/search/index.py


  Commit: 42e0325d595ddc9a85563e05b63c3ae54d9fdb9c
      https://github.com/ckan/ckan/commit/42e0325d595ddc9a85563e05b63c3ae54d9fdb9c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/controllers/package.py
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/tests/functional/test_tracking.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch 'wardi-2207-package-show-exclude-tracking'


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

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2204] Refactor confusing block


  Commit: 688333801112faade500dd448c9ccadad4015811
      https://github.com/ckan/ckan/commit/688333801112faade500dd448c9ccadad4015811
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2204] Delete old code


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

  Changed paths:
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/delete.py
    M ckan/model/resource_view.py
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/auth/test_delete.py

  Log Message:
  -----------
  [#2204] Add actions for clearing all or certain types of views


  Commit: 16aa14fdcc01be052af4f1679e26866d434f90cb
      https://github.com/ckan/ckan/commit/16aa14fdcc01be052af4f1679e26866d434f90cb
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2204] Add clear command to paster views


  Commit: 3d73cb44f7a0c886ec91bfc2590fbe88d02bd33f
      https://github.com/ckan/ckan/commit/3d73cb44f7a0c886ec91bfc2590fbe88d02bd33f
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/package.py
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/search.less
    M ckan/tests/functional/test_tracking.py
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/db.py
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    A doc/images/image_view.png
    A doc/images/manage_views.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/views_overview.png
    A doc/images/webpage_view.png
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  Merge branch 'master' into 2204-resource-views-cli


  Commit: 7cb05d08c482fd19cd81738e21448836a8817cd4
      https://github.com/ckan/ckan/commit/7cb05d08c482fd19cd81738e21448836a8817cd4
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M ckan/lib/datapreview.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.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
    M ckanext/datapusher/logic/action.py

  Log Message:
  -----------
  [#2204] Move default creation of views to actions

New actions `resource_create_default_resource_views` and
`package_create_default_resource_views` do what it says on the tin.
Docs + tests.


  Commit: 766a0b98006c8eb03becad4e69fd5b79119f1c6e
      https://github.com/ckan/ckan/commit/766a0b98006c8eb03becad4e69fd5b79119f1c6e
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

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

  Log Message:
  -----------
  [#2204] Fix auth function name


  Commit: 05471d5de6c716a8edc12622ea6ce513db39f8bf
      https://github.com/ckan/ckan/commit/05471d5de6c716a8edc12622ea6ce513db39f8bf
  Author: Sean Hammond <git at seanh.cc>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M CHANGELOG.rst
    M MANIFEST.in
    M ckan/__init__.py
    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/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    A ckan/i18n/eu/LC_MESSAGES/ckan.mo
    A ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    A ckan/i18n/hr/LC_MESSAGES/ckan.mo
    A ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    A ckan/i18n/lo/LC_MESSAGES/ckan.mo
    A ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    A ckan/i18n/my/LC_MESSAGES/ckan.mo
    A ckan/i18n/my/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/sw/LC_MESSAGES/ckan.mo
    A ckan/i18n/sw/LC_MESSAGES/ckan.po
    A ckan/i18n/th/LC_MESSAGES/ckan.mo
    A ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/accept.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    A ckan/lib/auth_tkt.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/fanstatic_resources.py
    R ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    M ckan/lib/navl/validators.py
    R ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    R ckan/lib/repoze_patch.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    A ckan/logic/action/patch.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    A ckan/logic/auth/patch.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/074_remove_resource_groups.py
    A ckan/migration/versions/075_rename_view_plugins.py
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/core.py
    M ckan/model/group.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/rating.py
    M ckan/model/resource.py
    M ckan/model/tag.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests/config/__init__.py
    A ckan/new_tests/controllers/test_api.py
    A ckan/new_tests/controllers/test_feed.py
    M ckan/new_tests/controllers/test_group.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/factories.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
    M ckan/new_tests/lib/search/test_index.py
    A ckan/new_tests/lib/test_auth_tkt.py
    A ckan/new_tests/lib/test_base.py
    A ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/lib/test_helpers.py
    A ckan/new_tests/lib/test_munge.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
    A ckan/new_tests/logic/action/test_patch.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
    A ckan/new_tests/logic/auth/test_get.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/model/test_resource.py
    M ckan/new_tests/model/test_resource_view.py
    A ckan/new_tests/test_authz.py
    M ckan/new_tests/test_factories.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
    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/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    A ckan/public/base/images/od_80x15_blue.png
    A ckan/public/base/images/placeholder-200x125.png
    A ckan/public/base/images/placeholder-420x220.png
    A ckan/public/base/images/placeholder-680x400.png
    M ckan/public/base/javascript/modules/resource-view-embed.js
    A ckan/public/base/javascript/modules/resource-view-filters-form.js
    A ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/view-filters.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    R ckan/public/base/less/resource-view-embed.less
    A ckan/public/base/less/resource-view.less
    M ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/view-filters.spec.js
    A ckan/public/base/vendor/polyfill-object-keys.js
    M ckan/public/base/vendor/resource.config
    M ckan/public/scripts/application.js
    R ckan/rating.py
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/development/snippets/markup.html
    M ckan/templates/footer.html
    M ckan/templates/group/index.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/snippets/help.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/new_view.html
    M ckan/templates/package/read.html
    A ckan/templates/package/read.n3
    A ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_data.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/additional_info.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_item.html
    M ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_filters.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/snippets/context.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/related.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.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/__init__.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    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
    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_accept.py
    M ckan/tests/lib/test_authenticator.py
    R ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    R ckan/tests/lib/test_field_types.py
    R ckan/tests/lib/test_munge.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_resource.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_plugins.py
    A ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    A ckanext/datapusher/tests/test_default_views.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_helpers.py
    A ckanext/datastore/tests/test_info.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/imageview/theme/templates/image_view.html
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/pdfview/plugin.py
    M ckanext/pdfview/tests/test_view.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.js
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.min.js
    M ckanext/reclineview/theme/public/vendor/flot/jquery.flot.js
    A ckanext/reclineview/theme/public/vendor/flot/jquery.flot.time.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet-src.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.min.js
    A ckanext/reclineview/theme/public/vendor/moment/2.0.0/moment.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.css
    M ckanext/reclineview/theme/public/vendor/recline/recline.dataset.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.css
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.png
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    A ckanext/reclineview/theme/public/vendor/timeline/css/loading.gif
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.css
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    A ckanext/reclineview/theme/public/vendor/timeline/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    A ckanext/reclineview/theme/public/vendor/underscore/1.4.4/underscore.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/textview/theme/public/css/text.css
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    R doc/_themes/sphinx-theme-okfn
    M doc/api/index.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/html.rst
    M doc/contributing/test.rst
    M doc/contributing/testing.rst
    M doc/contributing/upgrading-dependencies.rst
    M doc/extensions/adding-custom-fields.rst
    A doc/images/image_view.png
    A doc/images/manage_views.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/views_overview.png
    A doc/images/webpage_view.png
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/filestore.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
    M doc/maintaining/paster.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

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


  Commit: 077fcd5b2e0628768bbd34202022178d789b5b26
      https://github.com/ckan/ckan/commit/077fcd5b2e0628768bbd34202022178d789b5b26
  Author: Benjamin Laot <blaot35 at gmail.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/model/user.py
    M ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/search.less
    M ckan/templates/package/snippets/resource_view.html
    M ckan/tests/functional/test_tracking.py
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/db.py
    M ckanext/imageview/plugin.py
    M ckanext/pdfview/plugin.py
    M ckanext/pdfview/tests/test_view.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/plugin.py
    M doc/extensions/adding-custom-fields.rst
    A doc/images/image_view.png
    A doc/images/manage_views.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/views_overview.png
    A doc/images/webpage_view.png
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  Merge pull request #2 from ckan/master

Pull of ckan master in this branch


  Commit: ea145aab53f964d1250adbb305b158d50d66e139
      https://github.com/ckan/ckan/commit/ea145aab53f964d1250adbb305b158d50d66e139
  Author: Sean Hammond <seanh at users.noreply.github.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M ckan/controllers/package.py
    M ckanext/multilingual/plugin.py
    M setup.py

  Log Message:
  -----------
  Merge pull request #2284 from ckan/groundrace

Groundrace


  Commit: e5b74615c468c0a2e997985c6d0f3f36b1bf39fe
      https://github.com/ckan/ckan/commit/e5b74615c468c0a2e997985c6d0f3f36b1bf39fe
  Author: Benjamin Laot <blaot35 at gmail.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M ckan/templates/organization/member_new.html
    M ckan/templates/user/read_base.html

  Log Message:
  -----------
  Made some fields translatable #2285


  Commit: 6f190857ccaec5a5d0b68a828ee7a9e9c00125ec
      https://github.com/ckan/ckan/commit/6f190857ccaec5a5d0b68a828ee7a9e9c00125ec
  Author: Sean Hammond <git at seanh.cc>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M CHANGELOG.rst
    M MANIFEST.in
    M ckan/__init__.py
    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/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    A ckan/i18n/eu/LC_MESSAGES/ckan.mo
    A ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    A ckan/i18n/hr/LC_MESSAGES/ckan.mo
    A ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    A ckan/i18n/lo/LC_MESSAGES/ckan.mo
    A ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    A ckan/i18n/my/LC_MESSAGES/ckan.mo
    A ckan/i18n/my/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/sw/LC_MESSAGES/ckan.mo
    A ckan/i18n/sw/LC_MESSAGES/ckan.po
    A ckan/i18n/th/LC_MESSAGES/ckan.mo
    A ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/accept.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    A ckan/lib/auth_tkt.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/fanstatic_resources.py
    R ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    M ckan/lib/navl/validators.py
    R ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    R ckan/lib/repoze_patch.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    A ckan/logic/action/patch.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    A ckan/logic/auth/patch.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/074_remove_resource_groups.py
    A ckan/migration/versions/075_rename_view_plugins.py
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/core.py
    M ckan/model/group.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/rating.py
    M ckan/model/resource.py
    M ckan/model/tag.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests/config/__init__.py
    A ckan/new_tests/controllers/test_api.py
    A ckan/new_tests/controllers/test_feed.py
    M ckan/new_tests/controllers/test_group.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/factories.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
    M ckan/new_tests/lib/search/test_index.py
    A ckan/new_tests/lib/test_auth_tkt.py
    A ckan/new_tests/lib/test_base.py
    A ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/lib/test_helpers.py
    A ckan/new_tests/lib/test_munge.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
    A ckan/new_tests/logic/action/test_patch.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
    A ckan/new_tests/logic/auth/test_get.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/model/test_resource.py
    M ckan/new_tests/model/test_resource_view.py
    A ckan/new_tests/test_authz.py
    M ckan/new_tests/test_factories.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
    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/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    A ckan/public/base/images/od_80x15_blue.png
    A ckan/public/base/images/placeholder-200x125.png
    A ckan/public/base/images/placeholder-420x220.png
    A ckan/public/base/images/placeholder-680x400.png
    M ckan/public/base/javascript/modules/resource-view-embed.js
    A ckan/public/base/javascript/modules/resource-view-filters-form.js
    A ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/view-filters.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    R ckan/public/base/less/resource-view-embed.less
    A ckan/public/base/less/resource-view.less
    M ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/view-filters.spec.js
    A ckan/public/base/vendor/polyfill-object-keys.js
    M ckan/public/base/vendor/resource.config
    M ckan/public/scripts/application.js
    R ckan/rating.py
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/development/snippets/markup.html
    M ckan/templates/footer.html
    M ckan/templates/group/index.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/snippets/help.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/new_view.html
    M ckan/templates/package/read.html
    A ckan/templates/package/read.n3
    A ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_data.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/additional_info.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_item.html
    M ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_filters.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/snippets/context.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/related.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.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/__init__.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    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
    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_accept.py
    M ckan/tests/lib/test_authenticator.py
    R ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    R ckan/tests/lib/test_field_types.py
    R ckan/tests/lib/test_munge.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_resource.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_plugins.py
    A ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    A ckanext/datapusher/tests/test_default_views.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_helpers.py
    A ckanext/datastore/tests/test_info.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/imageview/theme/templates/image_view.html
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/pdfview/plugin.py
    M ckanext/pdfview/tests/test_view.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.js
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.min.js
    M ckanext/reclineview/theme/public/vendor/flot/jquery.flot.js
    A ckanext/reclineview/theme/public/vendor/flot/jquery.flot.time.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet-src.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.min.js
    A ckanext/reclineview/theme/public/vendor/moment/2.0.0/moment.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.css
    M ckanext/reclineview/theme/public/vendor/recline/recline.dataset.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.css
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.png
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    A ckanext/reclineview/theme/public/vendor/timeline/css/loading.gif
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.css
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    A ckanext/reclineview/theme/public/vendor/timeline/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    A ckanext/reclineview/theme/public/vendor/underscore/1.4.4/underscore.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/textview/theme/public/css/text.css
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    M dev-requirements.txt
    R doc/_themes/sphinx-theme-okfn
    M doc/api/index.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/html.rst
    M doc/contributing/i18n.rst
    M doc/contributing/test.rst
    M doc/contributing/testing.rst
    M doc/contributing/upgrading-dependencies.rst
    M doc/extensions/adding-custom-fields.rst
    A doc/images/image_view.png
    A doc/images/manage_views.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/views_overview.png
    A doc/images/webpage_view.png
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/filestore.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
    M doc/maintaining/paster.rst
    M doc/maintaining/solr-multicore.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into 1244-cli-user-fullname-unicode

Conflicts:
	ckan/lib/cli.py


  Commit: 50548bc129186e413770c214f00a80547489c658
      https://github.com/ckan/ckan/commit/50548bc129186e413770c214f00a80547489c658
  Author: Sean Hammond <seanh at users.noreply.github.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M ckan/lib/cli.py
    A ckan/new_tests/lib/test_cli.py

  Log Message:
  -----------
  Merge pull request #2286 from ckan/1244-cli-user-fullname-unicode

1244 cli user fullname unicode


  Commit: 0db8057b0d4e7fa03ca62b458a84eda9ddaad40a
      https://github.com/ckan/ckan/commit/0db8057b0d4e7fa03ca62b458a84eda9ddaad40a
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

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

  Log Message:
  -----------
  [#2204] Fix auth function name (take 2)


  Commit: 5193ccb55ea54f9b5d4b7b60e55ad48418962a80
      https://github.com/ckan/ckan/commit/5193ccb55ea54f9b5d4b7b60e55ad48418962a80
  Author: Denis Zgonjanin <deniszgonjanin at gmail.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  fix datastore population failing on encoding

Conflicts:
	ckanext/datastore/db.py


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

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/cli.py
    A ckan/new_tests/lib/test_cli.py
    M ckanext/multilingual/plugin.py
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 2204-resource-views-cli

Conflicts:
	ckan/lib/cli.py


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

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

  Log Message:
  -----------
  [#2158] Replace all resource extras on update so they don't get lost

Resource `extras` were being ignored on `resource_udpate`. The rest of
the resource field got updated but no the extras.

The resource `extras` field is using a custom `JsonDictType`, and
according to SQLAlchemy documentation:

> Note that the ORM by default will not detect “mutability” on such a
> type - meaning, in-place changes to values will not be detected and
> will not be flushed. Without further steps, you instead would need to
> replace the existing value with a new one on each parent object to
> detect changes.

Replacing `obj.extras` with a new dict solves the issue

http://docs.sqlalchemy.org/en/rel_0_9/core/custom_types.html#marshal-json-strings


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

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

  Log Message:
  -----------
  [#2158] Add more tests


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

  Changed paths:
    M ckan/new_tests/model/test_resource.py

  Log Message:
  -----------
  [#2158] Remove print


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

  Changed paths:
    M ckan/new_tests/model/test_resource.py

  Log Message:
  -----------
  [#2158] Fix model test

We need to assign a new extras dict so the change is detected


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

  Changed paths:
    M CHANGELOG.rst
    M MANIFEST.in
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    A ckan/i18n/eu/LC_MESSAGES/ckan.mo
    A ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    A ckan/i18n/hr/LC_MESSAGES/ckan.mo
    A ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    A ckan/i18n/lo/LC_MESSAGES/ckan.mo
    A ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    A ckan/i18n/my/LC_MESSAGES/ckan.mo
    A ckan/i18n/my/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/sw/LC_MESSAGES/ckan.mo
    A ckan/i18n/sw/LC_MESSAGES/ckan.po
    A ckan/i18n/th/LC_MESSAGES/ckan.mo
    A ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/075_rename_view_plugins.py
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/model/resource_view.py
    M ckan/model/user.py
    A ckan/new_tests/controllers/test_api.py
    M ckan/new_tests/controllers/test_group.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/lib/search/test_index.py
    A ckan/new_tests/lib/test_cli.py
    A ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/lib/test_helpers.py
    A ckan/new_tests/lib/test_munge.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_delete.py
    A ckan/new_tests/logic/auth/test_get.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/model/test_resource.py
    M ckan/new_tests/model/test_resource_view.py
    M ckan/new_tests/test_factories.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    A ckan/public/base/javascript/modules/resource-view-filters-form.js
    A ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/view-filters.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    A ckan/public/base/less/resource-view.less
    M ckan/public/base/less/search.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/view-filters.spec.js
    A ckan/public/base/vendor/polyfill-object-keys.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/group/snippets/info.html
    M ckan/templates/organization/index.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_filters.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/new_user_form.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_tracking.py
    R ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization_schema.py
    R ckan/tests/lib/test_munge.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    A ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    A ckanext/datapusher/tests/test_default_views.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_helpers.py
    A ckanext/datastore/tests/test_info.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/imageview/theme/templates/image_view.html
    M ckanext/multilingual/plugin.py
    M ckanext/pdfview/plugin.py
    M ckanext/pdfview/tests/test_view.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    M ckanext/resourceproxy/controller.py
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    M doc/contributing/frontend/index.rst
    M doc/contributing/test.rst
    M doc/extensions/adding-custom-fields.rst
    A doc/images/image_view.png
    A doc/images/manage_views.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/views_overview.png
    A doc/images/webpage_view.png
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/filestore.rst
    M doc/maintaining/installing/deployment.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 2158-resource-extras

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


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

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

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


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

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

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


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

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/package.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/search/index.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/schema.py
    M ckan/model/resource_view.py
    A ckan/new_tests/lib/test_cli.py
    M ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_delete.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/search.less
    M ckan/tests/functional/test_tracking.py
    M ckan/tests/logic/test_action.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datastore/db.py
    M ckanext/multilingual/plugin.py
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/textview/plugin.py
    M doc/contributing/frontend/templating.rst
    A doc/images/image_view.png
    A doc/images/manage_views.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/views_overview.png
    A doc/images/webpage_view.png
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 2270-remove-pdf-viewer

Conflicts:
	doc/maintaining/data-viewer.rst


  Commit: 8e08df829c4da465840d893d0924d933444dc2d4
      https://github.com/ckan/ckan/commit/8e08df829c4da465840d893d0924d933444dc2d4
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#2295] Fix formatting of config doc example


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

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  [#2270] Minor clarification on the changelog


  Commit: 25a3a66166425bd78dfbab99ab3035aa8be9e149
      https://github.com/ckan/ckan/commit/25a3a66166425bd78dfbab99ab3035aa8be9e149
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    R ckanext/pdfview/__init__.py
    R ckanext/pdfview/plugin.py
    R ckanext/pdfview/tests/__init__.py
    R ckanext/pdfview/tests/test_view.py
    R ckanext/pdfview/theme/public/css/pdf.css
    R ckanext/pdfview/theme/public/css/recline.css
    R ckanext/pdfview/theme/public/img/ajaxload-circle.gif
    R ckanext/pdfview/theme/public/pdf_view.js
    R ckanext/pdfview/theme/public/resource.config
    R ckanext/pdfview/theme/public/vendor/l10n/ar/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ar/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ca/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/cs/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/cs/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/da/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/de/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/de/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/el/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/es/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/he/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/he/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/it/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/it/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ja/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ko/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/locale.properties.js
    R ckanext/pdfview/theme/public/vendor/l10n/lt/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/lt/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/lt/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/nl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ro/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ro/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ru/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ru/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sv/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/tr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/vi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/viewer.properties
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-small.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/shadow.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/texture.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.js
    R ckanext/pdfview/theme/public/vendor/webL10n/README.md
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/pdfview/theme/templates/pdf.html
    M setup.py

  Log Message:
  -----------
  Merge pull request #2270 from ckan/2270-remove-pdf-viewer

Move PDF views into a separate extension


  Commit: e98aea6f87c371494769dbd20371c16970bf7b5d
      https://github.com/ckan/ckan/commit/e98aea6f87c371494769dbd20371c16970bf7b5d
  Author: Ian Ward <ian at excess.org>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M ckan/lib/dictization/model_save.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/model/test_resource.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/2158-resource-extras'


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

  Changed paths:
    M ckanext/reclineview/plugin.py

  Log Message:
  -----------
  [#2303] Create recline_view on xlxs files by default

XLSX it's supported by both DataProxy and DataPusher


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

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch '2295-minor-formatting-change' of https://github.com/brew/ckan into brew-2295-minor-formatting-change


  Commit: 9618f64486f4ae5c17b945e2cbb5da037a80d150
      https://github.com/ckan/ckan/commit/9618f64486f4ae5c17b945e2cbb5da037a80d150
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch 'brew-2295-minor-formatting-change'


  Commit: b70a1b97bcf94d48ccbb8abb5845415fee33849e
      https://github.com/ckan/ckan/commit/b70a1b97bcf94d48ccbb8abb5845415fee33849e
  Author: Benjamin Laot <blaot35 at gmail.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M ckan/lib/mailer.py

  Log Message:
  -----------
  The subject of the email is now translatable as it should be.


  Commit: 44f027ea31fe3402736897ff0ea030316f9f5e5e
      https://github.com/ckan/ckan/commit/44f027ea31fe3402736897ff0ea030316f9f5e5e
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M ckanext/reclineview/plugin.py

  Log Message:
  -----------
  Merge pull request #2303 from ckan/2303-enable-xlsx-views

Enable recline_view on xlsx files


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

  Changed paths:
    M ckanext/reclineview/theme/public/vendor/recline/recline.js

  Log Message:
  -----------
  [#2297] Fix visibility check on map view. Fixes #463

The following check was failing on the first load, so autozoom didn't
work:

https://github.com/okfn/recline/blob/3f4a30e054652d06b92cfe372ce66c8b5c79d4ca/src/view.map.js#L232

We are patching the local recline file but the same patch has already been
submitted to the main recline repo:

https://github.com/okfn/recline/pull/464


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

  Changed paths:
    M ckan/templates/organization/member_new.html
    M ckan/templates/user/read_base.html

  Log Message:
  -----------
  Merge branch '#2285-Made-some-fields-translatable' of https://github.com/benjaminlaot/ckan into benjaminlaot-#2285-Made-some-fields-translatable


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

  Changed paths:
    M ckan/templates/organization/member_new.html
    M ckan/templates/user/read_base.html

  Log Message:
  -----------
  Merge branch 'benjaminlaot-#2285-Made-some-fields-translatable'


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

  Changed paths:
    M ckan/lib/mailer.py

  Log Message:
  -----------
  Merge branch '2301_Subject_of_email_not_translatable' of https://github.com/benjaminlaot/ckan into benjaminlaot-2301_Subject_of_email_not_translatable


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

  Changed paths:
    M ckan/lib/mailer.py

  Log Message:
  -----------
  Merge branch 'benjaminlaot-2301_Subject_of_email_not_translatable'


  Commit: 111ddfe7140bcf9d21739117b6cfdc44a6057e34
      https://github.com/ckan/ckan/commit/111ddfe7140bcf9d21739117b6cfdc44a6057e34
  Author: Ian Ward <ian at excess.org>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Merge pull request #2182 from deniszgonjanin/datastore-encoding-error

datastore fails on non-ascii encodings


  Commit: 19a79522c8dfc7b493967c5e2dd08d52d8bfe4e8
      https://github.com/ckan/ckan/commit/19a79522c8dfc7b493967c5e2dd08d52d8bfe4e8
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M ckanext/reclineview/theme/public/vendor/recline/recline.js

  Log Message:
  -----------
  [#2319] Clean up field names before rendering the table

See okfn/recline#465 for details

Patching local recline but a PR has been sent to the recline repo:

https://github.com/okfn/recline/pull/466


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

  Changed paths:
    M ckan/controllers/user.py
    A ckan/new_tests/controllers/test_user.py

  Log Message:
  -----------
  [#2307] Show datasets on user dashboard

Probably missed in #2133.

Added a couple of tests


  Commit: 9332e7b7dacec423eb7eb81b9f0b4581e7f5727d
      https://github.com/ckan/ckan/commit/9332e7b7dacec423eb7eb81b9f0b4581e7f5727d
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M ckanext/reclineview/theme/public/vendor/recline/recline.js

  Log Message:
  -----------
  Merge pull request #2297 from ckan/2297-fix-recline-autozoom

Map view - Auto zoom to features


  Commit: 0dd2593bc2e0b7b8f7439cd8d2fd7c93084763af
      https://github.com/ckan/ckan/commit/0dd2593bc2e0b7b8f7439cd8d2fd7c93084763af
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M ckanext/reclineview/theme/public/vendor/recline/recline.js

  Log Message:
  -----------
  Merge pull request #2319 from ckan/2319-sanitize-recline-headers

Sanitize table headers on Recline views


  Commit: 1244c94dc8e192a44f86bcdd9d5fa7361a42f5b3
      https://github.com/ckan/ckan/commit/1244c94dc8e192a44f86bcdd9d5fa7361a42f5b3
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M ckanext/textview/plugin.py

  Log Message:
  -----------
  Don't assume resource format is there


  Commit: 7b30bef86fd192490006292a727958d77158dbbd
      https://github.com/ckan/ckan/commit/7b30bef86fd192490006292a727958d77158dbbd
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py

  Log Message:
  -----------
  [#2322] Check for `_datastore_only_resource` urls on recline views

Otherwise the automatic creation of views in DataStore only resources is
not triggered.


  Commit: 71fbb940e86ee666f85164e85788af5efa133bac
      https://github.com/ckan/ckan/commit/71fbb940e86ee666f85164e85788af5efa133bac
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M ckanext/reclineview/tests/test_view.py

  Log Message:
  -----------
  [#2322] Fix PEP8 and don't pollute global config


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

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

  Log Message:
  -----------
  [#2324] Don't "normalize" resource URL in recline view

Turns https into http


  Commit: 792d0a4233c3b3964c95f59e5d8d4b5d5121780c
      https://github.com/ckan/ckan/commit/792d0a4233c3b3964c95f59e5d8d4b5d5121780c
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #2324 from ckan/2324-dodgy-url-normalize-in-recline

Recline view converts all https resource urls to http


  Commit: 2d2d058fa056bf70aea1f81b1082ed7a3687ea85
      https://github.com/ckan/ckan/commit/2d2d058fa056bf70aea1f81b1082ed7a3687ea85
  Author: Ian Ward <ian at excess.org>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M ckan/controllers/user.py
    A ckan/new_tests/controllers/test_user.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/2307-datasets-in-dashboard'


  Commit: 13d7feeb8e77240a04a1f069bc2cabc256b96b0d
      https://github.com/ckan/ckan/commit/13d7feeb8e77240a04a1f069bc2cabc256b96b0d
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M ckanext/textview/plugin.py

  Log Message:
  -----------
  Merge pull request #2320 from ckan/2320-text-view-check-format

Don't assume resource format is there on text view plugin `can_view` method


  Commit: a96938e67a9f5b9f62b58342854878397e57ae3e
      https://github.com/ckan/ckan/commit/a96938e67a9f5b9f62b58342854878397e57ae3e
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-03-02 (Mon, 02 Mar 2015)

  Changed paths:
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py

  Log Message:
  -----------
  Merge branch '2322-recline-views-datastore-only'


  Commit: bc2b2f72f4ff7ad3f24e64fbcf6eb01273e45f7b
      https://github.com/ckan/ckan/commit/bc2b2f72f4ff7ad3f24e64fbcf6eb01273e45f7b
  Author: amercader <amercadero at gmail.com>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update changelog after 2.3 release

Conflicts:
	CHANGELOG.rst


  Commit: 805d5a7711fa99e0452948e278c3231927684fe6
      https://github.com/ckan/ckan/commit/805d5a7711fa99e0452948e278c3231927684fe6
  Author: amercader <amercadero at gmail.com>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Add note about DataPusher to changelog


  Commit: fe4677f7986a46fdfaa83c477a891bd6175d3869
      https://github.com/ckan/ckan/commit/fe4677f7986a46fdfaa83c477a891bd6175d3869
  Author: amercader <amercadero at gmail.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

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

  Log Message:
  -----------
  Update translation files after 2.3 release


  Commit: 3edd8ddae9109267083bd15d5ad2ec6d49c2afd4
      https://github.com/ckan/ckan/commit/3edd8ddae9109267083bd15d5ad2ec6d49c2afd4
  Author: amercader <amercadero at gmail.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

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

  Log Message:
  -----------
  Compile translation files after 2.3 release


  Commit: 8e15127f3e5ddda6334d080c198234a33044df76
      https://github.com/ckan/ckan/commit/8e15127f3e5ddda6334d080c198234a33044df76
  Author: amercader <amercadero at gmail.com>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/munge.py
    M ckan/lib/uploader.py
    M ckan/new_tests/lib/test_munge.py

  Log Message:
  -----------
  Merge branch 'tobes-2057-fix-filename-munging'


  Commit: cc909b6180f1d7ab18982f21d2c677d0e88f94f8
      https://github.com/ckan/ckan/commit/cc909b6180f1d7ab18982f21d2c677d0e88f94f8
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M ckan/lib/create_test_data.py

  Log Message:
  -----------
  Removes use of annakarenina.com to fix #2336


  Commit: 22c9c6161f08ddb956199721a1ccec9250eb7408
      https://github.com/ckan/ckan/commit/22c9c6161f08ddb956199721a1ccec9250eb7408
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/test_revision.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_dumper.py

  Log Message:
  -----------
  Remove other occurrences of annakarenina website


  Commit: 446853f158865f5ddc56f7aa5fd0324d7b6295c7
      https://github.com/ckan/ckan/commit/446853f158865f5ddc56f7aa5fd0324d7b6295c7
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M ckan/lib/create_test_data.py
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/test_revision.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_dumper.py

  Log Message:
  -----------
  Merge pull request #2342 from ckan/remove-dodgy-domain

Removes use of annakarenina.com to fix #2336


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

  Changed paths:
    M CHANGELOG.rst
    M MANIFEST.in
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    A ckan/i18n/eu/LC_MESSAGES/ckan.mo
    A ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    A ckan/i18n/hr/LC_MESSAGES/ckan.mo
    A ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    A ckan/i18n/lo/LC_MESSAGES/ckan.mo
    A ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    A ckan/i18n/my/LC_MESSAGES/ckan.mo
    A ckan/i18n/my/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    A ckan/i18n/ne/LC_MESSAGES/ckan.mo
    A ckan/i18n/ne/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/sw/LC_MESSAGES/ckan.mo
    A ckan/i18n/sw/LC_MESSAGES/ckan.po
    A ckan/i18n/th/LC_MESSAGES/ckan.mo
    A ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/cli.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
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/munge.py
    M ckan/lib/search/index.py
    M ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/075_rename_view_plugins.py
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/model/resource_view.py
    M ckan/model/user.py
    M ckan/new_tests/controllers/test_package.py
    A ckan/new_tests/controllers/test_user.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/lib/search/test_index.py
    A ckan/new_tests/lib/test_cli.py
    A ckan/new_tests/lib/test_datapreview.py
    A ckan/new_tests/lib/test_munge.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_delete.py
    A ckan/new_tests/logic/auth/test_get.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/model/test_resource.py
    M ckan/new_tests/model/test_resource_view.py
    M ckan/new_tests/test_factories.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/search.less
    M ckan/templates/group/snippets/info.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/additional_info.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_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/view_form.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/tests/legacy/functional/api/base.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/functional/test_revision.py
    M ckan/tests/legacy/functional/test_tracking.py
    R ckan/tests/legacy/lib/test_datapreview.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/legacy/lib/test_dictization_schema.py
    R ckan/tests/legacy/lib/test_munge.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_dumper.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/tests/test_default_views.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    A ckanext/datastore/tests/test_info.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/imageview/theme/templates/image_view.html
    M ckanext/multilingual/plugin.py
    R ckanext/pdfview/__init__.py
    R ckanext/pdfview/plugin.py
    R ckanext/pdfview/tests/__init__.py
    R ckanext/pdfview/tests/test_view.py
    R ckanext/pdfview/theme/public/css/pdf.css
    R ckanext/pdfview/theme/public/css/recline.css
    R ckanext/pdfview/theme/public/img/ajaxload-circle.gif
    R ckanext/pdfview/theme/public/pdf_view.js
    R ckanext/pdfview/theme/public/resource.config
    R ckanext/pdfview/theme/public/vendor/l10n/ar/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ar/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ca/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/cs/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/cs/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/da/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/de/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/de/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/el/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/es/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/he/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/he/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/it/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/it/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ja/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ko/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/locale.properties.js
    R ckanext/pdfview/theme/public/vendor/l10n/lt/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/lt/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/lt/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/nl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ro/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ro/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ru/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ru/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sv/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/tr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/vi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/viewer.properties
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-small.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/shadow.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/texture.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.js
    R ckanext/pdfview/theme/public/vendor/webL10n/README.md
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/pdfview/theme/templates/pdf.html
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    M ckanext/resourceproxy/controller.py
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    M doc/contributing/frontend/templating.rst
    M doc/extensions/adding-custom-fields.rst
    A doc/images/image_view.png
    A doc/images/manage_views.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/views_overview.png
    A doc/images/webpage_view.png
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/filestore.rst
    M doc/maintaining/installing/deployment.rst
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 1753-rename-legacy-tests

Conflicts:
	ckan/tests/functional/api/base.py
	ckan/tests/legacy/lib/test_datapreview.py
	ckan/tests/legacy/lib/test_munge.py
	ckanext/imageview/tests/test_view.py
	ckanext/pdfview/tests/test_view.py
	ckanext/webpageview/tests/test_view.py
	setup.py


Compare: https://github.com/ckan/ckan/compare/e7563075e6cc...1118b619b9af


More information about the ckan-changes mailing list