[ckan-changes] [okfn/ckan] 01f34b: [#473] Remove logic.ParameterError because it is n...

GitHub noreply at github.com
Tue Jun 18 09:27:13 UTC 2013


  Branch: refs/heads/890-button-ia
  Home:   https://github.com/okfn/ckan
  Commit: 01f34b1ab097ed9cd3d4b2e217e44fec981c68b7
      https://github.com/okfn/ckan/commit/01f34b1ab097ed9cd3d4b2e217e44fec981c68b7
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/email_notifications.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/tests/lib/test_email_notifications.py

  Log Message:
  -----------
  [#473] Remove logic.ParameterError because it is not different from logic.ValidationError


  Commit: fcf4da4e1df1b9f09037edb058dad7a6da9b4a24
      https://github.com/okfn/ckan/commit/fcf4da4e1df1b9f09037edb058dad7a6da9b4a24
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [#473] get_or_bust returns an array after the field because to make it consistent with logic.validate


  Commit: 70ce14f5a0616d0fe157cf814acd195d3873b84a
      https://github.com/okfn/ckan/commit/70ce14f5a0616d0fe157cf814acd195d3873b84a
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#473] get_or_bust uses schema validation so that we use common code paths and similar validation procedures


  Commit: 0a6411e232f81922002fd77d1dd42b9057a60fad
      https://github.com/okfn/ckan/commit/0a6411e232f81922002fd77d1dd42b9057a60fad
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/tests/functional/test_related.py

  Log Message:
  -----------
  [#473] related_list validates whether we have either an id or a name


  Commit: c229bc47685742a787866c10f9c0581ef51975b6
      https://github.com/okfn/ckan/commit/c229bc47685742a787866c10f9c0581ef51975b6
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#473] datastore_create should rely on a valid context
Otherwise errors occur when doing a deep copy of the context in validate


  Commit: c490c1782072023406df6ce71bd44e0f5970a9e1
      https://github.com/okfn/ckan/commit/c490c1782072023406df6ce71bd44e0f5970a9e1
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#473] indicate optional parameters in datastore API


  Commit: 19b53886df2167f04c46c1c390dc36a0045f175e
      https://github.com/okfn/ckan/commit/19b53886df2167f04c46c1c390dc36a0045f175e
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

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

  Log Message:
  -----------
  [#473] Test that wrong record type raises Integrity Error


  Commit: e6fc5d93276b707535ceae1f29d539dd058cac0d
      https://github.com/okfn/ckan/commit/e6fc5d93276b707535ceae1f29d539dd058cac0d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  [#473] Return IntegrityError as json from API


  Commit: c977f39c574f986e3bc73a37b9e27af9ae471cdf
      https://github.com/okfn/ckan/commit/c977f39c574f986e3bc73a37b9e27af9ae471cdf
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/tests/functional/test_related.py

  Log Message:
  -----------
  [#473] related_list should return Query if neither an id nor a name are provided


  Commit: e028159fff4951317dec8441089d17dea84622ca
      https://github.com/okfn/ckan/commit/e028159fff4951317dec8441089d17dea84622ca
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

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

  Log Message:
  -----------
  [#473] Validate parameters for current_package_list_with_resources


  Commit: 4fc96445810b2b79e4379eca85a6910c80ccddd4
      https://github.com/okfn/ckan/commit/4fc96445810b2b79e4379eca85a6910c80ccddd4
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

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

  Log Message:
  -----------
  [#473] Add offset to current_package_list_with_resources and mark page deprecated


  Commit: a0d84a1bcf1a4d0689871c9457f70cdbddb2e011
      https://github.com/okfn/ckan/commit/a0d84a1bcf1a4d0689871c9457f70cdbddb2e011
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

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

  Log Message:
  -----------
  [#473] Unify validation for autocompletion


  Commit: 433e77d2081f45f71287f8ae08d25768529ea141
      https://github.com/okfn/ckan/commit/433e77d2081f45f71287f8ae08d25768529ea141
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [#473] Refactor get_or_bust, we do not have to give validate a fake context


  Commit: bd96b7ee33dd68362bfefa82e2cdb6d865cfd9e8
      https://github.com/okfn/ckan/commit/bd96b7ee33dd68362bfefa82e2cdb6d865cfd9e8
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

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

  Log Message:
  -----------
  [#473] Validate package_search parameters against a schema


  Commit: 0acfba70d13ac4688ed11b05d84aadffa22e1b75
      https://github.com/okfn/ckan/commit/0acfba70d13ac4688ed11b05d84aadffa22e1b75
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

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

  Log Message:
  -----------
  [#473] Validate parameters for resource_search


  Commit: f0cf9ca2de2497297ca7baddb9fe1b9815a0b598
      https://github.com/okfn/ckan/commit/f0cf9ca2de2497297ca7baddb9fe1b9815a0b598
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

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

  Log Message:
  -----------
  [#473] Fix issue with empty schema in context of package_search


  Commit: 29398731ea3712b956e11ab73a3ba110d961a5ff
      https://github.com/okfn/ckan/commit/29398731ea3712b956e11ab73a3ba110d961a5ff
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

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

  Log Message:
  -----------
  [#473] Add missing rtype to status_show


  Commit: e9512c4971a410e3a870b4db5db1907612e28ce2
      https://github.com/okfn/ckan/commit/e9512c4971a410e3a870b4db5db1907612e28ce2
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-04 (Mon, 04 Mar 2013)

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

  Log Message:
  -----------
  [#473] Validate dashboard_activity_list, dashboard_activity_list_html, {group, dataset}_followee_list,


  Commit: be5f37fb3157c30f842006dd64488861cf8502b4
      https://github.com/okfn/ckan/commit/be5f37fb3157c30f842006dd64488861cf8502b4
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-12 (Tue, 12 Mar 2013)

  Changed paths:
    M .travis.yml
    A bin/travis-build
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    R ckan/lib/authztool.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/delete.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/logic/validators.py
    M ckan/migration/versions/027_adjust_harvester.py
    M ckan/migration/versions/045_user_name_unique.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    R ckan/public/base/css/fuchsia.min.css
    R ckan/public/base/css/green.min.css
    M ckan/public/base/css/main.css
    R ckan/public/base/css/main.min.css
    R ckan/public/base/css/maroon.min.css
    R ckan/public/base/css/red.min.css
    R ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
    R ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckan/public/base/i18n/bg.min.js
    R ckan/public/base/i18n/ca.min.js
    R ckan/public/base/i18n/cs_CZ.min.js
    R ckan/public/base/i18n/de.min.js
    R ckan/public/base/i18n/el.min.js
    R ckan/public/base/i18n/es.min.js
    R ckan/public/base/i18n/fi.min.js
    R ckan/public/base/i18n/fr.min.js
    R ckan/public/base/i18n/hu.min.js
    R ckan/public/base/i18n/it.min.js
    R ckan/public/base/i18n/lt.min.js
    R ckan/public/base/i18n/lv.min.js
    R ckan/public/base/i18n/nl.min.js
    R ckan/public/base/i18n/no.min.js
    R ckan/public/base/i18n/pl.min.js
    R ckan/public/base/i18n/pt_BR.min.js
    R ckan/public/base/i18n/ro.min.js
    R ckan/public/base/i18n/ru.min.js
    R ckan/public/base/i18n/sk.min.js
    R ckan/public/base/i18n/sl.min.js
    R ckan/public/base/i18n/sq.min.js
    R ckan/public/base/i18n/sr.min.js
    R ckan/public/base/i18n/sr_Latn.min.js
    R ckan/public/base/i18n/sv.min.js
    R ckan/public/base/i18n/zh_TW.min.js
    A ckan/public/base/images/table-seperator.png
    M ckan/public/base/javascript/client.js
    R ckan/public/base/javascript/client.min.js
    R ckan/public/base/javascript/i18n.min.js
    R ckan/public/base/javascript/main.min.js
    R ckan/public/base/javascript/module.min.js
    R ckan/public/base/javascript/modules/api-info.min.js
    M ckan/public/base/javascript/modules/autocomplete.js
    R ckan/public/base/javascript/modules/autocomplete.min.js
    R ckan/public/base/javascript/modules/basic-form.min.js
    R ckan/public/base/javascript/modules/confirm-action.min.js
    R ckan/public/base/javascript/modules/custom-fields.min.js
    R ckan/public/base/javascript/modules/dashboard.min.js
    R ckan/public/base/javascript/modules/data-viewer.min.js
    R ckan/public/base/javascript/modules/follow.min.js
    R ckan/public/base/javascript/modules/related-item.min.js
    R ckan/public/base/javascript/modules/resource-form.min.js
    R ckan/public/base/javascript/modules/resource-upload-field.min.js
    R ckan/public/base/javascript/modules/select-switch.min.js
    R ckan/public/base/javascript/modules/slug-preview.min.js
    A ckan/public/base/javascript/modules/table-selectable-rows.js
    A ckan/public/base/javascript/modules/table-toggle-more.js
    R ckan/public/base/javascript/notify.min.js
    R ckan/public/base/javascript/plugins/jquery.date-helpers.min.js
    R ckan/public/base/javascript/plugins/jquery.form-warning.min.js
    R ckan/public/base/javascript/plugins/jquery.inherit.min.js
    R ckan/public/base/javascript/plugins/jquery.proxy-all.min.js
    R ckan/public/base/javascript/plugins/jquery.slug-preview.min.js
    R ckan/public/base/javascript/plugins/jquery.slug.min.js
    R ckan/public/base/javascript/plugins/jquery.truncator.min.js
    R ckan/public/base/javascript/plugins/jquery.url-helpers.min.js
    R ckan/public/base/javascript/pubsub.min.js
    M ckan/public/base/javascript/resource.config
    R ckan/public/base/javascript/sandbox.min.js
    R ckan/public/base/javascript/tracking.min.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    A ckan/public/base/less/tables.less
    M ckan/public/base/less/variables.less
    R ckan/public/base/test/spec/ckan.spec.min.js
    R ckan/public/base/test/spec/client.spec.min.js
    R ckan/public/base/test/spec/module.spec.min.js
    R ckan/public/base/test/spec/modules/autocomplete.spec.min.js
    R ckan/public/base/test/spec/modules/basic-form.spec.min.js
    R ckan/public/base/test/spec/modules/confirm-action.spec.min.js
    R ckan/public/base/test/spec/modules/custom-fields.spec.min.js
    R ckan/public/base/test/spec/modules/related-item.spec.min.js
    R ckan/public/base/test/spec/modules/resource-form.spec.min.js
    R ckan/public/base/test/spec/modules/resource-upload-field.spec.min.js
    R ckan/public/base/test/spec/notify.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.date-helpers.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.form-warning.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.inherit.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.proxy-all.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.slug-preview.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.slug.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.url-helpers.spec.min.js
    R ckan/public/base/test/spec/pubsub.spec.min.js
    R ckan/public/base/test/spec/sandbox.spec.min.js
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/error_document_template.html
    M ckan/templates/footer.html
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/home/snippets/about_text.html
    A ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/base_form_page.html
    A 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/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    A ckan/templates/organization/snippets/help.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/snippets/related_form.html
    M ckan/templates/snippets/datapreview_embed_dialog.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    R ckan/templates/snippets/page_header.html
    M ckan/templates/snippets/popular.html
    M ckan/templates/snippets/related.html
    A ckan/templates/snippets/search_result_text.html
    A ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/logic/test_action.py
    R ckan/tests/mock_publisher_auth.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    R ckanext/jsonpreview/theme/public/css/json.min.css
    R ckanext/jsonpreview/theme/public/preview_json.min.js
    R ckanext/pdfpreview/theme/public/css/pdf.min.css
    R ckanext/pdfpreview/theme/public/css/recline.min.css
    R ckanext/pdfpreview/theme/public/preview_pdf.min.js
    R ckanext/publisher_form/__init__.py
    R ckanext/publisher_form/forms.py
    R ckanext/publisher_form/templates/dataset_form.html
    R ckanext/publisher_form/templates/publisher_form.html
    R ckanext/publisher_form/templates/publisher_index.html
    R ckanext/publisher_form/templates/publisher_layout.html
    R ckanext/publisher_form/templates/publisher_new.html
    R ckanext/publisher_form/templates/publisher_read.html
    R ckanext/reclinepreview/theme/public/css/recline.min.css
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 473-consistent-api-validation

Conflicts:
	ckan/tests/logic/test_action.py


  Commit: d6cd92095fdfe07b213be6d1e592628447d31c46
      https://github.com/okfn/ckan/commit/d6cd92095fdfe07b213be6d1e592628447d31c46
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-22 (Fri, 22 Mar 2013)

  Changed paths:
    A ckan/common.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/tag.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dumper.py
    M ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/jsonp.py
    M ckan/lib/mailer.py
    M ckan/lib/plugins.py
    M ckan/lib/repoze_patch.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/022_add_group_extras.py
    M ckan/migration/versions/029_version_groups.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/footer.html
    M ckan/templates/home/about.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/members.html
    M ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/snippets/simple_search.html
    A ckan/templates/tag/index.html
    M ckan/templates_legacy/group/layout.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/revision/layout.html
    M ckan/templates_legacy/user/layout.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_solr_search_index.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/misc/test_sync.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_dumper.py
    A ckanext/example_idatasetform/__init__.py
    A ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/templates/package/read.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    R ckanext/organizations/__init__.py
    R ckanext/organizations/controllers.py
    R ckanext/organizations/forms.py
    R ckanext/organizations/templates/email/join_publisher_request.txt
    R ckanext/organizations/templates/organization_edit.html
    R ckanext/organizations/templates/organizations/form.html
    R ckanext/organizations/templates/organizations/index.html
    R ckanext/organizations/templates/organizations/new.html
    R ckanext/organizations/templates/organizations/read.html
    R ckanext/organizations/templates/organizations/users.html
    R ckanext/organizations/templates/organizations/users_form.html
    R ckanext/organizations/templates_legacy/organizations/apply.html
    R ckanext/organizations/templates_legacy/organizations/apply_form.html
    R ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
    R ckanext/organizations/templates_legacy/organizations/form.html
    R ckanext/organizations/templates_legacy/organizations/history.html
    R ckanext/organizations/templates_legacy/organizations/index.html
    R ckanext/organizations/templates_legacy/organizations/layout.html
    R ckanext/organizations/templates_legacy/organizations/new.html
    R ckanext/organizations/templates_legacy/organizations/package_form.html
    R ckanext/organizations/templates_legacy/organizations/read.html
    R ckanext/organizations/templates_legacy/organizations/users.html
    R ckanext/organizations/templates_legacy/organizations/users_form.html
    R ckanext/resourceproxy/tests/file_server.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/test_tag_vocab_plugin.py
    R doc/administrative-dashboard.rst
    R doc/api-tutorial.rst
    R doc/api-util.rst
    R doc/api-v2.rst
    M doc/api.rst
    R doc/apiv3.rst
    M doc/architecture.rst
    A doc/ckan.logic.action.create.rst
    A doc/ckan.logic.action.delete.rst
    A doc/ckan.logic.action.get.rst
    A doc/ckan.logic.action.update.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/datastore-api.rst
    A doc/filestore-api.rst
    M doc/filestore.rst
    R doc/forms.rst
    M doc/index.rst
    M doc/install-from-source.rst
    A doc/legacy-api.rst
    M doc/loading-data.rst
    M doc/multilingual.rst
    M doc/python-coding-standards.rst
    M doc/tag-vocabularies.rst
    M pip-requirements-test.txt
    M pip-requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 473-consistent-api-validation


  Commit: a62367dcf9fe40d3568caf5ebf3aed5c5631cbc0
      https://github.com/okfn/ckan/commit/a62367dcf9fe40d3568caf5ebf3aed5c5631cbc0
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-22 (Fri, 22 Mar 2013)

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

  Log Message:
  -----------
  [#473] Validate package_search input with schema and use the validated data_dict


  Commit: f0abac75e8e722512fabe2befe823b75f7c868fa
      https://github.com/okfn/ckan/commit/f0abac75e8e722512fabe2befe823b75f7c868fa
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-23 (Sat, 23 Mar 2013)

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

  Log Message:
  -----------
  [#473] Fix package_search validation.
The problem was that `facet.field` is not always a list of strings but sometimes a string of a python list of strings. Furthermore, needless parameters are reported in search and not in the validation step so that they are reported as SearchQueryErrors and not ValidationErrors.


  Commit: 22750ffe6addf66bff217d107e82071bfb88298c
      https://github.com/okfn/ckan/commit/22750ffe6addf66bff217d107e82071bfb88298c
  Author: kindly <kindly at gmail.com>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/search/__init__.py

  Log Message:
  -----------
  #700 add muliprocessing reindex


  Commit: 4c46b575cc9f112d9b89cfa309db5283bf2bad12
      https://github.com/okfn/ckan/commit/4c46b575cc9f112d9b89cfa309db5283bf2bad12
  Author: kindly <kindly at gmail.com>
  Date:   2013-03-31 (Sun, 31 Mar 2013)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  #700 fix so all processes join


  Commit: 23b0b7cd0d62c17a39e8242c150e1482eecb9160
      https://github.com/okfn/ckan/commit/23b0b7cd0d62c17a39e8242c150e1482eecb9160
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#580] Fix resource edit errors losing info


  Commit: eb93bdf9ac879a31c0a8bc9bb620e954e4c978be
      https://github.com/okfn/ckan/commit/eb93bdf9ac879a31c0a8bc9bb620e954e4c978be
  Author: Ian Ward <ian at excess.org>
  Date:   2013-04-27 (Sat, 27 Apr 2013)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  add a helpful response to SearchIndexError exceptions raised within the action api


  Commit: c862b41b3bb085b25741fc65b3212a0dacf54dda
      https://github.com/okfn/ckan/commit/c862b41b3bb085b25741fc65b3212a0dacf54dda
  Author: Ian Ward <ian at excess.org>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  [#835] return str(exception) on SearchIndexError in acton API


  Commit: b344381617c8270dca1597a053d5988f0f5d7eac
      https://github.com/okfn/ckan/commit/b344381617c8270dca1597a053d5988f0f5d7eac
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M ckan/public/base/less/homepage.less
    M ckan/templates/home/index.html
    M ckan/templates/snippets/group_item.html

  Log Message:
  -----------
  [#698] Makes group listing on homepage consistant height and length and such

Simply adds max-height to content to ensure list items are all of the same
height, also adds truncation to the title, decreases the truncation length of
the group description to make sure it's always on one line and adds a
min-height to the box to ensure that it's always the same height (even if there
is only 1 result)


  Commit: 597afb71ce0282830f3419e2df4fe5f5f88fb153
      https://github.com/okfn/ckan/commit/597afb71ce0282830f3419e2df4fe5f5f88fb153
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-02 (Thu, 02 May 2013)

  Changed paths:
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    A ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization_item.html

  Log Message:
  -----------
  [#864] Makes media-list items and media-grid much better looking and more functional

Includes:
- `.media-grid` now stacks nicely on top of each other and each item is it's
own box
- Also `.media-item`s now have a single thing to click on which makes it alot
easier to get to the related item
- Updates to media.less to decrease the amount of noise within the CSS
- Snippets for group_item, organization_item and related_item have been
simplified and a few blocks have been added to them for extendability
- Small fixes to related items index and sub pages


  Commit: 9ddfef527e627d20939fe27dcacbac5d7fe0d57e
      https://github.com/okfn/ckan/commit/9ddfef527e627d20939fe27dcacbac5d7fe0d57e
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-03 (Fri, 03 May 2013)

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

  Log Message:
  -----------
  [#864] Fix for removed class


  Commit: 79d437518271d974e88b3fe563b9d2f3e46d2aac
      https://github.com/okfn/ckan/commit/79d437518271d974e88b3fe563b9d2f3e46d2aac
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/snippets/group_item.html

  Log Message:
  -----------
  [#864] Few small tweaks to the templates


  Commit: 85bfa969eea3b0d2fbd85fa3a04b363a424ddc70
      https://github.com/okfn/ckan/commit/85bfa969eea3b0d2fbd85fa3a04b363a424ddc70
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-11 (Sat, 11 May 2013)

  Changed paths:
    M ckan/model/meta.py
    M ckan/tests/__init__.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [893] Allow passing the engine to engine_is_pg and engine_is_sqlite so that can do the checks even if ckan uses a db which is different from the one the datastore uses


  Commit: ddaf84c9aad4b7da9880fa38115fc206138ff484
      https://github.com/okfn/ckan/commit/ddaf84c9aad4b7da9880fa38115fc206138ff484
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-21 (Tue, 21 May 2013)

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

  Log Message:
  -----------
  [#921] Add more docs about resource proxy


  Commit: 89fa558779bd553c749159302be1a29889248cab
      https://github.com/okfn/ckan/commit/89fa558779bd553c749159302be1a29889248cab
  Author: John Glover <j at johnglover.net>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [#473] clarify comment


  Commit: 98b4b04b136677b9bf6c2a0160367bb4b50de838
      https://github.com/okfn/ckan/commit/98b4b04b136677b9bf6c2a0160367bb4b50de838
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M LICENSE.txt
    M bin/travis-build
    A dev-requirements.txt
    M doc/install-from-source.rst
    M doc/test.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py

  Log Message:
  -----------
  [#491] Pin every dependency's exact version.

To create these files, I've used pip-dump from the pip-tools package.

All requirements in *-requirements.txt have their versions pinned, and in
setup.py we keep only our direct dependencies and with the versions that
should work (i.e. >=0.11).

We did this so we can guarantee that everyone is using the exact same
version as everybody else, including our deployments.

For more info, check http://nvie.com/posts/pin-your-packages/.


  Commit: 8cf11e43644b13e2a41d2b370a48f1b1e9d05c02
      https://github.com/okfn/ckan/commit/8cf11e43644b13e2a41d2b370a48f1b1e9d05c02
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    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/schema.py
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#473] Renamed pos_int_validator to natural_number_validator, improved code style, fixed potential server error


  Commit: b67a94101cda3483aaf87c5f0e79af381ce08fae
      https://github.com/okfn/ckan/commit/b67a94101cda3483aaf87c5f0e79af381ce08fae
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    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/schema.py
    M ckan/logic/validators.py

  Log Message:
  -----------
  Revert "[#473] Renamed pos_int_validator to natural_number_validator, improved code style, fixed potential server error"

This reverts commit 8cf11e43644b13e2a41d2b370a48f1b1e9d05c02.


  Commit: 3049160be8125cf9d442ccabb2d8550d97c2018d
      https://github.com/okfn/ckan/commit/3049160be8125cf9d442ccabb2d8550d97c2018d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#473] Renamed pos_int_validator to natural_number_validator, fixed potential server error


  Commit: 02663660de57c594b1a01f25950e7285f229119c
      https://github.com/okfn/ckan/commit/02663660de57c594b1a01f25950e7285f229119c
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#690] Fix url_for_static to force first arg as url


  Commit: dc044abaacd5586997716fdd19b4bbeaf59b1345
      https://github.com/okfn/ckan/commit/dc044abaacd5586997716fdd19b4bbeaf59b1345
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-31 (Fri, 31 May 2013)

  Changed paths:
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#473] Don't add PEP8 issues


  Commit: d09cffd83a4940bc3ff0f7fedf30656738a1335b
      https://github.com/okfn/ckan/commit/d09cffd83a4940bc3ff0f7fedf30656738a1335b
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-31 (Fri, 31 May 2013)

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

  Log Message:
  -----------
  [#473] Use json.loads instead of ast.literal_eval


  Commit: caa016eabe470223d19d1db0dce6480b26856bdb
      https://github.com/okfn/ckan/commit/caa016eabe470223d19d1db0dce6480b26856bdb
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_edit.html
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  [#873] Show upload option if filestore enabled

* Add a check_filestore helper that checks the config if filestore is
  enabled.
* Check if filestore is enabled and user is logged in before showing
  upload button.


  Commit: 007c1036ed3124301725126d5a0bad1f8922ba62
      https://github.com/okfn/ckan/commit/007c1036ed3124301725126d5a0bad1f8922ba62
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  [#414] Prevent callback parameter breaking action api and search


  Commit: 7e7cf40877bb1496ce601446e73c89418c086b1c
      https://github.com/okfn/ckan/commit/7e7cf40877bb1496ce601446e73c89418c086b1c
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.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/get.py
    M ckan/plugins/interfaces.py
    M ckan/tests/test_coding_standards.py
    R ckanext/jsonpreview/__init__.py
    R ckanext/jsonpreview/plugin.py
    R ckanext/jsonpreview/tests/__init__.py
    R ckanext/jsonpreview/tests/test_preview.py
    R ckanext/jsonpreview/theme/public/css/json.css
    R ckanext/jsonpreview/theme/public/preview_json.js
    R ckanext/jsonpreview/theme/public/resource.config
    R ckanext/jsonpreview/theme/templates/json.html
    M ckanext/pdfpreview/tests/test_preview.py
    A ckanext/textpreview/__init__.py
    A ckanext/textpreview/plugin.py
    A ckanext/textpreview/tests/__init__.py
    A ckanext/textpreview/tests/test_preview.py
    A ckanext/textpreview/theme/public/LICENSE
    A ckanext/textpreview/theme/public/css/text.css
    A ckanext/textpreview/theme/public/highlight.pack.js
    A ckanext/textpreview/theme/public/preview_text.js
    A ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/default.css
    A ckanext/textpreview/theme/public/styles/github.css
    A ckanext/textpreview/theme/templates/text.html
    R doc/CHANGELOG.rst
    M doc/api.rst
    R doc/architecture.rst
    M doc/background-tasks.rst
    A doc/ckan-coding-standards.rst
    R doc/ckan.logic.action.create.rst
    R doc/ckan.logic.action.delete.rst
    R doc/ckan.logic.action.get.rst
    R doc/ckan.logic.action.update.rst
    R doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    R doc/database-dumps.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.rst
    A doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    R doc/extensions.rst
    A doc/features.rst
    R doc/filestore-api.rst
    M doc/filestore.rst
    M doc/frontend-development.rst
    R doc/frontend-testing.rst
    A doc/getting-started.rst
    A doc/images/admin-page.png
    R doc/importing-datasets.rst
    M doc/index.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    A doc/installing.rst
    M doc/multilingual.rst
    M doc/paster.rst
    R doc/post-installation.rst
    R doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    R doc/release-cycle.rst
    M doc/release-process.rst
    A doc/releases.rst
    M doc/tag-vocabularies.rst
    M doc/test.rst
    M doc/theming.rst
    A doc/upgrading-a-package-install.rst
    A doc/upgrading-a-source-install.rst
    A doc/writing-extensions.rst
    M pip-requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 690-url-for-static-fix


  Commit: 8fca53ede4e13c26fa1963d8c4bc4e26d4fcb491
      https://github.com/okfn/ckan/commit/8fca53ede4e13c26fa1963d8c4bc4e26d4fcb491
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M ckan/lib/app_globals.py
    M ckan/lib/helpers.py
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_edit.html
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  [#873] Use a g.ofs_impl to check filestore status

* Remove the helper function check_datastore
* Create a global varibale called ofs_impl that stores
  the value of the config option


  Commit: ab28af9baaf0916edc5184208c35ce6e54d7d257
      https://github.com/okfn/ckan/commit/ab28af9baaf0916edc5184208c35ce6e54d7d257
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M doc/data-viewer.rst

  Log Message:
  -----------
  [#921] Correct a couple of typos in the docs


  Commit: f0bf985764f043649fe17e4745376b3eea23c754
      https://github.com/okfn/ckan/commit/f0bf985764f043649fe17e4745376b3eea23c754
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-upload-field.js

  Log Message:
  -----------
  [#902] Warns user of navigation if a upload is happening


  Commit: baa838a67955f390173a1967c25da0dd45ea3ad1
      https://github.com/okfn/ckan/commit/baa838a67955f390173a1967c25da0dd45ea3ad1
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M .tx/config
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    A ckan/config/install.py
    M ckan/config/who.ini
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    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/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    A ckan/i18n/dv/LC_MESSAGES/ckan.mo
    A ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    A ckan/i18n/id/LC_MESSAGES/ckan.mo
    A ckan/i18n/id/LC_MESSAGES/ckan.po
    A ckan/i18n/is/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/tr/LC_MESSAGES/ckan.mo
    A ckan/i18n/tr/LC_MESSAGES/ckan.po
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/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/package.py
    R ckan/model/test_user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    R ckan/public/base/images/flags.png
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/confirm-action.js
    M ckan/public/base/javascript/tracking.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/prose.less
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/group/about.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/revision/read.html
    A ckan/templates/snippets/additional_info.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    A ckan/tests/test_coding_standards.py
    M ckanext/datastore/commands.py
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    A ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    R ckanext/jsonpreview/__init__.py
    R ckanext/jsonpreview/plugin.py
    R ckanext/jsonpreview/tests/__init__.py
    R ckanext/jsonpreview/tests/test_preview.py
    R ckanext/jsonpreview/theme/public/css/json.css
    R ckanext/jsonpreview/theme/public/preview_json.js
    R ckanext/jsonpreview/theme/public/resource.config
    R ckanext/jsonpreview/theme/templates/json.html
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    A ckanext/textpreview/__init__.py
    A ckanext/textpreview/plugin.py
    A ckanext/textpreview/tests/__init__.py
    A ckanext/textpreview/tests/test_preview.py
    A ckanext/textpreview/theme/public/LICENSE
    A ckanext/textpreview/theme/public/css/text.css
    A ckanext/textpreview/theme/public/highlight.pack.js
    A ckanext/textpreview/theme/public/preview_text.js
    A ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/default.css
    A ckanext/textpreview/theme/public/styles/github.css
    A ckanext/textpreview/theme/templates/text.html
    M dev-requirements.txt
    R doc/CHANGELOG.rst
    M doc/api.rst
    M doc/apps-ideas.rst
    R doc/architecture.rst
    M doc/authorization.rst
    A doc/ckan-coding-standards.rst
    R doc/ckan.logic.action.create.rst
    R doc/ckan.logic.action.delete.rst
    R doc/ckan.logic.action.get.rst
    R doc/ckan.logic.action.update.rst
    R doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    R doc/database-dumps.rst
    M doc/datastore-api.rst
    M doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.rst
    A doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    R doc/extensions.rst
    A doc/features.rst
    R doc/filestore-api.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    M doc/frontend-development.rst
    R doc/frontend-testing.rst
    R doc/geospatial.rst
    A doc/getting-started.rst
    R doc/harvesting.rst
    M doc/i18n.rst
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    A doc/images/admin-page.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    R doc/importing-datasets.rst
    M doc/index.rst
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    A doc/installing.rst
    M doc/multilingual.rst
    M doc/paster.rst
    R doc/post-installation.rst
    R doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    R doc/release-cycle.rst
    A doc/release-process.rst
    A doc/releases.rst
    M doc/solr-setup.rst
    A doc/stats.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    M doc/tracking.rst
    A doc/upgrading-a-package-install.rst
    A doc/upgrading-a-source-install.rst
    M doc/writing-extensions.rst
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into 491

Conflicts:
	CONTRIBUTING.rst
	doc/install-from-source.rst
	doc/test.rst
	pip-requirements-test.txt
	pip-requirements.txt


  Commit: 1229530155aafa36cd811c68e083d9e3eb873471
      https://github.com/okfn/ckan/commit/1229530155aafa36cd811c68e083d9e3eb873471
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M doc/data-viewer.rst

  Log Message:
  -----------
  [#921] Extend resource proxy docs
Give an example which shows what exactly will not work. Explain how it gets around the same origin policy.


  Commit: dad3b5d144c073388134ae0e02be712ae8d4b580
      https://github.com/okfn/ckan/commit/dad3b5d144c073388134ae0e02be712ae8d4b580
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  [#491] Add remaining requirements and fix bug in setup.py

There was a typo, extra_requires should have been extras_require.


  Commit: 49bbd15892355d1ad5d5deff8f07ad8762bfd8be
      https://github.com/okfn/ckan/commit/49bbd15892355d1ad5d5deff8f07ad8762bfd8be
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    A .pipignore

  Log Message:
  -----------
  [#491] Never add CKAN itself to the requirements file


  Commit: b2a531d0f7dbce602670ebb90c6b5b8bda0adbd6
      https://github.com/okfn/ckan/commit/b2a531d0f7dbce602670ebb90c6b5b8bda0adbd6
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M dev-requirements.txt
    M requirements.txt

  Log Message:
  -----------
  [#491] Ordering requirements files

pip-dump, after adding any new requirement that it finds, sorts it.
As ours were unsorted, it would create noise when you upgraded. I'm
separating that noise in this commit.


  Commit: 4670a6da2e27de90baf80936454310d347b0eb0a
      https://github.com/okfn/ckan/commit/4670a6da2e27de90baf80936454310d347b0eb0a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-07 (Fri, 07 Jun 2013)

  Changed paths:
    M doc/_themes/sphinx-theme-okfn

  Log Message:
  -----------
  Update to a newer version of the Sphinx theme

Update the sphinx-theme-okfn git submodule to a newer commit. It looks
like it accidentally got reverted to an older commit recently. We can't
use the latest version of sphinx-theme-okfn because it breaks a bunch of
stuff, this commit looks like the newest version that 'just works' for
CKAN.


  Commit: 9b6adc8dc9b15cbb187499db4392fa74b8a9196b
      https://github.com/okfn/ckan/commit/9b6adc8dc9b15cbb187499db4392fa74b8a9196b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-07 (Fri, 07 Jun 2013)

  Changed paths:
    M CHANGELOG.rst
    M ckan/controllers/package.py
    M ckan/logic/action/update.py
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/confirm-action.js
    M ckan/public/base/less/layout.less

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


  Commit: 63ffff0997b9d5cef97b2de48531e6fb62b393b3
      https://github.com/okfn/ckan/commit/63ffff0997b9d5cef97b2de48531e6fb62b393b3
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-07 (Fri, 07 Jun 2013)

  Changed paths:
    M CHANGELOG.rst
    A doc/changelog.rst
    M doc/conf.py
    M doc/index.rst
    M doc/installing.rst
    M doc/release-process.rst
    R doc/releases.rst
    A doc/upgrade-package-ckan-1-to-2.rst
    A doc/upgrade-package-to-minor-release.rst
    A doc/upgrade-package-to-patch-release.rst
    A doc/upgrade-source.rst
    R doc/upgrading-a-package-install.rst
    R doc/upgrading-a-source-install.rst
    A doc/upgrading.rst

  Log Message:
  -----------
  [#945] Upgrading docs reorganization.

Reorganise the upgrading and releases docs. We now have a single
Upgrading page that includes info about the different types of release
and the release process, and links to the various instructions for
upgrading CKAN.

Fixes #945.


  Commit: 7771d4e7c06f6f91eed85451d6016fa876551f7c
      https://github.com/okfn/ckan/commit/7771d4e7c06f6f91eed85451d6016fa876551f7c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-07 (Fri, 07 Jun 2013)

  Changed paths:
    R doc/datastore-api.rst
    R doc/datastore-setup.rst

  Log Message:
  -----------
  Fix some Sphinx warnings

These two datastore-*.rst files got merged into sections within
datastore.rst, but apparently the files weren't deleted, or a merge
brought them back.


  Commit: 85ad0c73db0ece6723e287c912d079de6a391373
      https://github.com/okfn/ckan/commit/85ad0c73db0ece6723e287c912d079de6a391373
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    A .pipignore
    M LICENSE.txt
    M bin/travis-build
    A dev-requirements.txt
    M doc/install-from-source.rst
    M doc/test.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'vitorbaptista/491'


  Commit: c37a52610412823f582b26cd8f3662c690eae3f8
      https://github.com/okfn/ckan/commit/c37a52610412823f582b26cd8f3662c690eae3f8
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-06-09 (Sun, 09 Jun 2013)

  Changed paths:
    A .pipignore
    M .tx/config
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M LICENSE.txt
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    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/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    A ckan/i18n/dv/LC_MESSAGES/ckan.mo
    A ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    A ckan/i18n/id/LC_MESSAGES/ckan.mo
    A ckan/i18n/id/LC_MESSAGES/ckan.po
    A ckan/i18n/is/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/tr/LC_MESSAGES/ckan.mo
    A ckan/i18n/tr/LC_MESSAGES/ckan.po
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/base.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    R ckan/model/test_user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/confirm-action.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/prose.less
    M ckan/templates/group/about.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/related/snippets/related_item.html
    A ckan/templates/snippets/additional_info.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/commands.py
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    A ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    R ckanext/jsonpreview/__init__.py
    R ckanext/jsonpreview/plugin.py
    R ckanext/jsonpreview/tests/__init__.py
    R ckanext/jsonpreview/tests/test_preview.py
    R ckanext/jsonpreview/theme/public/css/json.css
    R ckanext/jsonpreview/theme/public/preview_json.js
    R ckanext/jsonpreview/theme/public/resource.config
    R ckanext/jsonpreview/theme/templates/json.html
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    A ckanext/textpreview/__init__.py
    A ckanext/textpreview/plugin.py
    A ckanext/textpreview/tests/__init__.py
    A ckanext/textpreview/tests/test_preview.py
    A ckanext/textpreview/theme/public/LICENSE
    A ckanext/textpreview/theme/public/css/text.css
    A ckanext/textpreview/theme/public/highlight.pack.js
    A ckanext/textpreview/theme/public/preview_text.js
    A ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/default.css
    A ckanext/textpreview/theme/public/styles/github.css
    A ckanext/textpreview/theme/templates/text.html
    A dev-requirements.txt
    R doc/CHANGELOG.rst
    M doc/_themes/sphinx-theme-okfn
    M doc/api.rst
    R doc/architecture.rst
    M doc/background-tasks.rst
    A doc/ckan-coding-standards.rst
    R doc/ckan.logic.action.create.rst
    R doc/ckan.logic.action.delete.rst
    R doc/ckan.logic.action.get.rst
    R doc/ckan.logic.action.update.rst
    R doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    R doc/database-dumps.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.rst
    A doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    R doc/extensions.rst
    A doc/features.rst
    R doc/filestore-api.rst
    M doc/filestore.rst
    M doc/frontend-development.rst
    R doc/frontend-testing.rst
    A doc/getting-started.rst
    A doc/images/admin-page.png
    R doc/importing-datasets.rst
    M doc/index.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    A doc/installing.rst
    M doc/multilingual.rst
    M doc/paster.rst
    R doc/post-installation.rst
    R doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    R doc/release-cycle.rst
    M doc/release-process.rst
    A doc/releases.rst
    M doc/tag-vocabularies.rst
    M doc/test.rst
    M doc/theming.rst
    A doc/upgrading-a-package-install.rst
    A doc/upgrading-a-source-install.rst
    A doc/writing-extensions.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 921-resourceproxy-docs

Conflicts:
	doc/data-viewer.rst


  Commit: b9e4eb8d2fdd252bc6f825d23dc5aec0309af0d8
      https://github.com/okfn/ckan/commit/b9e4eb8d2fdd252bc6f825d23dc5aec0309af0d8
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-06-09 (Sun, 09 Jun 2013)

  Changed paths:
    M doc/data-viewer.rst

  Log Message:
  -----------
  Clean up merge


  Commit: 79c0f732c7679fd30d3cfcd9542a8134985baf78
      https://github.com/okfn/ckan/commit/79c0f732c7679fd30d3cfcd9542a8134985baf78
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  Merge pull request #414 from okfn/414-api-callback-fixes

JSONP API problems


  Commit: fd588bcd19c816e1bbbd1ac24327e7901081d734
      https://github.com/okfn/ckan/commit/fd588bcd19c816e1bbbd1ac24327e7901081d734
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  [#454] Add polib to dev-requirements.txt


  Commit: 95702d2bd7ba0d069edaf589e4237dbf1c144cf0
      https://github.com/okfn/ckan/commit/95702d2bd7ba0d069edaf589e4237dbf1c144cf0
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M ckan/templates/organization/snippets/organization_form.html

  Log Message:
  -----------
  [#803] Warn users before deleting an organization

Deleting an organization deletes all the public and private datasets
belonging to the organization. Add a warning to the delete confirmation
about this.


  Commit: 767ce2670424719ac602535cdbe10b6e6bbd255e
      https://github.com/okfn/ckan/commit/767ce2670424719ac602535cdbe10b6e6bbd255e
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge branch '580-resource-edit-error'


  Commit: 1ba2b857da14743e49497a0d47e92b981c9849cd
      https://github.com/okfn/ckan/commit/1ba2b857da14743e49497a0d47e92b981c9849cd
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    A .pipignore
    M CHANGELOG.rst
    M LICENSE.txt
    M bin/travis-build
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/logic/action/update.py
    R ckan/model/test_user.py
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/confirm-action.js
    M ckan/public/base/less/layout.less
    M ckan/tests/models/test_user.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    A dev-requirements.txt
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/data-viewer.rst
    M doc/documentation-guidelines.rst
    M doc/install-from-source.rst
    M doc/test.rst
    M doc/upgrading-a-package-install.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py

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


  Commit: 68f0aeb88f00b2d7c2a7935ccb7fe5a1022f4c1b
      https://github.com/okfn/ckan/commit/68f0aeb88f00b2d7c2a7935ccb7fe5a1022f4c1b
  Author: John Glover <j at johnglover.net>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    A .pipignore
    M .tx/config
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M LICENSE.txt
    M README.rst
    M bin/osx-postgres-mem.sh
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    A ckan/config/install.py
    M ckan/config/routing.py
    M ckan/config/who.ini
    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/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    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/check_po_files.py
    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/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    A ckan/i18n/dv/LC_MESSAGES/ckan.mo
    A ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    A ckan/i18n/id/LC_MESSAGES/ckan.mo
    A ckan/i18n/id/LC_MESSAGES/ckan.po
    A ckan/i18n/is/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/tr/LC_MESSAGES/ckan.mo
    A ckan/i18n/tr/LC_MESSAGES/ckan.po
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/formatters.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/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/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/migration/versions/067_turn_extras_to_strings.py
    R ckan/misc.py
    M ckan/model/__init__.py
    M ckan/model/license.py
    M ckan/model/package.py
    M ckan/model/package_relationship.py
    M ckan/model/tag.py
    R ckan/model/test_user.py
    M ckan/model/tracking.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    R ckan/public/base/images/flags.png
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/confirm-action.js
    M ckan/public/base/javascript/tracking.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/prose.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/actions.html
    A ckan/templates/development/snippets/context.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/media_grid.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    R ckan/templates/development/snippets/toolbar.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    A ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_item.html
    A ckan/templates/group/snippets/history_revisions.html
    A ckan/templates/group/snippets/revisions_table.html
    M ckan/templates/header.html
    M ckan/templates/home/index.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/edit.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.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/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/followers.html
    A ckan/templates/package/history.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_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/data_api_button.html
    A ckan/templates/package/snippets/history_revisions.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.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/resources_list.html
    A ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    A ckan/templates/revision/__init__.py
    A ckan/templates/revision/diff.html
    A ckan/templates/revision/list.html
    A ckan/templates/revision/read.html
    A ckan/templates/revision/read_base.html
    A ckan/templates/revision/snippets/revisions_list.html
    A ckan/templates/snippets/additional_info.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/sort_by.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout.html
    M ckan/templates/user/new.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/misc/test_format_text.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    A ckan/tests/test_coding_standards.py
    M ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/commands.py
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    A ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    A ckanext/example_idatasetform/templates/package/snippets/package_basic_fields.html
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    R ckanext/jsonpreview/__init__.py
    R ckanext/jsonpreview/plugin.py
    R ckanext/jsonpreview/tests/__init__.py
    R ckanext/jsonpreview/tests/test_preview.py
    R ckanext/jsonpreview/theme/public/css/json.css
    R ckanext/jsonpreview/theme/public/preview_json.js
    R ckanext/jsonpreview/theme/public/resource.config
    R ckanext/jsonpreview/theme/templates/json.html
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/reclinepreview/theme/public/preview_recline.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.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    A ckanext/textpreview/__init__.py
    A ckanext/textpreview/plugin.py
    A ckanext/textpreview/tests/__init__.py
    A ckanext/textpreview/tests/test_preview.py
    A ckanext/textpreview/theme/public/LICENSE
    A ckanext/textpreview/theme/public/css/text.css
    A ckanext/textpreview/theme/public/highlight.pack.js
    A ckanext/textpreview/theme/public/preview_text.js
    A ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/default.css
    A ckanext/textpreview/theme/public/styles/github.css
    A ckanext/textpreview/theme/templates/text.html
    A dev-requirements.txt
    R doc/CHANGELOG.rst
    M doc/_templates/footer.html
    M doc/_themes/sphinx-theme-okfn
    R doc/about.rst
    M doc/api.rst
    M doc/apps-ideas.rst
    R doc/architecture.rst
    M doc/authorization.rst
    A doc/ckan-coding-standards.rst
    R doc/ckan.logic.action.create.rst
    R doc/ckan.logic.action.delete.rst
    R doc/ckan.logic.action.get.rst
    R doc/ckan.logic.action.update.rst
    R doc/commenting.rst
    R doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    R doc/contrib.rst
    A doc/contributing.rst
    M doc/css-coding-standards.rst
    M doc/data-viewer.rst
    R doc/database-dumps.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.rst
    A doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    R doc/extensions.rst
    A doc/features.rst
    R doc/filestore-api.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    M doc/frontend-development.rst
    R doc/frontend-testing.rst
    R doc/geospatial.rst
    A doc/getting-started.rst
    R doc/harvesting.rst
    M doc/i18n.rst
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    A doc/images/admin-page.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    A doc/images/popular-dataset.png
    A doc/images/popular-resource.png
    A doc/images/sort-datasets-by-popularity.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    M doc/index.rst
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    A doc/installing.rst
    M doc/javascript-coding-standards.rst
    M doc/javascript-module-tutorial.rst
    M doc/legacy-api.rst
    R doc/loading-data.rst
    M doc/multilingual.rst
    R doc/organizations_and_groups.rst
    M doc/paster.rst
    R doc/post-installation.rst
    R doc/publisher-profile.rst
    R doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    R doc/release-cycle.rst
    A doc/release-process.rst
    A doc/releases.rst
    M doc/resources.rst
    M doc/solr-setup.rst
    A doc/stats.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    A doc/tracking.rst
    A doc/upgrading-a-package-install.rst
    A doc/upgrading-a-source-install.rst
    R doc/user-stories-list.rst
    R doc/user-stories.rst
    M doc/writing-extensions.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  [#473] merge origin/master


  Commit: 13393b528d5816e2e2948a0ee54ffb6633303b9b
      https://github.com/okfn/ckan/commit/13393b528d5816e2e2948a0ee54ffb6633303b9b
  Author: John Glover <j at johnglover.net>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  Merge pull request #991 from okfn/454-polib-dev-req

[#454] Add polib to dev-requirements.txt


  Commit: cd13da57e283084bcf6d6626dfb9205a93e0fab2
      https://github.com/okfn/ckan/commit/cd13da57e283084bcf6d6626dfb9205a93e0fab2
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/public/base/less/homepage.less
    M ckan/templates/home/index.html
    M ckan/templates/snippets/group_item.html

  Log Message:
  -----------
  Merge branch '698-groups-height'


  Commit: 4014acd7493599054a0b50eb7b76bf0af702c6c8
      https://github.com/okfn/ckan/commit/4014acd7493599054a0b50eb7b76bf0af702c6c8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/public/base/css/main.css

  Log Message:
  -----------
  Recompile css


  Commit: 6bf85ac744141a7bd4f9d65928b2b86dad84e2e9
      https://github.com/okfn/ckan/commit/6bf85ac744141a7bd4f9d65928b2b86dad84e2e9
  Author: John Glover <j at johnglover.net>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/logic/action/get.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/homepage.less
    M ckan/templates/home/index.html
    M ckan/templates/snippets/group_item.html
    M dev-requirements.txt

  Log Message:
  -----------
  [#473] merge origin/master


  Commit: 16bc4ba5ea88064316fa38287c7301045a339c32
      https://github.com/okfn/ckan/commit/16bc4ba5ea88064316fa38287c7301045a339c32
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/lib/app_globals.py
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_edit.html

  Log Message:
  -----------
  Merge branch '873-upload-button-check'


  Commit: fcda749cec634b191984bcfd611e4ba3b2c3b985
      https://github.com/okfn/ckan/commit/fcda749cec634b191984bcfd611e4ba3b2c3b985
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    A ckan/migration/versions/068_add_package_extras_index.py

  Log Message:
  -----------
  [#982] Add new index to package_extra_revision to aid performance


  Commit: ed5fe85a2f71488a465cbad2d6b5a469dee261c4
      https://github.com/okfn/ckan/commit/ed5fe85a2f71488a465cbad2d6b5a469dee261c4
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html

  Log Message:
  -----------
  [#864] Adds better state for JS disabled on media listings


  Commit: 825a6da2a3cf98974df74cd90fc99b00e639860f
      https://github.com/okfn/ckan/commit/825a6da2a3cf98974df74cd90fc99b00e639860f
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html

  Log Message:
  -----------
  [#864] Add clearfix for related lists


  Commit: 9792a96a340634573bf0cc8a707a3046a8e2a256
      https://github.com/okfn/ckan/commit/9792a96a340634573bf0cc8a707a3046a8e2a256
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    A .pipignore
    M .tx/config
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M LICENSE.txt
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    A ckan/config/install.py
    M ckan/config/who.ini
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    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/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    A ckan/i18n/dv/LC_MESSAGES/ckan.mo
    A ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    A ckan/i18n/id/LC_MESSAGES/ckan.mo
    A ckan/i18n/id/LC_MESSAGES/ckan.po
    A ckan/i18n/is/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/tr/LC_MESSAGES/ckan.mo
    A ckan/i18n/tr/LC_MESSAGES/ckan.po
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/068_add_package_extras_index.py
    M ckan/model/package.py
    R ckan/model/test_user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    R ckan/public/base/images/flags.png
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/confirm-action.js
    M ckan/public/base/javascript/tracking.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/prose.less
    M ckan/templates/group/about.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/revision/read.html
    A ckan/templates/snippets/additional_info.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    A ckan/tests/test_coding_standards.py
    M ckanext/datastore/commands.py
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    A ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    R ckanext/jsonpreview/__init__.py
    R ckanext/jsonpreview/plugin.py
    R ckanext/jsonpreview/tests/__init__.py
    R ckanext/jsonpreview/tests/test_preview.py
    R ckanext/jsonpreview/theme/public/css/json.css
    R ckanext/jsonpreview/theme/public/preview_json.js
    R ckanext/jsonpreview/theme/public/resource.config
    R ckanext/jsonpreview/theme/templates/json.html
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    A ckanext/textpreview/__init__.py
    A ckanext/textpreview/plugin.py
    A ckanext/textpreview/tests/__init__.py
    A ckanext/textpreview/tests/test_preview.py
    A ckanext/textpreview/theme/public/LICENSE
    A ckanext/textpreview/theme/public/css/text.css
    A ckanext/textpreview/theme/public/highlight.pack.js
    A ckanext/textpreview/theme/public/preview_text.js
    A ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/default.css
    A ckanext/textpreview/theme/public/styles/github.css
    A ckanext/textpreview/theme/templates/text.html
    A dev-requirements.txt
    R doc/CHANGELOG.rst
    M doc/_themes/sphinx-theme-okfn
    M doc/api.rst
    R doc/architecture.rst
    M doc/authorization.rst
    A doc/ckan-coding-standards.rst
    R doc/ckan.logic.action.create.rst
    R doc/ckan.logic.action.delete.rst
    R doc/ckan.logic.action.get.rst
    R doc/ckan.logic.action.update.rst
    R doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    R doc/database-dumps.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.rst
    A doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    R doc/extensions.rst
    A doc/features.rst
    R doc/filestore-api.rst
    M doc/filestore.rst
    M doc/frontend-development.rst
    R doc/frontend-testing.rst
    R doc/geospatial.rst
    A doc/getting-started.rst
    R doc/harvesting.rst
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    A doc/images/admin-page.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    R doc/importing-datasets.rst
    M doc/index.rst
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    A doc/installing.rst
    M doc/multilingual.rst
    M doc/paster.rst
    R doc/post-installation.rst
    R doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    R doc/release-cycle.rst
    M doc/release-process.rst
    A doc/releases.rst
    M doc/solr-setup.rst
    A doc/stats.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    A doc/upgrading-a-package-install.rst
    A doc/upgrading-a-source-install.rst
    M doc/writing-extensions.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merged master


  Commit: f8474a2e85403d9b696e9e778df431310ce2249a
      https://github.com/okfn/ckan/commit/f8474a2e85403d9b696e9e778df431310ce2249a
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/public/base/css/main.css

  Log Message:
  -----------
  Recompile css


  Commit: a865639677e6542bbfe8fef293f6a8681fa44fc5
      https://github.com/okfn/ckan/commit/a865639677e6542bbfe8fef293f6a8681fa44fc5
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update CHANGELOG


  Commit: fc3507382c1d2411906c99031a0376b8051765d9
      https://github.com/okfn/ckan/commit/fc3507382c1d2411906c99031a0376b8051765d9
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Add 2.0.1 release date to CHANGELOG


  Commit: 98fc914cf884afb5d5ce6373f05852df9d2d75cd
      https://github.com/okfn/ckan/commit/98fc914cf884afb5d5ce6373f05852df9d2d75cd
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M CHANGELOG.rst
    A doc/changelog.rst
    M doc/conf.py
    M doc/index.rst
    M doc/installing.rst
    M doc/release-process.rst
    R doc/releases.rst
    A doc/upgrade-package-ckan-1-to-2.rst
    A doc/upgrade-package-to-minor-release.rst
    A doc/upgrade-package-to-patch-release.rst
    A doc/upgrade-source.rst
    R doc/upgrading-a-package-install.rst
    R doc/upgrading-a-source-install.rst
    A doc/upgrading.rst

  Log Message:
  -----------
  Merge branch '945-merge-upgrading-docs'


  Commit: 49132593b5ba96c732870b63a634305b2ca1dfb2
      https://github.com/okfn/ckan/commit/49132593b5ba96c732870b63a634305b2ca1dfb2
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  Merge branch '835-helpful-action-api-search-index-error' of git://github.com/open-data/ckan into open-data-835-helpful-action-api-search-index-error


  Commit: e3456e9ac13c253783d5edf2502ec696c14e4010
      https://github.com/okfn/ckan/commit/e3456e9ac13c253783d5edf2502ec696c14e4010
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  Merge branch 'open-data-835-helpful-action-api-search-index-error'


  Commit: 0e96f74e3f283e4a9906fc65633195cf26b55707
      https://github.com/okfn/ckan/commit/0e96f74e3f283e4a9906fc65633195cf26b55707
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ckan/model/meta.py
    M ckan/tests/__init__.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Merge branch '893-datastore-postgres-checks-fail-if-different-dbs'


  Commit: eae3f16b2a10aecbdc7ad1b82bc13f1b094fab36
      https://github.com/okfn/ckan/commit/eae3f16b2a10aecbdc7ad1b82bc13f1b094fab36
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

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

  Log Message:
  -----------
  [#473] Correct test for changed validation


  Commit: fb7e33647754d08c7b26f5a0ff781e519f9758dc
      https://github.com/okfn/ckan/commit/fb7e33647754d08c7b26f5a0ff781e519f9758dc
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ckan/lib/navl/dictization_functions.py

  Log Message:
  -----------
  [#473] Change deepcopy to copy in dictization_functions.augment_data because it caused problems with validate on dictionaries with objects such as context


  Commit: 6d10d8c0f22b8292aebb9be14ad80c8ef84ee545
      https://github.com/okfn/ckan/commit/6d10d8c0f22b8292aebb9be14ad80c8ef84ee545
  Author: kindly <kindly at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    A .pipignore
    M .tx/config
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M LICENSE.txt
    M README.rst
    M bin/osx-postgres-mem.sh
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    A ckan/config/install.py
    M ckan/config/routing.py
    M ckan/config/who.ini
    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/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    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/check_po_files.py
    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/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    A ckan/i18n/dv/LC_MESSAGES/ckan.mo
    A ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    A ckan/i18n/id/LC_MESSAGES/ckan.mo
    A ckan/i18n/id/LC_MESSAGES/ckan.po
    A ckan/i18n/is/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/tr/LC_MESSAGES/ckan.mo
    A ckan/i18n/tr/LC_MESSAGES/ckan.po
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/formatters.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/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/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/migration/versions/067_turn_extras_to_strings.py
    A ckan/migration/versions/068_add_package_extras_index.py
    R ckan/misc.py
    M ckan/model/__init__.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/package_relationship.py
    M ckan/model/tag.py
    R ckan/model/test_user.py
    M ckan/model/tracking.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    R ckan/public/base/images/flags.png
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/confirm-action.js
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    A ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/javascript/tracking.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    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/less/module.less
    M ckan/public/base/less/prose.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/actions.html
    A ckan/templates/development/snippets/context.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/media_grid.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    R ckan/templates/development/snippets/toolbar.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    A ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    A ckan/templates/group/snippets/history_revisions.html
    A ckan/templates/group/snippets/revisions_table.html
    M ckan/templates/header.html
    M ckan/templates/home/index.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/edit.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/followers.html
    A ckan/templates/package/history.html
    M ckan/templates/package/new_resource.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
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/data_api_button.html
    A ckan/templates/package/snippets/history_revisions.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.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/resources_list.html
    A ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    A ckan/templates/revision/__init__.py
    A ckan/templates/revision/diff.html
    A ckan/templates/revision/list.html
    A ckan/templates/revision/read.html
    A ckan/templates/revision/read_base.html
    A ckan/templates/revision/snippets/revisions_list.html
    A ckan/templates/snippets/additional_info.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/snippets/sort_by.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout.html
    M ckan/templates/user/new.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/misc/test_format_text.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    A ckan/tests/test_coding_standards.py
    M ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/commands.py
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    A ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    A ckanext/example_idatasetform/templates/package/snippets/package_basic_fields.html
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    R ckanext/jsonpreview/__init__.py
    R ckanext/jsonpreview/plugin.py
    R ckanext/jsonpreview/tests/__init__.py
    R ckanext/jsonpreview/tests/test_preview.py
    R ckanext/jsonpreview/theme/public/css/json.css
    R ckanext/jsonpreview/theme/public/preview_json.js
    R ckanext/jsonpreview/theme/public/resource.config
    R ckanext/jsonpreview/theme/templates/json.html
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/reclinepreview/theme/public/preview_recline.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.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    A ckanext/textpreview/__init__.py
    A ckanext/textpreview/plugin.py
    A ckanext/textpreview/tests/__init__.py
    A ckanext/textpreview/tests/test_preview.py
    A ckanext/textpreview/theme/public/LICENSE
    A ckanext/textpreview/theme/public/css/text.css
    A ckanext/textpreview/theme/public/highlight.pack.js
    A ckanext/textpreview/theme/public/preview_text.js
    A ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/default.css
    A ckanext/textpreview/theme/public/styles/github.css
    A ckanext/textpreview/theme/templates/text.html
    A dev-requirements.txt
    R doc/CHANGELOG.rst
    M doc/_templates/footer.html
    M doc/_themes/sphinx-theme-okfn
    R doc/about.rst
    M doc/api.rst
    M doc/apps-ideas.rst
    R doc/architecture.rst
    M doc/authorization.rst
    A doc/changelog.rst
    A doc/ckan-coding-standards.rst
    R doc/ckan.logic.action.create.rst
    R doc/ckan.logic.action.delete.rst
    R doc/ckan.logic.action.get.rst
    R doc/ckan.logic.action.update.rst
    R doc/commenting.rst
    R doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    R doc/contrib.rst
    A doc/contributing.rst
    M doc/css-coding-standards.rst
    M doc/data-viewer.rst
    R doc/database-dumps.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.rst
    A doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    R doc/extensions.rst
    A doc/features.rst
    R doc/filestore-api.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    M doc/frontend-development.rst
    R doc/frontend-testing.rst
    R doc/geospatial.rst
    A doc/getting-started.rst
    R doc/harvesting.rst
    M doc/i18n.rst
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    A doc/images/admin-page.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    A doc/images/popular-dataset.png
    A doc/images/popular-resource.png
    A doc/images/sort-datasets-by-popularity.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    M doc/index.rst
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    A doc/installing.rst
    M doc/javascript-coding-standards.rst
    M doc/javascript-module-tutorial.rst
    M doc/legacy-api.rst
    R doc/loading-data.rst
    M doc/multilingual.rst
    R doc/organizations_and_groups.rst
    M doc/paster.rst
    R doc/post-installation.rst
    R doc/publisher-profile.rst
    R doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    R doc/release-cycle.rst
    A doc/release-process.rst
    M doc/resources.rst
    M doc/solr-setup.rst
    A doc/stats.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    A doc/tracking.rst
    A doc/upgrade-package-ckan-1-to-2.rst
    A doc/upgrade-package-to-minor-release.rst
    A doc/upgrade-package-to-patch-release.rst
    A doc/upgrade-source.rst
    A doc/upgrading.rst
    R doc/user-stories-list.rst
    R doc/user-stories.rst
    M doc/writing-extensions.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  [700] merge master


  Commit: 576c885986dfec831273a0bdfa708c9867552fc2
      https://github.com/okfn/ckan/commit/576c885986dfec831273a0bdfa708c9867552fc2
  Author: kindly <kindly at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M doc/paster.rst

  Log Message:
  -----------
  [700] add paster docs


  Commit: 349e1cbb2010d4f60a90209dfd45aa5fdb1b2ce7
      https://github.com/okfn/ckan/commit/349e1cbb2010d4f60a90209dfd45aa5fdb1b2ce7
  Author: John Glover <j at johnglover.net>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/email_notifications.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/lib/test_email_notifications.py
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  Merge pull request #473 from okfn/473-consistent-api-validation

Action API is inconsistent


  Commit: fdd17159bf48cd752c29f9fd45f60c4dadf62cc1
      https://github.com/okfn/ckan/commit/fdd17159bf48cd752c29f9fd45f60c4dadf62cc1
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/search/__init__.py
    M doc/paster.rst

  Log Message:
  -----------
  Merge branch '700-speed-up-search-index'


  Commit: 46e76ceffd66c725018eb44c476e68307f503f89
      https://github.com/okfn/ckan/commit/46e76ceffd66c725018eb44c476e68307f503f89
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M doc/data-viewer.rst

  Log Message:
  -----------
  [#921] Edit the data viewer docs

Move the references to the resource_proxy extension in the text_preview
and pdf_preview sections into seealso boxes.

In the text_preview and pdf_preview docs themselves, don't say anything
about local vs remote files.

Change "can not" to cannot

In sections about individual extensions use singular eg. "this extension
is part of CKAN" not "these extensions are".

Change the reference of get_proxified_resource_url() to a :func:
reference, this doesn't make any difference currently but if we ever
added an API doc for the function to our Sphinx docs (e.g. via autodoc)
it would be hyperlinked to it.


  Commit: 80b026e4461cb777ccbc7cd6af6ac25ccb1ead87
      https://github.com/okfn/ckan/commit/80b026e4461cb777ccbc7cd6af6ac25ccb1ead87
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/plugins.py
    M ckan/plugins/interfaces.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/test_tag_vocab_plugin.py

  Log Message:
  -----------
  [#551] Remove all tractes of unused comments_template() method


  Commit: eaa90827047b086caf72e0b9e703424905657a1d
      https://github.com/okfn/ckan/commit/eaa90827047b086caf72e0b9e703424905657a1d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-upload-field.js

  Log Message:
  -----------
  Merge branch '902-uploader-stop-navigate'


  Commit: a10b690f377a87e9961592b0ecd203c6362e2706
      https://github.com/okfn/ckan/commit/a10b690f377a87e9961592b0ecd203c6362e2706
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M CHANGELOG.rst
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/email_notifications.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/search/__init__.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/068_add_package_extras_index.py
    M ckan/model/meta.py
    M ckan/public/base/css/main.css
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    A ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization_item.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/lib/test_email_notifications.py
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M dev-requirements.txt
    A doc/changelog.rst
    M doc/conf.py
    M doc/index.rst
    M doc/installing.rst
    M doc/paster.rst
    M doc/release-process.rst
    R doc/releases.rst
    A doc/upgrade-package-ckan-1-to-2.rst
    A doc/upgrade-package-to-minor-release.rst
    A doc/upgrade-package-to-patch-release.rst
    A doc/upgrade-source.rst
    R doc/upgrading-a-package-install.rst
    R doc/upgrading-a-source-install.rst
    A doc/upgrading.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 921-resourceproxy-docs


  Commit: bc877e03c6f8c9093c3b61beb8c93c4e079984ce
      https://github.com/okfn/ckan/commit/bc877e03c6f8c9093c3b61beb8c93c4e079984ce
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

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

  Log Message:
  -----------
  Merge branch '921-resourceproxy-docs'


  Commit: 3dcb714a0045e3d51e6878302c0fbc65098043c8
      https://github.com/okfn/ckan/commit/3dcb714a0045e3d51e6878302c0fbc65098043c8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/plugins.py
    M ckan/plugins/interfaces.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/test_tag_vocab_plugin.py

  Log Message:
  -----------
  Merge branch '551-remove-comments-template-method'


  Commit: 96722a1694a0fa1a0e61e1657d8ae59b524ea418
      https://github.com/okfn/ckan/commit/96722a1694a0fa1a0e61e1657d8ae59b524ea418
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    A .pipignore
    M CHANGELOG.rst
    M LICENSE.txt
    M bin/travis-build
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/068_add_package_extras_index.py
    M ckan/model/meta.py
    R ckan/model/test_user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/confirm-action.js
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    A ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/templates/group/about.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    A ckan/templates/snippets/additional_info.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_email_notifications.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/test_tag_vocab_plugin.py
    A dev-requirements.txt
    M doc/_themes/sphinx-theme-okfn
    A doc/changelog.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    M doc/index.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/installing.rst
    M doc/paster.rst
    M doc/release-process.rst
    R doc/releases.rst
    M doc/test.rst
    A doc/upgrade-package-ckan-1-to-2.rst
    A doc/upgrade-package-to-minor-release.rst
    A doc/upgrade-package-to-patch-release.rst
    A doc/upgrade-source.rst
    R doc/upgrading-a-package-install.rst
    R doc/upgrading-a-source-install.rst
    A doc/upgrading.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 690-url-for-static-fix


  Commit: 8d4d6b6671042b73f47b635bed556ae9eb41b2ee
      https://github.com/okfn/ckan/commit/8d4d6b6671042b73f47b635bed556ae9eb41b2ee
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#690] Make things more explicit and remove %s


  Commit: ac1159b632fc8d89ce76b671a25755a19755cd30
      https://github.com/okfn/ckan/commit/ac1159b632fc8d89ce76b671a25755a19755cd30
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge branch '690-url-for-static-fix'


  Commit: 0a9216b87b56d6da61208937218deb118085bb31
      https://github.com/okfn/ckan/commit/0a9216b87b56d6da61208937218deb118085bb31
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#1010] Catch NotFound on new resource when package does not exist

Catch ckan.logic.NotFound exceptions raised when trying to create a new
resource for a package that doesn't exist. This turns a 500 Server Error
into a proper 404 Not Found. Fixes #1010.


  Commit: 83b77586906b7092fb47a7e1c341ca6dac7d66c2
      https://github.com/okfn/ckan/commit/83b77586906b7092fb47a7e1c341ca6dac7d66c2
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M ckan/templates/organization/snippets/organization_form.html

  Log Message:
  -----------
  Merge pull request #993 from okfn/803-warn-before-deleting-org

[#803] Warn users before deleting an organization


  Commit: 3281080cad1fe2679fbb7192b60f11ab4a1eaf85
      https://github.com/okfn/ckan/commit/3281080cad1fe2679fbb7192b60f11ab4a1eaf85
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    A .pipignore
    M CHANGELOG.rst
    M LICENSE.txt
    M bin/travis-build
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/068_add_package_extras_index.py
    M ckan/model/meta.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    A ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization_item.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/lib/test_email_notifications.py
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/test_tag_vocab_plugin.py
    A dev-requirements.txt
    M doc/_themes/sphinx-theme-okfn
    A doc/changelog.rst
    M doc/conf.py
    M doc/data-viewer.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/installing.rst
    M doc/paster.rst
    M doc/release-process.rst
    R doc/releases.rst
    M doc/test.rst
    A doc/upgrade-package-ckan-1-to-2.rst
    A doc/upgrade-package-to-minor-release.rst
    A doc/upgrade-package-to-patch-release.rst
    A doc/upgrade-source.rst
    R doc/upgrading-a-package-install.rst
    R doc/upgrading-a-source-install.rst
    A doc/upgrading.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 890-button-ia


  Commit: 90ba3a9e9ecdc651ed44f01fb3be897f64d2c009
      https://github.com/okfn/ckan/commit/90ba3a9e9ecdc651ed44f01fb3be897f64d2c009
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/public/base/less/module.less
    M ckan/public/base/less/toolbar.less
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/index.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/package/search.html
    M ckan/templates/page.html

  Log Message:
  -----------
  [#890] Few tweaks to templates to get ready for iA review


Compare: https://github.com/okfn/ckan/compare/75da35490596...90ba3a9e9ecd


More information about the ckan-changes mailing list