[ckan-changes] [okfn/ckan] 7b57f3: [#1218] Ignore __extras on package_show extras

Thu Nov 28 11:46:46 UTC 2013

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 7b57f322c21b175e2f13035b68367171e65bdde7
      https://github.com/okfn/ckan/commit/7b57f322c21b175e2f13035b68367171e65bdde7
  Author: amercader <amercadero at gmail.com>
  Date:   2013-09-03 (Tue, 03 Sep 2013)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#1218] Ignore __extras on package_show extras


  Commit: f4132ceff66fcdecd96af865df9ebb81cc0919f2
      https://github.com/okfn/ckan/commit/f4132ceff66fcdecd96af865df9ebb81cc0919f2
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-25 (Mon, 25 Nov 2013)

  Changed paths:
    A .coveragerc
    M .travis.yml
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    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
    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/organization.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/template.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/munge.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.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/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/meta.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/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/core.py
    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/client.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/autocomplete.js
    A ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/datapusher.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/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/base.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/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/group/snippets/info.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/macros/form.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/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.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
    A ckan/templates/package/resource_data.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_help.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/related/snippets/related_item.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
    A ckan/templates/snippets/datapusher_status.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/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.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/model/test_group_and_organization_purge.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_related.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
    M ckan/tests/logic/test_tag.py
    A ckan/tests/models/test_follower.py
    M ckan/tests/models/test_user.py
    M ckan/tests/test_coding_standards.py
    A ckanext/datapusher/__init__.py
    A ckanext/datapusher/helpers.py
    A ckanext/datapusher/logic/__init__.py
    A ckanext/datapusher/logic/action.py
    A ckanext/datapusher/logic/auth.py
    A ckanext/datapusher/logic/schema.py
    A ckanext/datapusher/plugin.py
    A ckanext/datapusher/tests/__init__.py
    A ckanext/datapusher/tests/test.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/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.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/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.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
    A doc/_static/ckanlogo.png
    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
    M doc/ckan-coding-standards.rst
    M doc/conf.py
    M doc/configuration.rst
    A doc/contents.rst
    M doc/css-coding-standards.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/deployment.rst
    M doc/documentation-guidelines.rst
    M doc/email-notifications.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/filestore.rst
    M doc/getting-started.rst
    M 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/customize_look_and_feel.jpg
    A doc/images/edit_dataset.jpg
    A doc/images/exploring_datasets.jpg
    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/move_dataset_between_organizations.jpg
    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
    M doc/legacy-api.rst
    M doc/multilingual.rst
    R doc/solr-setup.rst
    A doc/sysadmin-guide.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
    A doc/upgrading-dependencies.rst
    A doc/user-guide.rst
    R doc/writing-extensions.rst
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 1218-remove-__extras


  Commit: cd580c6a6999a6f65704993b58615a8ef6ea977a
      https://github.com/okfn/ckan/commit/cd580c6a6999a6f65704993b58615a8ef6ea977a
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-25 (Mon, 25 Nov 2013)

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

  Log Message:
  -----------
  [#1218] Fix wrong test


  Commit: fb0fcf1ce1ca3028e00dd582afdb9476b7c2420f
      https://github.com/okfn/ckan/commit/fb0fcf1ce1ca3028e00dd582afdb9476b7c2420f
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-28 (Thu, 28 Nov 2013)

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

  Log Message:
  -----------
  Merge pull request #1218 from okfn/1218-remove-__extras

Hide __extras from extras on package_show


Compare: https://github.com/okfn/ckan/compare/edda21cd7f62...fb0fcf1ce1ca