[ckan-changes] [ckan/ckan] 44a678: [#3002] Only allow JSONP callback on the action AP...

GitHub noreply at github.com
Tue Jul 12 16:46:42 UTC 2016 

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 44a6783ca2b47e6f6a28345ed097b0877f224231
      https://github.com/ckan/ckan/commit/44a6783ca2b47e6f6a28345ed097b0877f224231
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-09 (Mon, 09 May 2016)

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

  Log Message:
  -----------
  [#3002] Only allow JSONP callback on the action API for GET requests

Updated the tests from the legacy ones.


  Commit: 4ee76da6b05c9b34413d1f232369ac92d94bad49
      https://github.com/ckan/ckan/commit/4ee76da6b05c9b34413d1f232369ac92d94bad49
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-09 (Mon, 09 May 2016)

  Changed paths:
    M doc/api/index.rst

  Log Message:
  -----------
  [#3002] Mention in docs that only GET is supported


  Commit: 54aff38c9b99085fd2588e299e8b15b42aba5380
      https://github.com/ckan/ckan/commit/54aff38c9b99085fd2588e299e8b15b42aba5380
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-09 (Mon, 09 May 2016)

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

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


  Commit: 02668cb8b24c29c94e12cc2629631fbc07312e5e
      https://github.com/ckan/ckan/commit/02668cb8b24c29c94e12cc2629631fbc07312e5e
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-10 (Tue, 10 May 2016)

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

  Log Message:
  -----------
  [#3002] Smarter nose import

cc @TkTech


  Commit: b52909dec4e777d77b6e46c067dbbc7ca1953d95
      https://github.com/ckan/ckan/commit/b52909dec4e777d77b6e46c067dbbc7ca1953d95
  Author: amercader <amercadero at gmail.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    R .travis.yml
    M Dockerfile
    M MANIFEST.in
    M README.rst
    M circle.yml
    M ckan/__init__.py
    M ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/common.py
    M ckan/config/environment.py
    M ckan/config/install.py
    M ckan/config/middleware.py
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/partyline.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/exceptions.py
    M ckan/i18n/__init__.py
    M ckan/i18n/check_po_files.py
    M ckan/lib/activity_streams.py
    M ckan/lib/activity_streams_session_extension.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/captcha.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/config_tool.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/extract.py
    M ckan/lib/fanstatic_extensions.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/formatters.py
    M ckan/lib/hash.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/jsonp.py
    R ckan/lib/lazyjson.py
    M ckan/lib/mailer.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    M ckan/lib/navl/__init__.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/common.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/lib/search/sql.py
    M ckan/lib/uploader.py
    M ckan/lib/util.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/patch.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/patch.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/manage.py
    M ckan/migration/versions/001_add_existing_tables.py
    M ckan/migration/versions/002_add_author_and_maintainer.py
    M ckan/migration/versions/003_add_user_object.py
    M ckan/migration/versions/004_add_group_object.py
    M ckan/migration/versions/005_add_authorization_tables.py
    M ckan/migration/versions/006_add_ratings.py
    M ckan/migration/versions/007_add_system_roles.py
    M ckan/migration/versions/008_update_vdm_ids.py
    M ckan/migration/versions/009_add_creation_timestamps.py
    M ckan/migration/versions/010_add_user_about.py
    M ckan/migration/versions/011_add_package_search_vector.py
    M ckan/migration/versions/012_add_resources.py
    M ckan/migration/versions/013_add_hash.py
    M ckan/migration/versions/014_hash_2.py
    M ckan/migration/versions/015_remove_state_object.py
    M ckan/migration/versions/016_uuids_everywhere.py
    M ckan/migration/versions/017_add_pkg_relationships.py
    M ckan/migration/versions/018_adjust_licenses.py
    M ckan/migration/versions/019_pkg_relationships_state.py
    M ckan/migration/versions/020_add_changeset.py
    M ckan/migration/versions/022_add_group_extras.py
    M ckan/migration/versions/023_add_harvesting.py
    M ckan/migration/versions/024_add_harvested_document.py
    M ckan/migration/versions/025_add_authorization_groups.py
    M ckan/migration/versions/026_authorization_group_user_pk.py
    M ckan/migration/versions/027_adjust_harvester.py
    M ckan/migration/versions/028_drop_harvest_source_status.py
    M ckan/migration/versions/029_version_groups.py
    M ckan/migration/versions/030_additional_user_attributes.py
    M ckan/migration/versions/031_move_openid_to_new_field.py
    M ckan/migration/versions/032_add_extra_info_field_to_resources.py
    M ckan/migration/versions/033_auth_group_user_id_add_conditional.py
    M ckan/migration/versions/034_resource_group_table.py
    M ckan/migration/versions/035_harvesting_doc_versioning.py
    M ckan/migration/versions/036_lockdown_roles.py
    M ckan/migration/versions/037_role_anon_editor.py
    M ckan/migration/versions/038_delete_migration_tables.py
    M ckan/migration/versions/039_add_expired_id_and_dates.py
    M ckan/migration/versions/040_reset_key_on_user.py
    M ckan/migration/versions/041_resource_new_fields.py
    M ckan/migration/versions/042_user_revision_indexes.py
    M ckan/migration/versions/043_drop_postgres_search.py
    M ckan/migration/versions/044_add_task_status.py
    M ckan/migration/versions/045_user_name_unique.py
    M ckan/migration/versions/046_drop_changesets.py
    M ckan/migration/versions/047_rename_package_group_member.py
    M ckan/migration/versions/048_add_activity_streams_tables.py
    M ckan/migration/versions/049_add_group_approval_status.py
    M ckan/migration/versions/050_term_translation_table.py
    M ckan/migration/versions/051_add_tag_vocabulary.py
    M ckan/migration/versions/052_update_member_capacities.py
    M ckan/migration/versions/053_add_group_logo.py
    M ckan/migration/versions/054_add_resource_created_date.py
    M ckan/migration/versions/055_update_user_and_activity_detail.py
    M ckan/migration/versions/056_add_related_table.py
    M ckan/migration/versions/057_tracking.py
    M ckan/migration/versions/058_add_follower_tables.py
    M ckan/migration/versions/059_add_related_count_and_flag.py
    M ckan/migration/versions/060_add_system_info_table.py
    M ckan/migration/versions/061_add_follower__group_table.py
    M ckan/migration/versions/062_add_dashboard_table.py
    M ckan/migration/versions/063_org_changes.py
    M ckan/migration/versions/064_add_email_last_sent_column.py
    M ckan/migration/versions/065_add_email_notifications_preference.py
    M ckan/migration/versions/066_default_package_type.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/migration/versions/068_add_package_extras_index.py
    M ckan/migration/versions/069_resource_url_and_metadata_modified.py
    M ckan/migration/versions/070_add_activity_and_resource_indexes.py
    M ckan/migration/versions/071_add_state_column_to_user_table.py
    M ckan/migration/versions/072_add_resource_view.py
    M ckan/migration/versions/073_update_resource_view_resource_id_constraint.py
    M ckan/migration/versions/074_remove_resource_groups.py
    M ckan/migration/versions/075_rename_view_plugins.py
    M ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/migration/versions/077_add_revisions_to_system_info.py
    M ckan/migration/versions/078_remove_old_authz_model.py
    M ckan/migration/versions/079_resource_revision_index.py
    M ckan/migration/versions/080_continuity_id_indexes.py
    M ckan/migration/versions/081_set_datastore_active.py
    M ckan/migration/versions/082_create_index_creator_user_id.py
    M ckan/migration/versions/083_remove_related_items.py
    M ckan/migration/versions/084_add_metadata_created.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/core.py
    M ckan/model/dashboard.py
    M ckan/model/domain_object.py
    M ckan/model/extension.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/group_extra.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/misc.py
    M ckan/model/modification.py
    M ckan/model/package.py
    M ckan/model/package_extra.py
    M ckan/model/package_relationship.py
    M ckan/model/rating.py
    M ckan/model/resource.py
    M ckan/model/resource_view.py
    M ckan/model/system_info.py
    M ckan/model/tag.py
    M ckan/model/task_status.py
    M ckan/model/term_translation.py
    M ckan/model/tracking.py
    M ckan/model/types.py
    M ckan/model/user.py
    M ckan/model/vocabulary.py
    M ckan/pastertemplates/__init__.py
    M ckan/pastertemplates/template/MANIFEST.in_tmpl
    M ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    M ckan/pastertemplates/template/ckanext/__init__.py
    A ckan/pastertemplates/template/requirements.txt_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/__init__.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/plugins/toolkit_sphinx_extension.py
    M ckan/public/base/css/main.css
    M ckan/public/base/images/sprite-resource-icons.png
    M ckan/public/base/less/module.less
    M ckan/templates/base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/snippets/feeds.html
    M ckan/templates/header.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/package/new.html
    M ckan/templates/package/read_base.html
    A ckan/templates/package/snippets/cannot_create_package.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/revision/__init__.py
    M ckan/templates/snippets/debug.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/language_selector.html
    A ckan/templates/tests/broken_helper_as_attribute.html
    A ckan/templates/tests/broken_helper_as_item.html
    A ckan/templates/tests/helper_as_attribute.html
    A ckan/templates/tests/helper_as_item.html
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/config/test_environment.py
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/__init__.py
    M ckan/tests/controllers/test_admin.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_feed.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_home.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_tags.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/controllers/test_util.py
    M ckan/tests/factories.py
    M ckan/tests/helpers.py
    M ckan/tests/i18n/test_check_po_files.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/ckantestplugins.py
    M ckan/tests/legacy/functional/api/__init__.py
    M ckan/tests/legacy/functional/api/base.py
    M ckan/tests/legacy/functional/api/model/test_group.py
    M ckan/tests/legacy/functional/api/model/test_licenses.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/model/test_ratings.py
    M ckan/tests/legacy/functional/api/model/test_relationships.py
    M ckan/tests/legacy/functional/api/model/test_revisions.py
    M ckan/tests/legacy/functional/api/model/test_tag.py
    M ckan/tests/legacy/functional/api/model/test_vocabulary.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/functional/api/test_api.py
    M ckan/tests/legacy/functional/api/test_dashboard.py
    M ckan/tests/legacy/functional/api/test_email_notifications.py
    M ckan/tests/legacy/functional/api/test_follow.py
    M ckan/tests/legacy/functional/api/test_misc.py
    M ckan/tests/legacy/functional/api/test_package_search.py
    M ckan/tests/legacy/functional/api/test_resource.py
    M ckan/tests/legacy/functional/api/test_resource_search.py
    M ckan/tests/legacy/functional/api/test_user.py
    M ckan/tests/legacy/functional/api/test_util.py
    M ckan/tests/legacy/functional/base.py
    M ckan/tests/legacy/functional/test_activity.py
    M ckan/tests/legacy/functional/test_admin.py
    M ckan/tests/legacy/functional/test_error.py
    M ckan/tests/legacy/functional/test_group.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/legacy/functional/test_preview_interface.py
    M ckan/tests/legacy/functional/test_revision.py
    M ckan/tests/legacy/functional/test_tag.py
    M ckan/tests/legacy/functional/test_tracking.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/html_check.py
    M ckan/tests/legacy/lib/__init__.py
    M ckan/tests/legacy/lib/test_alphabet_pagination.py
    M ckan/tests/legacy/lib/test_authenticator.py
    M ckan/tests/legacy/lib/test_cli.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/legacy/lib/test_dictization_schema.py
    M ckan/tests/legacy/lib/test_email_notifications.py
    M ckan/tests/legacy/lib/test_hash.py
    M ckan/tests/legacy/lib/test_helpers.py
    M ckan/tests/legacy/lib/test_i18n.py
    M ckan/tests/legacy/lib/test_navl.py
    M ckan/tests/legacy/lib/test_resource_search.py
    M ckan/tests/legacy/lib/test_simple_search.py
    M ckan/tests/legacy/lib/test_solr_package_search.py
    M ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/legacy/lib/test_solr_schema_version.py
    M ckan/tests/legacy/lib/test_solr_search_index.py
    M ckan/tests/legacy/lib/test_tag_search.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_auth.py
    M ckan/tests/legacy/logic/test_init.py
    M ckan/tests/legacy/logic/test_member.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/legacy/logic/test_tag_vocab.py
    M ckan/tests/legacy/logic/test_validators.py
    M ckan/tests/legacy/misc/test_format_text.py
    M ckan/tests/legacy/misc/test_mock_mail_server.py
    M ckan/tests/legacy/misc/test_sync.py
    M ckan/tests/legacy/mock_mail_server.py
    M ckan/tests/legacy/mock_plugin.py
    M ckan/tests/legacy/models/test_activity.py
    M ckan/tests/legacy/models/test_extras.py
    M ckan/tests/legacy/models/test_follower.py
    M ckan/tests/legacy/models/test_group.py
    M ckan/tests/legacy/models/test_misc.py
    M ckan/tests/legacy/models/test_package.py
    M ckan/tests/legacy/models/test_package_relationships.py
    M ckan/tests/legacy/models/test_purge_revision.py
    M ckan/tests/legacy/models/test_resource.py
    M ckan/tests/legacy/models/test_revision.py
    M ckan/tests/legacy/models/test_user.py
    M ckan/tests/legacy/pylons_controller.py
    M ckan/tests/legacy/schema/test_schema.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_plugins.py
    M ckan/tests/legacy/test_versions.py
    M ckan/tests/lib/__init__.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    M ckan/tests/lib/navl/test_dictization_functions.py
    M ckan/tests/lib/navl/test_validators.py
    M ckan/tests/lib/search/test_index.py
    M ckan/tests/lib/test_app_globals.py
    M ckan/tests/lib/test_auth_tkt.py
    M ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_config_tool.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_munge.py
    A ckan/tests/lib/test_navl.py
    M ckan/tests/logic/action/__init__.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_patch.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/__init__.py
    M ckan/tests/logic/auth/test_create.py
    M ckan/tests/logic/auth/test_delete.py
    M ckan/tests/logic/auth/test_get.py
    M ckan/tests/logic/auth/test_init.py
    M ckan/tests/logic/auth/test_update.py
    M ckan/tests/logic/test_conversion.py
    M ckan/tests/logic/test_converters.py
    M ckan/tests/logic/test_schema.py
    M ckan/tests/logic/test_validators.py
    M ckan/tests/migration/__init__.py
    M ckan/tests/model/__init__.py
    M ckan/tests/model/test_license.py
    M ckan/tests/model/test_resource.py
    M ckan/tests/model/test_resource_view.py
    M ckan/tests/model/test_system_info.py
    M ckan/tests/model/test_user.py
    M ckan/tests/plugins/__init__.py
    M ckan/tests/plugins/test_toolkit.py
    M ckan/tests/test_authz.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_factories.py
    M ckan/websetup.py
    M ckanext/__init__.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/helpers.py
    M ckanext/datapusher/interfaces.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/auth.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datapusher/tests/test_action.py
    M ckanext/datapusher/tests/test_default_views.py
    M ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/interfaces.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/helpers.py
    M ckanext/datastore/tests/sample_datastore_plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_disable.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_info.py
    M ckanext/datastore/tests/test_interface.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_iauthfunctions/plugin_v1.py
    M ckanext/example_iauthfunctions/plugin_v2.py
    M ckanext/example_iauthfunctions/plugin_v3.py
    M ckanext/example_iauthfunctions/plugin_v4.py
    M ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
    A ckanext/example_iauthfunctions/plugin_v6_parent_auth_functions.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/example_iconfigurer/controller.py
    M ckanext/example_iconfigurer/plugin.py
    M ckanext/example_iconfigurer/plugin_v1.py
    M ckanext/example_iconfigurer/plugin_v2.py
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/example_idatasetform/plugin_v1.py
    M ckanext/example_idatasetform/plugin_v2.py
    M ckanext/example_idatasetform/plugin_v3.py
    M ckanext/example_idatasetform/plugin_v4.py
    M ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_igroupform/plugin.py
    M ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/example_iresourcecontroller/plugin.py
    M ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    M ckanext/example_itemplatehelpers/plugin.py
    M ckanext/example_itranslation/plugin.py
    M ckanext/example_itranslation/plugin_v1.py
    M ckanext/example_itranslation/tests/test_plugin.py
    A ckanext/example_iuploader/__init__.py
    A ckanext/example_iuploader/plugin.py
    A ckanext/example_iuploader/test/__init__.py
    A ckanext/example_iuploader/test/test_plugin.py
    M ckanext/example_ivalidators/plugin.py
    M ckanext/example_ivalidators/tests/test_ivalidators.py
    M ckanext/example_theme/custom_config_setting/plugin.py
    M ckanext/example_theme/custom_emails/plugin.py
    M ckanext/example_theme/custom_emails/tests.py
    M ckanext/example_theme/v01_empty_extension/plugin.py
    M ckanext/example_theme/v02_empty_template/plugin.py
    M ckanext/example_theme/v08_custom_helper_function/plugin.py
    M ckanext/example_theme/v12_extra_public_dir/plugin.py
    M ckanext/example_theme/v15_fanstatic/plugin.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/plugin.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/plugin.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/__init__.py
    M ckanext/stats/controller.py
    M ckanext/stats/plugin.py
    M ckanext/stats/public/__init__.py
    M ckanext/stats/public/ckanext/__init__.py
    M ckanext/stats/public/ckanext/stats/__init__.py
    M ckanext/stats/stats.py
    M ckanext/stats/tests/__init__.py
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/test_tag_vocab_plugin.py
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    A contrib/docker/docker-cloud.yml
    A contrib/docker/docker-compose.yml
    M contrib/docker/my_init.d/50_configure
    M contrib/docker/postgresql/Dockerfile
    M contrib/docker/solr/Dockerfile
    R contrib/docker/solr/schema.xml
    A contrib/docker/solr/solrconfig.xml
    M dev-requirements.txt
    M doc/contributing/index.rst
    M doc/contributing/python.rst
    A doc/contributing/unicode.rst
    M doc/extensions/best-practices.rst
    M doc/maintaining/configuration.rst
    M profile_tests.py
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 3002-jsonp-get


  Commit: f879df191970934b42228bf2eb643b2d03188ba9
      https://github.com/ckan/ckan/commit/f879df191970934b42228bf2eb643b2d03188ba9
  Author: amercader <amercadero at gmail.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M bin/running_stats.py
    M ckan/config/deployment.ini_tmpl
    R ckan/config/middleware.py
    A ckan/config/middleware/__init__.py
    A ckan/config/middleware/common_middleware.py
    A ckan/config/middleware/flask_app.py
    A ckan/config/middleware/pylons_app.py
    R ckan/lib/util.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/model/extension.py
    M ckan/pastertemplates/template/+dot+travis.yml_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/public/base/javascript/modules/resource-view-filters-form.js
    M ckan/templates/package/snippets/resource_view.html
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_tags.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/functional/api/test_api.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/legacy/models/test_group.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/lib/search/test_index.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/example_iuploader/test/test_plugin.py
    M ckanext/example_theme/custom_emails/tests.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M doc/conf.py
    M doc/contributing/python.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/install-from-source.rst
    M test.ini

  Log Message:
  -----------
  Merge branch 'master' into 3002-jsonp-get

Conflicts:
	ckan/tests/controllers/test_api.py


  Commit: 9eb47a115bf1a2c404eb092b5a6afe2698cf1503
      https://github.com/ckan/ckan/commit/9eb47a115bf1a2c404eb092b5a6afe2698cf1503
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-07-12 (Tue, 12 Jul 2016)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/legacy/logic/test_action.py
    M doc/api/index.rst

  Log Message:
  -----------
  Merge pull request #3002 from ckan/3002-jsonp-get

Only allow JSONP callbacks on GET requests


Compare: https://github.com/ckan/ckan/compare/646f4ea9e496...9eb47a115bf1

More information about the ckan-changes mailing list