[ckan-changes] [ckan/ckan] 895306: [#1852] Remove unused code and add docstrings in d...

• Previous message: [ckan-changes] [ckan/ckan] e9775b: Adds new fields to group for related group/relatio...
• Next message: [ckan-changes] [ckan/ckan] 87fd74: [#2041] Test for munge_filename idempotence
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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

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

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


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

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

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

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

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

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


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

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

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

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

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

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


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

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

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

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


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

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

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


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

  Changed paths:
    M ckan/lib/datapreview.py

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


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

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

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

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

Also fixed log warnings and sphinx errors.


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

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

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

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

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


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

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

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


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

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

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

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

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

Added tests in ckanext/datapusher


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

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

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

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


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

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

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


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

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

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


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

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

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


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

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

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

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


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

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

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

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


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

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

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


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

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

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


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

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

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

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


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

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

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


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

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

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


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

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

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


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

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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


Compare: https://github.com/ckan/ckan/compare/09b0b5b07c23...2052628c4a45

• Previous message: [ckan-changes] [ckan/ckan] e9775b: Adds new fields to group for related group/relatio...
• Next message: [ckan-changes] [ckan/ckan] 87fd74: [#2041] Test for munge_filename idempotence
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]