[ckan-changes] [ckan/ckan] 75a11b: [#1251] Add resource_view table

• Previous message: [ckan-changes] [ckan/ckan] d2a6c4: [#1838] Adds docs
• Next message: [ckan-changes] [ckan/ckan] 75a11b: [#1251] Add resource_view table
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 75a11b3335204006d80a8ade13dd1bf37dc06d0f
      https://github.com/ckan/ckan/commit/75a11b3335204006d80a8ade13dd1bf37dc06d0f
  Author: John Glover <j at johnglover.net>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

  Changed paths:
    A ckan/migration/versions/071_add_resource_view.py
    M ckan/model/__init__.py
    A ckan/model/resource_view.py

  Log Message:
  -----------
  [#1251] Add resource_view table


  Commit: 0287639978fdc7308c7e1df1cfb8f95727173f99
      https://github.com/ckan/ckan/commit/0287639978fdc7308c7e1df1cfb8f95727173f99
  Author: John Glover <j at johnglover.net>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#1251] Add resource_view create functions


  Commit: b4eef9ec4ade97db9027322f09975c78788c8870
      https://github.com/ckan/ckan/commit/b4eef9ec4ade97db9027322f09975c78788c8870
  Author: John Glover <j at johnglover.net>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

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

  Log Message:
  -----------
  [#1251] Add resource_view_show


  Commit: feff4ef4fc1832f6b2c1840e4d944b80d7b63d40
      https://github.com/ckan/ckan/commit/feff4ef4fc1832f6b2c1840e4d944b80d7b63d40
  Author: John Glover <j at johnglover.net>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

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

  Log Message:
  -----------
  [#1251] Add resource_view_update


  Commit: d01c031702021585a70263255782a78979a6839b
      https://github.com/ckan/ckan/commit/d01c031702021585a70263255782a78979a6839b
  Author: John Glover <j at johnglover.net>
  Date:   2013-09-30 (Mon, 30 Sep 2013)

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

  Log Message:
  -----------
  [#1251] Add resource_view_delete action function


  Commit: bbb0aed1168445936f64cba834209c1498979b0c
      https://github.com/ckan/ckan/commit/bbb0aed1168445936f64cba834209c1498979b0c
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/auth/create.py
    M ckan/logic/schema.py
    M ckan/migration/versions/071_add_resource_view.py
    M ckan/model/resource_view.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#1251] Add title and description to resource_view.
Change 'view_number' to 'order'.


  Commit: 0762a102c5aec61b67f8e6c6a0478036b92baa57
      https://github.com/ckan/ckan/commit/0762a102c5aec61b67f8e6c6a0478036b92baa57
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

  Changed paths:
    A .coveragerc
    M .travis.yml
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M README.rst
    M bin/travis-build
    M ckan/ckan_nose_plugin.py
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.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/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/071_add_state_column_to_user_table.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.py
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckan/plugins/toolkit_sphinx_extension.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/javascript/modules/autocomplete.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/module.less
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2-spinner.gif
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.js
    R ckan/public/base/vendor/select2/select2.min.css
    M ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/select2x2.png
    R ckan/public/base/vendor/select2/spinner.gif
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/dataviewer/base.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/footer.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/organization/confirm_delete_member.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/edit.html
    A ckan/templates/package/edit_base.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/new_resource.html
    A ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    A ckan/templates/package/resource_edit_base.html
    A ckan/templates/package/resources.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_form.html
    A ckan/templates/package/snippets/resource_info.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/revision/read.html
    M ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/context/dataset.html
    M ckan/templates/snippets/context/group.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/private.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/followers.html
    A ckan/templates/user/snippets/recaptcha.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_group.py
    A ckan/tests/functional/test_tracking.py
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_authenticator.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_mailer.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_init.py
    A ckan/tests/models/test_follower.py
    M ckan/tests/models/test_user.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    A ckanext/example_iauthfunctions/__init__.py
    A ckanext/example_iauthfunctions/plugin.py
    A ckanext/example_iauthfunctions/plugin_v1.py
    A ckanext/example_iauthfunctions/plugin_v2.py
    A ckanext/example_iauthfunctions/plugin_v3.py
    A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/textpreview/theme/public/highlight.pack.js
    M ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/vendor/highlight.pack.js
    M dev-requirements.txt
    M doc/api.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    M doc/ckan-coding-standards.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/documentation-guidelines.rst
    A doc/extensions/best-practices.rst
    A doc/extensions/converters.rst
    A doc/extensions/index.rst
    A doc/extensions/plugin-interfaces.rst
    A doc/extensions/plugins-toolkit.rst
    A doc/extensions/testing-extensions.rst
    A doc/extensions/tutorial.rst
    A doc/extensions/validators.rst
    M doc/i18n.rst
    M doc/index.rst
    M doc/multilingual.rst
    M doc/tag-vocabularies.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    R doc/toolkit.rst
    M doc/upgrade-source.rst
    R doc/writing-extensions.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  fix merge conflicts


  Commit: 00bea6da714706f89a5dea8ebf9cbaaf520a6b83
      https://github.com/ckan/ckan/commit/00bea6da714706f89a5dea8ebf9cbaaf520a6b83
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/logic/schema.py
    R ckan/migration/versions/071_add_resource_view.py
    A ckan/migration/versions/072_add_resource_view.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#1251] updates to resource view logic, remove ordering in the api


  Commit: c06866509de4ae0ab9042657af393826a6411cf5
      https://github.com/ckan/ckan/commit/c06866509de4ae0ab9042657af393826a6411cf5
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

  Changed paths:
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/model/resource_view.py
    M ckan/plugins/interfaces.py
    M ckan/tests/logic/test_action.py
    M setup.py

  Log Message:
  -----------
  [#1251] view reordering and config on top level


  Commit: 421a7b8130af9861c64faeac95f28ac9abe0ab1a
      https://github.com/ckan/ckan/commit/421a7b8130af9861c64faeac95f28ac9abe0ab1a
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

  Changed paths:
    M README.rst
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/controllers/template.py
    M ckan/lib/base.py
    M ckan/logic/auth/create.py
    M ckan/model/meta.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/javascript/main.js
    M ckan/public/base/less/activity.less
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/snippets/info.html
    A ckan/templates/package/snippets/resource_help.html
    M ckan/tests/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_tag.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    R ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py

  Log Message:
  -----------
  merge master fixes


  Commit: c36e377da7a52facd804818c568fc3c6ee95496f
      https://github.com/ckan/ckan/commit/c36e377da7a52facd804818c568fc3c6ee95496f
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-29 (Tue, 29 Oct 2013)

  Changed paths:
    A ckanext/imageview/__init__.py
    A ckanext/imageview/plugin.py

  Log Message:
  -----------
  [#1251] add image view


  Commit: 2a184a2261773cef77f416410965b19a67ce03e5
      https://github.com/ckan/ckan/commit/2a184a2261773cef77f416410965b19a67ce03e5
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/schema.py
    M ckan/plugins/interfaces.py
    A ckan/templates/package/edit_view.html
    A ckan/templates/package/new_view.html
    M ckan/templates/package/resource_edit_base.html
    A ckan/templates/package/resource_views.html
    A ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_help.html
    A ckan/templates/package/view_edit_base.html
    M ckanext/imageview/plugin.py
    A ckanext/imageview/theme/templates/image_form.html

  Log Message:
  -----------
  [#1251] add view forms


  Commit: 8cc293cf0646f563e9fcb91265815acc4a9cfb00
      https://github.com/ckan/ckan/commit/8cc293cf0646f563e9fcb91265815acc4a9cfb00
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M ckan/lib/datapreview.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/plugins/interfaces.py

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


  Commit: e6ba1e987f2db6c4756e87897cf2dab81ef0e34c
      https://github.com/ckan/ckan/commit/e6ba1e987f2db6c4756e87897cf2dab81ef0e34c
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/resource_item.html
    A ckan/templates/package/snippets/resource_view.html

  Log Message:
  -----------
  [#1251] Show resource views on resource read page.
Still unstyled.


  Commit: 5737dcd5998a2bdba1421d51778be48ad16532a9
      https://github.com/ckan/ckan/commit/5737dcd5998a2bdba1421d51778be48ad16532a9
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

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

  Log Message:
  -----------
  [#1251] Update ckanext.imageview


  Commit: eb5bf29b465dc3319812f52bea49045aaf39e850
      https://github.com/ckan/ckan/commit/eb5bf29b465dc3319812f52bea49045aaf39e850
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/view_edit_base.html

  Log Message:
  -----------
  [#1251] add preview


  Commit: e1e41b2659bac18e83fef4004fcc8250a1ae450e
      https://github.com/ckan/ckan/commit/e1e41b2659bac18e83fef4004fcc8250a1ae450e
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/plugins/interfaces.py
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/resource_item.html
    A ckan/templates/package/snippets/resource_view.html
    M ckanext/imageview/plugin.py
    A ckanext/imageview/theme/templates/image_view.html

  Log Message:
  -----------
  [#1251] fix merge conflicts


  Commit: 5cfaff2008fa56ac1461e27bbe8ccb68dc9e6171
      https://github.com/ckan/ckan/commit/5cfaff2008fa56ac1461e27bbe8ccb68dc9e6171
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#1251] fix schema name issue in merge


  Commit: f0f771e51666e014d2051373b1776158d1e6a34b
      https://github.com/ckan/ckan/commit/f0f771e51666e014d2051373b1776158d1e6a34b
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#1251] a few changed to how interfaces work


  Commit: 1db8d708de19b0c22f2ef48f69eee87d18056dba
      https://github.com/ckan/ckan/commit/1db8d708de19b0c22f2ef48f69eee87d18056dba
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/plugins/interfaces.py
    M ckan/templates/package/view_edit_base.html

  Log Message:
  -----------
  [#1251] Update IResourceView interface.

Use 'view' instead of 'preview' and update docstrings.
Update code that uses IResourceView plugins
accordingly.


  Commit: 0b930d13fc06eacbe5f028f7f8195597a042b9bc
      https://github.com/ckan/ckan/commit/0b930d13fc06eacbe5f028f7f8195597a042b9bc
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

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

  Log Message:
  -----------
  [#1251] Update ckanext.imageview to work with new
IResourceView changes.

Use 'view' instead of 'preview'.

Move 'form_template' to top level method.

If no image_url specified, try to view the resource url.


  Commit: a9d2c1e8c99c8f37a6d23a21096ca12707bc413a
      https://github.com/ckan/ckan/commit/a9d2c1e8c99c8f37a6d23a21096ca12707bc413a
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ckan/tests/logic/test_action.py
    M ckanext/imageview/plugin.py

  Log Message:
  -----------
  [#1251] Fix failing tests.


  Commit: 29a775916886b2898665f878b52451ac01762024
      https://github.com/ckan/ckan/commit/29a775916886b2898665f878b52451ac01762024
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#1251] Bug fix: resource_view_list returns [] if
no views, not NotFound


  Commit: 7f138efa1a3a282beeb87131d90e2197f1e6cdbb
      https://github.com/ckan/ckan/commit/7f138efa1a3a282beeb87131d90e2197f1e6cdbb
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#1251] fix preview


  Commit: 97213f041e03c515f921fb489e34a732277a5344
      https://github.com/ckan/ckan/commit/97213f041e03c515f921fb489e34a732277a5344
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/1251-resource-view' into 1251-resource-view


  Commit: 0ddeec82f8ce569f6fcb3f591490e2dc2df712ac
      https://github.com/ckan/ckan/commit/0ddeec82f8ce569f6fcb3f591490e2dc2df712ac
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckanext/imageview/theme/templates/image_view.html
    M ckanext/resourceproxy/plugin.py

  Log Message:
  -----------
  [#1251] view proxy sort out


  Commit: cbe662fb26ad7a8f81fdcc4026fdce722502b364
      https://github.com/ckan/ckan/commit/cbe662fb26ad7a8f81fdcc4026fdce722502b364
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    A ckanext/imageview/tests/__init__.py
    A ckanext/imageview/tests/test_view.py

  Log Message:
  -----------
  [#1251] Add basic imageview test


  Commit: 65796b9304b4890e04d6cb6b7b52c39cb4d51dcb
      https://github.com/ckan/ckan/commit/65796b9304b4890e04d6cb6b7b52c39cb4d51dcb
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/view_edit_base.html
    M ckanext/imageview/plugin.py

  Log Message:
  -----------
  [#1251] Add iframe to resource view snippet.

Allow view plugins to disable iframing by setting
'iframed': False in their info dicts.

Actual iframe URL not included yet.


  Commit: 82101eb7a24939e9b0ce53e335ddf723e822775b
      https://github.com/ckan/ckan/commit/82101eb7a24939e9b0ce53e335ddf723e822775b
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/view_edit_base.html
    M ckanext/imageview/plugin.py
    A ckanext/imageview/tests/__init__.py
    A ckanext/imageview/tests/test_view.py

  Log Message:
  -----------
  fix merge issue in branch


  Commit: 374c130db0697f673aa2c8d8f35b8514d8759fbb
      https://github.com/ckan/ckan/commit/374c130db0697f673aa2c8d8f35b8514d8759fbb
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#1251] Add resource_view controller


  Commit: b20bbf77fd9810fc841bceffd4bd363cd51ac2d9
      https://github.com/ckan/ckan/commit/b20bbf77fd9810fc841bceffd4bd363cd51ac2d9
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckanext/imageview/theme/templates/image_view.html
    M ckanext/resourceproxy/plugin.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/1251-resource-view' into 1251-resource-view


  Commit: ede25899147eadc826b692f77665554c8c58ffec
      https://github.com/ckan/ckan/commit/ede25899147eadc826b692f77665554c8c58ffec
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/templates/package/snippets/resource_view.html
    M ckanext/textpreview/plugin.py
    R ckanext/textpreview/theme/templates/text.html
    A ckanext/textpreview/theme/templates/text_form.html
    A ckanext/textpreview/theme/templates/text_view.html

  Log Message:
  -----------
  [#1251] Set iframe src URL in resource_view snippet.

Update textpreview plugin.


  Commit: 294ed98b9c42e340886948230214f39f7e23ab1d
      https://github.com/ckan/ckan/commit/294ed98b9c42e340886948230214f39f7e23ab1d
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/templates/package/snippets/resource_view.html
    M ckanext/textpreview/plugin.py
    M ckanext/textpreview/theme/public/preview_text.js
    M ckanext/textpreview/theme/templates/text_view.html

  Log Message:
  -----------
  [#1251] fix preview on new and proxy textpreview plugin


  Commit: f2e49d5165fe35b5dea5ec69f66225e731c7e987
      https://github.com/ckan/ckan/commit/f2e49d5165fe35b5dea5ec69f66225e731c7e987
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M ckan/templates/dataviewer/base.html
    M ckanext/pdfpreview/plugin.py
    M ckanext/pdfpreview/theme/public/preview_pdf.js
    M ckanext/pdfpreview/theme/templates/pdf.html
    M ckanext/textpreview/plugin.py

  Log Message:
  -----------
  [#1251] fix pdf view


  Commit: 1080ac0c5e32cc459dc6aeabdd6a99a154613231
      https://github.com/ckan/ckan/commit/1080ac0c5e32cc459dc6aeabdd6a99a154613231
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M ckanext/reclinepreview/plugin.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    R ckanext/reclinepreview/theme/templates/recline.html
    A ckanext/reclinepreview/theme/templates/recline_graph_form.html
    A ckanext/reclinepreview/theme/templates/recline_grid_form.html
    A ckanext/reclinepreview/theme/templates/recline_map_form.html
    A ckanext/reclinepreview/theme/templates/recline_view.html
    M setup.py

  Log Message:
  -----------
  [#1251] Updating Recline views for new IResourceView
interface.

The only view options that are currently supported
are row offset and limit (so the graph in
particular is not usable at the moment).


  Commit: 3fb5eee7d9de7a663b1371c0c8d004986cbad5e9
      https://github.com/ckan/ckan/commit/3fb5eee7d9de7a663b1371c0c8d004986cbad5e9
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M ckan/public/base/javascript/main.js

  Log Message:
  -----------
  [#1251] Disable JS popover call.

Throws an error which is currently preventing
Recline views from loading.


  Commit: af9903e712bc2f552d94b763c0aa05618ae97d8d
      https://github.com/ckan/ckan/commit/af9903e712bc2f552d94b763c0aa05618ae97d8d
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    A ckan/templates/package/snippets/resource_view_embed.html

  Log Message:
  -----------
  [#1251] Fix embed link for non iframe views


  Commit: 5acd949d430cb2f71f739d62c0915d2b3fa3938e
      https://github.com/ckan/ckan/commit/5acd949d430cb2f71f739d62c0915d2b3fa3938e
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    A ckanext/webpageview/__init__.py
    A ckanext/webpageview/plugin.py
    A ckanext/webpageview/tests/__init__.py
    A ckanext/webpageview/tests/test_view.py
    A ckanext/webpageview/theme/templates/webpage_form.html
    A ckanext/webpageview/theme/templates/webpage_view.html
    M setup.py

  Log Message:
  -----------
  [#1251] webpage view type


  Commit: c682c4015d1f272914d7a43e5f6a7965a15fb123
      https://github.com/ckan/ckan/commit/c682c4015d1f272914d7a43e5f6a7965a15fb123
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M ckan/public/base/javascript/main.js
    M ckanext/reclinepreview/plugin.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    R ckanext/reclinepreview/theme/templates/recline.html
    A ckanext/reclinepreview/theme/templates/recline_graph_form.html
    A ckanext/reclinepreview/theme/templates/recline_grid_form.html
    A ckanext/reclinepreview/theme/templates/recline_map_form.html
    A ckanext/reclinepreview/theme/templates/recline_view.html
    M setup.py

  Log Message:
  -----------
  Merge branch '1251-resource-view' of github.com:okfn/ckan into 1251-resource-view


  Commit: 1cca7da1eb61763d4a3cb30c0de5cc001fcc415f
      https://github.com/ckan/ckan/commit/1cca7da1eb61763d4a3cb30c0de5cc001fcc415f
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M ckanext/reclinepreview/plugin.py

  Log Message:
  -----------
  [#1251] Bug fix: change ReclineView ignore_missing
validator to ignore_empty


  Commit: ffbd9e5867b2e7bc7e22a0b05dae3b6bc983d8fc
      https://github.com/ckan/ckan/commit/ffbd9e5867b2e7bc7e22a0b05dae3b6bc983d8fc
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/view_form.html
    M ckan/templates/package/view_edit_base.html

  Log Message:
  -----------
  [#1251] Pass View template variables through to
edit templates. Templates added using 'include'
instead of 'snippet'.

Edit and view templates did not have a consistent
name for the resource_view dict, have changed the
view templates to just 'data' for now.


  Commit: aa6efd550dc61af2fae8dc9c3d2cfd2a4dcbc4f2
      https://github.com/ckan/ckan/commit/aa6efd550dc61af2fae8dc9c3d2cfd2a4dcbc4f2
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M ckanext/pdfpreview/plugin.py

  Log Message:
  -----------
  [#1251] Remove unused import from pdfpreview


  Commit: afff845da26e0bc8ee11ddb8e7987880ad73495b
      https://github.com/ckan/ckan/commit/afff845da26e0bc8ee11ddb8e7987880ad73495b
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M ckanext/reclinepreview/plugin.py
    M ckanext/reclinepreview/theme/templates/recline_graph_form.html

  Log Message:
  -----------
  [#1251] Use 'data' instead of 'resource_view' in
ReclineView setup_template_variables.

Add simple ReclineGraph schema (still need validators)


  Commit: 3f1f4849745f46a253ee372f3e87f9ef291fd979
      https://github.com/ckan/ckan/commit/3f1f4849745f46a253ee372f3e87f9ef291fd979
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-08 (Fri, 08 Nov 2013)

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

  Log Message:
  -----------
  [#1251] add default views for basic types


  Commit: 2cfed649d2957884854d607d43963e56b5ca28c0
      https://github.com/ckan/ckan/commit/2cfed649d2957884854d607d43963e56b5ca28c0
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-08 (Fri, 08 Nov 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/view_form.html
    M ckan/templates/package/view_edit_base.html
    M ckanext/pdfpreview/plugin.py
    M ckanext/reclinepreview/plugin.py
    M ckanext/reclinepreview/theme/templates/recline_graph_form.html

  Log Message:
  -----------
  Merge branch '1251-resource-view' of github.com:okfn/ckan into 1251-resource-view


  Commit: 387c3275e0e785fdae9989c79878d5abf4bb7b7c
      https://github.com/ckan/ckan/commit/387c3275e0e785fdae9989c79878d5abf4bb7b7c
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

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

  Log Message:
  -----------
  [#1251] add paster commands to create default views and clean out ones that are no longer in plugins


  Commit: 35c2184dd525a89135f3bd905c72f1ae68f27089
      https://github.com/ckan/ckan/commit/35c2184dd525a89135f3bd905c72f1ae68f27089
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/templates/package/snippets/resource_view.html
    M ckanext/reclinepreview/plugin.py

  Log Message:
  -----------
  [#1251] add resource view back in data_dict sent to all templates


  Commit: fa49b546b2cd66502d5d5156bff00db4cf390dcb
      https://github.com/ckan/ckan/commit/fa49b546b2cd66502d5d5156bff00db4cf390dcb
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M ckan/lib/cli.py
    M ckanext/datapusher/logic/action.py

  Log Message:
  -----------
  [#1251] recline default view and migration


  Commit: 7a4c443f06c889c0a7febd0b8869e866569ada42
      https://github.com/ckan/ckan/commit/7a4c443f06c889c0a7febd0b8869e866569ada42
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

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

  Log Message:
  -----------
  [#1251] allways pass preview as params


  Commit: e66b41313973667457d9c8829223cd1a072cfecb
      https://github.com/ckan/ckan/commit/e66b41313973667457d9c8829223cd1a072cfecb
  Author: John <john at Johns-MacBook-Pro.local>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

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

  Log Message:
  -----------
  [#1251] Use 'include' instead of 'snippet' on new_view
template


  Commit: 94238a951ce45f0377d98dfb1431392084340e07
      https://github.com/ckan/ckan/commit/94238a951ce45f0377d98dfb1431392084340e07
  Author: John <john at Johns-MacBook-Pro.local>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M ckanext/reclinepreview/plugin.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/templates/recline_graph_form.html

  Log Message:
  -----------
  [#1251] Update Recline Graph. Enables graph
type and fields to be selected/saved.


  Commit: fcfedadd6d193f1b80a94d6a1b04f4c3bce75131
      https://github.com/ckan/ckan/commit/fcfedadd6d193f1b80a94d6a1b04f4c3bce75131
  Author: John <john at Johns-MacBook-Pro.local>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M ckanext/reclinepreview/plugin.py
    R ckanext/reclinepreview/tests/test_preview.py
    A ckanext/reclinepreview/tests/test_view.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/templates/recline_map_form.html

  Log Message:
  -----------
  [#1251] Update Recline Views.

Add basic config for map view. Add basic tests.


  Commit: bb86aeb1daf86cc7a45b2d30277ea173c42af41f
      https://github.com/ckan/ckan/commit/bb86aeb1daf86cc7a45b2d30277ea173c42af41f
  Author: John <john at Johns-MacBook-Pro.local>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M ckanext/reclinepreview/tests/test_view.py
    M ckanext/textpreview/plugin.py
    R ckanext/textpreview/tests/test_preview.py
    A ckanext/textpreview/tests/test_view.py

  Log Message:
  -----------
  [#1251] Fix ckanext.textpreview tests


  Commit: ca477a8693ec658cd4ae40a6c997fcb0331857e8
      https://github.com/ckan/ckan/commit/ca477a8693ec658cd4ae40a6c997fcb0331857e8
  Author: John <john at Johns-MacBook-Pro.local>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M ckanext/pdfpreview/plugin.py
    R ckanext/pdfpreview/tests/test_preview.py
    A ckanext/pdfpreview/tests/test_view.py

  Log Message:
  -----------
  [#1251] Fix pdfpreview tests


  Commit: 6b22981454316b605b0fca9984f40a98b6b59789
      https://github.com/ckan/ckan/commit/6b22981454316b605b0fca9984f40a98b6b59789
  Author: John <john at Johns-MacBook-Pro.local>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

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

  Log Message:
  -----------
  [#1251] PEP8 resource proxy tests, tidy imports a bit


  Commit: 4bd5cbc41c55a1fdf5628f9d004f22c38ba8fa09
      https://github.com/ckan/ckan/commit/4bd5cbc41c55a1fdf5628f9d004f22c38ba8fa09
  Author: John <john at Johns-MacBook-Pro.local>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M ckan/lib/datapreview.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/logic/action.py
    M ckanext/imageview/plugin.py
    M ckanext/reclinepreview/tests/test_view.py
    M ckanext/webpageview/plugin.py

  Log Message:
  -----------
  [#1251] Fixes for coding standards test failures


  Commit: 36982ac3b86418554852333ce5001f18a2807a88
      https://github.com/ckan/ckan/commit/36982ac3b86418554852333ce5001f18a2807a88
  Author: John <john at Johns-MacBook-Pro.local>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

  Changed paths:
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/templates/recline_view.html

  Log Message:
  -----------
  [#1251] Add pagination widget to Recline Grid


  Commit: c78ff4adad5847ef0dec01a4d1ee7576f82dddd3
      https://github.com/ckan/ckan/commit/c78ff4adad5847ef0dec01a4d1ee7576f82dddd3
  Author: John <john at Johns-MacBook-Pro.local>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py
    M ckanext/textpreview/plugin.py

  Log Message:
  -----------
  [#1251] Fix more tests


  Commit: 679f8c8de9576ab5ff7233e36079a5d1da60bdc3
      https://github.com/ckan/ckan/commit/679f8c8de9576ab5ff7233e36079a5d1da60bdc3
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

  Changed paths:
    M ckan/public/base/less/dataset.less
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/view_help.html
    M ckan/templates/package/view_edit_base.html

  Log Message:
  -----------
  [#1251] Updates to the resource view admin pages


  Commit: bc756f5ddc68b97836eb5299424456f3e7bf6f5f
      https://github.com/ckan/ckan/commit/bc756f5ddc68b97836eb5299424456f3e7bf6f5f
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

  Changed paths:
    A ckan/public/base/javascript/modules/resource-views.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_views_list.html
    A ckan/templates/package/snippets/resource_views_list_item.html

  Log Message:
  -----------
  [#1251] First working version of nav with view being shown


  Commit: 8eeffdfefc31e8110f043db619126fa02b57832d
      https://github.com/ckan/ckan/commit/8eeffdfefc31e8110f043db619126fa02b57832d
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-views.js
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html

  Log Message:
  -----------
  [#1251] Simplifies resource_read view templates by using hashes to allow for hot linking


  Commit: 5287e8f4095b1189f58a45b670b1ca86300c10bb
      https://github.com/ckan/ckan/commit/5287e8f4095b1189f58a45b670b1ca86300c10bb
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-views.js
    M ckan/public/base/less/dataset.less

  Log Message:
  -----------
  [#1251] Adds scrolling to resource nav


  Commit: 72be22edcc57c54b79e564a4c85d5383ecca7f7f
      https://github.com/ckan/ckan/commit/72be22edcc57c54b79e564a4c85d5383ecca7f7f
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-views.js
    M ckan/public/base/less/dataset.less
    M ckan/templates/package/snippets/resource_view.html

  Log Message:
  -----------
  [#1251] Adds custom scrollbar to webkit and small tweaks to JS


  Commit: 6ea4be70153dd5830076c4ac5285e094ef849ff3
      https://github.com/ckan/ckan/commit/6ea4be70153dd5830076c4ac5285e094ef849ff3
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

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

  Log Message:
  -----------
  [#1251] Tweak to resource_view to show title + desc


  Commit: 2ce3a9693ee46227628ef618a43ab47cc724fcc1
      https://github.com/ckan/ckan/commit/2ce3a9693ee46227628ef618a43ab47cc724fcc1
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckanext/pdfpreview/plugin.py
    M ckanext/reclinepreview/plugin.py
    M ckanext/textpreview/plugin.py
    M ckanext/webpageview/plugin.py

  Log Message:
  -----------
  [#1251] add icon support and better default icons


  Commit: e074ad159923216cf4eb715ee32faa17bf89d790
      https://github.com/ckan/ckan/commit/e074ad159923216cf4eb715ee32faa17bf89d790
  Author: John Martin <me at johnmart.in>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

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

  Log Message:
  -----------
  [#1251] Correct URL from 'View view' link


  Commit: 9479428290c0a85f632e2dc646dfe1fb3ee97e7f
      https://github.com/ckan/ckan/commit/9479428290c0a85f632e2dc646dfe1fb3ee97e7f
  Author: John Martin <me at johnmart.in>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

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

  Log Message:
  -----------
  [#1251] Makes resource iframe previews have full URLs for height calculation purposes


  Commit: 6ddf8ff372efdb9f2499d556b023e389061507e3
      https://github.com/ckan/ckan/commit/6ddf8ff372efdb9f2499d556b023e389061507e3
  Author: John Martin <me at johnmart.in>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    M ckanext/reclinepreview/theme/public/css/recline.css
    M ckanext/reclinepreview/theme/templates/recline_view.html

  Log Message:
  -----------
  [#1251] Tweaks to pagination controls on grid view


  Commit: e5c3200fefcb4aed90fe69d2198c4d3dc841b5ef
      https://github.com/ckan/ckan/commit/e5c3200fefcb4aed90fe69d2198c4d3dc841b5ef
  Author: John Martin <me at johnmart.in>
  Date:   2013-12-04 (Wed, 04 Dec 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html

  Log Message:
  -----------
  [#1251] Makes resource_read view all based of GET requests and not JS+hashes


  Commit: c715404e013892843508f501f95814f7961598ab
      https://github.com/ckan/ckan/commit/c715404e013892843508f501f95814f7961598ab
  Author: John Martin <me at johnmart.in>
  Date:   2013-12-04 (Wed, 04 Dec 2013)

  Changed paths:
    R ckan/public/base/javascript/modules/resource-views.js
    M ckan/public/base/javascript/resource.config

  Log Message:
  -----------
  [#1251] Removed old no longer needed JS module for resource views


  Commit: 7193f16ee4ca282b5e5264b862cc2e6d3aad41c9
      https://github.com/ckan/ckan/commit/7193f16ee4ca282b5e5264b862cc2e6d3aad41c9
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M ckanext/reclinepreview/plugin.py
    M ckanext/reclinepreview/tests/test_view.py
    R ckanext/reclinepreview/theme/templates/recline_grid_form.html

  Log Message:
  -----------
  [#1251] Remove offset/limit parameters on Recline's Grid view

As we already have pagination and page size, they're useless.


  Commit: 82def587efbda843ba20909c7e05ba140db61fdb
      https://github.com/ckan/ckan/commit/82def587efbda843ba20909c7e05ba140db61fdb
  Author: kindly <kindly at gmail.com>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#1251] Add icon to dropdown list


  Commit: 869c125a3516f2982b6f2c0db8a5664358facd78
      https://github.com/ckan/ckan/commit/869c125a3516f2982b6f2c0db8a5664358facd78
  Author: John Martin <me at johnmart.in>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

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

  Log Message:
  -----------
  [#1251] Added icon to new view dropdown


  Commit: 1ec77f8043454092032ee9a3d44167d47dcff594
      https://github.com/ckan/ckan/commit/1ec77f8043454092032ee9a3d44167d47dcff594
  Author: John Martin <me at johnmart.in>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M ckanext/imageview/plugin.py

  Log Message:
  -----------
  [#1251] Added icon to image view


  Commit: 21ed9a3862a070912edda1c0ad3ef9c84b8e1a60
      https://github.com/ckan/ckan/commit/21ed9a3862a070912edda1c0ad3ef9c84b8e1a60
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

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

  Log Message:
  -----------
  [#1251] Fixes ResourceProxy tests and add some new ones


  Commit: f4af92da359be5ea89783831619a552f6acd8da7
      https://github.com/ckan/ckan/commit/f4af92da359be5ea89783831619a552f6acd8da7
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M ckan/tests/test_plugins.py

  Log Message:
  -----------
  [#1251] Fix TestPlugins.test_plugin_loading_order

We used to check if the plugins are loaded in the correct order by removing the
last loaded plugins from the array. That used to be 2, but as we created new
plugins, this isn't true anymore.

To make the test more stable, I've changed it to not depend on the number of
plugins loaded before the ones we're interested in testing.


  Commit: 1ed767dd193a50af7abe74e039775e4ecc84155d
      https://github.com/ckan/ckan/commit/1ed767dd193a50af7abe74e039775e4ecc84155d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M ckan/lib/datapreview.py

  Log Message:
  -----------
  [#1251] Fix error on getting the newly created resources

We need to get the new resources to be able to create the default resource
views. To do so, we use the session's _object_cache. The problem is that the
current session might not have an _object_cache. This happens when the
transaction hasn't been flushed yet, or when it has been flushed but no new
objects were created.

This change supports both cases.


  Commit: 8d01cec1568a95bc85ebf34aaf288fa84d7b4760
      https://github.com/ckan/ckan/commit/8d01cec1568a95bc85ebf34aaf288fa84d7b4760
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

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

  Log Message:
  -----------
  [#1251] Fix small typo extenstion -> extension


  Commit: 79e806c0df5e5c56c41b39b8f4fb0e33f5778404
      https://github.com/ckan/ckan/commit/79e806c0df5e5c56c41b39b8f4fb0e33f5778404
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M .travis.yml
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M MANIFEST.in
    M README.rst
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    R ckan/config/solr/CHANGELOG.txt
    M ckan/config/solr/README.txt
    M ckan/config/solr/schema-1.2.xml
    M ckan/config/solr/schema-1.3.xml
    M ckan/config/solr/schema-1.4.xml
    M ckan/config/solr/schema-2.0.xml
    A 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/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/accept.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/munge.py
    M ckan/lib/plugins.py
    A ckan/lib/uploader.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/group.py
    M ckan/new_authz.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/test_validators.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/javascript/client.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/custom-fields.js
    A ckan/public/base/javascript/modules/image-upload.js
    A ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/search.less
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    A ckan/public/base/vendor/jquery.ui.core.js
    A ckan/public/base/vendor/jquery.ui.mouse.js
    A ckan/public/base/vendor/jquery.ui.sortable.js
    M ckan/public/base/vendor/jquery.ui.widget.js
    R ckan/public/base/vendor/jquery.ui.widget.min.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/config.html
    M ckan/templates/base.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/edit.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/layout1.html
    M ckan/templates/home/layout2.html
    M ckan/templates/home/layout3.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/activity.html
    R ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    A ckan/templates/package/group_list.html
    M ckan/templates/package/new.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resources.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/search_result_text.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/login.html
    M ckan/templates/user/read.html
    M ckan/templates/user/read_base.html
    R ckan/templates/user/snippets/back_to_user_action.html
    M ckan/templates/user/snippets/login_form.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/lib/test_accept.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_solr_schema_version.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/models/test_group.py
    M ckan/tests/test_coding_standards.py
    R ckan_deb/DEBIAN/control.template
    R ckan_deb/usr/bin/ckan-create-instance
    R ckan_deb/usr/bin/ckan-instance-maintenance
    R ckan_deb/usr/bin/ckan-setup-solr
    R ckan_deb/usr/lib/ckan/common.sh
    M ckanext/datapusher/helpers.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    R ckanext/example_iauthfunctions/plugin.py
    A ckanext/example_iauthfunctions/plugin_v4.py
    A ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    A ckanext/example_theme/__init__.py
    A ckanext/example_theme/custom_config_setting/__init__.py
    A ckanext/example_theme/custom_config_setting/plugin.py
    A ckanext/example_theme/custom_config_setting/templates/home/layout1.html
    A ckanext/example_theme/custom_config_setting/templates/snippets
    A ckanext/example_theme/v01_empty_extension/__init__.py
    A ckanext/example_theme/v01_empty_extension/plugin.py
    A ckanext/example_theme/v02_empty_template/__init__.py
    A ckanext/example_theme/v02_empty_template/plugin.py
    A ckanext/example_theme/v02_empty_template/templates/home/index.html
    A ckanext/example_theme/v03_jinja/__init__.py
    A ckanext/example_theme/v03_jinja/plugin.py
    A ckanext/example_theme/v03_jinja/templates/home/index.html
    A ckanext/example_theme/v04_ckan_extends/__init__.py
    A ckanext/example_theme/v04_ckan_extends/plugin.py
    A ckanext/example_theme/v04_ckan_extends/templates/home/index.html
    A ckanext/example_theme/v05_block/__init__.py
    A ckanext/example_theme/v05_block/plugin.py
    A ckanext/example_theme/v05_block/templates/home/layout1.html
    A ckanext/example_theme/v06_super/__init__.py
    A ckanext/example_theme/v06_super/plugin.py
    A ckanext/example_theme/v06_super/templates/home/layout1.html
    A ckanext/example_theme/v07_helper_function/__init__.py
    A ckanext/example_theme/v07_helper_function/plugin.py
    A ckanext/example_theme/v07_helper_function/templates/home/layout1.html
    A ckanext/example_theme/v08_custom_helper_function/__init__.py
    A ckanext/example_theme/v08_custom_helper_function/plugin.py
    A ckanext/example_theme/v08_custom_helper_function/templates/home/layout1.html
    A ckanext/example_theme/v09_snippet/__init__.py
    A ckanext/example_theme/v09_snippet/plugin.py
    A ckanext/example_theme/v09_snippet/templates/home/layout1.html
    A ckanext/example_theme/v10_custom_snippet/__init__.py
    A ckanext/example_theme/v10_custom_snippet/plugin.py
    A ckanext/example_theme/v10_custom_snippet/templates/home/layout1.html
    A ckanext/example_theme/v10_custom_snippet/templates/snippets/example_theme_most_popular_groups.html
    A ckanext/example_theme/v11_HTML_and_CSS/__init__.py
    A ckanext/example_theme/v11_HTML_and_CSS/plugin.py
    A ckanext/example_theme/v11_HTML_and_CSS/templates/home/layout1.html
    A ckanext/example_theme/v11_HTML_and_CSS/templates/snippets/example_theme_most_popular_groups.html
    A ckanext/example_theme/v12_extra_public_dir/__init__.py
    A ckanext/example_theme/v12_extra_public_dir/plugin.py
    A ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
    A ckanext/example_theme/v12_extra_public_dir/templates/home/layout1.html
    A ckanext/example_theme/v12_extra_public_dir/templates/home/snippets/promoted.html
    A ckanext/example_theme/v12_extra_public_dir/templates/snippets
    A ckanext/example_theme/v13_custom_css/__init__.py
    A ckanext/example_theme/v13_custom_css/plugin.py
    A ckanext/example_theme/v13_custom_css/public/example_theme.css
    A ckanext/example_theme/v13_custom_css/public/promoted-image.jpg
    A ckanext/example_theme/v13_custom_css/templates/base.html
    A ckanext/example_theme/v13_custom_css/templates/home
    A ckanext/example_theme/v13_custom_css/templates/snippets
    A ckanext/example_theme/v14_more_custom_css/__init__.py
    A ckanext/example_theme/v14_more_custom_css/plugin.py
    A ckanext/example_theme/v14_more_custom_css/public/example_theme.css
    A ckanext/example_theme/v14_more_custom_css/public/promoted-image.jpg
    A ckanext/example_theme/v14_more_custom_css/templates
    A ckanext/example_theme/v15_fanstatic/__init__.py
    A ckanext/example_theme/v15_fanstatic/fanstatic/example_theme.css
    A ckanext/example_theme/v15_fanstatic/plugin.py
    A ckanext/example_theme/v15_fanstatic/public/promoted-image.jpg
    A ckanext/example_theme/v15_fanstatic/templates/base.html
    A ckanext/example_theme/v15_fanstatic/templates/home
    A ckanext/example_theme/v15_fanstatic/templates/snippets
    A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
    A ckanext/example_theme/v16_initialize_a_javascript_module/plugin.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/public
    A ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
    A ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    M ckanext/imageview/plugin.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/pdfpreview/plugin.py
    M ckanext/reclinepreview/tests/test_view.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/textpreview/plugin.py
    M ckanext/webpageview/plugin.py
    A doc/.gitignore
    A doc/_static/ckanlogo.png
    M doc/_templates/footer.html
    M doc/_themes/sphinx-theme-okfn
    M doc/api.rst
    A doc/appendices/index.rst
    A doc/appendices/solr-multicore.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    R doc/ckan-coding-standards.rst
    M doc/conf.py
    M doc/configuration.rst
    A doc/contents.rst
    R doc/contributing.rst
    A doc/contributing/architecture.rst
    A doc/contributing/commit-messages.rst
    A doc/contributing/css.rst
    A doc/contributing/database-migrations.rst
    A doc/contributing/documentation.rst
    A doc/contributing/frontend/index.rst
    A doc/contributing/frontend/javascript-module-tutorial.rst
    A doc/contributing/frontend/resources.rst
    A doc/contributing/frontend/template-blocks.rst
    A doc/contributing/frontend/template-tutorial.rst
    A doc/contributing/frontend/templating.rst
    A doc/contributing/html.rst
    A doc/contributing/i18n.rst
    A doc/contributing/index.rst
    A doc/contributing/issues.rst
    A doc/contributing/javascript.rst
    A doc/contributing/pull-requests.rst
    A doc/contributing/python.rst
    A doc/contributing/release-process.rst
    A doc/contributing/reviewing.rst
    A doc/contributing/testing.rst
    A doc/contributing/upgrading-dependencies.rst
    R doc/css-coding-standards.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/deployment.rst
    R doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    M doc/extensions/best-practices.rst
    A doc/extensions/custom-config-settings.rst
    M doc/extensions/index.rst
    M doc/extensions/tutorial.rst
    M doc/features.rst
    M doc/filestore.rst
    R doc/frontend-development.rst
    M doc/getting-started.rst
    R doc/html-coding-standards.rst
    R doc/i18n.rst
    A doc/images/add_dataset_1.jpg
    A doc/images/add_dataset_2.jpg
    A doc/images/add_dataset_3.jpg
    R doc/images/admin-page.png
    R doc/images/ckan_logo_box.png
    A doc/images/create_organization.jpg
    A doc/images/custom-css.png
    A doc/images/customize_look_and_feel.jpg
    A doc/images/debug-footer.png
    A doc/images/edit_dataset.jpg
    A doc/images/exploring_datasets.jpg
    A doc/images/extra-public-dir.png
    A doc/images/html_and_css.png
    A doc/images/manage_news_feed.jpg
    A doc/images/manage_organization.jpg
    A doc/images/manage_user_profile.jpg
    A doc/images/manage_users.jpg
    A doc/images/more-custom-css.png
    A doc/images/most-popular-groups-custom-snippet.png
    A doc/images/most-popular-groups-snippet.png
    A doc/images/most-popular-groups.png
    A doc/images/move_dataset_between_organizations.jpg
    A doc/images/recently-changed-packages-activity-stream.png
    A doc/images/register_account.jpg
    A doc/images/search_the_site.jpg
    M doc/index.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    R doc/javascript-coding-standards.rst
    R doc/javascript-module-tutorial.rst
    M doc/legacy-api.rst
    R doc/migration.rst
    M doc/multilingual.rst
    R doc/python-coding-standards.rst
    R doc/release-process.rst
    R doc/resources.rst
    R doc/solr-setup.rst
    M doc/stats.rst
    A doc/sysadmin-guide.rst
    M doc/tag-vocabularies.rst
    R doc/template-blocks.rst
    R doc/template-tutorial.rst
    R doc/templating.rst
    M doc/test.rst
    R doc/testing-coding-standards.rst
    R doc/theming.rst
    A doc/theming/best-practices.rst

  Log Message:
  -----------
  merge master fixes and correct css


  Commit: ad9ad7c81f5b08d194b2024205a49777e7701a7b
      https://github.com/ckan/ckan/commit/ad9ad7c81f5b08d194b2024205a49777e7701a7b
  Author: kindly <kindly at gmail.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/schema.py
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/view_edit_base.html

  Log Message:
  -----------
  [#1251] add extra helpers and a way to select preview


  Commit: 4c98742fe67ea1303047dc84a9e63b1544928e57
      https://github.com/ckan/ckan/commit/4c98742fe67ea1303047dc84a9e63b1544928e57
  Author: kindly <kindly at gmail.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

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

  Log Message:
  -----------
  [#1251] change size names in info


  Commit: 4e071a99a65e7e04cdfe8f28ccee810cd9cb952e
      https://github.com/ckan/ckan/commit/4e071a99a65e7e04cdfe8f28ccee810cd9cb952e
  Author: kindly <kindly at gmail.com>
  Date:   2014-02-06 (Thu, 06 Feb 2014)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/templates/package/view_edit_base.html
    M ckanext/imageview/plugin.py

  Log Message:
  -----------
  [#1470] add full page view edit form option for use with dashboards etc


  Commit: ed6902516b9a2356a761b98ac276e78f4d8ce7bf
      https://github.com/ckan/ckan/commit/ed6902516b9a2356a761b98ac276e78f4d8ce7bf
  Author: kindly <kindly at gmail.com>
  Date:   2014-02-10 (Mon, 10 Feb 2014)

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

  Log Message:
  -----------
  [#1251] fix link back to view page


  Commit: ad0e88e617cda8c5fb9de5f8a86c40575dca4e0e
      https://github.com/ckan/ckan/commit/ad0e88e617cda8c5fb9de5f8a86c40575dca4e0e
  Author: kindly <kindly at gmail.com>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

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

  Log Message:
  -----------
  [#1251] fix image sizing


  Commit: 684527a8395818743d92283e78a441fd8ca111de
      https://github.com/ckan/ckan/commit/684527a8395818743d92283e78a441fd8ca111de
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-22 (Sat, 22 Feb 2014)

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

  Log Message:
  -----------
  [#1251] Add base template's styles to embedded resource view page


  Commit: 3c72af38dfa0e09702d0aef4ad92ac7ae4e0f046
      https://github.com/ckan/ckan/commit/3c72af38dfa0e09702d0aef4ad92ac7ae4e0f046
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    A ckan/public/base/javascript/modules/resource-view-embed.js
    M ckan/public/base/javascript/resource.config
    M ckan/templates/package/snippets/resource_view.html

  Log Message:
  -----------
  [#1251] Add modal with code ready to use to embed a view


  Commit: 185572a603326ea3bf07ba925bbaeb6c440a6a91
      https://github.com/ckan/ckan/commit/185572a603326ea3bf07ba925bbaeb6c440a6a91
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/resource-view-embed.js

  Log Message:
  -----------
  [#1251] Style embed resource view's modal


  Commit: e94b2b6489a23437c2ec93d81aa9593a12167937
      https://github.com/ckan/ckan/commit/e94b2b6489a23437c2ec93d81aa9593a12167937
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-view-embed.js

  Log Message:
  -----------
  [#1251] Remove footer from resource view embed's modal

There're already many ways to close the modal. We don't need another one.


  Commit: ddd21aa144a1f869558edc7f787826fa42d0620d
      https://github.com/ckan/ckan/commit/ddd21aa144a1f869558edc7f787826fa42d0620d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

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

  Log Message:
  -----------
  [#1251] Embed view uses absolute URL in iframe


  Commit: 09b3d6252271ab9a0e3d28d42594464924e33856
      https://github.com/ckan/ckan/commit/09b3d6252271ab9a0e3d28d42594464924e33856
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-view-embed.js

  Log Message:
  -----------
  [#1251] Adds frameBorder="0" to the resource view's embed iframe

It's not valid HTML5, but there're no better ways so far AFAIK.


  Commit: 37e9428a141dfcdaab12284cd9e9ec5d7b957f90
      https://github.com/ckan/ckan/commit/37e9428a141dfcdaab12284cd9e9ec5d7b957f90
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-view-embed.js

  Log Message:
  -----------
  [#1251] Change embed code's help text

Copied from OpenSpending.


  Commit: de790b3b041cdf5f6a88df3e4b93bf454bf75780
      https://github.com/ckan/ckan/commit/de790b3b041cdf5f6a88df3e4b93bf454bf75780
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/resource-view-embed.js
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/resource-view-embed.less

  Log Message:
  -----------
  [#1251] Embed code now has configurable width/height

I also moved the CSS to the right place: the .less files.


  Commit: 59d778269f6baa2157c6742492be2a3de1d80a70
      https://github.com/ckan/ckan/commit/59d778269f6baa2157c6742492be2a3de1d80a70
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-view-embed.js

  Log Message:
  -----------
  [#1251] Don't try to center the modal div

The problem is that we were trying to get the element's height when it was
still hidden (display: none). This always return 0px.

There're a few hacks, or I could've moved the div when it was actually shown,
but I didn't feel it was worth it. I don't think it's that bad to have it show
at the top of the page.


  Commit: 98eb2331a9e280d6033bffc780754703ff6a1afa
      https://github.com/ckan/ckan/commit/98eb2331a9e280d6033bffc780754703ff6a1afa
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    M ckan/public/base/css/main.css
    M ckan/public/base/less/resource-view-embed.less

  Log Message:
  -----------
  [#1251] Style embed modal's width and height inputs


  Commit: cb6678cb90090a7226885a2377dda7b6ad47f0cf
      https://github.com/ckan/ckan/commit/cb6678cb90090a7226885a2377dda7b6ad47f0cf
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-25 (Tue, 25 Feb 2014)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-view-embed.js

  Log Message:
  -----------
  [#1251] Remove forgotten console.log


  Commit: 2fae506670babfc0f9928c4b046e5ce21da7643f
      https://github.com/ckan/ckan/commit/2fae506670babfc0f9928c4b046e5ce21da7643f
  Author: kindly <kindly at gmail.com>
  Date:   2014-02-27 (Thu, 27 Feb 2014)

  Changed paths:
    M ckan/public/base/css/main.css
    A ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html

  Log Message:
  -----------
  [#1251] resource view reordering


  Commit: 383ac379c4ae9a4f5d9397c036160278818bc924
      https://github.com/ckan/ckan/commit/383ac379c4ae9a4f5d9397c036160278818bc924
  Author: kindly <kindly at gmail.com>
  Date:   2014-02-27 (Thu, 27 Feb 2014)

  Changed paths:
    M ckan/public/base/css/main.css
    A ckan/public/base/javascript/modules/resource-view-embed.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/resource-view-embed.less
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_view_embed.html

  Log Message:
  -----------
  Merge branch '1251-resource-view' of github.com:ckan/ckan into 1251-resource-view


  Commit: 8814dee89a4b1d4f79e27d32a9c6a33fe608813c
      https://github.com/ckan/ckan/commit/8814dee89a4b1d4f79e27d32a9c6a33fe608813c
  Author: kindly <kindly at gmail.com>
  Date:   2014-02-28 (Fri, 28 Feb 2014)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/plugins/interfaces.py
    M ckan/templates/package/resource_read.html
    M ckanext/reclinepreview/plugin.py

  Log Message:
  -----------
  [#1251] revive old preview code


  Commit: 01092b2b874cd2f42e61446d4cca1e8fe48c6406
      https://github.com/ckan/ckan/commit/01092b2b874cd2f42e61446d4cca1e8fe48c6406
  Author: kindly <kindly at gmail.com>
  Date:   2014-02-28 (Fri, 28 Feb 2014)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/templates/dataviewer/base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/resource_views_list.html

  Log Message:
  -----------
  [#1251] let preview appear first if availiable


  Commit: c958157694541471a7d5334864da30f10edb1c94
      https://github.com/ckan/ckan/commit/c958157694541471a7d5334864da30f10edb1c94
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-07 (Fri, 07 Mar 2014)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#1251] Improve interface docstrings


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

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#1251] Improve views command help strings


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

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#1251] Improve views command output strings


  Commit: 8180ec7b3dcacc720f4e834168971cfe57f6010f
      https://github.com/ckan/ckan/commit/8180ec7b3dcacc720f4e834168971cfe57f6010f
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#1251] get rid of default previews for types with views


  Commit: bb614cf38ad6afa50054591ff485a91abb5b674f
      https://github.com/ckan/ckan/commit/bb614cf38ad6afa50054591ff485a91abb5b674f
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/plugins/toolkit.py
    M ckanext/imageview/plugin.py

  Log Message:
  -----------
  [#1251] make get_new_resources as part of the toolkit


  Commit: 8b45f62403e8f298a4aed4806b6357d707e56ae2
      https://github.com/ckan/ckan/commit/8b45f62403e8f298a4aed4806b6357d707e56ae2
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-12 (Wed, 12 Mar 2014)

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

  Log Message:
  -----------
  [#1251] dont get view that do not ahve a valid plugin


  Commit: 66f8245743215c51b9fb967cf6d548243ab1d546
      https://github.com/ckan/ckan/commit/66f8245743215c51b9fb967cf6d548243ab1d546
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-12 (Wed, 12 Mar 2014)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#1251] dont fail on resources in datastore but not in CKAN


  Commit: d5593d7f6c56c6cd75593ff0ac6c50e39af97996
      https://github.com/ckan/ckan/commit/d5593d7f6c56c6cd75593ff0ac6c50e39af97996
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#1251] Allow datastore search to be able to take lists to generage in statements


  Commit: 5e3f1c324c69a80e2767dba90a71a1775b9f0771
      https://github.com/ckan/ckan/commit/5e3f1c324c69a80e2767dba90a71a1775b9f0771
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    R .gitmodules
    M .travis.yml
    M .tx/config
    M CHANGELOG.rst
    M bin/travis-install-dependencies
    M ckan/__init__.py
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/controllers/package.py
    M ckan/controllers/revision.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
    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/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
    A ckan/i18n/he/LC_MESSAGES/ckan.mo
    A ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/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/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/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
    A ckan/i18n/vi/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi/LC_MESSAGES/ckan.po
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    A 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/mailer.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__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/schema.py
    M ckan/model/license.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/action/__init__.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_init.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/index.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/tag_list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/new.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/login_form.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/plugin.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/__init__.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/public
    R ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    A ckanext/example_theme/v17_popover/__init__.py
    A ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v17_popover/plugin.py
    A ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    A ckanext/example_theme/v18_snippet_api/__init__.py
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v18_snippet_api/plugin.py
    A ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    A ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    A ckanext/example_theme/v19_01_error/__init__.py
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_01_error/plugin.py
    A ckanext/example_theme/v19_01_error/templates
    A ckanext/example_theme/v19_02_error_handling/__init__.py
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_02_error_handling/plugin.py
    A ckanext/example_theme/v19_02_error_handling/templates
    A ckanext/example_theme/v20_pubsub/__init__.py
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v20_pubsub/plugin.py
    A ckanext/example_theme/v20_pubsub/templates
    A ckanext/example_theme/v21_custom_jquery_plugin/__init__.py
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/jquery.greenify.js
    A ckanext/example_theme/v21_custom_jquery_plugin/plugin.py
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/ajax_snippets
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M dev-requirements.txt
    M doc/_templates/footer.html
    R doc/_themes/sphinx-theme-okfn
    R doc/api.rst
    A doc/api/index.rst
    A doc/api/legacy-api.rst
    R doc/appendices/index.rst
    R doc/appendices/solr-multicore.rst
    R doc/apps-ideas.rst
    R doc/authorization.rst
    R doc/background-tasks.rst
    M doc/conf.py
    R doc/configuration.rst
    M doc/contents.rst
    M doc/contributing/architecture.rst
    M doc/contributing/documentation.rst
    M doc/contributing/index.rst
    M doc/contributing/release-process.rst
    A doc/contributing/test.rst
    M doc/contributing/upgrading-dependencies.rst
    R doc/data-viewer.rst
    R doc/datastore.rst
    R doc/deployment.rst
    R doc/email-notifications.rst
    M doc/extensions/index.rst
    M doc/extensions/testing-extensions.rst
    M doc/extensions/tutorial.rst
    R doc/features.rst
    R doc/filestore.rst
    R doc/form-integration.rst
    R doc/getting-started.rst
    A doc/images/example_theme_javascript_popover.png
    A doc/images/example_theme_overlapping_popovers.png
    M doc/index.rst
    R doc/install-from-package.rst
    R doc/install-from-source.rst
    R doc/installing.rst
    R doc/legacy-api.rst
    R doc/linked-data-and-rdf.rst
    A doc/maintaining/apps-ideas.rst
    A doc/maintaining/authorization.rst
    A doc/maintaining/background-tasks.rst
    A doc/maintaining/configuration.rst
    A doc/maintaining/data-viewer.rst
    A doc/maintaining/datastore.rst
    A doc/maintaining/email-notifications.rst
    A doc/maintaining/filestore.rst
    A doc/maintaining/form-integration.rst
    A doc/maintaining/getting-started.rst
    A doc/maintaining/index.rst
    A doc/maintaining/installing/deployment.rst
    A doc/maintaining/installing/index.rst
    A doc/maintaining/installing/install-from-package.rst
    A doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/linked-data-and-rdf.rst
    A doc/maintaining/multilingual.rst
    A doc/maintaining/paster.rst
    A doc/maintaining/solr-multicore.rst
    A doc/maintaining/stats.rst
    A doc/maintaining/tag-vocabularies.rst
    A doc/maintaining/tracking.rst
    A doc/maintaining/upgrading/index.rst
    A doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
    A doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    A doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    A doc/maintaining/upgrading/upgrade-source.rst
    R doc/multilingual.rst
    R doc/paster.rst
    R doc/stats.rst
    M doc/sysadmin-guide.rst
    R doc/tag-vocabularies.rst
    R doc/test.rst
    M doc/theming/best-practices.rst
    M doc/theming/index.rst
    A doc/theming/javascript-api-client.rst
    A doc/theming/javascript-module-objects-and-methods.rst
    A doc/theming/javascript-sandbox.rst
    M doc/theming/javascript.rst
    A doc/theming/jquery-plugins.rst
    M doc/theming/templates.rst
    R doc/tracking.rst
    R doc/upgrade-package-ckan-1-to-2.rst
    R doc/upgrade-package-to-minor-release.rst
    R doc/upgrade-package-to-patch-release.rst
    R doc/upgrade-source.rst
    R doc/upgrading.rst
    M doc/user-guide.rst
    M setup.py

  Log Message:
  -----------
  [#1251] fix master merge conflicts


  Commit: 5c6608cd899b1bc06b1182058e798a42423ccf18
      https://github.com/ckan/ckan/commit/5c6608cd899b1bc06b1182058e798a42423ccf18
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

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

  Log Message:
  -----------
  [#1251] fix pep8 issues


  Commit: a9c630451d8117393cc12b1838663e25a02ce1f3
      https://github.com/ckan/ckan/commit/a9c630451d8117393cc12b1838663e25a02ce1f3
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-20 (Thu, 20 Mar 2014)

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

  Log Message:
  -----------
  [#1609] extra blocks broke facets, add another with block to fix


  Commit: ba697184522f749bf4c8deb9fe86af4adba99e2a
      https://github.com/ckan/ckan/commit/ba697184522f749bf4c8deb9fe86af4adba99e2a
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-20 (Thu, 20 Mar 2014)

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

  Log Message:
  -----------
  [#1251] Fixes to tests


  Commit: 722bdef2361cc0211bed665d0c29db46017b726b
      https://github.com/ckan/ckan/commit/722bdef2361cc0211bed665d0c29db46017b726b
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-20 (Thu, 20 Mar 2014)

  Changed paths:
    M ckanext/textpreview/plugin.py

  Log Message:
  -----------
  [#1251] Fixes to tests


  Commit: aa1745938043fd3a10b7d533f5e05b44ba0f6a5e
      https://github.com/ckan/ckan/commit/aa1745938043fd3a10b7d533f5e05b44ba0f6a5e
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Fix typo endit -> edit


  Commit: 5b9650c853e0e2169fba509e9cd41285d5e303dd
      https://github.com/ckan/ckan/commit/5b9650c853e0e2169fba509e9cd41285d5e303dd
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M MANIFEST.in
    M ckan/config/deployment.ini_tmpl
    A ckan/config/resource_formats.json
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/munge.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/resource.py
    M ckan/model/user.py
    A ckan/new_tests/controllers/test_util.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/templates/macros/form.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/lib/test_resource_search.py
    M doc/images/manage_users.jpg
    M doc/maintaining/configuration.rst
    M doc/maintaining/paster.rst
    M doc/sysadmin-guide.rst

  Log Message:
  -----------
  Merge branch 'master' into 1251-resource-view


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

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

  Log Message:
  -----------
  [#1573] Add new translations policy to docs


  Commit: 5dbaee747adc7d4b67a0b4be8e75243140d77298
      https://github.com/ckan/ckan/commit/5dbaee747adc7d4b67a0b4be8e75243140d77298
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    A doc/_themes/sphinx-theme-okfn
    M doc/contributing/frontend/index.rst
    M doc/contributing/html.rst
    M doc/contributing/i18n.rst
    M doc/contributing/index.rst
    M doc/contributing/javascript.rst
    M doc/contributing/python.rst
    A doc/contributing/string-i18n.rst
    M doc/extensions/best-practices.rst
    M doc/theming/best-practices.rst
    M doc/theming/javascript.rst
    M doc/theming/templates.rst

  Log Message:
  -----------
  [#809] Add i18n guide for devs

Fixes #809


  Commit: f9ee9b4eb981acf75e610ba28a8266b45aa8a3ef
      https://github.com/ckan/ckan/commit/f9ee9b4eb981acf75e610ba28a8266b45aa8a3ef
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M doc/contributing/index.rst
    A doc/contributing/simple-code-contributions.rst

  Log Message:
  -----------
  [#1564] Add beginner contribution docs on 'Good for Contribution'


  Commit: 24b6d0b46836335967a328ec2c9493cc2a84add6
      https://github.com/ckan/ckan/commit/24b6d0b46836335967a328ec2c9493cc2a84add6
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

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

  Log Message:
  -----------
  [#1251] Re-add ckan.model import removed by mistake in 00bea6d

This fixes a few tests.


  Commit: ab8a053d787e807a02c65702f8447a2153df6260
      https://github.com/ckan/ckan/commit/ab8a053d787e807a02c65702f8447a2153df6260
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-17 (Thu, 17 Apr 2014)

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

  Log Message:
  -----------
  [#1251] Fix typos depricated -> deprecated


  Commit: beaf2afb368dfaedfca5946dbcf4cac1b85a593c
      https://github.com/ckan/ckan/commit/beaf2afb368dfaedfca5946dbcf4cac1b85a593c
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-17 (Thu, 17 Apr 2014)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#1251] Deprecate with maintain.deprecated() instead of comments


  Commit: 16ccb796fce6fc954a4d67058f9da69665a2f37a
      https://github.com/ckan/ckan/commit/16ccb796fce6fc954a4d67058f9da69665a2f37a
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-17 (Thu, 17 Apr 2014)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  [#1251] Fix typo Embeded -> Embedded


  Commit: c09bc5c633aa6266e842f02fc34d09c024573b01
      https://github.com/ckan/ckan/commit/c09bc5c633aa6266e842f02fc34d09c024573b01
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#1251] Fix phrase wording


  Commit: 6c3a44976409323f8812454a0ccbe85e65852c53
      https://github.com/ckan/ckan/commit/6c3a44976409323f8812454a0ccbe85e65852c53
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#1251] Adds deprecated docstrings to PackageController.autocomplete


  Commit: d29bfb7cbd6bc79c493cfd664def3b17b41f51d0
      https://github.com/ckan/ckan/commit/d29bfb7cbd6bc79c493cfd664def3b17b41f51d0
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M .coveragerc
    M README.rst
    M bin/travis-run-tests
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/get.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/test_helpers.py
    A ckan/new_tests/logic/action/test_create.py
    A ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_converters.py
    M ckan/plugins/interfaces.py
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/header.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/plugin.py
    M dev-requirements.txt
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 1251-resource-view


  Commit: c2fa1f2c0cbac693309da06b582dca6ad8b557bf
      https://github.com/ckan/ckan/commit/c2fa1f2c0cbac693309da06b582dca6ad8b557bf
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M ckan/new_tests/factories.py
    A ckan/new_tests/test_factories.py
    M ckan/templates/home/snippets/search.html
    A doc/api.rst
    M doc/contributing/documentation.rst

  Log Message:
  -----------
  Merge branch 'master' into 1251-resource-view


  Commit: e9a5e89ed1723c5ac9d9dc2b873510d7c06989b0
      https://github.com/ckan/ckan/commit/e9a5e89ed1723c5ac9d9dc2b873510d7c06989b0
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

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

  Log Message:
  -----------
  [#1251] resource_view_create requires a view_type

If we don't do it, we'll try to get the view_type from the current plugins,
which will fail because there's no view_type called '' (empty string).


  Commit: fc697f26d7b0493e7a463f82d5bd8b6dfd0acaba
      https://github.com/ckan/ckan/commit/fc697f26d7b0493e7a463f82d5bd8b6dfd0acaba
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#1251] Remove @deprecated decorator from PackageController.autocomplete()

This makes our tests fail, probably because of a bug in the decorator itself.
I've created an issue at #1662 to try to figure it out.


  Commit: 7f8ca371666383f146c3b5abacb8ea883ea85126
      https://github.com/ckan/ckan/commit/7f8ca371666383f146c3b5abacb8ea883ea85126
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M ckan/new_tests/factories.py
    M ckan/new_tests/test_factories.py

  Log Message:
  -----------
  [#1251] Add ResourceView factory


  Commit: dd509e0d0f085e68ea8e0b981336d711b4560c1d
      https://github.com/ckan/ckan/commit/dd509e0d0f085e68ea8e0b981336d711b4560c1d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

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

  Log Message:
  -----------
  [#1251] Recreate resource_view_create tests as new_tests


  Commit: 96456140a865246a5e4ef190acad2e790a70310d
      https://github.com/ckan/ckan/commit/96456140a865246a5e4ef190acad2e790a70310d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

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

  Log Message:
  -----------
  [#1251] Fix docstrings saying that the resource_view title is required


  Commit: 98358bc91b3b43fefa8177d2465144266ae186b6
      https://github.com/ckan/ckan/commit/98358bc91b3b43fefa8177d2465144266ae186b6
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-23 (Wed, 23 Apr 2014)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/model/resource_view.py
    A ckan/new_tests/model/test_resource_view.py

  Log Message:
  -----------
  [#1251] Refactor "paster view clean"


  Commit: 9767d3334c13883ec5211c25883ac5e11e2a7c46
      https://github.com/ckan/ckan/commit/9767d3334c13883ec5211c25883ac5e11e2a7c46
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-23 (Wed, 23 Apr 2014)

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

  Log Message:
  -----------
  [#1251] Rewrite resource_view_update tests as new_tests


  Commit: 8ddcb61b0584522b6a9debc558214d08baa78834
      https://github.com/ckan/ckan/commit/8ddcb61b0584522b6a9debc558214d08baa78834
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/new_authz.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.js
    M ckan/public/base/vendor/select2/select2.min.js
    M ckan/templates/macros/form.html
    M doc/contributing/pull-requests.rst
    M doc/contributing/test.rst
    M doc/contributing/testing.rst
    M doc/maintaining/installing/deployment.rst

  Log Message:
  -----------
  Merge branch 'master' into 1251-resource-view

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


  Commit: e2f9e4aa20d093f558abdafc161a70ac5123015f
      https://github.com/ckan/ckan/commit/e2f9e4aa20d093f558abdafc161a70ac5123015f
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/templates/recline_view.html

  Log Message:
  -----------
  [#1251] Refactor ReclinePreview to not use global JS variables

Everything our module needs should be passed to it using data-* attributes.
This allow us to add multiple modules on the same page, and they won't mess up
with each other.


  Commit: f3e74a251e828af21b2816315af4eac735bcc444
      https://github.com/ckan/ckan/commit/f3e74a251e828af21b2816315af4eac735bcc444
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  [#1251] Minor refactoring on preview_recline.js

As in JS the variable definitions are hoisted to the beginning of the function,
we were defining "state" twice, which makes JSHint complain.


  Commit: 59f0f99b527b5acab908c997319606d3e157f9b9
      https://github.com/ckan/ckan/commit/59f0f99b527b5acab908c997319606d3e157f9b9
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/templates/recline_view.html

  Log Message:
  -----------
  [#1251] Change #recline-controls to class, so we can have multiple on one page


  Commit: 69ab2e3933a69c00dedb4b1507587b74d39cf964
      https://github.com/ckan/ckan/commit/69ab2e3933a69c00dedb4b1507587b74d39cf964
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/templates/recline_view.html

  Log Message:
  -----------
  [#1251] Move recline controls' widget to inside the module

A module should be self-contained, so we're able to have many in the same page.


  Commit: e00ef1b3a9f05476086aef040671d003d84967bd
      https://github.com/ckan/ckan/commit/e00ef1b3a9f05476086aef040671d003d84967bd
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  [#1251] Move Recline Grid controls to the top


  Commit: 1a6e562df8c682952c84e915cd42a5bdc02d29d2
      https://github.com/ckan/ckan/commit/1a6e562df8c682952c84e915cd42a5bdc02d29d2
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M ckanext/reclinepreview/theme/public/css/recline.css
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  [#1251] Add searching to recline grid


  Commit: b54b165029f88367fe58a80673907cf593e81431
      https://github.com/ckan/ckan/commit/b54b165029f88367fe58a80673907cf593e81431
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M ckanext/reclinepreview/theme/public/css/recline.css
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/resource.config
    A ckanext/reclinepreview/theme/public/widget.recordcount.js

  Log Message:
  -----------
  [#1251] Add record count to recline grid

Ideally this would be fixed in Recline itself. I created an issue in their
repository to try to contribute it upstream
(https://github.com/okfn/recline/issues/424).


  Commit: fd71934815009430a6cf5664bc7586ade549ec37
      https://github.com/ckan/ckan/commit/fd71934815009430a6cf5664bc7586ade549ec37
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#1251] Remove configurable widget sizex and sizey

This was useful when the widgets weren't resizable, which isn't the case
anymore.


  Commit: 4577c24c141740c776c3ef574a06bd5ced7de53b
      https://github.com/ckan/ckan/commit/4577c24c141740c776c3ef574a06bd5ced7de53b
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/model/resource.py
    A ckan/new_tests/model/test_resource.py

  Log Message:
  -----------
  [#1251] Refactor cli.py moving SQL queries to Resource model

I've also used SQLAlchemy instead of writing bare SQL.


  Commit: f293113ad72f1ff6d6d2eef9df5c72c6d3d8b817
      https://github.com/ckan/ckan/commit/f293113ad72f1ff6d6d2eef9df5c72c6d3d8b817
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  WIP


  Commit: 7a101cb897248fd0621b4b70f3999fee68fb4110
      https://github.com/ckan/ckan/commit/7a101cb897248fd0621b4b70f3999fee68fb4110
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#1251] Remove useless imports at cli.py


  Commit: 6b50e02a6acd4656f06caffac17cd29f3cc26e60
      https://github.com/ckan/ckan/commit/6b50e02a6acd4656f06caffac17cd29f3cc26e60
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    A ckan/migration/versions/073_update_resource_view_resource_id_constraint.py
    M ckan/new_tests/model/test_resource_view.py

  Log Message:
  -----------
  [#1251] Delete ResourceViews when purging their Resource


  Commit: b7bf87afbd63ef9390169226a53fcc08ed45b559
      https://github.com/ckan/ckan/commit/b7bf87afbd63ef9390169226a53fcc08ed45b559
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M ckanext/reclinepreview/plugin.py
    M ckanext/reclinepreview/tests/test_view.py
    M setup.py

  Log Message:
  -----------
  [#1251] Adds "recline_preview" plugin to ease the transition

This plugin simply loads "recline_grid", "recline_graph", and "recline_map",
while logging a WARNING to the user. This should be removed in next versions.


  Commit: a2ace8253981344fd7b74b6efd37a661e9aa4d77
      https://github.com/ckan/ckan/commit/a2ace8253981344fd7b74b6efd37a661e9aa4d77
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-07 (Wed, 07 May 2014)

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

  Log Message:
  -----------
  [#1251] Adds test making sure we remove recline_preview after CKAN 2.3


  Commit: f2c5483923e931f2c26ec1b3db3c3cfbf6729ab3
      https://github.com/ckan/ckan/commit/f2c5483923e931f2c26ec1b3db3c3cfbf6729ab3
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-08 (Thu, 08 May 2014)

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

  Log Message:
  -----------
  [#1251] Use p.toolkit.check_ckan_version instead of checking version directly.


  Commit: 889814b0444514fc4531286ffec56569f6448923
      https://github.com/ckan/ckan/commit/889814b0444514fc4531286ffec56569f6448923
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-08 (Thu, 08 May 2014)

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

  Log Message:
  -----------
  [#1251] Fix typo "lost of dictioniaries" -> "list of dictionaries"


  Commit: 48643d9beb30b6803e9ee838623e088969e3f8e9
      https://github.com/ckan/ckan/commit/48643d9beb30b6803e9ee838623e088969e3f8e9
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-12 (Mon, 12 May 2014)

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

  Log Message:
  -----------
  [#1251] Show message if there're no views created for a resource yet

It might be because it's still being loaded into the DataStore, or because
there's no views. Maybe we should explain these possibilities?


  Commit: 100633ca82d7c1f562d77bfd8a23ed5ce6c3171f
      https://github.com/ckan/ckan/commit/100633ca82d7c1f562d77bfd8a23ed5ce6c3171f
  Author: Mark S <mark at marksilver.net>
  Date:   2014-05-12 (Mon, 12 May 2014)

  Changed paths:
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  [#1251] support ckanext-viewhelper filters

for reclinepreview backed extensions. Fixes
https://github.com/ckan/ckanext-dashboard/issues/11


  Commit: 36360ce40aa87156c159228cd5f8c8f61da183f7
      https://github.com/ckan/ckan/commit/36360ce40aa87156c159228cd5f8c8f61da183f7
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-12 (Mon, 12 May 2014)

  Changed paths:
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  [#1251] Fix jshint issues on preview_recline.js


  Commit: 04065b961fa6a01800ad32cb4d201a08d43b6d21
      https://github.com/ckan/ckan/commit/04065b961fa6a01800ad32cb4d201a08d43b6d21
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-12 (Mon, 12 May 2014)

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

  Log Message:
  -----------
  [#1251] Fix problem when calling resource_views_list without a resource

It would've been better to use `resource.has_views`, as this is the intent of
that variable, but unfortunately that's not possible here.


  Commit: 20fe864597831a6f541dd61d67ed6e196e724e15
      https://github.com/ckan/ckan/commit/20fe864597831a6f541dd61d67ed6e196e724e15
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-12 (Mon, 12 May 2014)

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

  Log Message:
  -----------
  [#1251] Fix test that makes sure we remove recline_preview after CKAN 2.3


  Commit: 06781d2428b14491db439c5fdccddb25bfa103f5
      https://github.com/ckan/ckan/commit/06781d2428b14491db439c5fdccddb25bfa103f5
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-12 (Mon, 12 May 2014)

  Changed paths:
    M ckanext/reclinepreview/theme/public/css/recline.css
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/resource.config
    R ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.js
    R ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.min.js
    A ckanext/reclinepreview/theme/public/vendor/backbone/1.0.0/backbone.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.min.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.min.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.min.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings-white.png
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings.png
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.3.2/bootstrap.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap-responsive.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings-white.png
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings.png
    A ckanext/reclinepreview/theme/public/vendor/ckan.js/ckan.js
    M ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.js
    R ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.min.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowmovemanager.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowselectionmodel.js

  Log Message:
  -----------
  [#1251] Upgrade ReclineJS to fa1e4d3

This fixes #1636 and allow us to remove the recline's resource views from
iframes later, if we want to.

The CKAN.js version used is 0dad7d.


  Commit: a9cbaa6d16ceee42c3bc216430cdc8fff8470b59
      https://github.com/ckan/ckan/commit/a9cbaa6d16ceee42c3bc216430cdc8fff8470b59
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M ckanext/reclinepreview/plugin.py
    M ckanext/reclinepreview/tests/test_view.py
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  [#1251] Bring resource_preview with Recline.MultiView back

I've named it Data Explorer, as it's more self-explanatory than "Recline
Preview". It works the same way as it used to work, and the plugin is still
named "recline_preview" (might be good to change its name as well).


  Commit: 62249959f4f307a83b3f9496feec8596b0281aa1
      https://github.com/ckan/ckan/commit/62249959f4f307a83b3f9496feec8596b0281aa1
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-15 (Thu, 15 May 2014)

  Changed paths:
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js

  Log Message:
  -----------
  [#1251] Upgrade Recline to fix filters' support

This was fixed in https://github.com/okfn/recline/issues/425


  Commit: 194d6c16149a3961111484ae43acfc0db8166e50
      https://github.com/ckan/ckan/commit/194d6c16149a3961111484ae43acfc0db8166e50
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M CHANGELOG.rst
    M README.rst
    M ckan/controllers/related.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/vendor/jquery.min.js
    A ckan/public/base/vendor/select2/.gitignore
    A ckan/public/base/vendor/select2/LICENSE
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/bower.json
    A ckan/public/base/vendor/select2/component.json
    A ckan/public/base/vendor/select2/composer.json
    A ckan/public/base/vendor/select2/package.json
    A ckan/public/base/vendor/select2/release.sh
    A ckan/public/base/vendor/select2/select2-bootstrap.css
    M ckan/public/base/vendor/select2/select2.css
    A ckan/public/base/vendor/select2/select2.jquery.json
    M ckan/public/base/vendor/select2/select2.js
    M ckan/public/base/vendor/select2/select2.min.js
    A ckan/public/base/vendor/select2/select2_locale_ar.js
    A ckan/public/base/vendor/select2/select2_locale_bg.js
    A ckan/public/base/vendor/select2/select2_locale_ca.js
    A ckan/public/base/vendor/select2/select2_locale_cs.js
    A ckan/public/base/vendor/select2/select2_locale_da.js
    A ckan/public/base/vendor/select2/select2_locale_de.js
    A ckan/public/base/vendor/select2/select2_locale_el.js
    A ckan/public/base/vendor/select2/select2_locale_en.js.template
    A ckan/public/base/vendor/select2/select2_locale_es.js
    A ckan/public/base/vendor/select2/select2_locale_et.js
    A ckan/public/base/vendor/select2/select2_locale_eu.js
    A ckan/public/base/vendor/select2/select2_locale_fa.js
    A ckan/public/base/vendor/select2/select2_locale_fi.js
    A ckan/public/base/vendor/select2/select2_locale_fr.js
    A ckan/public/base/vendor/select2/select2_locale_gl.js
    A ckan/public/base/vendor/select2/select2_locale_he.js
    A ckan/public/base/vendor/select2/select2_locale_hr.js
    A ckan/public/base/vendor/select2/select2_locale_hu.js
    A ckan/public/base/vendor/select2/select2_locale_id.js
    A ckan/public/base/vendor/select2/select2_locale_is.js
    A ckan/public/base/vendor/select2/select2_locale_it.js
    A ckan/public/base/vendor/select2/select2_locale_ja.js
    A ckan/public/base/vendor/select2/select2_locale_ka.js
    A ckan/public/base/vendor/select2/select2_locale_ko.js
    A ckan/public/base/vendor/select2/select2_locale_lt.js
    A ckan/public/base/vendor/select2/select2_locale_lv.js
    A ckan/public/base/vendor/select2/select2_locale_mk.js
    A ckan/public/base/vendor/select2/select2_locale_ms.js
    A ckan/public/base/vendor/select2/select2_locale_nl.js
    A ckan/public/base/vendor/select2/select2_locale_no.js
    A ckan/public/base/vendor/select2/select2_locale_pl.js
    A ckan/public/base/vendor/select2/select2_locale_pt-BR.js
    A ckan/public/base/vendor/select2/select2_locale_pt-PT.js
    A ckan/public/base/vendor/select2/select2_locale_ro.js
    A ckan/public/base/vendor/select2/select2_locale_rs.js
    A ckan/public/base/vendor/select2/select2_locale_ru.js
    A ckan/public/base/vendor/select2/select2_locale_sk.js
    A ckan/public/base/vendor/select2/select2_locale_sv.js
    A ckan/public/base/vendor/select2/select2_locale_th.js
    A ckan/public/base/vendor/select2/select2_locale_tr.js
    A ckan/public/base/vendor/select2/select2_locale_uk.js
    A ckan/public/base/vendor/select2/select2_locale_vi.js
    A ckan/public/base/vendor/select2/select2_locale_zh-CN.js
    A ckan/public/base/vendor/select2/select2_locale_zh-TW.js
    M ckan/templates/footer.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/page.html
    M ckan/templates/snippets/license.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckan/tests/functional/test_tracking.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/bin/datastore_setup.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/plugin_v1.py
    A ckanext/example_idatasetform/plugin_v2.py
    A ckanext/example_idatasetform/plugin_v3.py
    A ckanext/example_idatasetform/plugin_v4.py
    A ckanext/example_idatasetform/templates/package/search.html
    A ckanext/example_idatasetform/templates/package/snippets/additional_info.html
    A ckanext/example_idatasetform/templates/package/snippets/resource_form.html
    A ckanext/example_idatasetform/tests/__init__.py
    A ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/__init__.py
    M doc/contributing/architecture.rst
    M doc/contributing/pull-requests.rst
    A doc/extensions/adding-custom-fields.rst
    M doc/extensions/index.rst
    M doc/images/add_dataset_3.jpg
    M doc/theming/best-practices.rst
    M doc/theming/static-files.rst
    M doc/user-guide.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 1251-resource-view

Conflicts:
	ckanext/resourceproxy/tests/test_proxy.py


  Commit: 5dcf7a7cf7eef9846e1b67a715aa83d217611c95
      https://github.com/ckan/ckan/commit/5dcf7a7cf7eef9846e1b67a715aa83d217611c95
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-23 (Mon, 23 Jun 2014)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/templates/footer.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/package/search.html
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    M ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M doc/theming/css.rst
    M doc/theming/fanstatic.rst
    M doc/theming/javascript.rst
    M doc/theming/static-files.rst

  Log Message:
  -----------
  Merge branch 'master' into 1251-resource-view


  Commit: 8b168f9a1991be6f5ff58c6528e6c90416148aeb
      https://github.com/ckan/ckan/commit/8b168f9a1991be6f5ff58c6528e6c90416148aeb
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-23 (Mon, 23 Jun 2014)

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

  Log Message:
  -----------
  Revert "Add tests for non-existent resource"

The code this commit is testing was changed in 0ddeec82, and this test isn't
relevant anymore.

This reverts commit 5c2c13bfcc7ca021c7acd92a1bf3cf2fa75ccd2f.

Conflicts:
	ckanext/resourceproxy/tests/test_proxy.py


  Commit: 57cfac2a78d47ec5c70e451a9a8f2e66cac492e7
      https://github.com/ckan/ckan/commit/57cfac2a78d47ec5c70e451a9a8f2e66cac492e7
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

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

  Log Message:
  -----------
  [#1251] Refactor test_create.py

I just changed the test names and modified to call assert_raises instead of
nose.tools.assert_raises.


  Commit: 5b30e194b51b674d40c333a02c5b31fd66a1c452
      https://github.com/ckan/ckan/commit/5b30e194b51b674d40c333a02c5b31fd66a1c452
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    A Dockerfile
    M bin/travis-install-dependencies
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/lib/search/index.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    A ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/controllers/test_util.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/search/__init__.py
    A ckan/new_tests/lib/search/test_index.py
    M ckan/new_tests/lib/test_helpers.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/public/base/less/forms.less
    M ckan/templates/admin/base.html
    A ckan/templates/admin/trash.html
    M ckan/templates/package/new_package_form.html
    R ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/snippets/package_form.html
    R ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/stages.html
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/plugin.py
    R ckanext/datastore/bin/__init__.py
    R ckanext/datastore/bin/datastore_setup.py
    R ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    A ckanext/datastore/helpers.py
    A ckanext/datastore/interfaces.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/set_permissions.sql
    A ckanext/datastore/tests/sample_datastore_plugin.py
    M ckanext/datastore/tests/test_delete.py
    A ckanext/datastore/tests/test_helpers.py
    A ckanext/datastore/tests/test_interface.py
    A ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    A contrib/docker/apache.conf
    A contrib/docker/apache.wsgi
    A contrib/docker/main.cf
    A contrib/docker/nginx.conf
    A contrib/docker/postgresql/Dockerfile
    A contrib/docker/solr/Dockerfile
    A contrib/docker/solr/schema.xml
    A contrib/docker/svc/ckan/run
    A contrib/docker/svc/nginx/run
    A contrib/docker/svc/postfix/run
    M doc/api/index.rst
    M doc/contributing/architecture.rst
    M doc/contributing/documentation.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/python.rst
    A doc/images/ckan_importing_diagram.graphml
    A doc/images/ckan_importing_diagram.png
    M doc/maintaining/datastore.rst
    M doc/maintaining/installing/index.rst
    M doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/installing/install-using-docker.rst
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 1251-resource-view

Conflicts:
	ckanext/datastore/db.py


  Commit: fc29b6eb18959523001c1ee2d7dfacd0ef2be46d
      https://github.com/ckan/ckan/commit/fc29b6eb18959523001c1ee2d7dfacd0ef2be46d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

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

  Log Message:
  -----------
  [#1251] Test that the DataStore supports filtering by multiple values

It doesn't currently, that's why I created issue #1830.


  Commit: cf8275ee83f564f5da7a2fe60357aed4ca7d53a9
      https://github.com/ckan/ckan/commit/cf8275ee83f564f5da7a2fe60357aed4ca7d53a9
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-05 (Sat, 05 Jul 2014)

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

  Log Message:
  -----------
  [#1251] Return 404 when visiting inexistent resource view page


  Commit: 5387ecee0ee40fe8a6ac77a28211b28773215155
      https://github.com/ckan/ckan/commit/5387ecee0ee40fe8a6ac77a28211b28773215155
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-21 (Mon, 21 Jul 2014)

  Changed paths:
    M ckan/migration/versions/072_add_resource_view.py
    M ckan/migration/versions/073_update_resource_view_resource_id_constraint.py

  Log Message:
  -----------
  [#1251] Wrap 72 and 73 migrations inside transactions


  Commit: a92bc2faea48f3c5c17aaa818fab83626ae2707b
      https://github.com/ckan/ckan/commit/a92bc2faea48f3c5c17aaa818fab83626ae2707b
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-21 (Mon, 21 Jul 2014)

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

  Log Message:
  -----------
  [#1251] Rename pdf_preview -> pdf_view

The pattern is *_preview for deprecated ResourcePreviews, and *_view for the
new ResourceViews.


  Commit: 38be74407903c3844e647153faf5e7d32b88ddfc
      https://github.com/ckan/ckan/commit/38be74407903c3844e647153faf5e7d32b88ddfc
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-21 (Mon, 21 Jul 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/lib/cli.py
    M ckanext/datapusher/logic/action.py
    R ckanext/reclinepreview/__init__.py
    R ckanext/reclinepreview/plugin.py
    R ckanext/reclinepreview/tests/__init__.py
    R ckanext/reclinepreview/tests/test_view.py
    R ckanext/reclinepreview/theme/public/css/recline.css
    R ckanext/reclinepreview/theme/public/img/ajaxload-circle.gif
    R ckanext/reclinepreview/theme/public/preview_recline.js
    R ckanext/reclinepreview/theme/public/resource.config
    R ckanext/reclinepreview/theme/public/vendor/backbone/1.0.0/backbone.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.3.2/bootstrap.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap-responsive.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings-white.png
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings.png
    R ckanext/reclinepreview/theme/public/vendor/ckan.js/ckan.js
    R ckanext/reclinepreview/theme/public/vendor/flot/excanvas.js
    R ckanext/reclinepreview/theme/public/vendor/flot/excanvas.min.js
    R ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
    R ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.js
    R ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.min.js
    R ckanext/reclinepreview/theme/public/vendor/json/json2.js
    R ckanext/reclinepreview/theme/public/vendor/json/json2.min.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    R ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.js
    R ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.min.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    R ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.js
    R ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/README.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowmovemanager.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowselectionmodel.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.css
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.png
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.js
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    R ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.js
    R ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.min.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    R ckanext/reclinepreview/theme/public/widget.recordcount.js
    R ckanext/reclinepreview/theme/templates/recline_graph_form.html
    R ckanext/reclinepreview/theme/templates/recline_map_form.html
    R ckanext/reclinepreview/theme/templates/recline_view.html
    A ckanext/reclineview/__init__.py
    A ckanext/reclineview/plugin.py
    A ckanext/reclineview/tests/__init__.py
    A ckanext/reclineview/tests/test_view.py
    A ckanext/reclineview/theme/public/css/recline.css
    A ckanext/reclineview/theme/public/img/ajaxload-circle.gif
    A ckanext/reclineview/theme/public/preview_recline.js
    A ckanext/reclineview/theme/public/resource.config
    A ckanext/reclineview/theme/public/vendor/backbone/1.0.0/backbone.js
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/bootstrap.js
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap-responsive.css
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap.css
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings-white.png
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings.png
    A ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    A ckanext/reclineview/theme/public/vendor/flot/excanvas.js
    A ckanext/reclineview/theme/public/vendor/flot/excanvas.min.js
    A ckanext/reclineview/theme/public/vendor/flot/jquery.flot.js
    A ckanext/reclineview/theme/public/vendor/flotr2/flotr2.js
    A ckanext/reclineview/theme/public/vendor/flotr2/flotr2.min.js
    A ckanext/reclineview/theme/public/vendor/jquery/1.7.1/jquery.js
    A ckanext/reclineview/theme/public/vendor/jquery/1.7.1/jquery.min.js
    A ckanext/reclineview/theme/public/vendor/json/json2.js
    A ckanext/reclineview/theme/public/vendor/json/json2.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    A ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.js
    A ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.min.js
    A ckanext/reclineview/theme/public/vendor/mustache/0.5.0-dev/mustache.js
    A ckanext/reclineview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.js
    A ckanext/reclineview/theme/public/vendor/recline/recline.css
    A ckanext/reclineview/theme/public/vendor/recline/recline.dataset.js
    A ckanext/reclineview/theme/public/vendor/recline/recline.dataset.min.js
    A ckanext/reclineview/theme/public/vendor/recline/recline.js
    A ckanext/reclineview/theme/public/vendor/recline/recline.min.css
    A ckanext/reclineview/theme/public/vendor/recline/recline.min.js
    A ckanext/reclineview/theme/public/vendor/showdown/20120615/showdown.js
    A ckanext/reclineview/theme/public/vendor/showdown/20120615/showdown.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/README.txt
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowmovemanager.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowselectionmodel.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.js
    A ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.css
    A ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    A ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.png
    A ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.js
    A ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    A ckanext/reclineview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.js
    A ckanext/reclineview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.min.js
    A ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.js
    A ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    A ckanext/reclineview/theme/public/widget.recordcount.js
    A ckanext/reclineview/theme/templates/recline_graph_form.html
    A ckanext/reclineview/theme/templates/recline_map_form.html
    A ckanext/reclineview/theme/templates/recline_view.html
    M doc/extensions/tutorial.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/theming/templates.rst
    M setup.py

  Log Message:
  -----------
  [#1251] Rename recline plugins to use *_view pattern


  Commit: f43476c9b62749c1cff0d04937d4d6ae76d691e6
      https://github.com/ckan/ckan/commit/f43476c9b62749c1cff0d04937d4d6ae76d691e6
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-21 (Mon, 21 Jul 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/lib/cli.py
    R ckanext/textpreview/__init__.py
    R ckanext/textpreview/plugin.py
    R ckanext/textpreview/tests/__init__.py
    R ckanext/textpreview/tests/test_view.py
    R ckanext/textpreview/theme/public/LICENSE
    R ckanext/textpreview/theme/public/css/text.css
    R ckanext/textpreview/theme/public/preview_text.js
    R ckanext/textpreview/theme/public/resource.config
    R ckanext/textpreview/theme/public/styles/default.css
    R ckanext/textpreview/theme/public/styles/github.css
    R ckanext/textpreview/theme/public/vendor/highlight.pack.js
    R ckanext/textpreview/theme/templates/text_form.html
    R ckanext/textpreview/theme/templates/text_view.html
    A ckanext/textview/__init__.py
    A ckanext/textview/plugin.py
    A ckanext/textview/tests/__init__.py
    A ckanext/textview/tests/test_view.py
    A ckanext/textview/theme/public/LICENSE
    A ckanext/textview/theme/public/css/text.css
    A ckanext/textview/theme/public/preview_text.js
    A ckanext/textview/theme/public/resource.config
    A ckanext/textview/theme/public/styles/default.css
    A ckanext/textview/theme/public/styles/github.css
    A ckanext/textview/theme/public/vendor/highlight.pack.js
    A ckanext/textview/theme/templates/text_form.html
    A ckanext/textview/theme/templates/text_view.html
    M doc/extensions/tutorial.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/theming/templates.rst
    M setup.py

  Log Message:
  -----------
  [#1251] Rename text_preview -> text_view


  Commit: eb921e6d92b259a876a335efede9c71c79b86691
      https://github.com/ckan/ckan/commit/eb921e6d92b259a876a335efede9c71c79b86691
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-21 (Mon, 21 Jul 2014)

  Changed paths:
    M Dockerfile
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/controllers/user.py
    M ckan/lib/search/index.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/new_tests/lib/search/test_index.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/functional/api/test_package_search.py
    M ckanext/datastore/db.py
    M ckanext/datastore/interfaces.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_search.py
    M contrib/docker/apache.conf
    M doc/api/index.rst
    M doc/contributing/reviewing.rst

  Log Message:
  -----------
  Merge branch 'master' into 1251-resource-view

Conflicts:
	ckanext/datastore/tests/test_search.py


  Commit: bdb78bc48aba1fc262adcee5bf879c69889932d7
      https://github.com/ckan/ckan/commit/bdb78bc48aba1fc262adcee5bf879c69889932d7
  Author: amercader <amercadero at gmail.com>
  Date:   2014-07-22 (Tue, 22 Jul 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/lib/cli.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/maintain.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/072_add_resource_view.py
    A ckan/migration/versions/073_update_resource_view_resource_id_constraint.py
    M ckan/model/__init__.py
    M ckan/model/resource.py
    A ckan/model/resource_view.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/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/model/test_resource.py
    A 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/main.css
    M ckan/public/base/javascript/main.js
    A ckan/public/base/javascript/modules/resource-view-embed.js
    A ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    A ckan/public/base/less/resource-view-embed.less
    M ckan/public/scripts/application.js
    M ckan/templates/dataviewer/base.html
    A ckan/templates/package/edit_view.html
    A ckan/templates/package/new_view.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    A ckan/templates/package/resource_views.html
    M ckan/templates/package/snippets/resource_item.html
    A ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_embed.html
    A ckan/templates/package/snippets/resource_views_list.html
    A ckan/templates/package/snippets/resource_views_list_item.html
    A ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_help.html
    A ckan/templates/package/view_edit_base.html
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_plugins.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datastore/tests/test_search.py
    A ckanext/imageview/__init__.py
    A ckanext/imageview/plugin.py
    A ckanext/imageview/tests/__init__.py
    A ckanext/imageview/tests/test_view.py
    A ckanext/imageview/theme/templates/image_form.html
    A ckanext/imageview/theme/templates/image_view.html
    R ckanext/pdfpreview/__init__.py
    R ckanext/pdfpreview/plugin.py
    R ckanext/pdfpreview/tests/__init__.py
    R ckanext/pdfpreview/tests/test_preview.py
    R ckanext/pdfpreview/theme/public/css/pdf.css
    R ckanext/pdfpreview/theme/public/css/recline.css
    R ckanext/pdfpreview/theme/public/img/ajaxload-circle.gif
    R ckanext/pdfpreview/theme/public/preview_pdf.js
    R ckanext/pdfpreview/theme/public/resource.config
    R ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    R ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/texture.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/README.md
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/pdfpreview/theme/templates/pdf.html
    A ckanext/pdfview/__init__.py
    A ckanext/pdfview/plugin.py
    A ckanext/pdfview/tests/__init__.py
    A ckanext/pdfview/tests/test_view.py
    A ckanext/pdfview/theme/public/css/pdf.css
    A ckanext/pdfview/theme/public/css/recline.css
    A ckanext/pdfview/theme/public/img/ajaxload-circle.gif
    A ckanext/pdfview/theme/public/preview_pdf.js
    A ckanext/pdfview/theme/public/resource.config
    A ckanext/pdfview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/zh-TW/viewer.properties
    A ckanext/pdfview/theme/public/vendor/pdfjs/pdf.js
    A ckanext/pdfview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.js
    A ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.min.js
    A ckanext/pdfview/theme/public/vendor/pdfviewer/debugger.js
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/texture.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.css
    A ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.js
    A ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.css
    A ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.js
    A ckanext/pdfview/theme/public/vendor/webL10n/README.md
    A ckanext/pdfview/theme/public/vendor/webL10n/l10n.js
    A ckanext/pdfview/theme/public/vendor/webL10n/l10n.min.js
    A ckanext/pdfview/theme/templates/pdf.html
    R ckanext/reclinepreview/__init__.py
    R ckanext/reclinepreview/plugin.py
    R ckanext/reclinepreview/tests/__init__.py
    R ckanext/reclinepreview/tests/test_preview.py
    R ckanext/reclinepreview/theme/public/css/recline.css
    R ckanext/reclinepreview/theme/public/img/ajaxload-circle.gif
    R ckanext/reclinepreview/theme/public/preview_recline.js
    R ckanext/reclinepreview/theme/public/resource.config
    R ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.js
    R ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.min.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.min.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.min.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.min.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings-white.png
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings.png
    R ckanext/reclinepreview/theme/public/vendor/flot/excanvas.js
    R ckanext/reclinepreview/theme/public/vendor/flot/excanvas.min.js
    R ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.js
    R ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.min.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
    R ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.js
    R ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.min.js
    R ckanext/reclinepreview/theme/public/vendor/json/json2.js
    R ckanext/reclinepreview/theme/public/vendor/json/json2.min.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    R ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.js
    R ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.min.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    R ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.js
    R ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/README.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.css
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.png
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.js
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    R ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.js
    R ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.min.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    R ckanext/reclinepreview/theme/templates/recline.html
    A ckanext/reclineview/__init__.py
    A ckanext/reclineview/plugin.py
    A ckanext/reclineview/tests/__init__.py
    A ckanext/reclineview/tests/test_view.py
    A ckanext/reclineview/theme/public/css/recline.css
    A ckanext/reclineview/theme/public/img/ajaxload-circle.gif
    A ckanext/reclineview/theme/public/preview_recline.js
    A ckanext/reclineview/theme/public/resource.config
    A ckanext/reclineview/theme/public/vendor/backbone/1.0.0/backbone.js
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/bootstrap.js
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap-responsive.css
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap.css
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings-white.png
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings.png
    A ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    A ckanext/reclineview/theme/public/vendor/flot/excanvas.js
    A ckanext/reclineview/theme/public/vendor/flot/excanvas.min.js
    A ckanext/reclineview/theme/public/vendor/flot/jquery.flot.js
    A ckanext/reclineview/theme/public/vendor/flotr2/flotr2.js
    A ckanext/reclineview/theme/public/vendor/flotr2/flotr2.min.js
    A ckanext/reclineview/theme/public/vendor/jquery/1.7.1/jquery.js
    A ckanext/reclineview/theme/public/vendor/jquery/1.7.1/jquery.min.js
    A ckanext/reclineview/theme/public/vendor/json/json2.js
    A ckanext/reclineview/theme/public/vendor/json/json2.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    A ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.js
    A ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.min.js
    A ckanext/reclineview/theme/public/vendor/mustache/0.5.0-dev/mustache.js
    A ckanext/reclineview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.js
    A ckanext/reclineview/theme/public/vendor/recline/recline.css
    A ckanext/reclineview/theme/public/vendor/recline/recline.dataset.js
    A ckanext/reclineview/theme/public/vendor/recline/recline.dataset.min.js
    A ckanext/reclineview/theme/public/vendor/recline/recline.js
    A ckanext/reclineview/theme/public/vendor/recline/recline.min.css
    A ckanext/reclineview/theme/public/vendor/recline/recline.min.js
    A ckanext/reclineview/theme/public/vendor/showdown/20120615/showdown.js
    A ckanext/reclineview/theme/public/vendor/showdown/20120615/showdown.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/README.txt
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowmovemanager.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowselectionmodel.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.js
    A ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.css
    A ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    A ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.png
    A ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.js
    A ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    A ckanext/reclineview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.js
    A ckanext/reclineview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.min.js
    A ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.js
    A ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    A ckanext/reclineview/theme/public/widget.recordcount.js
    A ckanext/reclineview/theme/templates/recline_graph_form.html
    A ckanext/reclineview/theme/templates/recline_map_form.html
    A ckanext/reclineview/theme/templates/recline_view.html
    M ckanext/resourceproxy/plugin.py
    M ckanext/resourceproxy/tests/test_proxy.py
    R ckanext/textpreview/__init__.py
    R ckanext/textpreview/plugin.py
    R ckanext/textpreview/tests/__init__.py
    R ckanext/textpreview/tests/test_preview.py
    R ckanext/textpreview/theme/public/LICENSE
    R ckanext/textpreview/theme/public/css/text.css
    R ckanext/textpreview/theme/public/preview_text.js
    R ckanext/textpreview/theme/public/resource.config
    R ckanext/textpreview/theme/public/styles/default.css
    R ckanext/textpreview/theme/public/styles/github.css
    R ckanext/textpreview/theme/public/vendor/highlight.pack.js
    R ckanext/textpreview/theme/templates/text.html
    A ckanext/textview/__init__.py
    A ckanext/textview/plugin.py
    A ckanext/textview/tests/__init__.py
    A ckanext/textview/tests/test_view.py
    A ckanext/textview/theme/public/LICENSE
    A ckanext/textview/theme/public/css/text.css
    A ckanext/textview/theme/public/preview_text.js
    A ckanext/textview/theme/public/resource.config
    A ckanext/textview/theme/public/styles/default.css
    A ckanext/textview/theme/public/styles/github.css
    A ckanext/textview/theme/public/vendor/highlight.pack.js
    A ckanext/textview/theme/templates/text_form.html
    A ckanext/textview/theme/templates/text_view.html
    A ckanext/webpageview/__init__.py
    A ckanext/webpageview/plugin.py
    A ckanext/webpageview/tests/__init__.py
    A ckanext/webpageview/tests/test_view.py
    A ckanext/webpageview/theme/templates/webpage_form.html
    A ckanext/webpageview/theme/templates/webpage_view.html
    M doc/extensions/tutorial.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/theming/templates.rst
    M setup.py

  Log Message:
  -----------
  Merge branch '1251-resource-view'


Compare: https://github.com/ckan/ckan/compare/e1d48743239b...bdb78bc48aba

• Previous message: [ckan-changes] [ckan/ckan] d2a6c4: [#1838] Adds docs
• Next message: [ckan-changes] [ckan/ckan] 75a11b: [#1251] Add resource_view table
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]