[ckan-changes] [ckan/ckan] c75a2f: [#2457] Fix permission check on organization_list_...

GitHub noreply at github.com
Thu Jan 5 10:33:21 UTC 2017


  Branch: refs/heads/3196-common-session
  Home:   https://github.com/ckan/ckan
  Commit: c75a2f8b2ef5d29ca3da3b5e25a2a89ab69b0220
      https://github.com/ckan/ckan/commit/c75a2f8b2ef5d29ca3da3b5e25a2a89ab69b0220
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

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

  Log Message:
  -----------
  [#2457] Fix permission check on organization_list_for_user

It was using `edit_group`, which does not exist, effectively meaning
that only amdinorgs were returned. Changed to `admin` to be consistent
with existing roles.


  Commit: bb432cb16e2bfae8b6693995e3ac493a1e870e73
      https://github.com/ckan/ckan/commit/bb432cb16e2bfae8b6693995e3ac493a1e870e73
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

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

  Log Message:
  -----------
  [#2457] Return capacity on organization_list_for_user

Add a new key on each organization with the role the user has on it


  Commit: cbf8dc6b00682cdb6440a34f53f30aad87070cc6
      https://github.com/ckan/ckan/commit/cbf8dc6b00682cdb6440a34f53f30aad87070cc6
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

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

  Log Message:
  -----------
  [#2457] Allow to provide an id to organization_list_for_user


  Commit: 07df7bf55948b6a154c6a45c247433c119f34cbf
      https://github.com/ckan/ckan/commit/07df7bf55948b6a154c6a45c247433c119f34cbf
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

  Changed paths:
    M ckan/templates/user/dashboard_organizations.html

  Log Message:
  -----------
  [#2457] Show all user's orgs in dashboard


  Commit: 71d47b32774273a2235fd7e5ba061c6d7ae921ce
      https://github.com/ckan/ckan/commit/71d47b32774273a2235fd7e5ba061c6d7ae921ce
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/user/dashboard_organizations.html

  Log Message:
  -----------
  [#2457] Show user's role on each org on dashboard


  Commit: f80c4afc0a2e1d7412a3f004a8599df814a4c068
      https://github.com/ckan/ckan/commit/f80c4afc0a2e1d7412a3f004a8599df814a4c068
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

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

  Log Message:
  -----------
  [#2457] Fix sphinx warning


  Commit: 9036adcb5b310dca68b8c2a6ab00597aed97a05e
      https://github.com/ckan/ckan/commit/9036adcb5b310dca68b8c2a6ab00597aed97a05e
  Author: amercader <amercadero at gmail.com>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M CHANGELOG.rst
    R bin/canada.py
    R bin/ckan-correct-tags.py
    R bin/ckan-edit-tags.py
    R bin/ckan-edit-tags2.py
    R bin/ckan-hmg-breakdown.py
    R bin/ckan-hmg-update-licenses.py
    R bin/ckan-rest-edit-tags.py
    R bin/ckan_edit_local.py
    R bin/ckan_spam.py
    R bin/copy-ckan-2-ckan.py
    R bin/dump-ukgov.py
    R bin/dump_23_pkgs.py
    R bin/fixes.py
    M bin/less
    R bin/loadconfig.py
    R bin/ons-load.py
    R bin/revision_manager.py
    R bin/status.py
    R bin/talisckan.py
    R bin/webstore_test.py
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/group.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/captcha.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    A ckan/lib/lazyjson.py
    M ckan/lib/uploader.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/create.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/077_add_revisions_to_system_info.py
    A ckan/migration/versions/078_remove_old_authz_model.py
    M ckan/model/__init__.py
    R ckan/model/authz.py
    M ckan/model/system_info.py
    M ckan/pastertemplates/template/README.rst_tmpl
    M ckan/plugins/interfaces.py
    M ckan/templates/admin/config.html
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    R ckan/templates/package/read.n3
    R ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckan/templates/user/snippets/user_search.html
    M ckan/tests/config/test_environment.py
    A ckan/tests/controllers/test_admin.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_group.py
    A ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/factories.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/ckantestplugins.py
    M ckan/tests/legacy/functional/api/model/test_group.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/model/test_vocabulary.py
    M ckan/tests/legacy/functional/api/test_dashboard.py
    M ckan/tests/legacy/functional/api/test_util.py
    M ckan/tests/legacy/functional/test_admin.py
    M ckan/tests/legacy/functional/test_group.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/legacy/models/test_group.py
    M ckan/tests/legacy/models/test_user.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_plugins.py
    R ckan/tests/legacy/test_wsgi_ckanclient.py
    R ckan/tests/legacy/wsgi_ckanclient.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    A ckan/tests/lib/test_app_globals.py
    M ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/test_get.py
    M ckan/tests/logic/auth/test_update.py
    M ckan/tests/logic/test_validators.py
    A ckan/tests/model/test_system_info.py
    A ckanext/datapusher/interfaces.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/example_iconfigurer/plugin.py
    A ckanext/example_iconfigurer/plugin_v1.py
    A ckanext/example_iconfigurer/plugin_v2.py
    A ckanext/example_iconfigurer/templates/admin/config.html
    A ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py
    M ckanext/example_theme/v08_custom_helper_function/plugin.py
    M ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    M ckanext/multilingual/solr/schema.xml
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    M ckanext/reclineview/theme/templates/recline_map_form.html
    M ckanext/resourceproxy/controller.py
    M ckanext/stats/controller.py
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/templates_legacy/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    M contrib/docker/my_init.d/50_configure
    M dev-requirements.txt
    M doc/api/index.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/template-blocks.rst
    M doc/contributing/release-process.rst
    M doc/extensions/index.rst
    A doc/extensions/remote-config-update.rst
    A doc/images/custom_config_fields.png
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/linked-data-and-rdf.rst
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 2457-fix-org-list-for-user


  Commit: 5e1fe97c92545cb7cde27219b3bd08cee386ad21
      https://github.com/ckan/ckan/commit/5e1fe97c92545cb7cde27219b3bd08cee386ad21
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-06 (Tue, 06 Oct 2015)

  Changed paths:
    M doc/maintaining/datastore.rst
    M doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/upgrading/upgrade-postgres.rst

  Log Message:
  -----------
  [#2555] Draft doc changes including upgrade script.


  Commit: d0debebaca4e4dd2a9bafd2d71933ec78f2e262b
      https://github.com/ckan/ckan/commit/d0debebaca4e4dd2a9bafd2d71933ec78f2e262b
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M doc/maintaining/upgrading/index.rst
    M doc/maintaining/upgrading/upgrade-postgres.rst

  Log Message:
  -----------
  [#2555] Formatting corrections etc


  Commit: f5599ab24c264dca54bc699e12bf8d33cbcdf12e
      https://github.com/ckan/ckan/commit/f5599ab24c264dca54bc699e12bf8d33cbcdf12e
  Author: Martin Burchell <martinb at aptivate.org>
  Date:   2016-04-14 (Thu, 14 Apr 2016)

  Changed paths:
    M ckan/controllers/feed.py

  Log Message:
  -----------
  Allow RSS feed to be extended

Allow RSS feed classes in webhelpers other than Atom1.
Allow additional values to be set on a feed item.


  Commit: a57848b2b71b1d3b7e877c8b2d6ea00e79d36171
      https://github.com/ckan/ckan/commit/a57848b2b71b1d3b7e877c8b2d6ea00e79d36171
  Author: Martin Burchell <martinb at aptivate.org>
  Date:   2016-04-18 (Mon, 18 Apr 2016)

  Changed paths:
    M ckan/controllers/feed.py

  Log Message:
  -----------
  Document new methods


  Commit: 8d041ff773b70b9843701591c97d3a92410c0328
      https://github.com/ckan/ckan/commit/8d041ff773b70b9843701591c97d3a92410c0328
  Author: amercader <amercadero at gmail.com>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/installing/postgres.rst
    A doc/maintaining/installing/solr.rst

  Log Message:
  -----------
  [#3087] Include Postgres and Solr steps on package and source install


  Commit: f72b0e249bb5ac4c83f584ec653095a26f621b1f
      https://github.com/ckan/ckan/commit/f72b0e249bb5ac4c83f584ec653095a26f621b1f
  Author: amercader <amercadero at gmail.com>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M doc/maintaining/installing/solr.rst
    R doc/maintaining/solr-multicore.rst

  Log Message:
  -----------
  [#3087] Remove old Solr multicore docs


  Commit: decbcb92b5879d896ae5a4e42b9646d4d885441d
      https://github.com/ckan/ckan/commit/decbcb92b5879d896ae5a4e42b9646d4d885441d
  Author: amercader <amercadero at gmail.com>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M doc/maintaining/index.rst

  Log Message:
  -----------
  [#3087] Remove solr-multicore from toctree


  Commit: 06237be58c124f274e59bfdd5d207c4ba812a0fb
      https://github.com/ckan/ckan/commit/06237be58c124f274e59bfdd5d207c4ba812a0fb
  Author: Martin Burchell <martinb at aptivate.org>
  Date:   2016-06-14 (Tue, 14 Jun 2016)

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

  Log Message:
  -----------
  Merge branch 'master' into override-feed-class


  Commit: 97569093388e01e5bebcfe5d2605d4abebc7d4d0
      https://github.com/ckan/ckan/commit/97569093388e01e5bebcfe5d2605d4abebc7d4d0
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-07-15 (Fri, 15 Jul 2016)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/template.py
    R ckan/public/robots.txt
    A ckan/templates/robots.txt
    A ckan/tests/controllers/test_template.py
    M ckan/tests/test_coding_standards.py
    A ckan/tests/test_robots_txt.py

  Log Message:
  -----------
  [iar#178] Allow customization of robots.txt.

Serve `/robots.txt` from a template instead of from a static file to
allow for customization by extensions and site owners. See
https://github.com/ckan/ideas-and-roadmap/issues/178.


  Commit: ffa526c817792cf9f96447bf90bb05af468b4713
      https://github.com/ckan/ckan/commit/ffa526c817792cf9f96447bf90bb05af468b4713
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

  Changed paths:
    M ckan/config/middleware/flask_app.py
    M ckan/tests/config/test_middleware.py

  Log Message:
  -----------
  [#3196] Add Fanstatic middleware to Flask

Hopefully just temporarily until we can replace it with something
better. This will be tested further on went the url_for stuff is
avaiable as well.

Changed wrong reference in a test


  Commit: ed747496ee61eb1fdca2bf77fa28af600b8a4f58
      https://github.com/ckan/ckan/commit/ed747496ee61eb1fdca2bf77fa28af600b8a4f58
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-22 (Mon, 22 Aug 2016)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/controllers/test_tags.py
    M ckan/tests/controllers/test_util.py

  Log Message:
  -----------
  [#3194] Ensure that relative redirects use the host on ckan.site_url

Conflicts:
	ckan/lib/helpers.py


  Commit: 53490115ce2c98e6e9bd0a45342e7943df4713dc
      https://github.com/ckan/ckan/commit/53490115ce2c98e6e9bd0a45342e7943df4713dc
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-22 (Mon, 22 Aug 2016)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#3194] Support both Flask and Pylons redirects


  Commit: bddd7b5298e2724114278b309333fcc5c0378cd8
      https://github.com/ckan/ckan/commit/bddd7b5298e2724114278b309333fcc5c0378cd8
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-23 (Tue, 23 Aug 2016)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/base.py
    M ckan/tests/controllers/test_package.py
    M ckan/views/__init__.py

  Log Message:
  -----------
  [#3196] Move user identify logic to a separate module

So it can be reused by Flask requests handlers and Pylons base
controllers


  Commit: ac207b1691d45976b2d637edecf84394219c76db
      https://github.com/ckan/ckan/commit/ac207b1691d45976b2d637edecf84394219c76db
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-23 (Tue, 23 Aug 2016)

  Changed paths:
    M ckan/config/middleware/flask_app.py
    M ckan/tests/config/test_middleware.py

  Log Message:
  -----------
  [#3194] Call indentify_user logic on all Flask requests

Using a Flask before_request handler. Added tests.

All credit goes to @brew


  Commit: 1683727fce578d05e0c581adbe0d22ea489673fd
      https://github.com/ckan/ckan/commit/1683727fce578d05e0c581adbe0d22ea489673fd
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-23 (Tue, 23 Aug 2016)

  Changed paths:
    M ckan/config/middleware/flask_app.py
    M ckan/lib/base.py
    M ckan/tests/lib/test_base.py
    M ckan/views/__init__.py

  Log Message:
  -----------
  [#3196] CORS headers added to Flask responses.

The method to set CORS headers moved to `views` module and CKAN core
refactored to import and use it.

Original commit by @brew (77a436eb)


  Commit: 15d16bc2b11c4eb0cbe459352f356d945b6f5077
      https://github.com/ckan/ckan/commit/15d16bc2b11c4eb0cbe459352f356d945b6f5077
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-23 (Tue, 23 Aug 2016)

  Changed paths:
    M ckan/config/middleware/flask_app.py

  Log Message:
  -----------
  [#3196] Add request timer for Flask requests

Times between before_request and after_request and outputs to log level
info


  Commit: 6cbe198f3f3333a9ef845b7e06ce1e3595b8ddf0
      https://github.com/ckan/ckan/commit/6cbe198f3f3333a9ef845b7e06ce1e3595b8ddf0
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-23 (Tue, 23 Aug 2016)

  Changed paths:
    M ckan/config/middleware/flask_app.py
    M ckan/lib/base.py
    M ckan/views/__init__.py

  Log Message:
  -----------
  [#3196] Move session cookie check to views module

Used by both base.py and Flask after_request handler.


  Commit: 889978b2d0f62523e673f881bc913baf115f7a31
      https://github.com/ckan/ckan/commit/889978b2d0f62523e673f881bc913baf115f7a31
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-23 (Tue, 23 Aug 2016)

  Changed paths:
    M ckan/config/middleware/flask_app.py

  Log Message:
  -----------
  [#3196] Ensure app_globals is up to date for each Flask request


  Commit: 9de80d10f2a36e6188051038e8c9ef36551b07c1
      https://github.com/ckan/ckan/commit/9de80d10f2a36e6188051038e8c9ef36551b07c1
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-23 (Tue, 23 Aug 2016)

  Changed paths:
    M ckan/views/__init__.py

  Log Message:
  -----------
  [#3196] Remove debugger call, return response object


  Commit: b13e8aca0df9e161ed60adb99a8eb4a5ec31fc26
      https://github.com/ckan/ckan/commit/b13e8aca0df9e161ed60adb99a8eb4a5ec31fc26
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-23 (Tue, 23 Aug 2016)

  Changed paths:
    M ckan/views/__init__.py

  Log Message:
  -----------
  [#3194] g is not dict


  Commit: 9b0be760e64809457c99b622bcef813ce4c20684
      https://github.com/ckan/ckan/commit/9b0be760e64809457c99b622bcef813ce4c20684
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-23 (Tue, 23 Aug 2016)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/controllers/util.py
    M ckan/lib/base.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/functional/test_user.py
    M ckanext/datapusher/plugin.py
    M ckanext/example_igroupform/tests/test_controllers.py

  Log Message:
  -----------
  Merge branch '3194-fix-redirects' into 3196-common-requests-code


  Commit: a802c130fe2b01478c6dbfcb1ffb29c6e235960b
      https://github.com/ckan/ckan/commit/a802c130fe2b01478c6dbfcb1ffb29c6e235960b
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-23 (Tue, 23 Aug 2016)

  Changed paths:
    M ckan/views/__init__.py

  Log Message:
  -----------
  [#3196] Fix string literals


  Commit: 0f3a55fe461c30934c4cd7808205a918595eee14
      https://github.com/ckan/ckan/commit/0f3a55fe461c30934c4cd7808205a918595eee14
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-30 (Tue, 30 Aug 2016)

  Changed paths:
    A .circleci-matrix.yml
    R .coveragerc
    A .github/ISSUE_TEMPLATE.md
    A .github/PULL_REQUEST_TEMPLATE.md
    R .travis.yml
    M .tx/config
    M CHANGELOG.rst
    A CONDUCT.rst
    M Dockerfile
    M LICENSE.txt
    M MANIFEST.in
    M README.rst
    A bin/postgres_init/1_create_ckan_db.sh
    A bin/postgres_init/2_create_ckan_datastore_db.sh
    M bin/running_stats.py
    A bin/solr_init/create_core.sh
    M bin/travis-install-dependencies
    M bin/travis-run-tests
    A circle.yml
    M ckan/__init__.py
    M ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/common.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/install.py
    R ckan/config/middleware.py
    A ckan/config/middleware/__init__.py
    A ckan/config/middleware/common_middleware.py
    A ckan/config/middleware/flask_app.py
    A ckan/config/middleware/pylons_app.py
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    R ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/exceptions.py
    M ckan/i18n/__init__.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/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/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    R ckan/i18n/dv/LC_MESSAGES/ckan.mo
    R ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    R ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    R ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    R ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    R ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    R ckan/i18n/eu/LC_MESSAGES/ckan.mo
    R ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    R ckan/i18n/lo/LC_MESSAGES/ckan.mo
    R ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    R ckan/i18n/my/LC_MESSAGES/ckan.mo
    R ckan/i18n/my/LC_MESSAGES/ckan.po
    R ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    R ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/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/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/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
    R ckan/i18n/sw/LC_MESSAGES/ckan.mo
    R ckan/i18n/sw/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    A ckan/i18n/tl/LC_MESSAGES/ckan.mo
    A ckan/i18n/tl/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    R ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    R ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    R ckan/lib/accept.py
    M ckan/lib/activity_streams.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    M ckan/lib/auth_tkt.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/captcha.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/config_tool.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    R ckan/lib/dumper.py
    M ckan/lib/email_notifications.py
    M ckan/lib/extract.py
    M ckan/lib/fanstatic_extensions.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/formatters.py
    M ckan/lib/hash.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    A ckan/lib/io.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/jsonp.py
    R ckan/lib/lazyjson.py
    M ckan/lib/mailer.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    M ckan/lib/navl/__init__.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/common.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    R ckan/lib/search/sql.py
    M ckan/lib/uploader.py
    R ckan/lib/util.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/patch.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/patch.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/manage.py
    M ckan/migration/versions/001_add_existing_tables.py
    M ckan/migration/versions/002_add_author_and_maintainer.py
    M ckan/migration/versions/003_add_user_object.py
    M ckan/migration/versions/004_add_group_object.py
    M ckan/migration/versions/005_add_authorization_tables.py
    M ckan/migration/versions/006_add_ratings.py
    M ckan/migration/versions/007_add_system_roles.py
    M ckan/migration/versions/008_update_vdm_ids.py
    M ckan/migration/versions/009_add_creation_timestamps.py
    M ckan/migration/versions/010_add_user_about.py
    M ckan/migration/versions/011_add_package_search_vector.py
    M ckan/migration/versions/012_add_resources.py
    M ckan/migration/versions/013_add_hash.py
    M ckan/migration/versions/014_hash_2.py
    M ckan/migration/versions/015_remove_state_object.py
    M ckan/migration/versions/016_uuids_everywhere.py
    M ckan/migration/versions/017_add_pkg_relationships.py
    M ckan/migration/versions/018_adjust_licenses.py
    M ckan/migration/versions/019_pkg_relationships_state.py
    M ckan/migration/versions/020_add_changeset.py
    M ckan/migration/versions/022_add_group_extras.py
    M ckan/migration/versions/023_add_harvesting.py
    M ckan/migration/versions/024_add_harvested_document.py
    M ckan/migration/versions/025_add_authorization_groups.py
    M ckan/migration/versions/026_authorization_group_user_pk.py
    M ckan/migration/versions/027_adjust_harvester.py
    M ckan/migration/versions/028_drop_harvest_source_status.py
    M ckan/migration/versions/029_version_groups.py
    M ckan/migration/versions/030_additional_user_attributes.py
    M ckan/migration/versions/031_move_openid_to_new_field.py
    M ckan/migration/versions/032_add_extra_info_field_to_resources.py
    M ckan/migration/versions/033_auth_group_user_id_add_conditional.py
    M ckan/migration/versions/034_resource_group_table.py
    M ckan/migration/versions/035_harvesting_doc_versioning.py
    M ckan/migration/versions/036_lockdown_roles.py
    M ckan/migration/versions/037_role_anon_editor.py
    M ckan/migration/versions/038_delete_migration_tables.py
    M ckan/migration/versions/039_add_expired_id_and_dates.py
    M ckan/migration/versions/040_reset_key_on_user.py
    M ckan/migration/versions/041_resource_new_fields.py
    M ckan/migration/versions/042_user_revision_indexes.py
    M ckan/migration/versions/043_drop_postgres_search.py
    M ckan/migration/versions/044_add_task_status.py
    M ckan/migration/versions/045_user_name_unique.py
    M ckan/migration/versions/046_drop_changesets.py
    M ckan/migration/versions/047_rename_package_group_member.py
    M ckan/migration/versions/048_add_activity_streams_tables.py
    M ckan/migration/versions/049_add_group_approval_status.py
    M ckan/migration/versions/050_term_translation_table.py
    M ckan/migration/versions/051_add_tag_vocabulary.py
    M ckan/migration/versions/052_update_member_capacities.py
    M ckan/migration/versions/053_add_group_logo.py
    M ckan/migration/versions/054_add_resource_created_date.py
    M ckan/migration/versions/055_update_user_and_activity_detail.py
    M ckan/migration/versions/056_add_related_table.py
    M ckan/migration/versions/057_tracking.py
    M ckan/migration/versions/058_add_follower_tables.py
    M ckan/migration/versions/059_add_related_count_and_flag.py
    M ckan/migration/versions/060_add_system_info_table.py
    M ckan/migration/versions/061_add_follower__group_table.py
    M ckan/migration/versions/062_add_dashboard_table.py
    M ckan/migration/versions/063_org_changes.py
    M ckan/migration/versions/064_add_email_last_sent_column.py
    M ckan/migration/versions/065_add_email_notifications_preference.py
    M ckan/migration/versions/066_default_package_type.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/migration/versions/068_add_package_extras_index.py
    M ckan/migration/versions/069_resource_url_and_metadata_modified.py
    M ckan/migration/versions/070_add_activity_and_resource_indexes.py
    M ckan/migration/versions/071_add_state_column_to_user_table.py
    M ckan/migration/versions/072_add_resource_view.py
    M ckan/migration/versions/073_update_resource_view_resource_id_constraint.py
    M ckan/migration/versions/074_remove_resource_groups.py
    M ckan/migration/versions/075_rename_view_plugins.py
    M ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/migration/versions/077_add_revisions_to_system_info.py
    M ckan/migration/versions/078_remove_old_authz_model.py
    A ckan/migration/versions/079_resource_revision_index.py
    A ckan/migration/versions/080_continuity_id_indexes.py
    A ckan/migration/versions/081_set_datastore_active.py
    A ckan/migration/versions/082_create_index_creator_user_id.py
    A ckan/migration/versions/083_remove_related_items.py
    A ckan/migration/versions/084_add_metadata_created.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/core.py
    M ckan/model/dashboard.py
    M ckan/model/domain_object.py
    M ckan/model/extension.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/group_extra.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/misc.py
    M ckan/model/modification.py
    M ckan/model/package.py
    M ckan/model/package_extra.py
    M ckan/model/package_relationship.py
    M ckan/model/rating.py
    R ckan/model/related.py
    M ckan/model/resource.py
    M ckan/model/resource_view.py
    M ckan/model/system_info.py
    M ckan/model/tag.py
    M ckan/model/task_status.py
    M ckan/model/term_translation.py
    M ckan/model/tracking.py
    M ckan/model/types.py
    M ckan/model/user.py
    M ckan/model/vocabulary.py
    R ckan/new_authz.py
    R ckan/new_tests.py
    M ckan/pastertemplates/__init__.py
    M ckan/pastertemplates/template/+dot+travis.yml_tmpl
    M ckan/pastertemplates/template/MANIFEST.in_tmpl
    M ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    M ckan/pastertemplates/template/ckanext/__init__.py
    A ckan/pastertemplates/template/requirements.txt_tmpl
    A ckan/pastertemplates/template/setup.cfg_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/__init__.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/plugins/toolkit_sphinx_extension.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    A ckan/public/base/images/ckan-logo-white.svg
    A ckan/public/base/images/ckan-logo.svg
    M ckan/public/base/images/sprite-resource-icons.png
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/image-upload.js
    R ckan/public/base/javascript/modules/related-item.js
    M ckan/public/base/javascript/modules/resource-view-filters-form.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/module.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/modules/image-upload.spec.js
    R ckan/public/base/test/spec/modules/related-item.spec.js
    A ckan/public/base/vendor/moment-with-locales.js
    M ckan/public/base/vendor/resource.config
    R ckan/public/css/boilerplate.css
    R ckan/public/css/bootstrap.min.css
    R ckan/public/css/chosen.css
    R ckan/public/css/forms.css
    R ckan/public/css/handheld.css
    R ckan/public/css/style.css
    R ckan/public/images/bullet_separator.png
    R ckan/public/images/button-shadow.png
    R ckan/public/images/chevron-down.png
    R ckan/public/images/chevron-up.png
    R ckan/public/images/chosen-sprite.png
    R ckan/public/images/ckan_logo_fullname_long.png
    R ckan/public/images/dlbg.png
    R ckan/public/images/dragbars.png
    R ckan/public/images/icons/add.png
    R ckan/public/images/icons/arrow-closed.gif
    R ckan/public/images/icons/arrow-down-16.png
    R ckan/public/images/icons/arrow-down-32.png
    R ckan/public/images/icons/arrow-open.gif
    R ckan/public/images/icons/arrow-right-16-black.png
    R ckan/public/images/icons/arrow-right-16.png
    R ckan/public/images/icons/arrow-right-32.png
    R ckan/public/images/icons/arrow_down.png
    R ckan/public/images/icons/arrow_down_grey.png
    R ckan/public/images/icons/arrow_up.png
    R ckan/public/images/icons/atom_feed.png
    R ckan/public/images/icons/ckan.ico
    R ckan/public/images/icons/comments.png
    R ckan/public/images/icons/delete.png
    R ckan/public/images/icons/door.png
    R ckan/public/images/icons/door_grey.png
    R ckan/public/images/icons/door_open.png
    R ckan/public/images/icons/drive_web.png
    R ckan/public/images/icons/edit-collapse.png
    R ckan/public/images/icons/edit-expand.png
    R ckan/public/images/icons/error.png
    R ckan/public/images/icons/followers.png
    R ckan/public/images/icons/group.png
    R ckan/public/images/icons/group_add.png
    R ckan/public/images/icons/group_edit.png
    R ckan/public/images/icons/key.png
    R ckan/public/images/icons/lock.png
    R ckan/public/images/icons/magnifier.png
    R ckan/public/images/icons/note.png
    R ckan/public/images/icons/openid.png
    R ckan/public/images/icons/package-disabled.png
    R ckan/public/images/icons/package.png
    R ckan/public/images/icons/package_add.png
    R ckan/public/images/icons/package_edit.png
    R ckan/public/images/icons/page_stack.png
    R ckan/public/images/icons/page_white.png
    R ckan/public/images/icons/page_white_add.png
    R ckan/public/images/icons/page_white_code.png
    R ckan/public/images/icons/page_white_compressed.png
    R ckan/public/images/icons/page_white_cup.png
    R ckan/public/images/icons/page_white_database.png
    R ckan/public/images/icons/page_white_error.png
    R ckan/public/images/icons/page_white_excel.png
    R ckan/public/images/icons/page_white_gear.png
    R ckan/public/images/icons/page_white_json.png
    R ckan/public/images/icons/page_white_link.png
    R ckan/public/images/icons/page_white_rdf.png
    R ckan/public/images/icons/page_white_stack.png
    R ckan/public/images/icons/page_white_text.png
    R ckan/public/images/icons/pencil.png
    R ckan/public/images/icons/remove.png
    R ckan/public/images/icons/star.png
    R ckan/public/images/icons/tag_blue.png
    R ckan/public/images/icons/unfilter.png
    R ckan/public/images/icons/user.png
    R ckan/public/images/icons/user_grey.png
    R ckan/public/images/icons/world_go.png
    R ckan/public/images/ldquo.png
    R ckan/public/images/photo-placeholder.png
    R ckan/public/images/stars.png
    R ckan/public/img/collaborate.png
    R ckan/public/img/find.png
    R ckan/public/img/glyphicons-halflings-white.png
    R ckan/public/img/glyphicons-halflings.png
    R ckan/public/img/lod2.png
    R ckan/public/img/logo.png
    R ckan/public/img/logo_64px_wide.png
    R ckan/public/img/share.png
    R ckan/public/scripts/application.js
    R ckan/public/scripts/dataexplorer/icon-sprite.png
    R ckan/public/scripts/dataexplorer/loading.gif
    R ckan/public/scripts/dataexplorer/table-view-template.js
    R ckan/public/scripts/dataexplorer/table-view.css
    R ckan/public/scripts/dataexplorer/table-view.js
    R ckan/public/scripts/dataexplorer/table-view.ui.js
    R ckan/public/scripts/outside.js
    R ckan/public/scripts/templates.js
    R ckan/public/scripts/vendor/backbone/0.5.1/backbone.js
    R ckan/public/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js
    R ckan/public/scripts/vendor/flot/0.7/excanvas.js
    R ckan/public/scripts/vendor/flot/0.7/jquery.flot.js
    R ckan/public/scripts/vendor/html5shiv/html5.js
    R ckan/public/scripts/vendor/jquery.chosen/0.9.7/chosen.js
    R ckan/public/scripts/vendor/jquery.cookie/jquery.cookie.min.js
    R ckan/public/scripts/vendor/jquery.event.drag/2.0/jquery.event.drag.min.js
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.fileupload-ui.css
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.fileupload-ui.js
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.fileupload.js
    R ckan/public/scripts/vendor/jquery.fileupload/20110801/jquery.iframe-transport.js
    R ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
    R ckan/public/scripts/vendor/jquery.placeholder/jquery.placeholder.js
    R ckan/public/scripts/vendor/jquery.tmpl/beta1/jquery.tmpl.js
    R ckan/public/scripts/vendor/jquery/1.7.1/jquery.js
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_0_000_40x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_100_000_40x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_75_ffffff_40x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_100_f0f0f0_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_55_fbf9ee_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_65_ffffff_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_75_dadada_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_95_fef1ec_1x400.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-bg_highlight-soft_100_f0f0f0_1x100.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_000_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_222222_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_2e83ff_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_444444_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_888888_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_b22_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/images/ui-icons_cd0a0a_256x240.png
    R ckan/public/scripts/vendor/jqueryui/1.8.14/css/jquery-ui.custom.css
    R ckan/public/scripts/vendor/jqueryui/1.8.14/jquery-ui.min.js
    R ckan/public/scripts/vendor/json2.js
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/layers.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/marker-shadow.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/marker.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/popup-close.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/zoom-in.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/images/zoom-out.png
    R ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.css
    R ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.ie.css
    R ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.js
    R ckan/public/scripts/vendor/modernizr/1.7/modernizr.min.js
    R ckan/public/scripts/vendor/moment/1.6.2/moment.js
    R ckan/public/scripts/vendor/mustache/0.5.0-dev/mustache.js
    R ckan/public/scripts/vendor/openid-selector/css/openid.css
    R ckan/public/scripts/vendor/openid-selector/images/aol.gif
    R ckan/public/scripts/vendor/openid-selector/images/blogger.ico
    R ckan/public/scripts/vendor/openid-selector/images/claimid.ico
    R ckan/public/scripts/vendor/openid-selector/images/facebook.gif
    R ckan/public/scripts/vendor/openid-selector/images/flickr.ico
    R ckan/public/scripts/vendor/openid-selector/images/google.gif
    R ckan/public/scripts/vendor/openid-selector/images/livejournal.ico
    R ckan/public/scripts/vendor/openid-selector/images/myopenid.ico
    R ckan/public/scripts/vendor/openid-selector/images/openid-inputicon.gif
    R ckan/public/scripts/vendor/openid-selector/images/openid.gif
    R ckan/public/scripts/vendor/openid-selector/images/technorati.ico
    R ckan/public/scripts/vendor/openid-selector/images/verisign.gif
    R ckan/public/scripts/vendor/openid-selector/images/verisign.ico
    R ckan/public/scripts/vendor/openid-selector/images/vidoop.ico
    R ckan/public/scripts/vendor/openid-selector/images/wordpress.ico
    R ckan/public/scripts/vendor/openid-selector/images/yahoo.gif
    R ckan/public/scripts/vendor/openid-selector/js/jquery-1.2.6.min.js
    R ckan/public/scripts/vendor/openid-selector/js/openid-jquery.js
    R ckan/public/scripts/vendor/recline/css/recline.css
    R ckan/public/scripts/vendor/resize/resize.js
    R ckan/public/scripts/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    R ckan/public/scripts/vendor/slickgrid/2.0.1/README.txt
    R ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-asc.gif
    R ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-desc.gif
    R ckan/public/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    R ckan/public/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    R ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.css
    R ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckan/public/scripts/vendor/underscore/1.1.6/underscore.js
    M ckan/templates/activity_streams/activity_stream_email_notifications.text
    R ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/base.html
    A ckan/templates/emails/invite_user.txt
    A ckan/templates/emails/invite_user_subject.txt
    A ckan/templates/emails/reset_password.txt
    A ckan/templates/emails/reset_password_subject.txt
    M ckan/templates/footer.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/snippets/feeds.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/base.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/new.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    R ckan/templates/package/related_list.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/additional_info.html
    A ckan/templates/package/snippets/cannot_create_package.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_info.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.html
    R ckan/templates/related/base_form_page.html
    R ckan/templates/related/confirm_delete.html
    R ckan/templates/related/dashboard.html
    R ckan/templates/related/edit.html
    R ckan/templates/related/edit_form.html
    R ckan/templates/related/new.html
    R ckan/templates/related/snippets/related_form.html
    R ckan/templates/related/snippets/related_item.html
    R ckan/templates/related/snippets/related_list.html
    M ckan/templates/revision/__init__.py
    M ckan/templates/snippets/debug.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/language_selector.html
    A ckan/templates/snippets/local_friendly_datetime.html
    M ckan/templates/snippets/organization_item.html
    R ckan/templates/snippets/related.html
    M ckan/templates/snippets/search_form.html
    A ckan/templates/tests/broken_helper_as_attribute.html
    A ckan/templates/tests/broken_helper_as_item.html
    A ckan/templates/tests/helper_as_attribute.html
    A ckan/templates/tests/helper_as_item.html
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/__init__.py
    M ckan/tests/config/test_environment.py
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/__init__.py
    M ckan/tests/controllers/test_admin.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_feed.py
    M ckan/tests/controllers/test_group.py
    A ckan/tests/controllers/test_home.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    A ckan/tests/controllers/test_tags.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/controllers/test_util.py
    M ckan/tests/factories.py
    M ckan/tests/helpers.py
    A ckan/tests/i18n/__init__.py
    A ckan/tests/i18n/test_check_po_files.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/ckantestplugins.py
    M ckan/tests/legacy/functional/api/__init__.py
    M ckan/tests/legacy/functional/api/base.py
    M ckan/tests/legacy/functional/api/model/test_group.py
    R ckan/tests/legacy/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/legacy/functional/api/model/test_licenses.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/model/test_ratings.py
    M ckan/tests/legacy/functional/api/model/test_relationships.py
    M ckan/tests/legacy/functional/api/model/test_revisions.py
    M ckan/tests/legacy/functional/api/model/test_tag.py
    M ckan/tests/legacy/functional/api/model/test_vocabulary.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/functional/api/test_api.py
    M ckan/tests/legacy/functional/api/test_dashboard.py
    M ckan/tests/legacy/functional/api/test_email_notifications.py
    M ckan/tests/legacy/functional/api/test_follow.py
    M ckan/tests/legacy/functional/api/test_misc.py
    M ckan/tests/legacy/functional/api/test_package_search.py
    M ckan/tests/legacy/functional/api/test_resource.py
    M ckan/tests/legacy/functional/api/test_resource_search.py
    R ckan/tests/legacy/functional/api/test_revision_search.py
    M ckan/tests/legacy/functional/api/test_user.py
    M ckan/tests/legacy/functional/api/test_util.py
    M ckan/tests/legacy/functional/base.py
    M ckan/tests/legacy/functional/test_activity.py
    M ckan/tests/legacy/functional/test_admin.py
    M ckan/tests/legacy/functional/test_error.py
    M ckan/tests/legacy/functional/test_group.py
    R ckan/tests/legacy/functional/test_home.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/legacy/functional/test_preview_interface.py
    R ckan/tests/legacy/functional/test_related.py
    M ckan/tests/legacy/functional/test_revision.py
    R ckan/tests/legacy/functional/test_storage.py
    M ckan/tests/legacy/functional/test_tag.py
    M ckan/tests/legacy/functional/test_tracking.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/html_check.py
    M ckan/tests/legacy/lib/__init__.py
    R ckan/tests/legacy/lib/test_accept.py
    M ckan/tests/legacy/lib/test_alphabet_pagination.py
    M ckan/tests/legacy/lib/test_authenticator.py
    M ckan/tests/legacy/lib/test_cli.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/legacy/lib/test_dictization_schema.py
    M ckan/tests/legacy/lib/test_email_notifications.py
    M ckan/tests/legacy/lib/test_hash.py
    M ckan/tests/legacy/lib/test_helpers.py
    M ckan/tests/legacy/lib/test_i18n.py
    R ckan/tests/legacy/lib/test_mailer.py
    M ckan/tests/legacy/lib/test_navl.py
    M ckan/tests/legacy/lib/test_resource_search.py
    R ckan/tests/legacy/lib/test_simple_search.py
    M ckan/tests/legacy/lib/test_solr_package_search.py
    M ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/legacy/lib/test_solr_schema_version.py
    M ckan/tests/legacy/lib/test_solr_search_index.py
    M ckan/tests/legacy/lib/test_tag_search.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_auth.py
    M ckan/tests/legacy/logic/test_init.py
    M ckan/tests/legacy/logic/test_member.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/legacy/logic/test_tag_vocab.py
    M ckan/tests/legacy/logic/test_validators.py
    M ckan/tests/legacy/misc/test_format_text.py
    M ckan/tests/legacy/misc/test_mock_mail_server.py
    M ckan/tests/legacy/misc/test_sync.py
    M ckan/tests/legacy/mock_mail_server.py
    M ckan/tests/legacy/mock_plugin.py
    M ckan/tests/legacy/models/test_activity.py
    M ckan/tests/legacy/models/test_extras.py
    M ckan/tests/legacy/models/test_follower.py
    M ckan/tests/legacy/models/test_group.py
    M ckan/tests/legacy/models/test_misc.py
    M ckan/tests/legacy/models/test_package.py
    M ckan/tests/legacy/models/test_package_relationships.py
    M ckan/tests/legacy/models/test_purge_revision.py
    M ckan/tests/legacy/models/test_resource.py
    M ckan/tests/legacy/models/test_revision.py
    M ckan/tests/legacy/models/test_user.py
    M ckan/tests/legacy/pylons_controller.py
    M ckan/tests/legacy/schema/test_schema.py
    M ckan/tests/legacy/test_coding_standards.py
    R ckan/tests/legacy/test_dumper.py
    M ckan/tests/legacy/test_plugins.py
    M ckan/tests/legacy/test_versions.py
    M ckan/tests/lib/__init__.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    M ckan/tests/lib/navl/test_dictization_functions.py
    M ckan/tests/lib/navl/test_validators.py
    M ckan/tests/lib/search/test_index.py
    M ckan/tests/lib/test_app_globals.py
    M ckan/tests/lib/test_auth_tkt.py
    M ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_config_tool.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_helpers.py
    A ckan/tests/lib/test_io.py
    A ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_munge.py
    A ckan/tests/lib/test_navl.py
    M ckan/tests/logic/action/__init__.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_patch.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/__init__.py
    M ckan/tests/logic/auth/test_create.py
    M ckan/tests/logic/auth/test_delete.py
    M ckan/tests/logic/auth/test_get.py
    M ckan/tests/logic/auth/test_init.py
    M ckan/tests/logic/auth/test_update.py
    M ckan/tests/logic/test_conversion.py
    M ckan/tests/logic/test_converters.py
    M ckan/tests/logic/test_schema.py
    M ckan/tests/logic/test_validators.py
    M ckan/tests/migration/__init__.py
    M ckan/tests/model/__init__.py
    M ckan/tests/model/test_license.py
    M ckan/tests/model/test_resource.py
    M ckan/tests/model/test_resource_view.py
    M ckan/tests/model/test_system_info.py
    M ckan/tests/model/test_user.py
    M ckan/tests/plugins/__init__.py
    A ckan/tests/plugins/test_toolkit.py
    M ckan/tests/test_authz.py
    M ckan/tests/test_coding_standards.py
    A ckan/tests/test_common.py
    M ckan/tests/test_factories.py
    M ckan/websetup.py
    M ckanext/__init__.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/helpers.py
    M ckanext/datapusher/interfaces.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/auth.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    A ckanext/datapusher/tests/test_action.py
    M ckanext/datapusher/tests/test_default_views.py
    M ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/interfaces.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/helpers.py
    M ckanext/datastore/tests/sample_datastore_plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_delete.py
    A ckanext/datastore/tests/test_disable.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_info.py
    M ckanext/datastore/tests/test_interface.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_iauthfunctions/plugin_v1.py
    M ckanext/example_iauthfunctions/plugin_v2.py
    M ckanext/example_iauthfunctions/plugin_v3.py
    M ckanext/example_iauthfunctions/plugin_v4.py
    M ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
    A ckanext/example_iauthfunctions/plugin_v6_parent_auth_functions.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/example_iconfigurer/controller.py
    M ckanext/example_iconfigurer/plugin.py
    M ckanext/example_iconfigurer/plugin_v1.py
    M ckanext/example_iconfigurer/plugin_v2.py
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/example_idatasetform/plugin_v1.py
    M ckanext/example_idatasetform/plugin_v2.py
    M ckanext/example_idatasetform/plugin_v3.py
    M ckanext/example_idatasetform/plugin_v4.py
    M ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_igroupform/plugin.py
    A ckanext/example_igroupform/templates/example_igroup_form/group_form.html
    M ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/example_iresourcecontroller/plugin.py
    M ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    M ckanext/example_itemplatehelpers/plugin.py
    A ckanext/example_itranslation/__init__.py
    A ckanext/example_itranslation/babel_mapping.cfg
    A ckanext/example_itranslation/i18n/ckanext-example_itranslation.pot
    A ckanext/example_itranslation/i18n/en/LC_MESSAGES/ckanext-example_itranslation.mo
    A ckanext/example_itranslation/i18n/en/LC_MESSAGES/ckanext-example_itranslation.po
    A ckanext/example_itranslation/i18n/en/LC_MESSAGES/ckanext-example_translation.po
    A ckanext/example_itranslation/i18n/fr/LC_MESSAGES/ckanext-example_itranslation.mo
    A ckanext/example_itranslation/i18n/fr/LC_MESSAGES/ckanext-example_itranslation.po
    A ckanext/example_itranslation/plugin.py
    A ckanext/example_itranslation/plugin_v1.py
    A ckanext/example_itranslation/setup.cfg
    A ckanext/example_itranslation/templates/home/index.html
    A ckanext/example_itranslation/tests/__init__.py
    A ckanext/example_itranslation/tests/test_plugin.py
    A ckanext/example_iuploader/__init__.py
    A ckanext/example_iuploader/plugin.py
    A ckanext/example_iuploader/test/__init__.py
    A ckanext/example_iuploader/test/test_plugin.py
    M ckanext/example_ivalidators/plugin.py
    M ckanext/example_ivalidators/tests/test_ivalidators.py
    M ckanext/example_theme/custom_config_setting/plugin.py
    A ckanext/example_theme/custom_emails/__init__.py
    A ckanext/example_theme/custom_emails/plugin.py
    A ckanext/example_theme/custom_emails/templates/emails/invite_user.txt
    A ckanext/example_theme/custom_emails/templates/emails/invite_user_subject.txt
    A ckanext/example_theme/custom_emails/templates/emails/reset_password.txt
    A ckanext/example_theme/custom_emails/templates/emails/reset_password_subject.txt
    A ckanext/example_theme/custom_emails/tests.py
    M ckanext/example_theme/v01_empty_extension/plugin.py
    M ckanext/example_theme/v02_empty_template/plugin.py
    M ckanext/example_theme/v08_custom_helper_function/plugin.py
    M ckanext/example_theme/v12_extra_public_dir/plugin.py
    M ckanext/example_theme/v15_fanstatic/plugin.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/plugin.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/css/recline.css
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    R ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/bootstrap.js
    R ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap-responsive.css
    R ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap.css
    R ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings-white.png
    R ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings.png
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/css/bootstrap-theme.css
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/css/bootstrap.css
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/fonts/glyphicons-halflings-regular.eot
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/fonts/glyphicons-halflings-regular.svg
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/fonts/glyphicons-halflings-regular.ttf
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/fonts/glyphicons-halflings-regular.woff
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/js/bootstrap.js
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster-src.js
    A ckanext/reclineview/theme/public/vendor/recline/flot.css
    A ckanext/reclineview/theme/public/vendor/recline/map.css
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    A ckanext/reclineview/theme/public/vendor/recline/slickgrid.css
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/README.txt
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowmovemanager.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowselectionmodel.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.css
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/MIT-LICENSE.txt
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/README.md
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/controls/slick.columnpicker.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/controls/slick.columnpicker.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/controls/slick.pager.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/controls/slick.pager.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_222222_256x240.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_2e83ff_256x240.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_454545_256x240.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_888888_256x240.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_cd0a0a_256x240.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/jquery-ui-1.8.16.custom.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/actions.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/ajax-loader-small.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_redo.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_peppermint.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_spearmint.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_undo.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_blue.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_star.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_toggle_minus.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_toggle_plus.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/calendar.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/collapse.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/comment_yellow.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/down.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/drag-handle.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/editor-helper-bg.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/expand.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/header-bg.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/header-columns-bg.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/header-columns-over-bg.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/help.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/info.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/listview.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/pencil.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/row-over-bg.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-asc.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-asc.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-desc.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-desc.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/stripes.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tag_red.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tick.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/user_identity.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/user_identity_plus.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/jquery-1.7.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/jquery-ui-1.8.16.custom.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/jquery.event.drag-2.2.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/jquery.event.drop-2.2.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.autotooltips.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.cellcopymanager.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.cellrangedecorator.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.cellrangeselector.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.cellselectionmodel.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.checkboxselectcolumn.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.headerbuttons.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.headerbuttons.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.headermenu.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.headermenu.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.rowmovemanager.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.rowselectionmodel.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick-default-theme.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.core.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.dataview.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.editors.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.formatters.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.grid.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.grid.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.groupitemmetadataprovider.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.remotemodel.js
    A ckanext/reclineview/theme/public/vendor/timeline/LICENSE
    A ckanext/reclineview/theme/public/vendor/timeline/README
    M ckanext/reclineview/theme/templates/recline_view.html
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/plugin.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/__init__.py
    M ckanext/stats/controller.py
    M ckanext/stats/plugin.py
    M ckanext/stats/public/__init__.py
    M ckanext/stats/public/ckanext/__init__.py
    M ckanext/stats/public/ckanext/stats/__init__.py
    R ckanext/stats/public/ckanext/stats/app.js
    R ckanext/stats/public/ckanext/stats/demo.html
    R ckanext/stats/public/ckanext/stats/style.css
    M ckanext/stats/stats.py
    R ckanext/stats/templates_legacy/__init__.py
    R ckanext/stats/templates_legacy/ckanext/__init__.py
    R ckanext/stats/templates_legacy/ckanext/stats/__init__.py
    R ckanext/stats/templates_legacy/ckanext/stats/index.html
    R ckanext/stats/templates_legacy/ckanext/stats/leaderboard.html
    M ckanext/stats/tests/__init__.py
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/test_tag_vocab_plugin.py
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    A contrib/docker/docker-cloud.yml
    A contrib/docker/docker-compose.yml
    M contrib/docker/my_init.d/50_configure
    M contrib/docker/postgresql/Dockerfile
    M contrib/docker/solr/Dockerfile
    R contrib/docker/solr/schema.xml
    A contrib/docker/solr/solrconfig.xml
    M dev-requirements.txt
    M doc/_templates/footer.html
    R doc/api.rst
    M doc/api/index.rst
    M doc/api/legacy-api.rst
    M doc/conf.py
    M doc/contents.rst
    M doc/contributing/css.rst
    M doc/contributing/database-migrations.rst
    M doc/contributing/documentation.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/javascript-module-tutorial.rst
    M doc/contributing/frontend/template-blocks.rst
    M doc/contributing/frontend/templating.rst
    M doc/contributing/i18n.rst
    M doc/contributing/index.rst
    M doc/contributing/issues.rst
    M doc/contributing/javascript.rst
    M doc/contributing/pull-requests.rst
    M doc/contributing/python.rst
    M doc/contributing/release-process.rst
    M doc/contributing/reviewing.rst
    M doc/contributing/string-i18n.rst
    M doc/contributing/test.rst
    A doc/contributing/unicode.rst
    M doc/extensions/adding-custom-fields.rst
    M doc/extensions/best-practices.rst
    M doc/extensions/custom-config-settings.rst
    M doc/extensions/index.rst
    M doc/extensions/remote-config-update.rst
    A doc/extensions/translating-extensions.rst
    M doc/extensions/tutorial.rst
    M doc/index.rst
    M doc/maintaining/apps-ideas.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    A doc/maintaining/database-management.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/email-notifications.rst
    M doc/maintaining/filestore.rst
    M doc/maintaining/getting-started.rst
    M doc/maintaining/index.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/installing/index.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    R doc/maintaining/installing/install-using-docker.rst
    M doc/maintaining/paster.rst
    M doc/maintaining/upgrading/index.rst
    M doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-source.rst
    M doc/theming/javascript-module-objects-and-methods.rst
    M doc/theming/javascript.rst
    M doc/theming/templates.rst
    M profile_tests.py
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini
    M test.ini

  Log Message:
  -----------
  Merge branch 'master' into 2457-fix-org-list-for-user

Conflicts:
	ckan/lib/helpers.py


  Commit: cf979ce110941081be721320dab189b11c51ccce
      https://github.com/ckan/ckan/commit/cf979ce110941081be721320dab189b11c51ccce
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-30 (Tue, 30 Aug 2016)

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#2457] Return all organizations the user belongs to

Regardless of capacity, not just the ones where the user is an
administrator.


  Commit: 1cccb7d1e141c9b2e49ed5e81f73465bbe3b6948
      https://github.com/ckan/ckan/commit/1cccb7d1e141c9b2e49ed5e81f73465bbe3b6948
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-14 (Wed, 14 Sep 2016)

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

  Log Message:
  -----------
  [#3225] Update release docs with new brnanches conventions


  Commit: 4149b8f6959ed4418288358f6f89eda40eb3d66d
      https://github.com/ckan/ckan/commit/4149b8f6959ed4418288358f6f89eda40eb3d66d
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-14 (Wed, 14 Sep 2016)

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

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


  Commit: 7180a9edbdb74ec40f5e6f934c9d8a37dfe2e2ab
      https://github.com/ckan/ckan/commit/7180a9edbdb74ec40f5e6f934c9d8a37dfe2e2ab
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware/flask_app.py
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/lib/render.py
    M ckan/lib/search/__init__.py
    R ckan/lib/search/sql.py
    M ckan/public/base/vendor/moment-with-locales.js
    M ckan/tests/controllers/test_feed.py
    R ckan/tests/legacy/lib/test_simple_search.py
    M ckanext/datapusher/cli.py
    M ckanext/example_theme/custom_config_setting/plugin.py
    M ckanext/example_theme/custom_emails/tests.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/templates/recline_view.html
    M doc/contributing/architecture.rst
    M doc/contributing/test.rst
    A doc/images/architecture.png
    A doc/images/architecture.svg
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch 'master' into 3196-common-requests-code

Conflicts:
	ckan/config/middleware/flask_app.py


  Commit: fd39a58e54a2f2f2a63c336f78a9750fcd50be53
      https://github.com/ckan/ckan/commit/fd39a58e54a2f2f2a63c336f78a9750fcd50be53
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M ckan/controllers/feed.py

  Log Message:
  -----------
  [#3196] Fix bad merge conflict


  Commit: 38b886b000628563d6b8f821c32de846ed5d439c
      https://github.com/ckan/ckan/commit/38b886b000628563d6b8f821c32de846ed5d439c
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Fix NE locale, which was broken in a bad merge


  Commit: 73bded7a1330edf21a914c821d157ab66d144b88
      https://github.com/ckan/ckan/commit/73bded7a1330edf21a914c821d157ab66d144b88
  Author: Martin Burchell <martinb at aptivate.org>
  Date:   2016-09-21 (Wed, 21 Sep 2016)

  Changed paths:
    M CHANGELOG.rst
    M bin/running_stats.py
    M circle.yml
    M ckan/__init__.py
    M ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/common.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    R ckan/config/middleware.py
    A ckan/config/middleware/__init__.py
    A ckan/config/middleware/common_middleware.py
    A ckan/config/middleware/flask_app.py
    A ckan/config/middleware/pylons_app.py
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    R ckan/config/solr/schema-1.2.xml
    R ckan/config/solr/schema-1.3.xml
    R ckan/config/solr/schema-1.4.xml
    R ckan/config/solr/schema-2.0.xml
    M ckan/config/solr/schema.xml
    A ckan/config/supervisor-ckan-worker.conf
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    R ckan/controllers/partyline.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    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/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/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/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    A ckan/i18n/tl/LC_MESSAGES/ckan.mo
    A ckan/i18n/tl/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/lib/activity_streams.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/app_globals.py
    M ckan/lib/auth_tkt.py
    M ckan/lib/base.py
    M ckan/lib/captcha.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/config_tool.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/hash.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    A ckan/lib/io.py
    A ckan/lib/jobs.py
    M ckan/lib/mailer.py
    M ckan/lib/munge.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    A ckan/lib/redis.py
    M ckan/lib/render.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    R ckan/lib/search/sql.py
    M ckan/lib/uploader.py
    R ckan/lib/util.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/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/081_set_datastore_active.py
    A ckan/migration/versions/085_adjust_activity_timestamps.py
    M ckan/model/activity.py
    M ckan/model/extension.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/pastertemplates/template/+dot+travis.yml_tmpl
    M ckan/pastertemplates/template/MANIFEST.in_tmpl
    A ckan/pastertemplates/template/requirements.txt_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/modules/resource-view-filters-form.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/module.less
    M ckan/public/base/vendor/moment-with-locales.js
    M ckan/templates/base.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/package/new.html
    A ckan/templates/package/snippets/cannot_create_package.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/tests/config/test_environment.py
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/test_admin.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_feed.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_tags.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/controllers/test_util.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/functional/api/base.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/functional/api/test_api.py
    M ckan/tests/legacy/functional/api/test_email_notifications.py
    M ckan/tests/legacy/functional/api/test_user.py
    M ckan/tests/legacy/functional/test_activity.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/legacy/lib/test_helpers.py
    M ckan/tests/legacy/lib/test_i18n.py
    M ckan/tests/legacy/lib/test_navl.py
    R ckan/tests/legacy/lib/test_simple_search.py
    M ckan/tests/legacy/lib/test_solr_search_index.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_auth.py
    M ckan/tests/legacy/misc/test_mock_mail_server.py
    M ckan/tests/legacy/misc/test_sync.py
    M ckan/tests/legacy/mock_mail_server.py
    M ckan/tests/legacy/models/test_group.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_plugins.py
    M ckan/tests/lib/search/test_index.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_datapreview.py
    A ckan/tests/lib/test_io.py
    A ckan/tests/lib/test_jobs.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_munge.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_patch.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/test_validators.py
    M ckan/tests/model/test_license.py
    M ckan/tests/test_coding_standards.py
    A ckan/tests/test_common.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.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_disable.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
    M ckanext/example_iauthfunctions/plugin_v6_parent_auth_functions.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_igroupform/tests/test_controllers.py
    A ckanext/example_ipermissionlabels/__init__.py
    A ckanext/example_ipermissionlabels/plugin.py
    A ckanext/example_ipermissionlabels/tests/__init__.py
    A ckanext/example_ipermissionlabels/tests/test_example_ipermissionlabels.py
    M ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    M ckanext/example_iuploader/test/test_plugin.py
    M ckanext/example_ivalidators/tests/test_ivalidators.py
    M ckanext/example_theme/custom_config_setting/plugin.py
    M ckanext/example_theme/custom_emails/tests.py
    M ckanext/multilingual/plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/css/recline.css
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    R ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/bootstrap.js
    R ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap-responsive.css
    R ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap.css
    R ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings-white.png
    R ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings.png
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/css/bootstrap-theme.css
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/css/bootstrap.css
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/fonts/glyphicons-halflings-regular.eot
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/fonts/glyphicons-halflings-regular.svg
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/fonts/glyphicons-halflings-regular.ttf
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/fonts/glyphicons-halflings-regular.woff
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/js/bootstrap.js
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster-src.js
    A ckanext/reclineview/theme/public/vendor/recline/flot.css
    A ckanext/reclineview/theme/public/vendor/recline/map.css
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    A ckanext/reclineview/theme/public/vendor/recline/slickgrid.css
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/README.txt
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowmovemanager.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowselectionmodel.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.css
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/MIT-LICENSE.txt
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/README.md
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/controls/slick.columnpicker.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/controls/slick.columnpicker.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/controls/slick.pager.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/controls/slick.pager.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_222222_256x240.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_2e83ff_256x240.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_454545_256x240.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_888888_256x240.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_cd0a0a_256x240.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/jquery-ui-1.8.16.custom.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/actions.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/ajax-loader-small.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_redo.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_peppermint.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_spearmint.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_undo.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_blue.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_star.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_toggle_minus.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_toggle_plus.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/calendar.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/collapse.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/comment_yellow.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/down.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/drag-handle.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/editor-helper-bg.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/expand.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/header-bg.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/header-columns-bg.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/header-columns-over-bg.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/help.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/info.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/listview.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/pencil.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/row-over-bg.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-asc.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-asc.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-desc.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-desc.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/stripes.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tag_red.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tick.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/user_identity.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/user_identity_plus.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/jquery-1.7.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/jquery-ui-1.8.16.custom.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/jquery.event.drag-2.2.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/jquery.event.drop-2.2.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.autotooltips.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.cellcopymanager.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.cellrangedecorator.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.cellrangeselector.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.cellselectionmodel.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.checkboxselectcolumn.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.headerbuttons.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.headerbuttons.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.headermenu.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.headermenu.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.rowmovemanager.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.rowselectionmodel.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick-default-theme.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.core.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.dataview.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.editors.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.formatters.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.grid.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.grid.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.groupitemmetadataprovider.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.remotemodel.js
    A ckanext/reclineview/theme/public/vendor/timeline/LICENSE
    A ckanext/reclineview/theme/public/vendor/timeline/README
    M ckanext/reclineview/theme/templates/recline_view.html
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/plugin.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/stats/tests/__init__.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/textview/tests/test_view.py
    M dev-requirements.txt
    M doc/api/index.rst
    M doc/conf.py
    M doc/contributing/architecture.rst
    M doc/contributing/database-migrations.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/javascript-module-tutorial.rst
    M doc/contributing/index.rst
    M doc/contributing/python.rst
    M doc/contributing/string-i18n.rst
    M doc/contributing/test.rst
    A doc/contributing/unicode.rst
    M doc/extensions/best-practices.rst
    M doc/extensions/custom-config-settings.rst
    M doc/extensions/plugins-toolkit.rst
    M doc/extensions/translating-extensions.rst
    M doc/extensions/tutorial.rst
    A doc/images/architecture.png
    A doc/images/architecture.svg
    M doc/maintaining/authorization.rst
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    A doc/maintaining/database-management.rst
    M doc/maintaining/getting-started.rst
    M doc/maintaining/index.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/paster.rst
    M doc/maintaining/upgrading/index.rst
    M doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-source.rst
    M doc/theming/best-practices.rst
    M doc/theming/javascript-module-objects-and-methods.rst
    M doc/theming/javascript.rst
    M doc/theming/templates.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini
    M test.ini

  Log Message:
  -----------
  Merge branch 'master' into override-feed-class


  Commit: 1049fd162168a6d8d6e84db1ce4f4e7b25a337e8
      https://github.com/ckan/ckan/commit/1049fd162168a6d8d6e84db1ce4f4e7b25a337e8
  Author: Martin Burchell <martinb at aptivate.org>
  Date:   2016-09-21 (Wed, 21 Sep 2016)

  Changed paths:
    M ckan/controllers/feed.py
    M ckan/plugins/interfaces.py
    M ckan/tests/controllers/test_feed.py
    M setup.py

  Log Message:
  -----------
  Change to use IFeed interface


  Commit: 0083672cf09317dcb2ba2550f98da1df5a6fea80
      https://github.com/ckan/ckan/commit/0083672cf09317dcb2ba2550f98da1df5a6fea80
  Author: Martin Burchell <martinb at aptivate.org>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M ckan/tests/logic/action/test_get.py
    M ckanext/example_ipermissionlabels/tests/test_example_ipermissionlabels.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into override-feed-class


  Commit: f5f1d1c36ebbb93d83761ce1e46198f9b01a3300
      https://github.com/ckan/ckan/commit/f5f1d1c36ebbb93d83761ce1e46198f9b01a3300
  Author: Martin Burchell <martinb at aptivate.org>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

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

  Log Message:
  -----------
  Only load test plugin if not loaded


  Commit: 28a3e2ff01f3bfb3a3433f96a721a5e302741100
      https://github.com/ckan/ckan/commit/28a3e2ff01f3bfb3a3433f96a721a5e302741100
  Author: Martin Burchell <martinb at aptivate.org>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Improve IFeed documentation


  Commit: 22dda1d95487f39db9c1f1e9293938194bb17807
      https://github.com/ckan/ckan/commit/22dda1d95487f39db9c1f1e9293938194bb17807
  Author: Martin Burchell <martinb at aptivate.org>
  Date:   2016-09-26 (Mon, 26 Sep 2016)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/jobs.py
    M ckan/plugins/interfaces.py
    M ckan/tests/config/test_environment.py
    M ckan/tests/lib/test_jobs.py
    M ckan/tests/test_coding_standards.py
    M doc/contributing/architecture.rst
    M doc/maintaining/background-tasks.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into override-feed-class

Conflicts:
	ckan/plugins/interfaces.py


  Commit: a33e3808a5b95cfae25b95e91e2fd9d6c7e09045
      https://github.com/ckan/ckan/commit/a33e3808a5b95cfae25b95e91e2fd9d6c7e09045
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/resource_formats.json
    M ckan/lib/jobs.py
    M ckan/plugins/interfaces.py
    M ckan/tests/config/test_environment.py
    M ckan/tests/lib/test_jobs.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/test_coding_standards.py
    M ckanext/example_ipermissionlabels/tests/test_example_ipermissionlabels.py
    M doc/contributing/architecture.rst
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/installing/deployment.rst

  Log Message:
  -----------
  Merge branch 'master' into fix-ne-locale


  Commit: 87d9da0a47f31a30bfb21cd4d4353ecac718df46
      https://github.com/ckan/ckan/commit/87d9da0a47f31a30bfb21cd4d4353ecac718df46
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/resource_formats.json
    R ckan/config/solr/schema-1.2.xml
    R ckan/config/solr/schema-1.3.xml
    R ckan/config/solr/schema-1.4.xml
    R ckan/config/solr/schema-2.0.xml
    M ckan/config/solr/schema.xml
    A ckan/config/supervisor-ckan-worker.conf
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/formatters.py
    A ckan/lib/jobs.py
    M ckan/lib/plugins.py
    A ckan/lib/redis.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/schema.py
    A ckan/migration/versions/085_adjust_activity_timestamps.py
    M ckan/model/activity.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/tests/config/test_environment.py
    M ckan/tests/helpers.py
    M ckan/tests/lib/test_cli.py
    A ckan/tests/lib/test_jobs.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/test_coding_standards.py
    A ckanext/example_ipermissionlabels/__init__.py
    A ckanext/example_ipermissionlabels/plugin.py
    A ckanext/example_ipermissionlabels/tests/__init__.py
    A ckanext/example_ipermissionlabels/tests/test_example_ipermissionlabels.py
    M doc/api/index.rst
    M doc/contributing/architecture.rst
    M doc/contributing/test.rst
    M doc/extensions/best-practices.rst
    M doc/extensions/custom-config-settings.rst
    M doc/extensions/plugins-toolkit.rst
    M doc/maintaining/authorization.rst
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/paster.rst
    M doc/theming/best-practices.rst
    M doc/theming/javascript.rst
    M doc/theming/templates.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 3196-common-requests-code

Conflicts:
	ckan/plugins/interfaces.py


  Commit: 8e38f42aaf70199f9756ba55f8118e13941499d5
      https://github.com/ckan/ckan/commit/8e38f42aaf70199f9756ba55f8118e13941499d5
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M ckan/config/middleware/flask_app.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#3196] Add IMiddleware hooks to Flask stack

Clarify what app will you get on the interface docstrings

Conflicts:
	ckan/config/middleware/flask_app.py
	ckan/plugins/interfaces.py


  Commit: bc9bb6a701be096752b9912ddb5484251feb574b
      https://github.com/ckan/ckan/commit/bc9bb6a701be096752b9912ddb5484251feb574b
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-09-29 (Thu, 29 Sep 2016)

  Changed paths:
    M ckan/templates/ajax_snippets/api_info.html

  Log Message:
  -----------
  Removed API info links for api queries

Issue #3076 - Help to prevent robots that don't listen to robot.txt from
calling needless querys on api links


  Commit: ffc7c7d1fcd0dd6b5983583620857540ac2845d9
      https://github.com/ckan/ckan/commit/ffc7c7d1fcd0dd6b5983583620857540ac2845d9
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-09-29 (Thu, 29 Sep 2016)

  Changed paths:
    R ckan/templates/ajax_snippets/api_info.html
    M ckanext/datastore/plugin.py
    A ckanext/datastore/templates/ajax_snippets/api_info.html

  Log Message:
  -----------
  Moved api_info.html to datastore ext, datastore now has a template path added to globals


  Commit: a09c11bd7d61f2940b2c6430a9c1835e914c5def
      https://github.com/ckan/ckan/commit/a09c11bd7d61f2940b2c6430a9c1835e914c5def
  Author: Fabio Anderegg <fabio.anderegg at liip.ch>
  Date:   2016-09-30 (Fri, 30 Sep 2016)

  Changed paths:
    M ckanext/datastore/plugin.py
    M ckanext/datastore/set_permissions.sql

  Log Message:
  -----------
  [#2345] datastore: create _table_metadata view in set_permissions.sql


  Commit: 3ef2c319fe55a4a4effb8611f1b1b5cd4d39750e
      https://github.com/ckan/ckan/commit/3ef2c319fe55a4a4effb8611f1b1b5cd4d39750e
  Author: amercader <amercadero at gmail.com>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    M ckan/common.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/resource_formats.json
    R ckan/config/solr/schema-1.2.xml
    R ckan/config/solr/schema-1.3.xml
    R ckan/config/solr/schema-1.4.xml
    R ckan/config/solr/schema-2.0.xml
    M ckan/config/solr/schema.xml
    A ckan/config/supervisor-ckan-worker.conf
    M ckan/controllers/package.py
    M ckan/controllers/util.py
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    A ckan/lib/jobs.py
    M ckan/lib/plugins.py
    A ckan/lib/redis.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/schema.py
    A ckan/migration/versions/085_adjust_activity_timestamps.py
    M ckan/model/activity.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/vendor/moment-with-locales.js
    M ckan/tests/config/test_environment.py
    M ckan/tests/controllers/test_tags.py
    M ckan/tests/controllers/test_util.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/lib/test_cli.py
    A ckan/tests/lib/test_jobs.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/plugin.py
    M ckanext/example_igroupform/tests/test_controllers.py
    A ckanext/example_ipermissionlabels/__init__.py
    A ckanext/example_ipermissionlabels/plugin.py
    A ckanext/example_ipermissionlabels/tests/__init__.py
    A ckanext/example_ipermissionlabels/tests/test_example_ipermissionlabels.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/templates/recline_view.html
    M doc/api/index.rst
    M doc/contributing/architecture.rst
    M doc/contributing/test.rst
    M doc/extensions/best-practices.rst
    M doc/extensions/custom-config-settings.rst
    M doc/extensions/plugins-toolkit.rst
    A doc/images/architecture.png
    A doc/images/architecture.svg
    M doc/maintaining/authorization.rst
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/paster.rst
    M doc/theming/best-practices.rst
    M doc/theming/javascript.rst
    M doc/theming/templates.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 2457-fix-org-list-for-user


  Commit: d519a1bfd54fe510cc963008e758aef21ff8b87a
      https://github.com/ckan/ckan/commit/d519a1bfd54fe510cc963008e758aef21ff8b87a
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    M ckan/templates/package/resource_read.html
    R ckan/templates/package/snippets/data_api_button.html
    A ckanext/datastore/templates/package/resource_read.html
    A ckanext/datastore/templates/package/snippets/data_api_button.html

  Log Message:
  -----------
  Moving data api specific template snippets to datastore ext


  Commit: efe47e8eec4ff2a20cabe8fbd163998ee6888233
      https://github.com/ckan/ckan/commit/efe47e8eec4ff2a20cabe8fbd163998ee6888233
  Author: Ian Ward <ian at excess.org>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    R ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/package/resource_read.html
    R ckan/templates/package/snippets/data_api_button.html
    M ckanext/datastore/plugin.py
    A ckanext/datastore/templates/ajax_snippets/api_info.html
    A ckanext/datastore/templates/package/resource_read.html
    A ckanext/datastore/templates/package/snippets/data_api_button.html

  Log Message:
  -----------
  Merge pull request #3261 from HighwayThree/issue_3076_api_info

[#3076] Removed links in api_info.html


  Commit: 56a7cbb18408ddce778651abdf364ae941562dd4
      https://github.com/ckan/ckan/commit/56a7cbb18408ddce778651abdf364ae941562dd4
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-10-06 (Thu, 06 Oct 2016)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/template.py
    R ckan/public/robots.txt
    A ckan/templates/robots.txt
    A ckan/tests/controllers/test_template.py
    M ckan/tests/test_coding_standards.py
    A ckan/tests/test_robots_txt.py

  Log Message:
  -----------
  Merge pull request #3164 from torfsen/iar178-allow-customization-of-robots-txt

[iar#178] Allow customization of robots.txt


  Commit: 1fc8e0fa84511b3598457f46063dfabb2e032425
      https://github.com/ckan/ckan/commit/1fc8e0fa84511b3598457f46063dfabb2e032425
  Author: Matt Fullerton <mattfullerton at users.noreply.github.com>
  Date:   2016-10-07 (Fri, 07 Oct 2016)

  Changed paths:
    M ckanext/reclineview/theme/public/recline_view.js

  Log Message:
  -----------
  Fixes #2657 by not ignoring filters when embedded


  Commit: 1f0a45cf0b56db8b88c8fee12586ea05c0e578ab
      https://github.com/ckan/ckan/commit/1f0a45cf0b56db8b88c8fee12586ea05c0e578ab
  Author: amercader <amercadero at gmail.com>
  Date:   2016-10-07 (Fri, 07 Oct 2016)

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

  Log Message:
  -----------
  [#2457] Fix SQLAlchemy boolean filter


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

  Changed paths:
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  [#2457] Add and update tests


  Commit: 8a5e6da1a6797b8f860ecc90741892e166902e71
      https://github.com/ckan/ckan/commit/8a5e6da1a6797b8f860ecc90741892e166902e71
  Author: amercader <amercadero at gmail.com>
  Date:   2016-10-07 (Fri, 07 Oct 2016)

  Changed paths:
    M doc/maintaining/datastore.rst
    M doc/maintaining/upgrading/index.rst
    M doc/maintaining/upgrading/upgrade-postgres.rst

  Log Message:
  -----------
  Final tweaks on the postgres update docs


  Commit: 9b03b8891b5cd6d3d9cf32e13766afacd2fe735c
      https://github.com/ckan/ckan/commit/9b03b8891b5cd6d3d9cf32e13766afacd2fe735c
  Author: amercader <amercadero at gmail.com>
  Date:   2016-10-07 (Fri, 07 Oct 2016)

  Changed paths:
    A .circleci-matrix.yml
    R .coveragerc
    A .github/ISSUE_TEMPLATE.md
    A .github/PULL_REQUEST_TEMPLATE.md
    R .travis.yml
    M .tx/config
    M CHANGELOG.rst
    A CONDUCT.rst
    M Dockerfile
    M LICENSE.txt
    M MANIFEST.in
    M README.rst
    A bin/postgres_init/1_create_ckan_db.sh
    A bin/postgres_init/2_create_ckan_datastore_db.sh
    M bin/running_stats.py
    A bin/solr_init/create_core.sh
    M bin/travis-install-dependencies
    M bin/travis-run-tests
    A circle.yml
    M ckan/__init__.py
    M ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/common.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/install.py
    R ckan/config/middleware.py
    A ckan/config/middleware/__init__.py
    A ckan/config/middleware/common_middleware.py
    A ckan/config/middleware/flask_app.py
    A ckan/config/middleware/pylons_app.py
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    R ckan/config/solr/schema-1.2.xml
    R ckan/config/solr/schema-1.3.xml
    R ckan/config/solr/schema-1.4.xml
    R ckan/config/solr/schema-2.0.xml
    M ckan/config/solr/schema.xml
    A ckan/config/supervisor-ckan-worker.conf
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/exceptions.py
    M ckan/i18n/__init__.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/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/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    R ckan/i18n/dv/LC_MESSAGES/ckan.mo
    R ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    R ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    R ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    R ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    R ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    R ckan/i18n/eu/LC_MESSAGES/ckan.mo
    R ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    R ckan/i18n/lo/LC_MESSAGES/ckan.mo
    R ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    R ckan/i18n/my/LC_MESSAGES/ckan.mo
    R ckan/i18n/my/LC_MESSAGES/ckan.po
    R ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    R ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/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/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/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
    R ckan/i18n/sw/LC_MESSAGES/ckan.mo
    R ckan/i18n/sw/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    A ckan/i18n/tl/LC_MESSAGES/ckan.mo
    A ckan/i18n/tl/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    R ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    R ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    R ckan/lib/accept.py
    M ckan/lib/activity_streams.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    M ckan/lib/auth_tkt.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/captcha.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/config_tool.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    R ckan/lib/dumper.py
    M ckan/lib/email_notifications.py
    M ckan/lib/extract.py
    M ckan/lib/fanstatic_extensions.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/formatters.py
    M ckan/lib/hash.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    A ckan/lib/io.py
    M ckan/lib/jinja_extensions.py
    A ckan/lib/jobs.py
    M ckan/lib/jsonp.py
    R ckan/lib/lazyjson.py
    M ckan/lib/mailer.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    M ckan/lib/navl/__init__.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    A ckan/lib/redis.py
    M ckan/lib/render.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/common.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    R ckan/lib/search/sql.py
    M ckan/lib/uploader.py
    R ckan/lib/util.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/patch.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/patch.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/manage.py
    M ckan/migration/versions/001_add_existing_tables.py
    M ckan/migration/versions/002_add_author_and_maintainer.py
    M ckan/migration/versions/003_add_user_object.py
    M ckan/migration/versions/004_add_group_object.py
    M ckan/migration/versions/005_add_authorization_tables.py
    M ckan/migration/versions/006_add_ratings.py
    M ckan/migration/versions/007_add_system_roles.py
    M ckan/migration/versions/008_update_vdm_ids.py
    M ckan/migration/versions/009_add_creation_timestamps.py
    M ckan/migration/versions/010_add_user_about.py
    M ckan/migration/versions/011_add_package_search_vector.py
    M ckan/migration/versions/012_add_resources.py
    M ckan/migration/versions/013_add_hash.py
    M ckan/migration/versions/014_hash_2.py
    M ckan/migration/versions/015_remove_state_object.py
    M ckan/migration/versions/016_uuids_everywhere.py
    M ckan/migration/versions/017_add_pkg_relationships.py
    M ckan/migration/versions/018_adjust_licenses.py
    M ckan/migration/versions/019_pkg_relationships_state.py
    M ckan/migration/versions/020_add_changeset.py
    M ckan/migration/versions/022_add_group_extras.py
    M ckan/migration/versions/023_add_harvesting.py
    M ckan/migration/versions/024_add_harvested_document.py
    M ckan/migration/versions/025_add_authorization_groups.py
    M ckan/migration/versions/026_authorization_group_user_pk.py
    M ckan/migration/versions/027_adjust_harvester.py
    M ckan/migration/versions/028_drop_harvest_source_status.py
    M ckan/migration/versions/029_version_groups.py
    M ckan/migration/versions/030_additional_user_attributes.py
    M ckan/migration/versions/031_move_openid_to_new_field.py
    M ckan/migration/versions/032_add_extra_info_field_to_resources.py
    M ckan/migration/versions/033_auth_group_user_id_add_conditional.py
    M ckan/migration/versions/034_resource_group_table.py
    M ckan/migration/versions/035_harvesting_doc_versioning.py
    M ckan/migration/versions/036_lockdown_roles.py
    M ckan/migration/versions/037_role_anon_editor.py
    M ckan/migration/versions/038_delete_migration_tables.py
    M ckan/migration/versions/039_add_expired_id_and_dates.py
    M ckan/migration/versions/040_reset_key_on_user.py
    M ckan/migration/versions/041_resource_new_fields.py
    M ckan/migration/versions/042_user_revision_indexes.py
    M ckan/migration/versions/043_drop_postgres_search.py
    M ckan/migration/versions/044_add_task_status.py
    M ckan/migration/versions/045_user_name_unique.py
    M ckan/migration/versions/046_drop_changesets.py
    M ckan/migration/versions/047_rename_package_group_member.py
    M ckan/migration/versions/048_add_activity_streams_tables.py
    M ckan/migration/versions/049_add_group_approval_status.py
    M ckan/migration/versions/050_term_translation_table.py
    M ckan/migration/versions/051_add_tag_vocabulary.py
    M ckan/migration/versions/052_update_member_capacities.py
    M ckan/migration/versions/053_add_group_logo.py
    M ckan/migration/versions/054_add_resource_created_date.py
    M ckan/migration/versions/055_update_user_and_activity_detail.py
    M ckan/migration/versions/056_add_related_table.py
    M ckan/migration/versions/057_tracking.py
    M ckan/migration/versions/058_add_follower_tables.py
    M ckan/migration/versions/059_add_related_count_and_flag.py
    M ckan/migration/versions/060_add_system_info_table.py
    M ckan/migration/versions/061_add_follower__group_table.py
    M ckan/migration/versions/062_add_dashboard_table.py
    M ckan/migration/versions/063_org_changes.py
    M ckan/migration/versions/064_add_email_last_sent_column.py
    M ckan/migration/versions/065_add_email_notifications_preference.py
    M ckan/migration/versions/066_default_package_type.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/migration/versions/068_add_package_extras_index.py
    M ckan/migration/versions/069_resource_url_and_metadata_modified.py
    M ckan/migration/versions/070_add_activity_and_resource_indexes.py
    M ckan/migration/versions/071_add_state_column_to_user_table.py
    M ckan/migration/versions/072_add_resource_view.py
    M ckan/migration/versions/073_update_resource_view_resource_id_constraint.py
    M ckan/migration/versions/074_remove_resource_groups.py
    M ckan/migration/versions/075_rename_view_plugins.py
    M ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/migration/versions/077_add_revisions_to_system_info.py
    M ckan/migration/versions/078_remove_old_authz_model.py
    M ckan/migration/versions/079_resource_revision_index.py
    M ckan/migration/versions/080_continuity_id_indexes.py
    A ckan/migration/versions/081_set_datastore_active.py
    A ckan/migration/versions/082_create_index_creator_user_id.py
    A ckan/migration/versions/083_remove_related_items.py
    A ckan/migration/versions/084_add_metadata_created.py
    A ckan/migration/versions/085_adjust_activity_timestamps.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/core.py
    M ckan/model/dashboard.py
    M ckan/model/domain_object.py
    M ckan/model/extension.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/group_extra.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/misc.py
    M ckan/model/modification.py
    M ckan/model/package.py
    M ckan/model/package_extra.py
    M ckan/model/package_relationship.py
    M ckan/model/rating.py
    R ckan/model/related.py
    M ckan/model/resource.py
    M ckan/model/resource_view.py
    M ckan/model/system_info.py
    M ckan/model/tag.py
    M ckan/model/task_status.py
    M ckan/model/term_translation.py
    M ckan/model/tracking.py
    M ckan/model/types.py
    M ckan/model/user.py
    M ckan/model/vocabulary.py
    R ckan/new_authz.py
    R ckan/new_tests.py
    M ckan/pastertemplates/__init__.py
    M ckan/pastertemplates/template/+dot+travis.yml_tmpl
    M ckan/pastertemplates/template/MANIFEST.in_tmpl
    M ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    M ckan/pastertemplates/template/ckanext/__init__.py
    A ckan/pastertemplates/template/requirements.txt_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/__init__.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/plugins/toolkit_sphinx_extension.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    A ckan/public/base/images/ckan-logo-white.svg
    A ckan/public/base/images/ckan-logo.svg
    M ckan/public/base/images/sprite-resource-icons.png
    M ckan/public/base/javascript/modules/image-upload.js
    R ckan/public/base/javascript/modules/related-item.js
    M ckan/public/base/javascript/modules/resource-view-filters-form.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/module.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/modules/image-upload.spec.js
    R ckan/public/base/test/spec/modules/related-item.spec.js
    M ckan/public/base/vendor/moment-with-locales.js
    R ckan/public/robots.txt
    M ckan/templates/activity_streams/activity_stream_email_notifications.text
    R ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/base.html
    A ckan/templates/emails/invite_user.txt
    A ckan/templates/emails/invite_user_subject.txt
    A ckan/templates/emails/reset_password.txt
    A ckan/templates/emails/reset_password_subject.txt
    M ckan/templates/footer.html
    M ckan/templates/group/index.html
    M ckan/templates/group/snippets/feeds.html
    M ckan/templates/header.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/package/base.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/new.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    R ckan/templates/package/related_list.html
    M ckan/templates/package/resource_read.html
    A ckan/templates/package/snippets/cannot_create_package.html
    R ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_info.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/revision/__init__.py
    A ckan/templates/robots.txt
    M ckan/templates/snippets/debug.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/language_selector.html
    M ckan/templates/snippets/organization_item.html
    R ckan/templates/snippets/related.html
    M ckan/templates/snippets/search_form.html
    A ckan/templates/tests/broken_helper_as_attribute.html
    A ckan/templates/tests/broken_helper_as_item.html
    A ckan/templates/tests/helper_as_attribute.html
    A ckan/templates/tests/helper_as_item.html
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/__init__.py
    M ckan/tests/config/test_environment.py
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/__init__.py
    M ckan/tests/controllers/test_admin.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_feed.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_home.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_tags.py
    A ckan/tests/controllers/test_template.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/controllers/test_util.py
    M ckan/tests/factories.py
    M ckan/tests/helpers.py
    A ckan/tests/i18n/__init__.py
    A ckan/tests/i18n/test_check_po_files.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/ckantestplugins.py
    M ckan/tests/legacy/functional/api/__init__.py
    M ckan/tests/legacy/functional/api/base.py
    M ckan/tests/legacy/functional/api/model/test_group.py
    M ckan/tests/legacy/functional/api/model/test_licenses.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/model/test_ratings.py
    M ckan/tests/legacy/functional/api/model/test_relationships.py
    M ckan/tests/legacy/functional/api/model/test_revisions.py
    M ckan/tests/legacy/functional/api/model/test_tag.py
    M ckan/tests/legacy/functional/api/model/test_vocabulary.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/functional/api/test_api.py
    M ckan/tests/legacy/functional/api/test_dashboard.py
    M ckan/tests/legacy/functional/api/test_email_notifications.py
    M ckan/tests/legacy/functional/api/test_follow.py
    M ckan/tests/legacy/functional/api/test_misc.py
    M ckan/tests/legacy/functional/api/test_package_search.py
    M ckan/tests/legacy/functional/api/test_resource.py
    M ckan/tests/legacy/functional/api/test_resource_search.py
    M ckan/tests/legacy/functional/api/test_user.py
    M ckan/tests/legacy/functional/api/test_util.py
    M ckan/tests/legacy/functional/base.py
    M ckan/tests/legacy/functional/test_activity.py
    M ckan/tests/legacy/functional/test_admin.py
    M ckan/tests/legacy/functional/test_error.py
    M ckan/tests/legacy/functional/test_group.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/legacy/functional/test_preview_interface.py
    R ckan/tests/legacy/functional/test_related.py
    M ckan/tests/legacy/functional/test_revision.py
    M ckan/tests/legacy/functional/test_tag.py
    M ckan/tests/legacy/functional/test_tracking.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/html_check.py
    M ckan/tests/legacy/lib/__init__.py
    R ckan/tests/legacy/lib/test_accept.py
    M ckan/tests/legacy/lib/test_alphabet_pagination.py
    M ckan/tests/legacy/lib/test_authenticator.py
    M ckan/tests/legacy/lib/test_cli.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/legacy/lib/test_dictization_schema.py
    M ckan/tests/legacy/lib/test_email_notifications.py
    M ckan/tests/legacy/lib/test_hash.py
    M ckan/tests/legacy/lib/test_helpers.py
    M ckan/tests/legacy/lib/test_i18n.py
    R ckan/tests/legacy/lib/test_mailer.py
    M ckan/tests/legacy/lib/test_navl.py
    M ckan/tests/legacy/lib/test_resource_search.py
    R ckan/tests/legacy/lib/test_simple_search.py
    M ckan/tests/legacy/lib/test_solr_package_search.py
    M ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/legacy/lib/test_solr_schema_version.py
    M ckan/tests/legacy/lib/test_solr_search_index.py
    M ckan/tests/legacy/lib/test_tag_search.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_auth.py
    M ckan/tests/legacy/logic/test_init.py
    M ckan/tests/legacy/logic/test_member.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/legacy/logic/test_tag_vocab.py
    M ckan/tests/legacy/logic/test_validators.py
    M ckan/tests/legacy/misc/test_format_text.py
    M ckan/tests/legacy/misc/test_mock_mail_server.py
    M ckan/tests/legacy/misc/test_sync.py
    M ckan/tests/legacy/mock_mail_server.py
    M ckan/tests/legacy/mock_plugin.py
    M ckan/tests/legacy/models/test_activity.py
    M ckan/tests/legacy/models/test_extras.py
    M ckan/tests/legacy/models/test_follower.py
    M ckan/tests/legacy/models/test_group.py
    M ckan/tests/legacy/models/test_misc.py
    M ckan/tests/legacy/models/test_package.py
    M ckan/tests/legacy/models/test_package_relationships.py
    M ckan/tests/legacy/models/test_purge_revision.py
    M ckan/tests/legacy/models/test_resource.py
    M ckan/tests/legacy/models/test_revision.py
    M ckan/tests/legacy/models/test_user.py
    M ckan/tests/legacy/pylons_controller.py
    M ckan/tests/legacy/schema/test_schema.py
    M ckan/tests/legacy/test_coding_standards.py
    R ckan/tests/legacy/test_dumper.py
    M ckan/tests/legacy/test_plugins.py
    M ckan/tests/legacy/test_versions.py
    M ckan/tests/lib/__init__.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    M ckan/tests/lib/navl/test_dictization_functions.py
    M ckan/tests/lib/navl/test_validators.py
    M ckan/tests/lib/search/test_index.py
    M ckan/tests/lib/test_app_globals.py
    M ckan/tests/lib/test_auth_tkt.py
    M ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_config_tool.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_helpers.py
    A ckan/tests/lib/test_io.py
    A ckan/tests/lib/test_jobs.py
    A ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_munge.py
    A ckan/tests/lib/test_navl.py
    M ckan/tests/logic/action/__init__.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_patch.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/__init__.py
    M ckan/tests/logic/auth/test_create.py
    M ckan/tests/logic/auth/test_delete.py
    M ckan/tests/logic/auth/test_get.py
    M ckan/tests/logic/auth/test_init.py
    M ckan/tests/logic/auth/test_update.py
    M ckan/tests/logic/test_conversion.py
    M ckan/tests/logic/test_converters.py
    M ckan/tests/logic/test_schema.py
    M ckan/tests/logic/test_validators.py
    M ckan/tests/migration/__init__.py
    M ckan/tests/model/__init__.py
    M ckan/tests/model/test_license.py
    M ckan/tests/model/test_resource.py
    M ckan/tests/model/test_resource_view.py
    M ckan/tests/model/test_system_info.py
    M ckan/tests/model/test_user.py
    M ckan/tests/plugins/__init__.py
    A ckan/tests/plugins/test_toolkit.py
    M ckan/tests/test_authz.py
    M ckan/tests/test_coding_standards.py
    A ckan/tests/test_common.py
    M ckan/tests/test_factories.py
    A ckan/tests/test_robots_txt.py
    M ckan/websetup.py
    M ckanext/__init__.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/helpers.py
    M ckanext/datapusher/interfaces.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/auth.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    A ckanext/datapusher/tests/test_action.py
    M ckanext/datapusher/tests/test_default_views.py
    M ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/interfaces.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/templates/ajax_snippets/api_info.html
    A ckanext/datastore/templates/package/resource_read.html
    A ckanext/datastore/templates/package/snippets/data_api_button.html
    M ckanext/datastore/tests/helpers.py
    M ckanext/datastore/tests/sample_datastore_plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_disable.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_info.py
    M ckanext/datastore/tests/test_interface.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_iauthfunctions/plugin_v1.py
    M ckanext/example_iauthfunctions/plugin_v2.py
    M ckanext/example_iauthfunctions/plugin_v3.py
    M ckanext/example_iauthfunctions/plugin_v4.py
    M ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
    A ckanext/example_iauthfunctions/plugin_v6_parent_auth_functions.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/example_iconfigurer/controller.py
    M ckanext/example_iconfigurer/plugin.py
    M ckanext/example_iconfigurer/plugin_v1.py
    M ckanext/example_iconfigurer/plugin_v2.py
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/example_idatasetform/plugin_v1.py
    M ckanext/example_idatasetform/plugin_v2.py
    M ckanext/example_idatasetform/plugin_v3.py
    M ckanext/example_idatasetform/plugin_v4.py
    M ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_igroupform/plugin.py
    A ckanext/example_igroupform/templates/example_igroup_form/group_form.html
    M ckanext/example_igroupform/tests/test_controllers.py
    A ckanext/example_ipermissionlabels/__init__.py
    A ckanext/example_ipermissionlabels/plugin.py
    A ckanext/example_ipermissionlabels/tests/__init__.py
    A ckanext/example_ipermissionlabels/tests/test_example_ipermissionlabels.py
    M ckanext/example_iresourcecontroller/plugin.py
    M ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    M ckanext/example_itemplatehelpers/plugin.py
    M ckanext/example_itranslation/plugin.py
    M ckanext/example_itranslation/plugin_v1.py
    M ckanext/example_itranslation/setup.cfg
    M ckanext/example_itranslation/tests/test_plugin.py
    A ckanext/example_iuploader/__init__.py
    A ckanext/example_iuploader/plugin.py
    A ckanext/example_iuploader/test/__init__.py
    A ckanext/example_iuploader/test/test_plugin.py
    M ckanext/example_ivalidators/plugin.py
    M ckanext/example_ivalidators/tests/test_ivalidators.py
    M ckanext/example_theme/custom_config_setting/plugin.py
    A ckanext/example_theme/custom_emails/__init__.py
    A ckanext/example_theme/custom_emails/plugin.py
    A ckanext/example_theme/custom_emails/templates/emails/invite_user.txt
    A ckanext/example_theme/custom_emails/templates/emails/invite_user_subject.txt
    A ckanext/example_theme/custom_emails/templates/emails/reset_password.txt
    A ckanext/example_theme/custom_emails/templates/emails/reset_password_subject.txt
    A ckanext/example_theme/custom_emails/tests.py
    M ckanext/example_theme/v01_empty_extension/plugin.py
    M ckanext/example_theme/v02_empty_template/plugin.py
    M ckanext/example_theme/v08_custom_helper_function/plugin.py
    M ckanext/example_theme/v12_extra_public_dir/plugin.py
    M ckanext/example_theme/v15_fanstatic/plugin.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/plugin.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/css/recline.css
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    R ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/bootstrap.js
    R ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap-responsive.css
    R ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap.css
    R ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings-white.png
    R ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings.png
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/css/bootstrap-theme.css
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/css/bootstrap.css
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/fonts/glyphicons-halflings-regular.eot
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/fonts/glyphicons-halflings-regular.svg
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/fonts/glyphicons-halflings-regular.ttf
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/fonts/glyphicons-halflings-regular.woff
    A ckanext/reclineview/theme/public/vendor/bootstrap/3.2.0/js/bootstrap.js
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster-src.js
    A ckanext/reclineview/theme/public/vendor/recline/flot.css
    A ckanext/reclineview/theme/public/vendor/recline/map.css
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    A ckanext/reclineview/theme/public/vendor/recline/slickgrid.css
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/README.txt
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowmovemanager.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowselectionmodel.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.css
    R ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/MIT-LICENSE.txt
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/README.md
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/controls/slick.columnpicker.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/controls/slick.columnpicker.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/controls/slick.pager.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/controls/slick.pager.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_222222_256x240.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_2e83ff_256x240.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_454545_256x240.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_888888_256x240.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_cd0a0a_256x240.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/jquery-ui-1.8.16.custom.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/actions.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/ajax-loader-small.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_redo.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_peppermint.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_spearmint.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_undo.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_blue.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_star.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_toggle_minus.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_toggle_plus.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/calendar.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/collapse.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/comment_yellow.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/down.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/drag-handle.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/editor-helper-bg.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/expand.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/header-bg.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/header-columns-bg.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/header-columns-over-bg.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/help.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/info.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/listview.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/pencil.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/row-over-bg.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-asc.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-asc.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-desc.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-desc.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/stripes.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tag_red.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tick.png
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/user_identity.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/user_identity_plus.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/jquery-1.7.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/jquery-ui-1.8.16.custom.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/jquery.event.drag-2.2.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/jquery.event.drop-2.2.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.autotooltips.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.cellcopymanager.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.cellrangedecorator.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.cellrangeselector.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.cellselectionmodel.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.checkboxselectcolumn.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.headerbuttons.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.headerbuttons.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.headermenu.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.headermenu.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.rowmovemanager.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/plugins/slick.rowselectionmodel.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick-default-theme.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.core.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.dataview.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.editors.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.formatters.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.grid.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.grid.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.groupitemmetadataprovider.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.2/slick.remotemodel.js
    A ckanext/reclineview/theme/public/vendor/timeline/LICENSE
    A ckanext/reclineview/theme/public/vendor/timeline/README
    M ckanext/reclineview/theme/templates/recline_view.html
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/plugin.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/__init__.py
    M ckanext/stats/controller.py
    M ckanext/stats/plugin.py
    M ckanext/stats/public/__init__.py
    M ckanext/stats/public/ckanext/__init__.py
    M ckanext/stats/public/ckanext/stats/__init__.py
    M ckanext/stats/stats.py
    M ckanext/stats/tests/__init__.py
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/test_tag_vocab_plugin.py
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    A contrib/docker/docker-cloud.yml
    A contrib/docker/docker-compose.yml
    M contrib/docker/my_init.d/50_configure
    M contrib/docker/postgresql/Dockerfile
    M contrib/docker/solr/Dockerfile
    R contrib/docker/solr/schema.xml
    A contrib/docker/solr/solrconfig.xml
    M dev-requirements.txt
    M doc/_templates/footer.html
    M doc/api/index.rst
    M doc/conf.py
    M doc/contributing/architecture.rst
    M doc/contributing/css.rst
    M doc/contributing/database-migrations.rst
    M doc/contributing/documentation.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/javascript-module-tutorial.rst
    M doc/contributing/frontend/template-blocks.rst
    M doc/contributing/frontend/templating.rst
    M doc/contributing/i18n.rst
    M doc/contributing/index.rst
    M doc/contributing/issues.rst
    M doc/contributing/javascript.rst
    M doc/contributing/pull-requests.rst
    M doc/contributing/python.rst
    M doc/contributing/release-process.rst
    M doc/contributing/string-i18n.rst
    M doc/contributing/test.rst
    A doc/contributing/unicode.rst
    M doc/extensions/adding-custom-fields.rst
    M doc/extensions/best-practices.rst
    M doc/extensions/custom-config-settings.rst
    M doc/extensions/plugins-toolkit.rst
    M doc/extensions/remote-config-update.rst
    M doc/extensions/translating-extensions.rst
    M doc/extensions/tutorial.rst
    A doc/images/architecture.png
    A doc/images/architecture.svg
    M doc/maintaining/apps-ideas.rst
    M doc/maintaining/authorization.rst
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    A doc/maintaining/database-management.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/email-notifications.rst
    M doc/maintaining/filestore.rst
    M doc/maintaining/getting-started.rst
    M doc/maintaining/index.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/installing/index.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    R doc/maintaining/installing/install-using-docker.rst
    M doc/maintaining/paster.rst
    M doc/maintaining/upgrading/index.rst
    M doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-source.rst
    M doc/theming/best-practices.rst
    M doc/theming/javascript-module-objects-and-methods.rst
    M doc/theming/javascript.rst
    M doc/theming/templates.rst
    M profile_tests.py
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini
    M test.ini

  Log Message:
  -----------
  Merge branch 'master' into postgres-version

Conflicts:
	doc/maintaining/installing/install-from-source.rst


  Commit: 0d284d291ad78f4357d0a8eb431ef52df6cc7e20
      https://github.com/ckan/ckan/commit/0d284d291ad78f4357d0a8eb431ef52df6cc7e20
  Author: amercader <amercadero at gmail.com>
  Date:   2016-10-07 (Fri, 07 Oct 2016)

  Changed paths:
    M ckan/tests/logic/action/test_get.py

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


  Commit: 497a7450e33a36e8758f4712f5bba759d1fe19b4
      https://github.com/ckan/ckan/commit/497a7450e33a36e8758f4712f5bba759d1fe19b4
  Author: amercader <amercadero at gmail.com>
  Date:   2016-10-07 (Fri, 07 Oct 2016)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/templates/user/dashboard_organizations.html
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  [#2457] Use manage_group as default permission


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

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

  Log Message:
  -----------
  [#2457] Fix perm name and typo


  Commit: 7e3e1815107e24eefd77bd115fbaf9a55e2cff96
      https://github.com/ckan/ckan/commit/7e3e1815107e24eefd77bd115fbaf9a55e2cff96
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/user/dashboard_organizations.html
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  Merge pull request #2457 from ckan/2457-fix-org-list-for-user

Fix getting available organizations for a particular user


  Commit: dbf5173c1b8c2e64048435de35d190e47441ac29
      https://github.com/ckan/ckan/commit/dbf5173c1b8c2e64048435de35d190e47441ac29
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
    M ckan/controllers/feed.py
    M ckan/plugins/interfaces.py
    M ckan/tests/controllers/test_feed.py
    M setup.py

  Log Message:
  -----------
  Merge pull request #2962 from aptivate/override-feed-class

Allow RSS feed to be extended


  Commit: 569428afb3b58c5b126aa1cb66d3b2f712c6489f
      https://github.com/ckan/ckan/commit/569428afb3b58c5b126aa1cb66d3b2f712c6489f
  Author: Yan <yan.rudneko at linkdigital.com.au>
  Date:   2016-10-12 (Wed, 12 Oct 2016)

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

  Log Message:
  -----------
  [#2346] Dashboard_activity_list_html() dosen't pass user id

Load more don't work on Dashboard page, because dashboard_activity_list_html() don't pass id as an argument, so in activity-stream.js the user_activity_list_html() gives us an error.

Fix it by passing id from context as we do with model= context['model']. As a result context['user'] gives us the name of current user and we can use it, because user_activity_list_html() can take both id and username as id.


  Commit: 0bb525d641d45a2b635a6ef09b689e3e96eaf708
      https://github.com/ckan/ckan/commit/0bb525d641d45a2b635a6ef09b689e3e96eaf708
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-10-13 (Thu, 13 Oct 2016)

  Changed paths:
    M ckan/pastertemplates/template/setup.cfg_tmpl

  Log Message:
  -----------
  [#3275] Fix incorrect i18n paths in extension's setup.cfg template.

The i18n paths for `python setup.py extract_messages`, etc. were missing
a `ckanext/<extension name>/` prefix.


  Commit: c17cf77d3112144599f892addf8ab01bd4d304b2
      https://github.com/ckan/ckan/commit/c17cf77d3112144599f892addf8ab01bd4d304b2
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-10-14 (Fri, 14 Oct 2016)

  Changed paths:
    M ckanext/reclineview/theme/public/recline_view.js

  Log Message:
  -----------
  Merge pull request #3266 from mattfullerton/patch-4

Fixes #2657 by not ignoring filters when embedded


  Commit: b8d2e4893ae1e74b5f0a38d50652ea4bdfea919d
      https://github.com/ckan/ckan/commit/b8d2e4893ae1e74b5f0a38d50652ea4bdfea919d
  Author: amercader <amercadero at gmail.com>
  Date:   2016-10-14 (Fri, 14 Oct 2016)

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

  Log Message:
  -----------
  Merge branch '2346-dashboard_activity_list_html' of https://github.com/Engerrs/ckan into Engerrs-2346-dashboard_activity_list_html


  Commit: 7480cbf5c85e151fe4254e8315c8e74a6c83c1ff
      https://github.com/ckan/ckan/commit/7480cbf5c85e151fe4254e8315c8e74a6c83c1ff
  Author: amercader <amercadero at gmail.com>
  Date:   2016-10-14 (Fri, 14 Oct 2016)

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

  Log Message:
  -----------
  Merge branch 'Engerrs-2346-dashboard_activity_list_html'


  Commit: 7db10af50f60b3ab6769b141676d047d05ee8943
      https://github.com/ckan/ckan/commit/7db10af50f60b3ab6769b141676d047d05ee8943
  Author: amercader <amercadero at gmail.com>
  Date:   2016-10-14 (Fri, 14 Oct 2016)

  Changed paths:
    M ckan/pastertemplates/template/setup.cfg_tmpl

  Log Message:
  -----------
  Merge branch '3275-incorrect-i18n-paths-in-setup.cfg' of https://github.com/torfsen/ckan into torfsen-3275-incorrect-i18n-paths-in-setup.cfg


  Commit: 6033c6ab35256d942e47e407e05a6dec28bbc3ce
      https://github.com/ckan/ckan/commit/6033c6ab35256d942e47e407e05a6dec28bbc3ce
  Author: amercader <amercadero at gmail.com>
  Date:   2016-10-14 (Fri, 14 Oct 2016)

  Changed paths:
    M ckan/pastertemplates/template/setup.cfg_tmpl

  Log Message:
  -----------
  Merge branch 'torfsen-3275-incorrect-i18n-paths-in-setup.cfg'


  Commit: c02e1d0ddc47a67dddf02319fd28a92780db41b4
      https://github.com/ckan/ckan/commit/c02e1d0ddc47a67dddf02319fd28a92780db41b4
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-10-18 (Tue, 18 Oct 2016)

  Changed paths:
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Merge pull request #3246 from ckan/fix-ne-locale

Fix NE locale, which was broken in a bad merge


  Commit: 72f994ae333fc8621aa3f749542953d4bbcaccc1
      https://github.com/ckan/ckan/commit/72f994ae333fc8621aa3f749542953d4bbcaccc1
  Author: amercader <amercadero at gmail.com>
  Date:   2016-10-21 (Fri, 21 Oct 2016)

  Changed paths:
    M ckan/tests/logic/action/test_delete.py

  Log Message:
  -----------
  [#3265] Add tests for user_delete


  Commit: d6b980343d89621b51955498f2262abbbac36ff6
      https://github.com/ckan/ckan/commit/d6b980343d89621b51955498f2262abbbac36ff6
  Author: amercader <amercadero at gmail.com>
  Date:   2016-10-21 (Fri, 21 Oct 2016)

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

  Log Message:
  -----------
  [#3265] Use user id to delete memberships

Otherwise when passing the user name on `user_delete` the memberships
where not deleted


  Commit: fe1330ca26bcf3e4984716a6a6dc74c836fad850
      https://github.com/ckan/ckan/commit/fe1330ca26bcf3e4984716a6a6dc74c836fad850
  Author: amercader <amercadero at gmail.com>
  Date:   2016-10-21 (Fri, 21 Oct 2016)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#3265] Use action on user remove CLI command

Otherwise we miss all the membership logic


  Commit: 4daac8bd5bbc7ed8a8cb3375529433ed4c5cc662
      https://github.com/ckan/ckan/commit/4daac8bd5bbc7ed8a8cb3375529433ed4c5cc662
  Author: amercader <amercadero at gmail.com>
  Date:   2016-10-21 (Fri, 21 Oct 2016)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  [#3282] Fix exception when requesting /e or /n

Fixes #3282

Due to a bug in how we construct the list of available locales in
`get_locales_from_config` we ended up with `e` and `n` in it. If you
actually requested a URL with /e/ as the lang code you got an exception
because Pylons raised a `LanguageError` when trying to access the `e` or
`n` language files.


  Commit: f3698a67241857219d401cfcba816e8408f80a74
      https://github.com/ckan/ckan/commit/f3698a67241857219d401cfcba816e8408f80a74
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    M doc/maintaining/datastore.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/upgrading/index.rst
    A doc/maintaining/upgrading/upgrade-postgres.rst

  Log Message:
  -----------
  Merge pull request #2670 from ckan/postgres-version

PostgreSQL version 9.2


  Commit: 214d7cb61ed3a52fb11bae9069876701155500c1
      https://github.com/ckan/ckan/commit/214d7cb61ed3a52fb11bae9069876701155500c1
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  Merge pull request #3285 from ckan/3282-bug-in-locale-list

[#3282] Fix exception when requesting /e or /n


  Commit: 4344f7a3cc1d4a80208ea3b3190c477f385d2fda
      https://github.com/ckan/ckan/commit/4344f7a3cc1d4a80208ea3b3190c477f385d2fda
  Author: Ian Ward <ian at excess.org>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

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

  Log Message:
  -----------
  Merge pull request #3225 from ckan/3225-update-release-docs

Add branch/tag for 2.6-latest


  Commit: c0d88b56d954136de08967e1b249ce4ac260ed41
      https://github.com/ckan/ckan/commit/c0d88b56d954136de08967e1b249ce4ac260ed41
  Author: Ian Ward <ian at excess.org>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/logic/action/delete.py
    M ckan/tests/logic/action/test_delete.py

  Log Message:
  -----------
  Merge pull request #3284 from ckan/3265-user-delete-memberships

[#3265] Fixes removal of memberships on user_delete


  Commit: 7dfd08c0866a2e5cf1b765e0ec1546447380fb4e
      https://github.com/ckan/ckan/commit/7dfd08c0866a2e5cf1b765e0ec1546447380fb4e
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M requirements.in

  Log Message:
  -----------
  Storing the size and mimetypes from uploads

size is stored as bytes

there's a bit of redundancy with getting the mimetypes of files, by
default, mimetype is determined by the url, fallback is done by using
`python-magic` module


  Commit: 90ed8f76a956deed8a041bdeab6495b13893d873
      https://github.com/ckan/ckan/commit/90ed8f76a956deed8a041bdeab6495b13893d873
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M ckan/lib/uploader.py

  Log Message:
  -----------
  Specified which exception to catch for python-magic call failure


  Commit: 38681d6b6f6775b62d188447a79c60f29a55577e
      https://github.com/ckan/ckan/commit/38681d6b6f6775b62d188447a79c60f29a55577e
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

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

  Log Message:
  -----------
  Dont override size and mimetype if specified by the user


  Commit: 3dc9ed9811da79767ad1644b10ec8cca2a0e58e4
      https://github.com/ckan/ckan/commit/3dc9ed9811da79767ad1644b10ec8cca2a0e58e4
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

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

  Log Message:
  -----------
  Fixing code placement due to failing many tests, moved filesize and mimetype in ResourceUpload init method instead of upload method


  Commit: 8d80e366f00b569a64961d1f0807c2f91554ba8b
      https://github.com/ckan/ckan/commit/8d80e366f00b569a64961d1f0807c2f91554ba8b
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

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

  Log Message:
  -----------
  Added some test for mimetype and size

Testing by user specified parameters are passing,
not sure how to approach testing real uploads in the tests


  Commit: f75cffa76963b603481651410637599b31d6e35a
      https://github.com/ckan/ckan/commit/f75cffa76963b603481651410637599b31d6e35a
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

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

  Log Message:
  -----------
  Basic tests in place, need a better way to providing a file for real upload to the resource_create action


  Commit: 96053f2527f63aad95efddc91df815c094aa9893
      https://github.com/ckan/ckan/commit/96053f2527f63aad95efddc91df815c094aa9893
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_update.py

  Log Message:
  -----------
  Finishing test_create tests, moved mimetype logic back into uploader.py,
test_model_dictize.py had one test that now expects size to be 0, fixing
formatting for pip8


  Commit: 7cfaaa17696e25e58383764603af80c57ffcac22
      https://github.com/ckan/ckan/commit/7cfaaa17696e25e58383764603af80c57ffcac22
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

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

  Log Message:
  -----------
  updating resources that dont have an upload will not update the size var


  Commit: 64d55e140ffca72eaf0715d2a643dd270f8e71f7
      https://github.com/ckan/ckan/commit/64d55e140ffca72eaf0715d2a643dd270f8e71f7
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

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

  Log Message:
  -----------
  Added tests for updating a resource

The included tests have a similar process as the tests for creating a
resource.


  Commit: 00738b59bc5d0b3b9164c7f85c0ec88154ad0b36
      https://github.com/ckan/ckan/commit/00738b59bc5d0b3b9164c7f85c0ec88154ad0b36
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Pinning python-magic to 0.4.6 and adding to requirements.txt


  Commit: 0764a3c2163faa2a6da6b6f25416037a0db36031
      https://github.com/ckan/ckan/commit/0764a3c2163faa2a6da6b6f25416037a0db36031
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M ckan/lib/uploader.py

  Log Message:
  -----------
  Added config option for guessing mimetype


  Commit: e42cf00dfc4f9e74aac58bbd707842014281aae2
      https://github.com/ckan/ckan/commit/e42cf00dfc4f9e74aac58bbd707842014281aae2
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M test-core.ini

  Log Message:
  -----------
  Adding resource upload directory for circleci


  Commit: 533071dbbe4221f4b193977b18574873366c4f86
      https://github.com/ckan/ckan/commit/533071dbbe4221f4b193977b18574873366c4f86
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

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

  Log Message:
  -----------
  Could have saved myself many hours if i knew @helpers.change_config was a thing


  Commit: 8ad4c26564b490db682180b475362540bb5cb4fa
      https://github.com/ckan/ckan/commit/8ad4c26564b490db682180b475362540bb5cb4fa
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Added config doc info for ckan.mimetype_guess


  Commit: 8c5298dc701b41b43b5ee0c6e43be0a3f5d5a58b
      https://github.com/ckan/ckan/commit/8c5298dc701b41b43b5ee0c6e43be0a3f5d5a58b
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

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

  Log Message:
  -----------
  Fixing pep8

Remove whitespace


  Commit: 0045b8476036f645483cc5a73f93ce00401af526
      https://github.com/ckan/ckan/commit/0045b8476036f645483cc5a73f93ce00401af526
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M ckan/lib/uploader.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  Reverting changes on Upload class in uploader


  Commit: d381d1e3a3c5bb28f3c183e7b24c191272312572
      https://github.com/ckan/ckan/commit/d381d1e3a3c5bb28f3c183e7b24c191272312572
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M test-core.ini

  Log Message:
  -----------
  Disable upload storage, causing webtest bug for file uploads


  Commit: 88531cccf3ec669fb657ff8d6cddcf85ce57d517
      https://github.com/ckan/ckan/commit/88531cccf3ec669fb657ff8d6cddcf85ce57d517
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

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

  Log Message:
  -----------
  @amercader is a hero, test passing with fakefs
Fixing pep8


  Commit: 86b4e4a2340a5c6db6b4a19eb7653741c832936f
      https://github.com/ckan/ckan/commit/86b4e4a2340a5c6db6b4a19eb7653741c832936f
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

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

  Log Message:
  -----------
  Fixing docstrings to use ''' instead of """

In accordance to the coding standards


  Commit: bf90c31ddb175dbe2219225b6c5d0559e6ae063e
      https://github.com/ckan/ckan/commit/bf90c31ddb175dbe2219225b6c5d0559e6ae063e
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M ckan/lib/dictization/__init__.py
    M ckan/model/resource.py

  Log Message:
  -----------
  Adding long data type to table_dictize, defaulting size column to be 0


  Commit: 69bf8c6a69b081ef38f075942a9dd85c713995ec
      https://github.com/ckan/ckan/commit/69bf8c6a69b081ef38f075942a9dd85c713995ec
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M ckan/lib/uploader.py
    M ckan/model/resource.py
    M ckan/tests/lib/dictization/test_model_dictize.py

  Log Message:
  -----------
  Reverting size initialization, have size value only when there's a file upload


  Commit: 8be9d720807ecfc467b06644c80f7d795ba809b4
      https://github.com/ckan/ckan/commit/8be9d720807ecfc467b06644c80f7d795ba809b4
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

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

  Log Message:
  -----------
  Pep8 var comparison


  Commit: 50c66b6822b1a18d523a9afa816b421fae31ab01
      https://github.com/ckan/ckan/commit/50c66b6822b1a18d523a9afa816b421fae31ab01
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Note for size type change


  Commit: 9de1f467d852d2fac75217cfd36b400d779e718e
      https://github.com/ckan/ckan/commit/9de1f467d852d2fac75217cfd36b400d779e718e
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-10-26 (Wed, 26 Oct 2016)

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/dictization/__init__.py
    M ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_update.py
    M doc/maintaining/configuration.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge pull request #3205 from HighwayThree/issue_1517_size_mimetypes

Storing the size and mimetypes from uploads


  Commit: 0c39acd7917c364620770bffd1d6192a5426fa47
      https://github.com/ckan/ckan/commit/0c39acd7917c364620770bffd1d6192a5426fa47
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-10-29 (Sat, 29 Oct 2016)

  Changed paths:
    M doc/maintaining/index.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/installing/postgres.rst
    A doc/maintaining/installing/solr.rst
    R doc/maintaining/solr-multicore.rst

  Log Message:
  -----------
  Merge pull request #3087 from ckan/install-docs-pg-solr

Consolidate Postgres and Solr install docs


  Commit: 57373cf2843f8e09747c5d631d12e5073725459f
      https://github.com/ckan/ckan/commit/57373cf2843f8e09747c5d631d12e5073725459f
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/i18n.py

  Log Message:
  -----------
  [iar#176] Move code for building JS translations to ckan.lib.i18n.


  Commit: 8a7fac68147830ba2def5dbe931e584eb2fbd174
      https://github.com/ckan/ckan/commit/8a7fac68147830ba2def5dbe931e584eb2fbd174
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  [iar#176] Collect translations from extensions.


  Commit: 571b8c9bfdf04ddeb67fd08de1bb644fb13bf4ae
      https://github.com/ckan/ckan/commit/571b8c9bfdf04ddeb67fd08de1bb644fb13bf4ae
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  [iar#176] Only generate JS translations if necessary.

`ckan.lib.i18n.build_js_translations` now only re-generates a language's
JS translations if the compiled translation file is missing or
out-dated.


  Commit: 4007ee7ae1b48f27447ed7121a8bebb877995fdf
      https://github.com/ckan/ckan/commit/4007ee7ae1b48f27447ed7121a8bebb877995fdf
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [iar#176] Regenerate JS translations during server startup.


  Commit: 00677c298d58bd01a90404efe75681a7c4c69916
      https://github.com/ckan/ckan/commit/00677c298d58bd01a90404efe75681a7c4c69916
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
    M ckan/lib/i18n.py
    A ckan/tests/lib/_i18n_build_js_translations/ckanext-test_js_translations.pot
    A ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po
    A ckan/tests/lib/test_i18n.py
    M setup.py

  Log Message:
  -----------
  [iar#176] Tests for JS translation generation


  Commit: 5f6e385d5846a46f97440e604dcd83891cfef292
      https://github.com/ckan/ckan/commit/5f6e385d5846a46f97440e604dcd83891cfef292
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
    M ckan/plugins/interfaces.py
    M doc/contributing/string-i18n.rst
    M doc/extensions/translating-extensions.rst
    M doc/maintaining/paster.rst

  Log Message:
  -----------
  [iar#176] Update documentation for JavaScript translations


  Commit: 908914967a13e4950059d359d28078adf00b52f8
      https://github.com/ckan/ckan/commit/908914967a13e4950059d359d28078adf00b52f8
  Author: amercader <amercadero at gmail.com>
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update changelog after 2.6.0 release


  Commit: 967ae042786590b510a165524db365c6cf22ae9e
      https://github.com/ckan/ckan/commit/967ae042786590b510a165524db365c6cf22ae9e
  Author: amercader <amercadero at gmail.com>
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
    M ckan/i18n/ckan.pot

  Log Message:
  -----------
  Extract new strings in pot file


  Commit: a3d89db8ae046209150624888318352d76caf56a
      https://github.com/ckan/ckan/commit/a3d89db8ae046209150624888318352d76caf56a
  Author: amercader <amercadero at gmail.com>
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/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/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tl/LC_MESSAGES/ckan.mo
    M ckan/i18n/tl/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Update strings files before CKAN 2.6.0 call for translations

Conflicts:
	ckan/i18n/zh_CN/LC_MESSAGES/ckan.po


  Commit: b191472b479552979ee1e402f0fc1595ebed5ce2
      https://github.com/ckan/ckan/commit/b191472b479552979ee1e402f0fc1595ebed5ce2
  Author: amercader <amercadero at gmail.com>
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
    M .gitattributes
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Update translations from Transifex before 2.6


  Commit: 82da41191f4884250fb0d50a94afd7a1444fe7ed
      https://github.com/ckan/ckan/commit/82da41191f4884250fb0d50a94afd7a1444fe7ed
  Author: amercader <amercadero at gmail.com>
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo

  Log Message:
  -----------
  Compile strings after 2.6.0 release


  Commit: a786d63331d0a2b141849d4715b30a41407a97a7
      https://github.com/ckan/ckan/commit/a786d63331d0a2b141849d4715b30a41407a97a7
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
    M contrib/docker/solr/Dockerfile

  Log Message:
  -----------
  Solr Dockerfile Update

Upgrade Solr Version 6.0 -> 6.2

Schema.xml is getted from the master (SysLinks not work in docker)


  Commit: 8e5db8f0f1e0a7c46e4217b18abf0a549219b147
      https://github.com/ckan/ckan/commit/8e5db8f0f1e0a7c46e4217b18abf0a549219b147
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
    M contrib/docker/my_init.d/50_configure
    M contrib/docker/postgresql/Dockerfile

  Log Message:
  -----------
  Postgres Update

Fix a bug with password of the Postgres Instance

Upgrades the postgres image from 9.5 to 9.6


  Commit: c1a75953e836ee843850c870aa653b4057a4e6c5
      https://github.com/ckan/ckan/commit/c1a75953e836ee843850c870aa653b4057a4e6c5
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
    M contrib/docker/solr/Dockerfile

  Log Message:
  -----------
  Update Dockerfile


  Commit: 65e49562bdde004879c1233af5b2c5f5ff852b10
      https://github.com/ckan/ckan/commit/65e49562bdde004879c1233af5b2c5f5ff852b10
  Author: Ian Ward <ian at excess.org>
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
    M contrib/docker/solr/Dockerfile

  Log Message:
  -----------
  Merge pull request #3295 from deinok/docker-update-solr

Solr Dockerfile Update


  Commit: 0c4a0a2f7b8dc19952e58a94b12472b35ce5cf1b
      https://github.com/ckan/ckan/commit/0c4a0a2f7b8dc19952e58a94b12472b35ce5cf1b
  Author: Gleb <gleb.rudenko at linkdigital.com.au>
  Date:   2016-11-04 (Fri, 04 Nov 2016)

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [3292] iUploader interface two attributes were added to documentation


  Commit: fe2707a84967c392fc718a528bc73a8684b8ebd6
      https://github.com/ckan/ckan/commit/fe2707a84967c392fc718a528bc73a8684b8ebd6
  Author: Mark Gregson <mark.gregson at linkdigital.com.au>
  Date:   2016-11-05 (Sat, 05 Nov 2016)

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

  Log Message:
  -----------
  Track the 'URL' download link on the resource page.

This link didn't have the resource-url-analytics class that enabled internal tracking.


  Commit: 253b19f3f51aeae25a7ffeaed204e92dea31195c
      https://github.com/ckan/ckan/commit/253b19f3f51aeae25a7ffeaed204e92dea31195c
  Author: deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-05 (Sat, 05 Nov 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Beaker Update


  Commit: 382ab0424da531e56b98add978f03ae103adf59c
      https://github.com/ckan/ckan/commit/382ab0424da531e56b98add978f03ae103adf59c
  Author: deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-05 (Sat, 05 Nov 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Bleach Upgrade


  Commit: d894accf301c10b83e493579caac066d78e96ae2
      https://github.com/ckan/ckan/commit/d894accf301c10b83e493579caac066d78e96ae2
  Author: deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-05 (Sat, 05 Nov 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Flask Upgrade


  Commit: d350e4aebb9d5998730578de2f732e482a499809
      https://github.com/ckan/ckan/commit/d350e4aebb9d5998730578de2f732e482a499809
  Author: deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-05 (Sat, 05 Nov 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Markdown Upgrade


  Commit: fa692913c9bcf67cf04af5353e0d9ee9b5563cbc
      https://github.com/ckan/ckan/commit/fa692913c9bcf67cf04af5353e0d9ee9b5563cbc
  Author: deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-05 (Sat, 05 Nov 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  python-magic Upgrade


  Commit: 09a829f3d029693328746d892b1883f46f53cae4
      https://github.com/ckan/ckan/commit/09a829f3d029693328746d892b1883f46f53cae4
  Author: deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-05 (Sat, 05 Nov 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  PySolr Upgrade


  Commit: 15d092bb0a31a1b2aef3330504ae0f3674348baf
      https://github.com/ckan/ckan/commit/15d092bb0a31a1b2aef3330504ae0f3674348baf
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-05 (Sat, 05 Nov 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Requests Upgrade


  Commit: f88d48fead236f9a0f504e8ccc739027bf99e6a2
      https://github.com/ckan/ckan/commit/f88d48fead236f9a0f504e8ccc739027bf99e6a2
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-05 (Sat, 05 Nov 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  SQLParse Upgrade


  Commit: d448ae80a00aaa99fe4e2353e8e331a9181e125e
      https://github.com/ckan/ckan/commit/d448ae80a00aaa99fe4e2353e8e331a9181e125e
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-05 (Sat, 05 Nov 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  TzLocal Updated


  Commit: a835bcadd889ca5a42158c058b9f424c4b61f4c5
      https://github.com/ckan/ckan/commit/a835bcadd889ca5a42158c058b9f424c4b61f4c5
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-05 (Sat, 05 Nov 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  pytz Upgrade


  Commit: 9523657c59cfdb7c8ef674bb71f96048e4eebce4
      https://github.com/ckan/ckan/commit/9523657c59cfdb7c8ef674bb71f96048e4eebce4
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-06 (Sun, 06 Nov 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  zope.interface Upgraded


  Commit: 7e11259c1e9249477494e54e5fccd1196eeb1f59
      https://github.com/ckan/ckan/commit/7e11259c1e9249477494e54e5fccd1196eeb1f59
  Author: Gleb <gleb.rudenko at linkdigital.com.au>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#3292] description text change


  Commit: 5ae872368c5a680a0c6e8bca5bf334e12328a04f
      https://github.com/ckan/ckan/commit/5ae872368c5a680a0c6e8bca5bf334e12328a04f
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Merge pull request #3301 from gleb-rudenko/3292-iuploader-interface-doc-add-two-attributes-description

[#3292] iUploader interface two attributes were added to documentation


  Commit: 1e176657266c8d2b24e56f0d77b1fe7211ccfc86
      https://github.com/ckan/ckan/commit/1e176657266c8d2b24e56f0d77b1fe7211ccfc86
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

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

  Log Message:
  -----------
  Merge pull request #3304 from DataShades/track-another-resource-link

Track the 'URL' download link on the resource page.


  Commit: 49c54546cd040ddd2462d9a3584f37f6c39f1181
      https://github.com/ckan/ckan/commit/49c54546cd040ddd2462d9a3584f37f6c39f1181
  Author: portail de données ouvertes datalocale.fr <datalocale at cg33.fr>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    M doc/api/index.rst

  Log Message:
  -----------
  suppression of the id argument on group_list api requests

Suppression of the id=data-explorer on the httpie and the python script examples


  Commit: bedc048afdd5a2441d8d2e510c0e21d6263dc730
      https://github.com/ckan/ckan/commit/bedc048afdd5a2441d8d2e510c0e21d6263dc730
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    M doc/api/index.rst

  Log Message:
  -----------
  Merge pull request #3307 from datalocale/patch-1

suppression of the id argument on group_list api requests


  Commit: f4217002fe752934e8cdde9079015185b1d48d90
      https://github.com/ckan/ckan/commit/f4217002fe752934e8cdde9079015185b1d48d90
  Author: amercader <amercadero at gmail.com>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M ckan/config/middleware/flask_app.py

  Log Message:
  -----------
  [#3196] Remove builtin timer

It is available on the Flask Debug toolbar


  Commit: 82d1ced11251fa0d9cee2078ecc775d2c7cc5009
      https://github.com/ckan/ckan/commit/82d1ced11251fa0d9cee2078ecc775d2c7cc5009
  Author: amercader <amercadero at gmail.com>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M ckan/config/middleware/flask_app.py

  Log Message:
  -----------
  [#3196] Improve blueprint rules detection

Avoid detecting rules from blueprints that start with the same string
(eg `user` and `users`). Better list creation.


  Commit: 183f56056b09ac9cf15a3e1f1df3403926d3a0f0
      https://github.com/ckan/ckan/commit/183f56056b09ac9cf15a3e1f1df3403926d3a0f0
  Author: Mantas <sirexas at gmail.com>
  Date:   2016-11-13 (Sun, 13 Nov 2016)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Add setup.py classifiers

It took me some time to find what Python versions are supported by CKAN, to fix
that added classifiers to the setup.py.


  Commit: 732116bb3c29e4e478dc78ac082befcac3888618
      https://github.com/ckan/ckan/commit/732116bb3c29e4e478dc78ac082befcac3888618
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Merge pull request #3311 from sirex/setup-classifiers

Add setup.py classifiers


  Commit: ee5047de95c9908c0792944b7e63ac46984fee25
      https://github.com/ckan/ckan/commit/ee5047de95c9908c0792944b7e63ac46984fee25
  Author: amercader <amercadero at gmail.com>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

  Changed paths:
    M ckan/config/middleware/flask_app.py

  Log Message:
  -----------
  [#3196] Move handlers to module level functions


  Commit: 93dc635c90b96693da096ae06c57b9d123b79c37
      https://github.com/ckan/ckan/commit/93dc635c90b96693da096ae06c57b9d123b79c37
  Author: amercader <amercadero at gmail.com>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

  Changed paths:
    M ckan/config/middleware/flask_app.py

  Log Message:
  -----------
  [#3196] Simplify add core blueprint function as per @TkTech advice


  Commit: 2180b83f093dcb112c9580d988ae1a4e6497ceec
      https://github.com/ckan/ckan/commit/2180b83f093dcb112c9580d988ae1a4e6497ceec
  Author: amercader <amercadero at gmail.com>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

  Changed paths:
    M .gitattributes
    M CHANGELOG.rst
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/controllers/template.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/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/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tl/LC_MESSAGES/ckan.mo
    M ckan/i18n/tl/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/cli.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/uploader.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/pastertemplates/template/setup.cfg_tmpl
    M ckan/plugins/interfaces.py
    R ckan/public/robots.txt
    R ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/resource_read.html
    R ckan/templates/package/snippets/data_api_button.html
    A ckan/templates/robots.txt
    M ckan/templates/user/dashboard_organizations.html
    M ckan/tests/controllers/test_feed.py
    A ckan/tests/controllers/test_template.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/test_coding_standards.py
    A ckan/tests/test_robots_txt.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/templates/ajax_snippets/api_info.html
    A ckanext/datastore/templates/package/resource_read.html
    A ckanext/datastore/templates/package/snippets/data_api_button.html
    M ckanext/reclineview/theme/public/recline_view.js
    M contrib/docker/solr/Dockerfile
    M doc/api/index.rst
    M doc/contributing/release-process.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/index.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/installing/postgres.rst
    A doc/maintaining/installing/solr.rst
    R doc/maintaining/solr-multicore.rst
    M doc/maintaining/upgrading/index.rst
    A doc/maintaining/upgrading/upgrade-postgres.rst
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 3196-common-requests-code


  Commit: 26d10d89b1956a362fa97135d97e8749570bdec2
      https://github.com/ckan/ckan/commit/26d10d89b1956a362fa97135d97e8749570bdec2
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge pull request #3305 from deinok/ckan-requirements-upgrade

Requirements.in Update


  Commit: 896acf460d6d9beb4802b41fe67a194d7f5a8164
      https://github.com/ckan/ckan/commit/896acf460d6d9beb4802b41fe67a194d7f5a8164
  Author: Ian Ward <ian at excess.org>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

  Changed paths:
    M contrib/docker/my_init.d/50_configure
    M contrib/docker/postgresql/Dockerfile

  Log Message:
  -----------
  Merge pull request #3296 from deinok/docker-upgrade-postgres

Docker Postgres Update


  Commit: 9bbe0fc764c2f8b7e0a8af3bb272f48890167b13
      https://github.com/ckan/ckan/commit/9bbe0fc764c2f8b7e0a8af3bb272f48890167b13
  Author: amercader <amercadero at gmail.com>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

  Changed paths:
    M ckan/views/api.py

  Log Message:
  -----------
  [#3196] Remove comments and improve docstrings on api blueprint


  Commit: aba9a6de6a0b43d2979f453f51a5875c0f16d942
      https://github.com/ckan/ckan/commit/aba9a6de6a0b43d2979f453f51a5875c0f16d942
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/cli.py
    M ckan/lib/i18n.py
    M ckan/plugins/interfaces.py
    A ckan/tests/lib/_i18n_build_js_translations/ckanext-test_js_translations.pot
    A ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po
    A ckan/tests/lib/test_i18n.py
    M doc/contributing/string-i18n.rst
    M doc/extensions/translating-extensions.rst
    M doc/maintaining/paster.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #3272 from torfsen/iar176-js-translations-in-extensions

Support for JS translations in extensions


  Commit: a8ddb45350f219f3a3bd519a9a43a2a4085a5542
      https://github.com/ckan/ckan/commit/a8ddb45350f219f3a3bd519a9a43a2a4085a5542
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  BeaultifulSoup - Update


  Commit: d0baaa23df5be4a3ed301f57eb87aff7b50e1866
      https://github.com/ckan/ckan/commit/d0baaa23df5be4a3ed301f57eb87aff7b50e1866
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  PipTools - Update


  Commit: 94e98b73a282aa5094693c935af603483e43183c
      https://github.com/ckan/ckan/commit/94e98b73a282aa5094693c935af603483e43183c
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  PyFakeFs - Update


  Commit: 85d5d0cc164f7812774d8cdf12c5ba0c06fffb6a
      https://github.com/ckan/ckan/commit/85d5d0cc164f7812774d8cdf12c5ba0c06fffb6a
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-16 (Wed, 16 Nov 2016)

  Changed paths:
    M ckan/common.py
    M ckan/config/environment.py
    M ckan/config/middleware/__init__.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/auth_tkt.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/munge.py
    M ckan/lib/search/common.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/model/core.py
    M ckan/plugins/toolkit_sphinx_extension.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/logic/test_tag_vocab.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/test_update.py
    M ckan/tests/logic/test_validators.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/example_idatasetform/plugin_v1.py
    M ckanext/example_idatasetform/plugin_v2.py
    M ckanext/example_idatasetform/plugin_v4.py
    M ckanext/example_igroupform/plugin.py
    M dev-requirements.txt

  Log Message:
  -----------
  Pep8 - BugFixing


  Commit: 7a976fe6189b4629c61d90501680efbbf1cabc1b
      https://github.com/ckan/ckan/commit/7a976fe6189b4629c61d90501680efbbf1cabc1b
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-11-16 (Wed, 16 Nov 2016)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  Merge pull request #3313 from deinok/dev-requirements-update

Dev Requirements Update


  Commit: e396257fe558c752bd71925dfce2e3200aad09cc
      https://github.com/ckan/ckan/commit/e396257fe558c752bd71925dfce2e3200aad09cc
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/cli.py
    M ckan/lib/i18n.py
    M ckan/plugins/interfaces.py
    A ckan/tests/lib/_i18n_build_js_translations/ckanext-test_js_translations.pot
    A ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po
    A ckan/tests/lib/test_i18n.py
    M dev-requirements.txt
    M doc/contributing/string-i18n.rst
    M doc/extensions/translating-extensions.rst
    M doc/maintaining/paster.rst
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/ckan/master' into pep8

# Conflicts:
#	ckan/config/environment.py
#	dev-requirements.txt


  Commit: 2f3a07fcb6b9d4c9e5f2a52b072be9a3b63c1a5f
      https://github.com/ckan/ckan/commit/2f3a07fcb6b9d4c9e5f2a52b072be9a3b63c1a5f
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M ckan/config/environment.py
    M dev-requirements.txt

  Log Message:
  -----------
  Fix Merge Issue


  Commit: 35aee1ac3e52840fb18ecfdf5adcbbd3e35c99c8
      https://github.com/ckan/ckan/commit/35aee1ac3e52840fb18ecfdf5adcbbd3e35c99c8
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  ES305 On environment.py


  Commit: 9b5bf5d3accc147c90348f210a261cace00f8199
      https://github.com/ckan/ckan/commit/9b5bf5d3accc147c90348f210a261cace00f8199
  Author: Ian Ward <ian at excess.org>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M ckan/common.py
    M ckan/config/middleware/__init__.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/auth_tkt.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/munge.py
    M ckan/lib/search/common.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/model/core.py
    M ckan/plugins/toolkit_sphinx_extension.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/logic/test_tag_vocab.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/test_update.py
    M ckan/tests/logic/test_validators.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/example_idatasetform/plugin_v1.py
    M ckanext/example_idatasetform/plugin_v2.py
    M ckanext/example_idatasetform/plugin_v4.py
    M ckanext/example_igroupform/plugin.py
    M dev-requirements.txt

  Log Message:
  -----------
  Merge pull request #3314 from deinok/pep8

Pep8 - BugFixing


  Commit: e196fcd8d24572b70ade496ab5bcb368f09526ff
      https://github.com/ckan/ckan/commit/e196fcd8d24572b70ade496ab5bcb368f09526ff
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

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

  Log Message:
  -----------
  [#3151] Add `ckan.i18n._` and `ckan.i18n.ngettext` JS functions.

They are intended as replacements for the raw Jed interface
`ckan.i18n.translate`. The latter makes extraction of plural messages
impossible and is therefore deprecated.


  Commit: 254f77051ab344910c43a84f2132b4515694babf
      https://github.com/ckan/ckan/commit/254f77051ab344910c43a84f2132b4515694babf
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M ckan/public/base/javascript/module.js
    M ckan/public/base/test/spec/module.spec.js

  Log Message:
  -----------
  [#3151] Add `this._` and `this.ngettext` methods to JS modules.

They are shortucts to `ckan.i18n._` and `ckan.i18n.ngettext`,
respectively, and replace the old `this.i18n` mechanism which is hereby
deprecated.

The `ckan.i18n.translate` and `ckan.i18n` arguments passed to module
initialization functions are also deprecated.


  Commit: 9e81917546c7ad806728ba6cded2b284a77fe464
      https://github.com/ckan/ckan/commit/9e81917546c7ad806728ba6cded2b284a77fe464
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M ckan/public/base/javascript/modules/activity-stream.js
    M ckan/public/base/javascript/modules/api-info.js
    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/modules/custom-fields.js
    M ckan/public/base/javascript/modules/dashboard.js
    M ckan/public/base/javascript/modules/dataset-visibility.js
    M ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/popover-context.js
    M ckan/public/base/javascript/modules/resource-form.js
    M ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/public/base/javascript/modules/resource-view-embed.js
    M ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/modules/table-selectable-rows.js
    M ckan/public/base/javascript/modules/table-toggle-more.js
    M ckan/templates/admin/config.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/user/edit_user_form.html
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/stats/public/ckanext/stats/javascript/modules/plot.js
    M ckanext/textview/theme/public/text_view.js

  Log Message:
  -----------
  [#3151] Update JS modules to new i18n functions.

* Usages of `this.i18n` are replaced by `this._` and `this.ngettext`.

* Module initialization functions only take a single parameter (jQuery).

* The `confirm-action` module allows to pass the content via a HTML
  `data-module-`-parameter.  That parameter has been renamed from
  `data-module-i18n-content` to `data-module-content` to reflect the
  deprecation of the `this.i18n`-functionality. The old name still works
  but the templates have been updated to use the new name instead.


  Commit: 739e3c254abf8d149f97f2302fee703e99cabfed
      https://github.com/ckan/ckan/commit/739e3c254abf8d149f97f2302fee703e99cabfed
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M setup.cfg

  Log Message:
  -----------
  [#3151] Remove deprecated JS i18n functions from Babel configuration.


  Commit: 466d2fbbba3ad43085e0f22e4129f086ae3617c8
      https://github.com/ckan/ckan/commit/466d2fbbba3ad43085e0f22e4129f086ae3617c8
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/i18n.spec.js
    M ckan/public/base/test/spec/module.spec.js
    M ckan/public/base/test/spec/modules/confirm-action.spec.js
    M ckan/public/base/test/spec/sandbox.spec.js

  Log Message:
  -----------
  [#3151] Tests for new JavaScript i18n interface.


  Commit: 3ba38a72547477a7ea64d4faee7c17b291757f66
      https://github.com/ckan/ckan/commit/3ba38a72547477a7ea64d4faee7c17b291757f66
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/javascript-module-tutorial.rst
    M doc/contributing/frontend/templating.rst
    M doc/contributing/javascript.rst
    M doc/contributing/string-i18n.rst
    M doc/extensions/translating-extensions.rst
    M doc/theming/javascript-module-objects-and-methods.rst

  Log Message:
  -----------
  [#3151] Update documentation of i18n in JS

Updates the documentation and example code for the new `this._` and
`this.ngettext` methods of JS modules.


  Commit: 8e8c50ef86270f98a5db7fc410c5dfe35b35fd02
      https://github.com/ckan/ckan/commit/8e8c50ef86270f98a5db7fc410c5dfe35b35fd02
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    A ckan/public/base/i18n/.gitignore
    R ckan/public/base/i18n/bg.js
    R ckan/public/base/i18n/ca.js
    R ckan/public/base/i18n/cs_CZ.js
    R ckan/public/base/i18n/de.js
    R ckan/public/base/i18n/el.js
    R ckan/public/base/i18n/es.js
    R ckan/public/base/i18n/fi.js
    R ckan/public/base/i18n/fr.js
    R ckan/public/base/i18n/hu.js
    R ckan/public/base/i18n/it.js
    R ckan/public/base/i18n/lt.js
    R ckan/public/base/i18n/lv.js
    R ckan/public/base/i18n/nl.js
    R ckan/public/base/i18n/no.js
    R ckan/public/base/i18n/pl.js
    R ckan/public/base/i18n/pt_BR.js
    R ckan/public/base/i18n/ro.js
    R ckan/public/base/i18n/ru.js
    R ckan/public/base/i18n/sk.js
    R ckan/public/base/i18n/sl.js
    R ckan/public/base/i18n/sq.js
    R ckan/public/base/i18n/sr.js
    R ckan/public/base/i18n/sr_Latn.js
    R ckan/public/base/i18n/sv.js
    R ckan/public/base/i18n/zh_TW.js

  Log Message:
  -----------
  [#3317] Don't track automatically generated JS translation files in git


  Commit: ad3c34eba83e74d15ca11e904a6cdc793938001b
      https://github.com/ckan/ckan/commit/ad3c34eba83e74d15ca11e904a6cdc793938001b
  Author: Peter Dave Hello <hsu at peterdavehello.org>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    M Dockerfile

  Log Message:
  -----------
  Optimize Docker image build to minimize its size

Combine apt-get related commands in a single RUN statements,
to prevent some additional but useless layers created during the build.

Size difference:
```
$ docker images
REPOSITORY TAG    IMAGE ID CREATED         SIZE
after      <none> 84cac1   9 minutes ago   629 MB
before     <none> ff3e9b   32 minutes ago  651.5 MB
```

Reference:
  Best practices for writing Dockerfiles
  https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#run


  Commit: e379f11e2c25cbce16347cdbddf4caf1269bba7e
      https://github.com/ckan/ckan/commit/e379f11e2c25cbce16347cdbddf4caf1269bba7e
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  Don't crash if PO files aren't exactly where we expected them when generating translations.


  Commit: b7ed82e6bc961247a61784f67f81ae510239c2b5
      https://github.com/ckan/ckan/commit/b7ed82e6bc961247a61784f67f81ae510239c2b5
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  3260 removed idle connection

Session, that used for querying config varibales diring startup
was not finished and one idle connection appeared in postgres.

Now session committed in the end of environment setup.


  Commit: 33b9f9d6e845787c0413e9c85eee19fde454089c
      https://github.com/ckan/ckan/commit/33b9f9d6e845787c0413e9c85eee19fde454089c
  Author: Ian Ward <ian at excess.org>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    M Dockerfile

  Log Message:
  -----------
  Merge pull request #3322 from PeterDaveHelloKitchen/Dockerfile-optimize

Optimize Docker image build to minimize its size


  Commit: d6fb44b655918f80abec7e36996cd7b439c4aeaa
      https://github.com/ckan/ckan/commit/d6fb44b655918f80abec7e36996cd7b439c4aeaa
  Author: Ian Ward <ian at excess.org>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    M ckanext/datastore/plugin.py
    M ckanext/datastore/set_permissions.sql

  Log Message:
  -----------
  Merge pull request #3258 from fanderegg/2345-do-not-recreate-datastore-view-on-startup

[#2345] datastore: only create _table_metadata view if it does not exist yet


  Commit: 709f3dac3ced296a61a31d3ebb1a89d3ea8686a6
      https://github.com/ckan/ckan/commit/709f3dac3ced296a61a31d3ebb1a89d3ea8686a6
  Author: Peter Dave Hello <hsu at peterdavehello.org>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  Changed paths:
    M ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
    M doc/images/add_dataset_1.jpg
    M doc/images/add_dataset_2.jpg
    M doc/images/add_dataset_3.jpg
    M doc/images/create_organization.jpg
    M doc/images/customize_look_and_feel.jpg
    M doc/images/edit_dataset.jpg
    M doc/images/exploring_datasets.jpg
    M doc/images/manage_news_feed.jpg
    M doc/images/manage_organization.jpg
    M doc/images/manage_user_profile.jpg
    M doc/images/manage_users.jpg
    M doc/images/move_dataset_between_organizations.jpg
    M doc/images/register_account.jpg
    M doc/images/search_the_site.jpg

  Log Message:
  -----------
  Use mozjpeg to recompress jpg images losslessly


  Commit: 3d6f9853e71386bafb1ab3c2e1cebab943f8aeb8
      https://github.com/ckan/ckan/commit/3d6f9853e71386bafb1ab3c2e1cebab943f8aeb8
  Author: Peter Dave Hello <hsu at peterdavehello.org>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  Changed paths:
    M ckan/public/base/images/background-tag-ie7.png
    M ckan/public/base/images/background-tag.png
    M ckan/public/base/images/background-tile.png
    M ckan/public/base/images/bg.png
    M ckan/public/base/images/breadcrumb-slash-ie7.png
    M ckan/public/base/images/ckan-logo-footer.png
    M ckan/public/base/images/ckan-logo.png
    M ckan/public/base/images/dashboard-followee-related.png
    M ckan/public/base/images/dotted.png
    M ckan/public/base/images/editing.png
    M ckan/public/base/images/full-width-nav-right.png
    M ckan/public/base/images/icon-search-27x26.png
    M ckan/public/base/images/nav-active.png
    M ckan/public/base/images/nav.png
    M ckan/public/base/images/od_80x15_blue.png
    M ckan/public/base/images/placeholder-200x125.png
    M ckan/public/base/images/placeholder-420x220.png
    M ckan/public/base/images/placeholder-680x400.png
    M ckan/public/base/images/placeholder-application.png
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-image.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/images/sprite-ckan-icons.png
    M ckan/public/base/images/sprite-resource-icons.png
    M ckan/public/base/images/table-seperator.png
    M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    M ckan/public/base/vendor/select2/select2.png
    M ckan/public/base/vendor/select2/select2x2.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_222222_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_2e83ff_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_454545_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_888888_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_cd0a0a_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_redo.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_peppermint.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_spearmint.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_undo.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_blue.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_star.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/drag-handle.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/help.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-asc.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-desc.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/stripes.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tag_red.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tick.png
    M ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    M ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    M doc/_static/ckanlogo.png
    M doc/images/9.png
    M doc/images/architecture.png
    M doc/images/ckan_importing_diagram.png
    M doc/images/custom-css.png
    M doc/images/custom_config_fields.png
    M doc/images/debug-footer.png
    M doc/images/example_theme_javascript_popover.png
    M doc/images/example_theme_overlapping_popovers.png
    M doc/images/extra-public-dir.png
    M doc/images/html_and_css.png
    M doc/images/image_view.png
    M doc/images/manage_views.png
    M doc/images/more-custom-css.png
    M doc/images/most-popular-groups-custom-snippet.png
    M doc/images/most-popular-groups-snippet.png
    M doc/images/most-popular-groups.png
    M doc/images/popular-dataset.png
    M doc/images/popular-resource.png
    M doc/images/recently-changed-packages-activity-stream.png
    M doc/images/recline_graph_view.png
    M doc/images/recline_grid_view.png
    M doc/images/recline_map_view.png
    M doc/images/recline_view.png
    M doc/images/sort-datasets-by-popularity.png
    M doc/images/text_view.png
    M doc/images/views_overview.png
    M doc/images/webpage_view.png

  Log Message:
  -----------
  Use zopflipng to recompress png images losslessly


  Commit: 42167162f21cd457cd5e713a77c8ba09d62cf439
      https://github.com/ckan/ckan/commit/42167162f21cd457cd5e713a77c8ba09d62cf439
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2016-11-24 (Thu, 24 Nov 2016)

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

  Log Message:
  -----------
  3245 datastore_active race condition

`datastore_create` directly updates database and solr index and
this reduces possibility of conflicts inside simultaneous calls


  Commit: 425597f6caea90c7513162727268c5aa6d744277
      https://github.com/ckan/ckan/commit/425597f6caea90c7513162727268c5aa6d744277
  Author: Ian Ward <ian at excess.org>
  Date:   2016-11-25 (Fri, 25 Nov 2016)

  Changed paths:
    M ckan/i18n/check_po_files.py
    M dev-requirements.txt
    M doc/contributing/release-process.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#3316] make polib a proper requirement


  Commit: d6db29e8f756e7d1f35576c2979238823ac39bb9
      https://github.com/ckan/ckan/commit/d6db29e8f756e7d1f35576c2979238823ac39bb9
  Author: Ian Ward <ian at excess.org>
  Date:   2016-11-25 (Fri, 25 Nov 2016)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#3335] Revert "Fix 500 error on viewing a group with a custom group schema"

This reverts commit 952f28b659aa297cdeaf12d4512da6532cf1c591.


  Commit: 82a12f28ac9e2e30210426c97bbdb97fc2f78c56
      https://github.com/ckan/ckan/commit/82a12f28ac9e2e30210426c97bbdb97fc2f78c56
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M ckan/i18n/check_po_files.py
    M dev-requirements.txt
    M doc/contributing/release-process.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge pull request #3334 from ckan/3316-polib-req

make polib a proper requirement


  Commit: 33233941953523261075ace93ff7cbde6a928e49
      https://github.com/ckan/ckan/commit/33233941953523261075ace93ff7cbde6a928e49
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/jobs.py

  Log Message:
  -----------
  [#3332] Properly close database connections in background workers

RQ background workers exit via `os._exit`, which (by design) omits all
of Python's usual clean up routines. As a result, the SQLAlchemy session
and its associated database connections have to be cleaned up manually.
This hadn't been done before, leading to sporadic exceptions due to SSL
connections being unexpectedly closed.

This commit fixes that situation by properly closing each worker's
SQLAlchemy session and its associated database connections.


  Commit: 535f1b4e01584224399a4cf6b45c499cd03f9553
      https://github.com/ckan/ckan/commit/535f1b4e01584224399a4cf6b45c499cd03f9553
  Author: amercader <amercadero at gmail.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M Dockerfile
    M ckan/common.py
    M ckan/config/environment.py
    M ckan/config/middleware/__init__.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/check_po_files.py
    M ckan/lib/auth_tkt.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/munge.py
    M ckan/lib/search/common.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/model/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit_sphinx_extension.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/logic/test_tag_vocab.py
    M ckan/tests/legacy/test_coding_standards.py
    A ckan/tests/lib/_i18n_build_js_translations/ckanext-test_js_translations.pot
    A ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po
    M ckan/tests/lib/test_cli.py
    A ckan/tests/lib/test_i18n.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/test_update.py
    M ckan/tests/logic/test_validators.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/set_permissions.sql
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/example_idatasetform/plugin_v1.py
    M ckanext/example_idatasetform/plugin_v2.py
    M ckanext/example_idatasetform/plugin_v4.py
    M ckanext/example_igroupform/plugin.py
    M contrib/docker/my_init.d/50_configure
    M contrib/docker/postgresql/Dockerfile
    M dev-requirements.txt
    M doc/contributing/release-process.rst
    M doc/contributing/string-i18n.rst
    M doc/extensions/translating-extensions.rst
    M doc/maintaining/paster.rst
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 3196-common-requests-code


  Commit: 0b0454c60ac125d8075f2120f0ac93cddbe192dd
      https://github.com/ckan/ckan/commit/0b0454c60ac125d8075f2120f0ac93cddbe192dd
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  \#3189 Datastore doesn't add site_url to resource created via API

Small change in datastore plugin, that generates
fully-qualified url during datastore creation


  Commit: 05df1be404eabfe7bf8e0a81afcb73c31ce84825
      https://github.com/ckan/ckan/commit/05df1be404eabfe7bf8e0a81afcb73c31ce84825
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  Merge pull request #3335 from ckan/3335-org-display-name-crash

organization_create/_update crash if display_name passed


  Commit: 91a95c99e99d84544baeba8ff00c8569423df2f3
      https://github.com/ckan/ckan/commit/91a95c99e99d84544baeba8ff00c8569423df2f3
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  Merge pull request #3324 from smotornyuk/3260-idle-connections

[#3260] Removed idle connection


  Commit: d8dd8a8971cd49bc221f950d9eb0534361f74ca5
      https://github.com/ckan/ckan/commit/d8dd8a8971cd49bc221f950d9eb0534361f74ca5
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    A ckan/public/base/i18n/.gitignore
    R ckan/public/base/i18n/bg.js
    R ckan/public/base/i18n/ca.js
    R ckan/public/base/i18n/cs_CZ.js
    R ckan/public/base/i18n/de.js
    R ckan/public/base/i18n/el.js
    R ckan/public/base/i18n/es.js
    R ckan/public/base/i18n/fi.js
    R ckan/public/base/i18n/fr.js
    R ckan/public/base/i18n/hu.js
    R ckan/public/base/i18n/it.js
    R ckan/public/base/i18n/lt.js
    R ckan/public/base/i18n/lv.js
    R ckan/public/base/i18n/nl.js
    R ckan/public/base/i18n/no.js
    R ckan/public/base/i18n/pl.js
    R ckan/public/base/i18n/pt_BR.js
    R ckan/public/base/i18n/ro.js
    R ckan/public/base/i18n/ru.js
    R ckan/public/base/i18n/sk.js
    R ckan/public/base/i18n/sl.js
    R ckan/public/base/i18n/sq.js
    R ckan/public/base/i18n/sr.js
    R ckan/public/base/i18n/sr_Latn.js
    R ckan/public/base/i18n/sv.js
    R ckan/public/base/i18n/zh_TW.js

  Log Message:
  -----------
  Merge pull request #3318 from torfsen/3317-do-not-track-js-translation-files

[#3317] Don't track automatically generated JS translation files in git


  Commit: 911c2e48abc018cf7ab55ceb9cb62f9e96f46859
      https://github.com/ckan/ckan/commit/911c2e48abc018cf7ab55ceb9cb62f9e96f46859
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/jobs.py

  Log Message:
  -----------
  Merge pull request #3337 from torfsen/3332-close-worker-db-connection

[#3332] Properly close database connections in background workers


  Commit: 4a794a262717f6c4edb5daf8c7b829cb9a356458
      https://github.com/ckan/ckan/commit/4a794a262717f6c4edb5daf8c7b829cb9a356458
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  Merge pull request #3323 from open-data/autojs_crash

Don't crash if PO files aren't exactly where we expected them when ge…


  Commit: 4a5d82c3b303fb165f8ed3184a56ac78d108fdf7
      https://github.com/ckan/ckan/commit/4a5d82c3b303fb165f8ed3184a56ac78d108fdf7
  Author: amercader <amercadero at gmail.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M ckan/common.py

  Log Message:
  -----------
  Pep 8


  Commit: d90ef1c5bcd3d09e3d40354796d78e4ac28a26c7
      https://github.com/ckan/ckan/commit/d90ef1c5bcd3d09e3d40354796d78e4ac28a26c7
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  Merge pull request #3338 from smotornyuk/3189-datastore-api-strips-site-name-from-resource

#3189 Datastore doesn't add site_url to resource created via API


  Commit: 356c6452b57b1ca50db3e39871c8a742bd7607f9
      https://github.com/ckan/ckan/commit/356c6452b57b1ca50db3e39871c8a742bd7607f9
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M ckan/public/base/javascript/i18n.js
    M ckan/public/base/javascript/module.js
    M ckan/public/base/javascript/modules/activity-stream.js
    M ckan/public/base/javascript/modules/api-info.js
    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/modules/custom-fields.js
    M ckan/public/base/javascript/modules/dashboard.js
    M ckan/public/base/javascript/modules/dataset-visibility.js
    M ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/popover-context.js
    M ckan/public/base/javascript/modules/resource-form.js
    M ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/public/base/javascript/modules/resource-view-embed.js
    M ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/modules/table-selectable-rows.js
    M ckan/public/base/javascript/modules/table-toggle-more.js
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/i18n.spec.js
    M ckan/public/base/test/spec/module.spec.js
    M ckan/public/base/test/spec/modules/confirm-action.spec.js
    M ckan/public/base/test/spec/sandbox.spec.js
    M ckan/templates/admin/config.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/user/edit_user_form.html
    M ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/stats/public/ckanext/stats/javascript/modules/plot.js
    M ckanext/textview/theme/public/text_view.js
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/javascript-module-tutorial.rst
    M doc/contributing/frontend/templating.rst
    M doc/contributing/javascript.rst
    M doc/contributing/string-i18n.rst
    M doc/extensions/translating-extensions.rst
    M doc/theming/javascript-module-objects-and-methods.rst
    M setup.cfg

  Log Message:
  -----------
  Merge pull request #3211 from torfsen/3151-plural-translations-in-javascript

[#3151] Extractable plural translations in JavaScript


  Commit: 1235de2881052705a33c660597353cdd32e296bd
      https://github.com/ckan/ckan/commit/1235de2881052705a33c660597353cdd32e296bd
  Author: amercader <amercadero at gmail.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M doc/api/index.rst
    M doc/user-guide.rst

  Log Message:
  -----------
  [#3336] Better document packages vs datasets


  Commit: 3c6bc705bca6bacb34ca8f667ada6e5a7aaf1b13
      https://github.com/ckan/ckan/commit/3c6bc705bca6bacb34ca8f667ada6e5a7aaf1b13
  Author: Khalegh-H3 <khalegh at highwaythreesolutions.com>
  Date:   2016-11-29 (Tue, 29 Nov 2016)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  Moved ErrorController rout to right after plugins custom routs.


  Commit: d211d3bd9c32a49ebf35ccf79f8cf802aad5441f
      https://github.com/ckan/ckan/commit/d211d3bd9c32a49ebf35ccf79f8cf802aad5441f
  Author: Ian Ward <ian at excess.org>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  Merge pull request #3340 from HighwayThree/3328-customized-error-handling

Moved ErrorController rout to right after plugins custom routes.


  Commit: 4537b1d4b7c90ef9f0d76d4cd62205e25dfa0d8c
      https://github.com/ckan/ckan/commit/4537b1d4b7c90ef9f0d76d4cd62205e25dfa0d8c
  Author: Ian Ward <ian at excess.org>
  Date:   2016-12-01 (Thu, 01 Dec 2016)

  Changed paths:
    M doc/api/index.rst
    M doc/user-guide.rst

  Log Message:
  -----------
  Merge pull request #3339 from ckan/3336-document-package

Document better that packages are datasets


  Commit: 24389388cd9889e71c9a6712a74aa7466ce4d85c
      https://github.com/ckan/ckan/commit/24389388cd9889e71c9a6712a74aa7466ce4d85c
  Author: Fabio Anderegg <fabio.anderegg at liip.ch>
  Date:   2016-12-02 (Fri, 02 Dec 2016)

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

  Log Message:
  -----------
  javascript: use ckan locale instead of browser locale to format dates


  Commit: 7086e16f14a3a9d2c334d366f5286d4fabaef43d
      https://github.com/ckan/ckan/commit/7086e16f14a3a9d2c334d366f5286d4fabaef43d
  Author: Fabio Anderegg <fabio.anderegg at liip.ch>
  Date:   2016-12-02 (Fri, 02 Dec 2016)

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

  Log Message:
  -----------
  ckan datastore: convert data error to unicode instead of str to avoid encoding errors


  Commit: 2fe4f679c08d6994804d3181849da3e096955551
      https://github.com/ckan/ckan/commit/2fe4f679c08d6994804d3181849da3e096955551
  Author: Ian Ward <ian at excess.org>
  Date:   2016-12-02 (Fri, 02 Dec 2016)

  Changed paths:
    M ckanext/datastore/controller.py

  Log Message:
  -----------
  [#3344] datastore dump: internally paginate with datastore_search


  Commit: e29e8cd76b99db449d713896ea22471cd3550372
      https://github.com/ckan/ckan/commit/e29e8cd76b99db449d713896ea22471cd3550372
  Author: Ian Ward <ian at excess.org>
  Date:   2016-12-02 (Fri, 02 Dec 2016)

  Changed paths:
    M ckanext/datastore/controller.py

  Log Message:
  -----------
  [#3344] pep8


  Commit: 984f22277c3dacac47290f0a17a390ccc86b95a1
      https://github.com/ckan/ckan/commit/984f22277c3dacac47290f0a17a390ccc86b95a1
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M ckan/templates/organization/member_new.html

  Log Message:
  -----------
  Added parenthesis in organization/member_new, line59


  Commit: 062fe97a5e41ceeb5a0d48e572e980e541fd4a4a
      https://github.com/ckan/ckan/commit/062fe97a5e41ceeb5a0d48e572e980e541fd4a4a
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M ckan/logic/auth/create.py
    M ckan/tests/legacy/functional/api/test_activity.py

  Log Message:
  -----------
  check group name and id during package creation


  Commit: d87e2d731a4a5afe7573b62ab274b7f686a90422
      https://github.com/ckan/ckan/commit/d87e2d731a4a5afe7573b62ab274b7f686a90422
  Author: Ian Ward <ian at excess.org>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M ckan/templates/organization/member_new.html

  Log Message:
  -----------
  Merge pull request #3350 from smotornyuk/missing-parenthesis-in-organization-member_new

Added parenthesis in organization/member_new, line59


  Commit: e4bf3b0a0a06120377e5ea01d2494f236fad27fd
      https://github.com/ckan/ckan/commit/e4bf3b0a0a06120377e5ea01d2494f236fad27fd
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-12-06 (Tue, 06 Dec 2016)

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

  Log Message:
  -----------
  [#3352] Introduce all_fields option to user_list with test.


  Commit: 21a2b18472cb07d00657fc4c8432a936df047046
      https://github.com/ckan/ckan/commit/21a2b18472cb07d00657fc4c8432a936df047046
  Author: amercader <amercadero at gmail.com>
  Date:   2016-12-06 (Tue, 06 Dec 2016)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/lib/i18n.py
    M ckan/lib/jobs.py
    M ckan/logic/schema.py
    A ckan/public/base/i18n/.gitignore
    R ckan/public/base/i18n/bg.js
    R ckan/public/base/i18n/ca.js
    R ckan/public/base/i18n/cs_CZ.js
    R ckan/public/base/i18n/de.js
    R ckan/public/base/i18n/el.js
    R ckan/public/base/i18n/es.js
    R ckan/public/base/i18n/fi.js
    R ckan/public/base/i18n/fr.js
    R ckan/public/base/i18n/hu.js
    R ckan/public/base/i18n/it.js
    R ckan/public/base/i18n/lt.js
    R ckan/public/base/i18n/lv.js
    R ckan/public/base/i18n/nl.js
    R ckan/public/base/i18n/no.js
    R ckan/public/base/i18n/pl.js
    R ckan/public/base/i18n/pt_BR.js
    R ckan/public/base/i18n/ro.js
    R ckan/public/base/i18n/ru.js
    R ckan/public/base/i18n/sk.js
    R ckan/public/base/i18n/sl.js
    R ckan/public/base/i18n/sq.js
    R ckan/public/base/i18n/sr.js
    R ckan/public/base/i18n/sr_Latn.js
    R ckan/public/base/i18n/sv.js
    R ckan/public/base/i18n/zh_TW.js
    M ckan/public/base/javascript/i18n.js
    M ckan/public/base/javascript/module.js
    M ckan/public/base/javascript/modules/activity-stream.js
    M ckan/public/base/javascript/modules/api-info.js
    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/modules/custom-fields.js
    M ckan/public/base/javascript/modules/dashboard.js
    M ckan/public/base/javascript/modules/dataset-visibility.js
    M ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/popover-context.js
    M ckan/public/base/javascript/modules/resource-form.js
    M ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/public/base/javascript/modules/resource-view-embed.js
    M ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/modules/table-selectable-rows.js
    M ckan/public/base/javascript/modules/table-toggle-more.js
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/i18n.spec.js
    M ckan/public/base/test/spec/module.spec.js
    M ckan/public/base/test/spec/modules/confirm-action.spec.js
    M ckan/public/base/test/spec/sandbox.spec.js
    M ckan/templates/admin/config.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/user/edit_user_form.html
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/stats/public/ckanext/stats/javascript/modules/plot.js
    M ckanext/textview/theme/public/text_view.js
    M doc/api/index.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/javascript-module-tutorial.rst
    M doc/contributing/frontend/templating.rst
    M doc/contributing/javascript.rst
    M doc/contributing/string-i18n.rst
    M doc/extensions/translating-extensions.rst
    M doc/theming/javascript-module-objects-and-methods.rst
    M doc/user-guide.rst
    M setup.cfg

  Log Message:
  -----------
  Merge branch 'master' into 3196-common-requests-code


  Commit: 739e5b071486f3e6b4a1d549347942aaccee0214
      https://github.com/ckan/ckan/commit/739e5b071486f3e6b4a1d549347942aaccee0214
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-12-06 (Tue, 06 Dec 2016)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  [#3354] Migrate table is kept during tests when the rows of all the other tables is deleted.


  Commit: f733a2412d9657f8e383e2f5cd3513386fe95268
      https://github.com/ckan/ckan/commit/f733a2412d9657f8e383e2f5cd3513386fe95268
  Author: Ian Ward <ian at excess.org>
  Date:   2016-12-06 (Tue, 06 Dec 2016)

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

  Log Message:
  -----------
  Merge pull request #3343 from fanderegg/datastore-fix-exception-unicode-error

ckan datastore: convert data error to unicode instead of str to avoid decode error


  Commit: 7c39683cbd2a7f7e6c630f14779f184f58bbd080
      https://github.com/ckan/ckan/commit/7c39683cbd2a7f7e6c630f14779f184f58bbd080
  Author: Ian Ward <ian at excess.org>
  Date:   2016-12-06 (Tue, 06 Dec 2016)

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

  Log Message:
  -----------
  Merge pull request #3342 from fanderegg/fix-format-date-language

javascript: use ckan locale instead of browser locale to format dates


  Commit: e7b0f15408e6eacf7998b25e60d6edba34255327
      https://github.com/ckan/ckan/commit/e7b0f15408e6eacf7998b25e60d6edba34255327
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-12-06 (Tue, 06 Dec 2016)

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

  Log Message:
  -----------
  Merge pull request #3353 from ckan/3352-user-list-strings

[#3352] Introduce all_fields option to user_list with test.


  Commit: 124547a92ff4ca898cf80cc04cf7f1cfc3ef70a4
      https://github.com/ckan/ckan/commit/124547a92ff4ca898cf80cc04cf7f1cfc3ef70a4
  Author: Ian Ward <ian at excess.org>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

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

  Log Message:
  -----------
  Merge pull request #3331 from smotornyuk/3245-datastore_active-race-condition

3245 datastore_active race condition


  Commit: 1ae142877432127eade9d57f5ecc6ba877b7d6d3
      https://github.com/ckan/ckan/commit/1ae142877432127eade9d57f5ecc6ba877b7d6d3
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

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

  Log Message:
  -----------
  normal user added to "roger" group in order to pass auth checks


  Commit: 621c9c0022fd49e8eec4e9e12288206499182e9f
      https://github.com/ckan/ckan/commit/621c9c0022fd49e8eec4e9e12288206499182e9f
  Author: Ian Ward <ian at excess.org>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#3360] format exception instead of passing to error()


  Commit: 461a2e932854f24fe33f896e3ce66982c5f0be80
      https://github.com/ckan/ckan/commit/461a2e932854f24fe33f896e3ce66982c5f0be80
  Author: Ian Ward <ian at excess.org>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#3361] fix for showing private datasets on org pages


  Commit: 9f6d4a5fd1bf5cdf98d2e3aa608df10ef8ffd29c
      https://github.com/ckan/ckan/commit/9f6d4a5fd1bf5cdf98d2e3aa608df10ef8ffd29c
  Author: Ian Ward <ian at excess.org>
  Date:   2016-12-09 (Fri, 09 Dec 2016)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#3360] except Exception


  Commit: 9b9262a6695fb589c01cc53f11313b2fc051288f
      https://github.com/ckan/ckan/commit/9b9262a6695fb589c01cc53f11313b2fc051288f
  Author: Ian Ward <ian at excess.org>
  Date:   2016-12-09 (Fri, 09 Dec 2016)

  Changed paths:
    M ckan/tests/lib/test_jobs.py

  Log Message:
  -----------
  [#3359] skip test_fork_within_a_transaction until we can fix


  Commit: f0e978ba14b59df1b0bbb91c1b764458b1febb38
      https://github.com/ckan/ckan/commit/f0e978ba14b59df1b0bbb91c1b764458b1febb38
  Author: Ian Ward <ian at excess.org>
  Date:   2016-12-09 (Fri, 09 Dec 2016)

  Changed paths:
    M ckan/tests/lib/test_jobs.py

  Log Message:
  -----------
  [#3359] coding standards


  Commit: 727fe76a4da67fb590e87ce75c5284f145a6e495
      https://github.com/ckan/ckan/commit/727fe76a4da67fb590e87ce75c5284f145a6e495
  Author: Ian Ward <ian at excess.org>
  Date:   2016-12-09 (Fri, 09 Dec 2016)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  Merge pull request #3355 from ckan/3354-tests-keep-migrate-table

[#3354] Migrate table is kept during tests


  Commit: 31b816707ab773ccb6530f90de584883375c0a2f
      https://github.com/ckan/ckan/commit/31b816707ab773ccb6530f90de584883375c0a2f
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-12-09 (Fri, 09 Dec 2016)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Merge pull request #3360 from ckan/3360-cli-fail-failing

cli: TypeError: expected a character buffer object


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

  Changed paths:
    M ckan/lib/cli.py
    M ckan/logic/action/get.py
    M ckan/model/__init__.py
    M ckan/public/base/javascript/main.js
    M ckan/tests/logic/action/test_get.py
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  Merge branch 'master' into 3196-common-requests-code


  Commit: 2414929da480f3797b53488ef3d9cc8f30a3df6e
      https://github.com/ckan/ckan/commit/2414929da480f3797b53488ef3d9cc8f30a3df6e
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2016-12-12 (Mon, 12 Dec 2016)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/logic/action/get.py
    M ckan/model/__init__.py
    M ckan/public/base/javascript/main.js
    M ckan/templates/organization/member_new.html
    M ckan/tests/logic/action/test_get.py
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  Merge branch 'master' into 3308-problem-with-adding-datasets-to-group


  Commit: 8298ff35d1226e3cd019ca7d02e352a8afdef73e
      https://github.com/ckan/ckan/commit/8298ff35d1226e3cd019ca7d02e352a8afdef73e
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2016-12-12 (Mon, 12 Dec 2016)

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

  Log Message:
  -----------
  inside `_create_package` user becomes admin of group


  Commit: 7ec0e2a1617409ab3a226a4bf9b1ee6a2c139717
      https://github.com/ckan/ckan/commit/7ec0e2a1617409ab3a226a4bf9b1ee6a2c139717
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2016-12-12 (Mon, 12 Dec 2016)

  Changed paths:
    M doc/extensions/tutorial.rst
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Updated value for `ckan.auth.user_create_groups

Now documentation contains correct default value - False.
Also this option mentioned in writhing extension guide


  Commit: e1278813aaf3ce5fecdc0d4b8ef2c03f3ac6dd96
      https://github.com/ckan/ckan/commit/e1278813aaf3ce5fecdc0d4b8ef2c03f3ac6dd96
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-12-12 (Mon, 12 Dec 2016)

  Changed paths:
    M ckan/logic/auth/create.py
    M ckan/tests/legacy/functional/api/test_activity.py

  Log Message:
  -----------
  Merge pull request #3351 from smotornyuk/3308-problem-with-adding-datasets-to-group

Check group name and id in data_dict during package creation


  Commit: aa18efd9fdd9df349de1dcadca3885026a0db41e
      https://github.com/ckan/ckan/commit/aa18efd9fdd9df349de1dcadca3885026a0db41e
  Author: Ian Ward <ian at excess.org>
  Date:   2016-12-13 (Tue, 13 Dec 2016)

  Changed paths:
    M doc/extensions/tutorial.rst
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge pull request #3363 from smotornyuk/3329-corect-value-in-documentation-for-user_create_group

Updated value for `ckan.auth.user_create_groups


  Commit: e310f7a3ca3ccc373c7851a1f75edb1da1bbb8e0
      https://github.com/ckan/ckan/commit/e310f7a3ca3ccc373c7851a1f75edb1da1bbb8e0
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-12-13 (Tue, 13 Dec 2016)

  Changed paths:
    M ckan/tests/lib/test_jobs.py

  Log Message:
  -----------
  Merge pull request #3359 from ckan/3359-skip-job-fork-test

Intermittent test failures in test_jobs


  Commit: 0512b22e58798f2546bab3a0fbd262670e99f2d1
      https://github.com/ckan/ckan/commit/0512b22e58798f2546bab3a0fbd262670e99f2d1
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-12-14 (Wed, 14 Dec 2016)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Merge pull request #3361 from ckan/3361-fix-include-private

group/org package lists should always include private


  Commit: 29f67ef86c2b1f6b637d67be64e13966071ecef6
      https://github.com/ckan/ckan/commit/29f67ef86c2b1f6b637d67be64e13966071ecef6
  Author: Ian Ward <ian at excess.org>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M ckan/model/system_info.py

  Log Message:
  -----------
  [#3366] paster: tolerate missing system_info table


  Commit: 8837fa65c83dd47a9911695c18fa8f0c6e6294cc
      https://github.com/ckan/ckan/commit/8837fa65c83dd47a9911695c18fa8f0c6e6294cc
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2016-12-16 (Fri, 16 Dec 2016)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  `render_markdown` breaks links with ampersands

Added few additional allowed tags to `bleach.clean`
function and changed sanitization sequence so that
markdown applied first and only after that result cleaned


  Commit: bb6b4d051ba86ca3f1c3f2d2bbd24f7dbbb52256
      https://github.com/ckan/ckan/commit/bb6b4d051ba86ca3f1c3f2d2bbd24f7dbbb52256
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2016-12-16 (Fri, 16 Dec 2016)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  added some tests and src attr to img


  Commit: d250fcf84bc9060d2cd94ba40d1173bd1045cbf9
      https://github.com/ckan/ckan/commit/d250fcf84bc9060d2cd94ba40d1173bd1045cbf9
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-12-16 (Fri, 16 Dec 2016)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  Merge pull request #3364 from smotornyuk/3356-render_markdown-does-not-break-links

`render_markdown` breaks links with ampersands


  Commit: cb020f80368f5b903cdda6ddcd72d44122c96e14
      https://github.com/ckan/ckan/commit/cb020f80368f5b903cdda6ddcd72d44122c96e14
  Author: Ian Ward <ian at excess.org>
  Date:   2016-12-16 (Fri, 16 Dec 2016)

  Changed paths:
    M ckanext/datastore/controller.py

  Log Message:
  -----------
  [#3344] handle offset, limit; better toolkit imports


  Commit: ccb8dd54509b96e9aa8666ed9117989627300ba3
      https://github.com/ckan/ckan/commit/ccb8dd54509b96e9aa8666ed9117989627300ba3
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-12-17 (Sat, 17 Dec 2016)

  Changed paths:
    M ckanext/datastore/controller.py

  Log Message:
  -----------
  Merge pull request #3344 from ckan/3344-big-dumps

Allow larger datastore dumps


  Commit: bb23ece70ae6bac8b0429b973b6508974f8169d2
      https://github.com/ckan/ckan/commit/bb23ece70ae6bac8b0429b973b6508974f8169d2
  Author: Yan <yan.rudenko at linkdigital.com.au>
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
    M ckan/logic/action/update.py
    M ckan/model/dashboard.py

  Log Message:
  -----------
  [#3373]Dashboard_mark_activities_old is set to utcnow() format

The problem was that dashboard_mark_activities_old method was not changed to utcnow() format, so when datasets were updated, because of the time difference, user have seen them before he actually entered the page.

I've adde utcnow() format for this method and now the time works fine. Also added untnow() to Dashboard model, so the time can be saved correctly.


  Commit: a60f026588378b2b563d2cc6144aeccb76026d2d
      https://github.com/ckan/ckan/commit/a60f026588378b2b563d2cc6144aeccb76026d2d
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-12-21 (Wed, 21 Dec 2016)

  Changed paths:
    M ckan/lib/i18n.py
    M ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po

  Log Message:
  -----------
  Fix random order of translation files

During the generation of the JS translation files the order of the input
files previously was random by accident, as it implicitly depended on
the order of a normal Python dict. This randomly broke the ability of
extensions to override JS translations from CKAN core.

This commit fixes that issue by using an OrderedDict to ensure that
translation files provided by extensions are loaded after those of CKAN
core.


  Commit: 44c39e06ad01701774de389868ee49ae3b02e564
      https://github.com/ckan/ckan/commit/44c39e06ad01701774de389868ee49ae3b02e564
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-12-21 (Wed, 21 Dec 2016)

  Changed paths:
    M ckan/lib/base.py
    M ckan/tests/lib/test_base.py

  Log Message:
  -----------
  Fix unicode auth exception


  Commit: e7913c35fb4155aac6d79ff6e9f26f0e79a97c68
      https://github.com/ckan/ckan/commit/e7913c35fb4155aac6d79ff6e9f26f0e79a97c68
  Author: Matt Fullerton <matt.fullerton at gmail.com>
  Date:   2016-12-26 (Mon, 26 Dec 2016)

  Changed paths:
    M ckanext/imageview/plugin.py
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  Add an ckan.preview.image_formats config option for the image viewer


  Commit: 613c094877aa822733efb7618a1543e3909c112d
      https://github.com/ckan/ckan/commit/613c094877aa822733efb7618a1543e3909c112d
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-12-30 (Fri, 30 Dec 2016)

  Changed paths:
    M ckan/model/system_info.py

  Log Message:
  -----------
  Merge pull request #3366 from ckan/3366-tolerate-missing-system-info

Tolerate missing system_info table


  Commit: 835a468f08463d72a247d2632fa99714e5bd6605
      https://github.com/ckan/ckan/commit/835a468f08463d72a247d2632fa99714e5bd6605
  Author: Matt Fullerton <matt.fullerton at gmail.com>
  Date:   2017-01-02 (Mon, 02 Jan 2017)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Doc/Config improvements
Add clarification to configuration doc that list is space delimited and do the same for text_view formats
Remove type in config example (image instead of text)
Add sample configs for text_view and image_view


  Commit: 477f4a0f4a4ed321f3fa90c6064960dd2cb0fab8
      https://github.com/ckan/ckan/commit/477f4a0f4a4ed321f3fa90c6064960dd2cb0fab8
  Author: Matt Fullerton <matt.fullerton at gmail.com>
  Date:   2017-01-02 (Mon, 02 Jan 2017)

  Changed paths:
    M ckanext/imageview/plugin.py

  Log Message:
  -----------
  Respect a user's right to provide no image formats via the config


  Commit: 47d878e82678f24e7af0aff6773c396c32dd72b0
      https://github.com/ckan/ckan/commit/47d878e82678f24e7af0aff6773c396c32dd72b0
  Author: amercader <amercadero at gmail.com>
  Date:   2017-01-03 (Tue, 03 Jan 2017)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/helpers.py
    M ckan/logic/auth/create.py
    M ckan/model/system_info.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_jobs.py
    M ckanext/datastore/controller.py
    M doc/extensions/tutorial.rst
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch 'master' into 3196-common-requests-code


  Commit: 2c5477c4075d524e0a94c59f6eed22fc965b9f8b
      https://github.com/ckan/ckan/commit/2c5477c4075d524e0a94c59f6eed22fc965b9f8b
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-01-03 (Tue, 03 Jan 2017)

  Changed paths:
    M ckan/lib/base.py
    M ckan/tests/lib/test_base.py

  Log Message:
  -----------
  Merge pull request #3378 from ckan/fix-unicode-auth-exception

Fix unicode auth exception


  Commit: 286a4acff4c6dc997faeeb23fdd7f0709f7b73d1
      https://github.com/ckan/ckan/commit/286a4acff4c6dc997faeeb23fdd7f0709f7b73d1
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-01-03 (Tue, 03 Jan 2017)

  Changed paths:
    M ckan/lib/i18n.py
    M ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po

  Log Message:
  -----------
  Merge pull request #3376 from torfsen/fix-random-translation-files-order

Fix random order of translation files


  Commit: 7328b584cb1817cce45aa2b4038ef01428139de0
      https://github.com/ckan/ckan/commit/7328b584cb1817cce45aa2b4038ef01428139de0
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-01-03 (Tue, 03 Jan 2017)

  Changed paths:
    M ckan/logic/action/update.py
    M ckan/model/dashboard.py

  Log Message:
  -----------
  Merge pull request #3374 from Engerrs/3373-dashboard_mark_activities_old_to_utcnow_time

[#3373]Dashboard_mark_activities_old is set to utcnow() format


  Commit: d63655f4b58e2f103cd847a5257802443fbaad6f
      https://github.com/ckan/ckan/commit/d63655f4b58e2f103cd847a5257802443fbaad6f
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-03 (Tue, 03 Jan 2017)

  Changed paths:
    M ckan/public/base/images/background-tag-ie7.png
    M ckan/public/base/images/background-tag.png
    M ckan/public/base/images/background-tile.png
    M ckan/public/base/images/bg.png
    M ckan/public/base/images/breadcrumb-slash-ie7.png
    M ckan/public/base/images/ckan-logo-footer.png
    M ckan/public/base/images/ckan-logo.png
    M ckan/public/base/images/dashboard-followee-related.png
    M ckan/public/base/images/dotted.png
    M ckan/public/base/images/editing.png
    M ckan/public/base/images/full-width-nav-right.png
    M ckan/public/base/images/icon-search-27x26.png
    M ckan/public/base/images/nav-active.png
    M ckan/public/base/images/nav.png
    M ckan/public/base/images/od_80x15_blue.png
    M ckan/public/base/images/placeholder-200x125.png
    M ckan/public/base/images/placeholder-420x220.png
    M ckan/public/base/images/placeholder-680x400.png
    M ckan/public/base/images/placeholder-application.png
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-image.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/images/sprite-ckan-icons.png
    M ckan/public/base/images/sprite-resource-icons.png
    M ckan/public/base/images/table-seperator.png
    M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    M ckan/public/base/vendor/select2/select2.png
    M ckan/public/base/vendor/select2/select2x2.png
    M ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_222222_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_2e83ff_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_454545_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_888888_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_cd0a0a_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_redo.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_peppermint.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_spearmint.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_undo.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_blue.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_star.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/drag-handle.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/help.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-asc.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-desc.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/stripes.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tag_red.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tick.png
    M ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    M ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    M doc/_static/ckanlogo.png
    M doc/images/9.png
    M doc/images/add_dataset_1.jpg
    M doc/images/add_dataset_2.jpg
    M doc/images/add_dataset_3.jpg
    M doc/images/architecture.png
    M doc/images/ckan_importing_diagram.png
    M doc/images/create_organization.jpg
    M doc/images/custom-css.png
    M doc/images/custom_config_fields.png
    M doc/images/customize_look_and_feel.jpg
    M doc/images/debug-footer.png
    M doc/images/edit_dataset.jpg
    M doc/images/example_theme_javascript_popover.png
    M doc/images/example_theme_overlapping_popovers.png
    M doc/images/exploring_datasets.jpg
    M doc/images/extra-public-dir.png
    M doc/images/html_and_css.png
    M doc/images/image_view.png
    M doc/images/manage_news_feed.jpg
    M doc/images/manage_organization.jpg
    M doc/images/manage_user_profile.jpg
    M doc/images/manage_users.jpg
    M doc/images/manage_views.png
    M doc/images/more-custom-css.png
    M doc/images/most-popular-groups-custom-snippet.png
    M doc/images/most-popular-groups-snippet.png
    M doc/images/most-popular-groups.png
    M doc/images/move_dataset_between_organizations.jpg
    M doc/images/popular-dataset.png
    M doc/images/popular-resource.png
    M doc/images/recently-changed-packages-activity-stream.png
    M doc/images/recline_graph_view.png
    M doc/images/recline_grid_view.png
    M doc/images/recline_map_view.png
    M doc/images/recline_view.png
    M doc/images/register_account.jpg
    M doc/images/search_the_site.jpg
    M doc/images/sort-datasets-by-popularity.png
    M doc/images/text_view.png
    M doc/images/views_overview.png
    M doc/images/webpage_view.png

  Log Message:
  -----------
  Merge pull request #3330 from PeterDaveHelloKitchen/image-optimize

Image lossless optimization


  Commit: 918a32f79b994ce54a31a607be98593000566fd8
      https://github.com/ckan/ckan/commit/918a32f79b994ce54a31a607be98593000566fd8
  Author: Matt Fullerton <matt.fullerton at gmail.com>
  Date:   2017-01-03 (Tue, 03 Jan 2017)

  Changed paths:
    M ckanext/imageview/plugin.py

  Log Message:
  -----------
  Fix for pep8


  Commit: 97da20e7affa82ee7f7ca5356f2450124d7f9556
      https://github.com/ckan/ckan/commit/97da20e7affa82ee7f7ca5356f2450124d7f9556
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-01-03 (Tue, 03 Jan 2017)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckanext/imageview/plugin.py
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  Merge pull request #3380 from mattfullerton/image-view-configurable-formats

Add an ckan.preview.image_formats config option for the image viewer


  Commit: fbe614dc3ba83ec91b9fbadf9f7f887ebc0b43d6
      https://github.com/ckan/ckan/commit/fbe614dc3ba83ec91b9fbadf9f7f887ebc0b43d6
  Author: amercader <amercadero at gmail.com>
  Date:   2017-01-04 (Wed, 04 Jan 2017)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/lib/i18n.py
    M ckan/logic/action/update.py
    M ckan/model/dashboard.py
    M ckan/public/base/images/background-tag-ie7.png
    M ckan/public/base/images/background-tag.png
    M ckan/public/base/images/background-tile.png
    M ckan/public/base/images/bg.png
    M ckan/public/base/images/breadcrumb-slash-ie7.png
    M ckan/public/base/images/ckan-logo-footer.png
    M ckan/public/base/images/ckan-logo.png
    M ckan/public/base/images/dashboard-followee-related.png
    M ckan/public/base/images/dotted.png
    M ckan/public/base/images/editing.png
    M ckan/public/base/images/full-width-nav-right.png
    M ckan/public/base/images/icon-search-27x26.png
    M ckan/public/base/images/nav-active.png
    M ckan/public/base/images/nav.png
    M ckan/public/base/images/od_80x15_blue.png
    M ckan/public/base/images/placeholder-200x125.png
    M ckan/public/base/images/placeholder-420x220.png
    M ckan/public/base/images/placeholder-680x400.png
    M ckan/public/base/images/placeholder-application.png
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-image.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/images/sprite-ckan-icons.png
    M ckan/public/base/images/sprite-resource-icons.png
    M ckan/public/base/images/table-seperator.png
    M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    M ckan/public/base/vendor/select2/select2.png
    M ckan/public/base/vendor/select2/select2x2.png
    M ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po
    M ckan/tests/lib/test_base.py
    M ckan/views/__init__.py
    M ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
    M ckanext/imageview/plugin.py
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_222222_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_2e83ff_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_454545_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_888888_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_cd0a0a_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_redo.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_peppermint.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_spearmint.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_undo.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_blue.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_star.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/drag-handle.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/help.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-asc.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-desc.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/stripes.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tag_red.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tick.png
    M ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    M ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    M doc/_static/ckanlogo.png
    M doc/images/9.png
    M doc/images/add_dataset_1.jpg
    M doc/images/add_dataset_2.jpg
    M doc/images/add_dataset_3.jpg
    M doc/images/architecture.png
    M doc/images/ckan_importing_diagram.png
    M doc/images/create_organization.jpg
    M doc/images/custom-css.png
    M doc/images/custom_config_fields.png
    M doc/images/customize_look_and_feel.jpg
    M doc/images/debug-footer.png
    M doc/images/edit_dataset.jpg
    M doc/images/example_theme_javascript_popover.png
    M doc/images/example_theme_overlapping_popovers.png
    M doc/images/exploring_datasets.jpg
    M doc/images/extra-public-dir.png
    M doc/images/html_and_css.png
    M doc/images/image_view.png
    M doc/images/manage_news_feed.jpg
    M doc/images/manage_organization.jpg
    M doc/images/manage_user_profile.jpg
    M doc/images/manage_users.jpg
    M doc/images/manage_views.png
    M doc/images/more-custom-css.png
    M doc/images/most-popular-groups-custom-snippet.png
    M doc/images/most-popular-groups-snippet.png
    M doc/images/most-popular-groups.png
    M doc/images/move_dataset_between_organizations.jpg
    M doc/images/popular-dataset.png
    M doc/images/popular-resource.png
    M doc/images/recently-changed-packages-activity-stream.png
    M doc/images/recline_graph_view.png
    M doc/images/recline_grid_view.png
    M doc/images/recline_map_view.png
    M doc/images/recline_view.png
    M doc/images/register_account.jpg
    M doc/images/search_the_site.jpg
    M doc/images/sort-datasets-by-popularity.png
    M doc/images/text_view.png
    M doc/images/views_overview.png
    M doc/images/webpage_view.png
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  Merge branch 'master' into 3196-common-requests-code


  Commit: 471bea5ddafd21539c07f93c73d8466f26a7e7b1
      https://github.com/ckan/ckan/commit/471bea5ddafd21539c07f93c73d8466f26a7e7b1
  Author: amercader <amercadero at gmail.com>
  Date:   2017-01-04 (Wed, 04 Jan 2017)

  Changed paths:
    M ckan/views/__init__.py

  Log Message:
  -----------
  [#3378] Change order of debug statement

Otherwise if there is a unicode error it won't get caught before
decoding


  Commit: 87691cc283e06f36489374a0b70a3da3acfeb4e8
      https://github.com/ckan/ckan/commit/87691cc283e06f36489374a0b70a3da3acfeb4e8
  Author: amercader <amercadero at gmail.com>
  Date:   2017-01-04 (Wed, 04 Jan 2017)

  Changed paths:
    M ckan/views/__init__.py

  Log Message:
  -----------
  Prefix literals


  Commit: 47f4edd6ae20e3a9877afc99217b5b807c7cf862
      https://github.com/ckan/ckan/commit/47f4edd6ae20e3a9877afc99217b5b807c7cf862
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-01-04 (Wed, 04 Jan 2017)

  Changed paths:
    M ckan/authz.py
    M ckan/common.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/plugins/interfaces.py
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/helpers.py
    M ckan/tests/lib/test_base.py
    M ckan/tests/test_common.py
    A ckan/views/__init__.py
    A ckan/views/api.py
    A ckanext/example_flask_iblueprint/__init__.py
    A ckanext/example_flask_iblueprint/plugin.py
    A ckanext/example_flask_iblueprint/templates/about.html
    A ckanext/example_flask_iblueprint/templates/about_base.html
    A ckanext/example_flask_iblueprint/tests/__init__.py
    A ckanext/example_flask_iblueprint/tests/test_routes.py
    M ckanext/test_tag_vocab_plugin.py
    M dev-requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge pull request #3212 from ckan/3196-common-requests-code

[#3196] Common requests code for Flask and Pylons


  Commit: 89a95363392179e65ff56e0c502c375045c47ada
      https://github.com/ckan/ckan/commit/89a95363392179e65ff56e0c502c375045c47ada
  Author: amercader <amercadero at gmail.com>
  Date:   2017-01-05 (Thu, 05 Jan 2017)

  Changed paths:
    M .gitattributes
    M CHANGELOG.rst
    M Dockerfile
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware/__init__.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/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/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/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/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tl/LC_MESSAGES/ckan.mo
    M ckan/i18n/tl/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/auth_tkt.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/jobs.py
    M ckan/lib/munge.py
    M ckan/lib/search/common.py
    M ckan/lib/uploader.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/schema.py
    M ckan/model/__init__.py
    M ckan/model/core.py
    M ckan/model/dashboard.py
    M ckan/model/system_info.py
    M ckan/pastertemplates/template/setup.cfg_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit_sphinx_extension.py
    A ckan/public/base/i18n/.gitignore
    R ckan/public/base/i18n/bg.js
    R ckan/public/base/i18n/ca.js
    R ckan/public/base/i18n/cs_CZ.js
    R ckan/public/base/i18n/de.js
    R ckan/public/base/i18n/el.js
    R ckan/public/base/i18n/es.js
    R ckan/public/base/i18n/fi.js
    R ckan/public/base/i18n/fr.js
    R ckan/public/base/i18n/hu.js
    R ckan/public/base/i18n/it.js
    R ckan/public/base/i18n/lt.js
    R ckan/public/base/i18n/lv.js
    R ckan/public/base/i18n/nl.js
    R ckan/public/base/i18n/no.js
    R ckan/public/base/i18n/pl.js
    R ckan/public/base/i18n/pt_BR.js
    R ckan/public/base/i18n/ro.js
    R ckan/public/base/i18n/ru.js
    R ckan/public/base/i18n/sk.js
    R ckan/public/base/i18n/sl.js
    R ckan/public/base/i18n/sq.js
    R ckan/public/base/i18n/sr.js
    R ckan/public/base/i18n/sr_Latn.js
    R ckan/public/base/i18n/sv.js
    R ckan/public/base/i18n/zh_TW.js
    M ckan/public/base/images/background-tag-ie7.png
    M ckan/public/base/images/background-tag.png
    M ckan/public/base/images/background-tile.png
    M ckan/public/base/images/bg.png
    M ckan/public/base/images/breadcrumb-slash-ie7.png
    M ckan/public/base/images/ckan-logo-footer.png
    M ckan/public/base/images/ckan-logo.png
    M ckan/public/base/images/dashboard-followee-related.png
    M ckan/public/base/images/dotted.png
    M ckan/public/base/images/editing.png
    M ckan/public/base/images/full-width-nav-right.png
    M ckan/public/base/images/icon-search-27x26.png
    M ckan/public/base/images/nav-active.png
    M ckan/public/base/images/nav.png
    M ckan/public/base/images/od_80x15_blue.png
    M ckan/public/base/images/placeholder-200x125.png
    M ckan/public/base/images/placeholder-420x220.png
    M ckan/public/base/images/placeholder-680x400.png
    M ckan/public/base/images/placeholder-application.png
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-image.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/images/sprite-ckan-icons.png
    M ckan/public/base/images/sprite-resource-icons.png
    M ckan/public/base/images/table-seperator.png
    M ckan/public/base/javascript/i18n.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/module.js
    M ckan/public/base/javascript/modules/activity-stream.js
    M ckan/public/base/javascript/modules/api-info.js
    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/modules/custom-fields.js
    M ckan/public/base/javascript/modules/dashboard.js
    M ckan/public/base/javascript/modules/dataset-visibility.js
    M ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/popover-context.js
    M ckan/public/base/javascript/modules/resource-form.js
    M ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/public/base/javascript/modules/resource-view-embed.js
    M ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/modules/table-selectable-rows.js
    M ckan/public/base/javascript/modules/table-toggle-more.js
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/i18n.spec.js
    M ckan/public/base/test/spec/module.spec.js
    M ckan/public/base/test/spec/modules/confirm-action.spec.js
    M ckan/public/base/test/spec/sandbox.spec.js
    M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    M ckan/public/base/vendor/select2/select2.png
    M ckan/public/base/vendor/select2/select2x2.png
    R ckan/public/robots.txt
    M ckan/templates/admin/config.html
    R ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.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/resource_read.html
    R ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/resource_form.html
    A ckan/templates/robots.txt
    M ckan/templates/user/dashboard_organizations.html
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/test_feed.py
    M ckan/tests/controllers/test_package.py
    A ckan/tests/controllers/test_template.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/logic/test_tag_vocab.py
    M ckan/tests/legacy/test_coding_standards.py
    A ckan/tests/lib/_i18n_build_js_translations/ckanext-test_js_translations.pot
    A ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po
    M ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_helpers.py
    A ckan/tests/lib/test_i18n.py
    M ckan/tests/lib/test_jobs.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/test_update.py
    M ckan/tests/logic/test_validators.py
    M ckan/tests/test_coding_standards.py
    A ckan/tests/test_robots_txt.py
    M ckan/views/__init__.py
    M ckan/views/api.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/set_permissions.sql
    A ckanext/datastore/templates/ajax_snippets/api_info.html
    A ckanext/datastore/templates/package/resource_read.html
    A ckanext/datastore/templates/package/snippets/data_api_button.html
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/example_idatasetform/plugin_v1.py
    M ckanext/example_idatasetform/plugin_v2.py
    M ckanext/example_idatasetform/plugin_v4.py
    M ckanext/example_igroupform/plugin.py
    M ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
    M ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    M ckanext/imageview/plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_222222_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_2e83ff_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_454545_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_888888_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_cd0a0a_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_redo.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_peppermint.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_spearmint.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_undo.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_blue.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_star.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/drag-handle.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/help.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-asc.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-desc.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/stripes.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tag_red.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tick.png
    M ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    M ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    M ckanext/stats/public/ckanext/stats/javascript/modules/plot.js
    M ckanext/textview/theme/public/text_view.js
    M contrib/docker/my_init.d/50_configure
    M contrib/docker/postgresql/Dockerfile
    M contrib/docker/solr/Dockerfile
    M dev-requirements.txt
    M doc/_static/ckanlogo.png
    M doc/api/index.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/javascript-module-tutorial.rst
    M doc/contributing/frontend/templating.rst
    M doc/contributing/javascript.rst
    M doc/contributing/release-process.rst
    M doc/contributing/string-i18n.rst
    M doc/extensions/translating-extensions.rst
    M doc/extensions/tutorial.rst
    M doc/images/9.png
    M doc/images/add_dataset_1.jpg
    M doc/images/add_dataset_2.jpg
    M doc/images/add_dataset_3.jpg
    M doc/images/architecture.png
    M doc/images/ckan_importing_diagram.png
    M doc/images/create_organization.jpg
    M doc/images/custom-css.png
    M doc/images/custom_config_fields.png
    M doc/images/customize_look_and_feel.jpg
    M doc/images/debug-footer.png
    M doc/images/edit_dataset.jpg
    M doc/images/example_theme_javascript_popover.png
    M doc/images/example_theme_overlapping_popovers.png
    M doc/images/exploring_datasets.jpg
    M doc/images/extra-public-dir.png
    M doc/images/html_and_css.png
    M doc/images/image_view.png
    M doc/images/manage_news_feed.jpg
    M doc/images/manage_organization.jpg
    M doc/images/manage_user_profile.jpg
    M doc/images/manage_users.jpg
    M doc/images/manage_views.png
    M doc/images/more-custom-css.png
    M doc/images/most-popular-groups-custom-snippet.png
    M doc/images/most-popular-groups-snippet.png
    M doc/images/most-popular-groups.png
    M doc/images/move_dataset_between_organizations.jpg
    M doc/images/popular-dataset.png
    M doc/images/popular-resource.png
    M doc/images/recently-changed-packages-activity-stream.png
    M doc/images/recline_graph_view.png
    M doc/images/recline_grid_view.png
    M doc/images/recline_map_view.png
    M doc/images/recline_view.png
    M doc/images/register_account.jpg
    M doc/images/search_the_site.jpg
    M doc/images/sort-datasets-by-popularity.png
    M doc/images/text_view.png
    M doc/images/views_overview.png
    M doc/images/webpage_view.png
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/index.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/installing/postgres.rst
    A doc/maintaining/installing/solr.rst
    M doc/maintaining/paster.rst
    R doc/maintaining/solr-multicore.rst
    M doc/maintaining/upgrading/index.rst
    A doc/maintaining/upgrading/upgrade-postgres.rst
    M doc/theming/javascript-module-objects-and-methods.rst
    M doc/user-guide.rst
    M requirements.in
    M requirements.txt
    M setup.cfg
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 3196-common-session


Compare: https://github.com/ckan/ckan/compare/b2f207bedc3c...89a953633921


More information about the ckan-changes mailing list