[ckan-changes] [ckan/ckan] 44aa96: [#1078] avoid json loads/dumps with LazyJSONObject

GitHub noreply at github.com
Fri Oct 9 15:45:28 UTC 2015


  Branch: refs/heads/upgrade-requirements
  Home:   https://github.com/ckan/ckan
  Commit: 44aa9699f667f300d57e5f7291686f5fb2d216ea
      https://github.com/ckan/ckan/commit/44aa9699f667f300d57e5f7291686f5fb2d216ea
  Author: Ian Ward <ian at excess.org>
  Date:   2013-09-04 (Wed, 04 Sep 2013)

  Changed paths:
    M ckan/controllers/api.py
    A ckan/lib/lazyjson.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#1078] avoid json loads/dumps with LazyJSONObject


  Commit: 3ae69be07908ab3fb6305e2b284d2ec0d61d45c9
      https://github.com/ckan/ckan/commit/3ae69be07908ab3fb6305e2b284d2ec0d61d45c9
  Author: Ian Ward <ian at excess.org>
  Date:   2013-09-04 (Wed, 04 Sep 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/lazyjson.py

  Log Message:
  -----------
  [#1078] LazyJSONEncoder as fallback for api call responses


  Commit: ce5d7e85280bdd350abbc39c19a9f37066472603
      https://github.com/ckan/ckan/commit/ce5d7e85280bdd350abbc39c19a9f37066472603
  Author: Ian Ward <ian at excess.org>
  Date:   2013-09-04 (Wed, 04 Sep 2013)

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

  Log Message:
  -----------
  [#1078] force package_show return type within resource_update


  Commit: 9330b47e0e314ee461aac1529a77a3fb6acb30a0
      https://github.com/ckan/ckan/commit/9330b47e0e314ee461aac1529a77a3fb6acb30a0
  Author: Ian Ward <ian at excess.org>
  Date:   2013-09-04 (Wed, 04 Sep 2013)

  Changed paths:
    M ckan/lib/lazyjson.py

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


  Commit: 12420cefcc8ad3e40e429201189857cf99abd69e
      https://github.com/ckan/ckan/commit/12420cefcc8ad3e40e429201189857cf99abd69e
  Author: Ian Ward <ian at excess.org>
  Date:   2013-09-04 (Wed, 04 Sep 2013)

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

  Log Message:
  -----------
  [#1078] force package_show return type within resource_create


  Commit: 5f0ca73ed2e2e65ec071884f8c17498c666dd448
      https://github.com/ckan/ckan/commit/5f0ca73ed2e2e65ec071884f8c17498c666dd448
  Author: Ian Ward <ian at excess.org>
  Date:   2013-09-04 (Wed, 04 Sep 2013)

  Changed paths:
    M ckan/lib/lazyjson.py

  Log Message:
  -----------
  [#1078] 2.7 comatibility fix: use simplejson for lazyjson


  Commit: 5a795f2bd9424d6bd0d30389b0477f7567e83019
      https://github.com/ckan/ckan/commit/5a795f2bd9424d6bd0d30389b0477f7567e83019
  Author: Ian Ward <ian at excess.org>
  Date:   2013-09-04 (Wed, 04 Sep 2013)

  Changed paths:
    M ckan/lib/lazyjson.py

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


  Commit: 6dc13331a5e7ea7fcfbc8f49373b8205fbe40033
      https://github.com/ckan/ckan/commit/6dc13331a5e7ea7fcfbc8f49373b8205fbe40033
  Author: Ian Ward <ian at excess.org>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

  Changed paths:
    A .coveragerc
    R .gitmodules
    M .travis.yml
    M .tx/config
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    A Dockerfile
    M MANIFEST.in
    M README.rst
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests
    M ckan/__init__.py
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    A ckan/config/resource_formats.json
    M ckan/config/routing.py
    R ckan/config/solr/CHANGELOG.txt
    M ckan/config/solr/README.txt
    M ckan/config/solr/schema-1.2.xml
    M ckan/config/solr/schema-1.3.xml
    M ckan/config/solr/schema-1.4.xml
    M ckan/config/solr/schema-2.0.xml
    A ckan/config/solr/schema.xml
    M ckan/config/who.ini
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/exceptions.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/dv/LC_MESSAGES/ckan.mo
    M 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
    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
    A ckan/i18n/he/LC_MESSAGES/ckan.mo
    A ckan/i18n/he/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/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    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
    A ckan/i18n/vi/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi/LC_MESSAGES/ckan.po
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    A 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
    M ckan/lib/accept.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    A ckan/lib/auth_tkt.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    A 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
    R ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    R ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    R ckan/lib/repoze_patch.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    A ckan/lib/uploader.py
    A 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
    A 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
    A 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
    A ckan/migration/versions/071_add_state_column_to_user_table.py
    A ckan/migration/versions/072_add_resource_view.py
    A ckan/migration/versions/073_update_resource_view_resource_id_constraint.py
    A ckan/migration/versions/074_remove_resource_groups.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/core.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/modification.py
    M ckan/model/package.py
    M ckan/model/rating.py
    M ckan/model/resource.py
    A ckan/model/resource_view.py
    M ckan/model/tag.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/config/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/controllers/test_feed.py
    A ckan/new_tests/controllers/test_group.py
    A ckan/new_tests/controllers/test_package.py
    A ckan/new_tests/controllers/test_util.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/dictization/__init__.py
    A ckan/new_tests/lib/dictization/test_model_dictize.py
    A ckan/new_tests/lib/navl/__init__.py
    A ckan/new_tests/lib/navl/test_dictization_functions.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/lib/search/__init__.py
    A ckan/new_tests/lib/search/test_index.py
    A ckan/new_tests/lib/test_auth_tkt.py
    A ckan/new_tests/lib/test_base.py
    A ckan/new_tests/lib/test_config_tool.py
    A ckan/new_tests/lib/test_helpers.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_create.py
    A ckan/new_tests/logic/action/test_delete.py
    A ckan/new_tests/logic/action/test_get.py
    A ckan/new_tests/logic/action/test_patch.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_create.py
    A ckan/new_tests/logic/auth/test_delete.py
    A ckan/new_tests/logic/auth/test_init.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_conversion.py
    A ckan/new_tests/logic/test_converters.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/model/test_resource.py
    A ckan/new_tests/model/test_resource_view.py
    A ckan/new_tests/model/test_user.py
    A ckan/new_tests/plugins/__init__.py
    A ckan/new_tests/test_authz.py
    A ckan/new_tests/test_coding_standards.py
    A ckan/new_tests/test_factories.py
    M ckan/pastertemplates/__init__.py
    A ckan/pastertemplates/template/+dot+coveragerc_tmpl
    A ckan/pastertemplates/template/+dot+gitignore_tmpl
    A ckan/pastertemplates/template/+dot+travis.yml_tmpl
    A ckan/pastertemplates/template/LICENSE_tmpl
    A ckan/pastertemplates/template/MANIFEST.in_tmpl
    A ckan/pastertemplates/template/README.rst_tmpl
    A ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    A ckan/pastertemplates/template/bin/travis-run.sh_tmpl
    R ckan/pastertemplates/template/ckanext/+project+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/fanstatic/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/plugin.py_tmpl
    A ckan/pastertemplates/template/ckanext/+project_shortname+/public/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/templates/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/test_plugin.py_tmpl
    R ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore
    A ckan/pastertemplates/template/ckanext_+project_shortname+.egg-info/.gitignore
    A ckan/pastertemplates/template/dev-requirements.txt_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    A ckan/pastertemplates/template/test.ini_tmpl
    M ckan/plugins/__init__.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckan/plugins/toolkit_sphinx_extension.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    A ckan/public/base/images/od_80x15_blue.png
    A ckan/public/base/images/placeholder-200x125.png
    A ckan/public/base/images/placeholder-420x220.png
    A ckan/public/base/images/placeholder-680x400.png
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/custom-fields.js
    A ckan/public/base/javascript/modules/image-upload.js
    A ckan/public/base/javascript/modules/resource-reorder.js
    A ckan/public/base/javascript/modules/resource-view-embed.js
    A ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/datapusher.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/main.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/jquery.min.js
    A ckan/public/base/vendor/jquery.ui.core.js
    A ckan/public/base/vendor/jquery.ui.mouse.js
    A ckan/public/base/vendor/jquery.ui.sortable.js
    M ckan/public/base/vendor/jquery.ui.widget.js
    R ckan/public/base/vendor/jquery.ui.widget.min.js
    M ckan/public/base/vendor/resource.config
    A ckan/public/base/vendor/select2/.gitignore
    A ckan/public/base/vendor/select2/LICENSE
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/bower.json
    A ckan/public/base/vendor/select2/component.json
    A ckan/public/base/vendor/select2/composer.json
    A ckan/public/base/vendor/select2/package.json
    A ckan/public/base/vendor/select2/release.sh
    A ckan/public/base/vendor/select2/select2-bootstrap.css
    A ckan/public/base/vendor/select2/select2-spinner.gif
    M ckan/public/base/vendor/select2/select2.css
    A ckan/public/base/vendor/select2/select2.jquery.json
    M ckan/public/base/vendor/select2/select2.js
    R ckan/public/base/vendor/select2/select2.min.css
    M ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/select2_locale_ar.js
    A ckan/public/base/vendor/select2/select2_locale_bg.js
    A ckan/public/base/vendor/select2/select2_locale_ca.js
    A ckan/public/base/vendor/select2/select2_locale_cs.js
    A ckan/public/base/vendor/select2/select2_locale_da.js
    A ckan/public/base/vendor/select2/select2_locale_de.js
    A ckan/public/base/vendor/select2/select2_locale_el.js
    A ckan/public/base/vendor/select2/select2_locale_en.js.template
    A ckan/public/base/vendor/select2/select2_locale_es.js
    A ckan/public/base/vendor/select2/select2_locale_et.js
    A ckan/public/base/vendor/select2/select2_locale_eu.js
    A ckan/public/base/vendor/select2/select2_locale_fa.js
    A ckan/public/base/vendor/select2/select2_locale_fi.js
    A ckan/public/base/vendor/select2/select2_locale_fr.js
    A ckan/public/base/vendor/select2/select2_locale_gl.js
    A ckan/public/base/vendor/select2/select2_locale_he.js
    A ckan/public/base/vendor/select2/select2_locale_hr.js
    A ckan/public/base/vendor/select2/select2_locale_hu.js
    A ckan/public/base/vendor/select2/select2_locale_id.js
    A ckan/public/base/vendor/select2/select2_locale_is.js
    A ckan/public/base/vendor/select2/select2_locale_it.js
    A ckan/public/base/vendor/select2/select2_locale_ja.js
    A ckan/public/base/vendor/select2/select2_locale_ka.js
    A ckan/public/base/vendor/select2/select2_locale_ko.js
    A ckan/public/base/vendor/select2/select2_locale_lt.js
    A ckan/public/base/vendor/select2/select2_locale_lv.js
    A ckan/public/base/vendor/select2/select2_locale_mk.js
    A ckan/public/base/vendor/select2/select2_locale_ms.js
    A ckan/public/base/vendor/select2/select2_locale_nl.js
    A ckan/public/base/vendor/select2/select2_locale_no.js
    A ckan/public/base/vendor/select2/select2_locale_pl.js
    A ckan/public/base/vendor/select2/select2_locale_pt-BR.js
    A ckan/public/base/vendor/select2/select2_locale_pt-PT.js
    A ckan/public/base/vendor/select2/select2_locale_ro.js
    A ckan/public/base/vendor/select2/select2_locale_rs.js
    A ckan/public/base/vendor/select2/select2_locale_ru.js
    A ckan/public/base/vendor/select2/select2_locale_sk.js
    A ckan/public/base/vendor/select2/select2_locale_sv.js
    A ckan/public/base/vendor/select2/select2_locale_th.js
    A ckan/public/base/vendor/select2/select2_locale_tr.js
    A ckan/public/base/vendor/select2/select2_locale_uk.js
    A ckan/public/base/vendor/select2/select2_locale_vi.js
    A ckan/public/base/vendor/select2/select2_locale_zh-CN.js
    A ckan/public/base/vendor/select2/select2_locale_zh-TW.js
    A ckan/public/base/vendor/select2/select2x2.png
    R ckan/public/base/vendor/select2/spinner.gif
    M ckan/public/scripts/application.js
    R ckan/rating.py
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    A ckan/templates/admin/trash.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/base.html
    M ckan/templates/dataviewer/base.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/markup.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/edit.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/organization/confirm_delete_member.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/activity.html
    R ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/edit.html
    A ckan/templates/package/edit_base.html
    A ckan/templates/package/edit_view.html
    M ckan/templates/package/followers.html
    A ckan/templates/package/group_list.html
    M ckan/templates/package/history.html
    M ckan/templates/package/new.html
    M ckan/templates/package/new_package_form.html
    R ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/new_resource.html
    A ckan/templates/package/new_resource_not_draft.html
    A ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    A ckan/templates/package/read.n3
    A ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    A ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit.html
    A ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    A ckan/templates/package/resource_views.html
    A ckan/templates/package/resources.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    R ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_edit_form.html
    M ckan/templates/package/snippets/resource_form.html
    A ckan/templates/package/snippets/resource_help.html
    A ckan/templates/package/snippets/resource_info.html
    M ckan/templates/package/snippets/resource_item.html
    A ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_embed.html
    A ckan/templates/package/snippets/resource_views_list.html
    A ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/package/snippets/stages.html
    A ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_help.html
    A ckan/templates/package/view_edit_base.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/revision/read.html
    M ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/context/dataset.html
    M ckan/templates/snippets/context/group.html
    M ckan/templates/snippets/context/user.html
    A ckan/templates/snippets/datapusher_status.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/private.html
    M ckan/templates/snippets/related.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/search_result_text.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/tag_list.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/new.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    R ckan/templates/user/snippets/back_to_user_action.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/followers.html
    M ckan/templates/user/snippets/login_form.html
    A ckan/templates/user/snippets/recaptcha.html
    R ckan/templates_legacy/__init__.py
    R ckan/templates_legacy/_snippet/data-api-help.html
    R ckan/templates_legacy/_util.html
    R ckan/templates_legacy/activity_streams/activity_stream_items.html
    R ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/admin/index.html
    R ckan/templates_legacy/admin/layout.html
    R ckan/templates_legacy/admin/trash.html
    R ckan/templates_legacy/error_document_template.html
    R ckan/templates_legacy/facets.html
    R ckan/templates_legacy/group/__init__.py
    R ckan/templates_legacy/group/authz.html
    R ckan/templates_legacy/group/edit.html
    R ckan/templates_legacy/group/edit_form.html
    R ckan/templates_legacy/group/history.html
    R ckan/templates_legacy/group/index.html
    R ckan/templates_legacy/group/layout.html
    R ckan/templates_legacy/group/new.html
    R ckan/templates_legacy/group/new_group_form.html
    R ckan/templates_legacy/group/read.html
    R ckan/templates_legacy/home/__init__.py
    R ckan/templates_legacy/home/about.html
    R ckan/templates_legacy/home/index.html
    R ckan/templates_legacy/home/layout.html
    R ckan/templates_legacy/importer/__init__.py
    R ckan/templates_legacy/importer/importer.html
    R ckan/templates_legacy/importer/preview.html
    R ckan/templates_legacy/importer/result.html
    R ckan/templates_legacy/js_strings.html
    R ckan/templates_legacy/layout.html
    R ckan/templates_legacy/layout_base.html
    R ckan/templates_legacy/package/__init__.py
    R ckan/templates_legacy/package/authz.html
    R ckan/templates_legacy/package/comments.html
    R ckan/templates_legacy/package/edit.html
    R ckan/templates_legacy/package/edit_form.html
    R ckan/templates_legacy/package/editresources.html
    R ckan/templates_legacy/package/followers.html
    R ckan/templates_legacy/package/form.html
    R ckan/templates_legacy/package/form_extra_fields.html
    R ckan/templates_legacy/package/form_fields.html
    R ckan/templates_legacy/package/form_resources.html
    R ckan/templates_legacy/package/history.html
    R ckan/templates_legacy/package/layout.html
    R ckan/templates_legacy/package/new.html
    R ckan/templates_legacy/package/new_package_form.html
    R ckan/templates_legacy/package/read.html
    R ckan/templates_legacy/package/read.n3
    R ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/read_core.html
    R ckan/templates_legacy/package/resource_embedded_dataviewer.html
    R ckan/templates_legacy/package/resource_read.html
    R ckan/templates_legacy/package/resources.html
    R ckan/templates_legacy/package/search.html
    R ckan/templates_legacy/package/search_form.html
    R ckan/templates_legacy/package/snippets/data_preview.html
    R ckan/templates_legacy/related/add-related.html
    R ckan/templates_legacy/related/dashboard.html
    R ckan/templates_legacy/related/related_list.html
    R ckan/templates_legacy/rest/__init__.py
    R ckan/templates_legacy/revision/__init__.py
    R ckan/templates_legacy/revision/diff.html
    R ckan/templates_legacy/revision/layout.html
    R ckan/templates_legacy/revision/list.html
    R ckan/templates_legacy/revision/read.html
    R ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    R ckan/templates_legacy/snippets/data-viewer-embed-dialog.html
    R ckan/templates_legacy/snippets/follow_button.html
    R ckan/templates_legacy/snippets/internal-tracking.html
    R ckan/templates_legacy/snippets/package_list.html
    R ckan/templates_legacy/snippets/recline-extra-footer.html
    R ckan/templates_legacy/snippets/recline-extra-header.html
    R ckan/templates_legacy/snippets/revision_list.html
    R ckan/templates_legacy/storage/index.html
    R ckan/templates_legacy/storage/success.html
    R ckan/templates_legacy/tag/__init__.py
    R ckan/templates_legacy/tag/index.html
    R ckan/templates_legacy/tag/layout.html
    R ckan/templates_legacy/tag/read.html
    R ckan/templates_legacy/user/__init__.py
    R ckan/templates_legacy/user/dashboard.html
    R ckan/templates_legacy/user/edit.html
    R ckan/templates_legacy/user/edit_user_form.html
    R ckan/templates_legacy/user/followers.html
    R ckan/templates_legacy/user/layout.html
    R ckan/templates_legacy/user/list.html
    R ckan/templates_legacy/user/login.html
    R ckan/templates_legacy/user/logout.html
    R ckan/templates_legacy/user/logout_first.html
    R ckan/templates_legacy/user/new.html
    R ckan/templates_legacy/user/new_user_form.html
    R ckan/templates_legacy/user/perform_reset.html
    R ckan/templates_legacy/user/read.html
    R ckan/templates_legacy/user/request_reset.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/api/test_package_search.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_cors.py
    R ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_relationships.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tag_vocab.py
    A ckan/tests/functional/test_tracking.py
    R ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_accept.py
    A ckan/tests/lib/test_authenticator.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    R ckan/tests/lib/test_field_types.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/lib/test_solr_schema_version.py
    M ckan/tests/lib/test_solr_search_index.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/logic/test_tag.py
    A ckan/tests/models/test_follower.py
    M ckan/tests/models/test_group.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_resource.py
    M ckan/tests/models/test_user.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_plugins.py
    R ckan_deb/DEBIAN/control.template
    R ckan_deb/usr/bin/ckan-create-instance
    R ckan_deb/usr/bin/ckan-instance-maintenance
    R ckan_deb/usr/bin/ckan-setup-solr
    R ckan_deb/usr/lib/ckan/common.sh
    A ckanext/datapusher/__init__.py
    A ckanext/datapusher/helpers.py
    A ckanext/datapusher/logic/__init__.py
    A ckanext/datapusher/logic/action.py
    A ckanext/datapusher/logic/auth.py
    A ckanext/datapusher/logic/schema.py
    A ckanext/datapusher/plugin.py
    A ckanext/datapusher/tests/__init__.py
    A ckanext/datapusher/tests/test.py
    R ckanext/datastore/bin/__init__.py
    R ckanext/datastore/bin/datastore_setup.py
    R ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    A ckanext/datastore/helpers.py
    A 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/set_permissions.sql
    M ckanext/datastore/tests/helpers.py
    A ckanext/datastore/tests/sample_datastore_plugin.py
    M ckanext/datastore/tests/test_create.py
    A ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    A ckanext/datastore/tests/test_helpers.py
    A ckanext/datastore/tests/test_interface.py
    A 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
    A ckanext/example_iauthfunctions/__init__.py
    A ckanext/example_iauthfunctions/plugin_v1.py
    A ckanext/example_iauthfunctions/plugin_v2.py
    A ckanext/example_iauthfunctions/plugin_v3.py
    A ckanext/example_iauthfunctions/plugin_v4.py
    A ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
    A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/plugin_v1.py
    A ckanext/example_idatasetform/plugin_v2.py
    A ckanext/example_idatasetform/plugin_v3.py
    A ckanext/example_idatasetform/plugin_v4.py
    A ckanext/example_idatasetform/templates/package/search.html
    A ckanext/example_idatasetform/templates/package/snippets/additional_info.html
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/templates/package/snippets/resource_form.html
    A ckanext/example_idatasetform/tests/__init__.py
    A ckanext/example_idatasetform/tests/test_example_idatasetform.py
    A ckanext/example_iresourcecontroller/__init__.py
    A ckanext/example_iresourcecontroller/plugin.py
    A ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    A ckanext/example_ivalidators/__init__.py
    A ckanext/example_ivalidators/plugin.py
    A ckanext/example_ivalidators/tests/__init__.py
    A ckanext/example_ivalidators/tests/test_ivalidators.py
    A ckanext/example_theme/__init__.py
    A ckanext/example_theme/custom_config_setting/__init__.py
    A ckanext/example_theme/custom_config_setting/plugin.py
    A ckanext/example_theme/custom_config_setting/templates/home/layout1.html
    A ckanext/example_theme/custom_config_setting/templates/snippets
    A ckanext/example_theme/v01_empty_extension/__init__.py
    A ckanext/example_theme/v01_empty_extension/plugin.py
    A ckanext/example_theme/v02_empty_template/__init__.py
    A ckanext/example_theme/v02_empty_template/plugin.py
    A ckanext/example_theme/v02_empty_template/templates/home/index.html
    A ckanext/example_theme/v03_jinja/__init__.py
    A ckanext/example_theme/v03_jinja/plugin.py
    A ckanext/example_theme/v03_jinja/templates/home/index.html
    A ckanext/example_theme/v04_ckan_extends/__init__.py
    A ckanext/example_theme/v04_ckan_extends/plugin.py
    A ckanext/example_theme/v04_ckan_extends/templates/home/index.html
    A ckanext/example_theme/v05_block/__init__.py
    A ckanext/example_theme/v05_block/plugin.py
    A ckanext/example_theme/v05_block/templates/home/layout1.html
    A ckanext/example_theme/v06_super/__init__.py
    A ckanext/example_theme/v06_super/plugin.py
    A ckanext/example_theme/v06_super/templates/home/layout1.html
    A ckanext/example_theme/v07_helper_function/__init__.py
    A ckanext/example_theme/v07_helper_function/plugin.py
    A ckanext/example_theme/v07_helper_function/templates/home/layout1.html
    A ckanext/example_theme/v08_custom_helper_function/__init__.py
    A ckanext/example_theme/v08_custom_helper_function/plugin.py
    A ckanext/example_theme/v08_custom_helper_function/templates/home/layout1.html
    A ckanext/example_theme/v09_snippet/__init__.py
    A ckanext/example_theme/v09_snippet/plugin.py
    A ckanext/example_theme/v09_snippet/templates/home/layout1.html
    A ckanext/example_theme/v10_custom_snippet/__init__.py
    A ckanext/example_theme/v10_custom_snippet/plugin.py
    A ckanext/example_theme/v10_custom_snippet/templates/home/layout1.html
    A ckanext/example_theme/v10_custom_snippet/templates/snippets/example_theme_most_popular_groups.html
    A ckanext/example_theme/v11_HTML_and_CSS/__init__.py
    A ckanext/example_theme/v11_HTML_and_CSS/plugin.py
    A ckanext/example_theme/v11_HTML_and_CSS/templates/home/layout1.html
    A ckanext/example_theme/v11_HTML_and_CSS/templates/snippets/example_theme_most_popular_groups.html
    A ckanext/example_theme/v12_extra_public_dir/__init__.py
    A ckanext/example_theme/v12_extra_public_dir/plugin.py
    A ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
    A ckanext/example_theme/v12_extra_public_dir/templates/home/layout1.html
    A ckanext/example_theme/v12_extra_public_dir/templates/home/snippets/promoted.html
    A ckanext/example_theme/v12_extra_public_dir/templates/snippets
    A ckanext/example_theme/v13_custom_css/__init__.py
    A ckanext/example_theme/v13_custom_css/plugin.py
    A ckanext/example_theme/v13_custom_css/public/example_theme.css
    A ckanext/example_theme/v13_custom_css/public/promoted-image.jpg
    A ckanext/example_theme/v13_custom_css/templates/base.html
    A ckanext/example_theme/v13_custom_css/templates/home
    A ckanext/example_theme/v13_custom_css/templates/snippets
    A ckanext/example_theme/v14_more_custom_css/__init__.py
    A ckanext/example_theme/v14_more_custom_css/plugin.py
    A ckanext/example_theme/v14_more_custom_css/public/example_theme.css
    A ckanext/example_theme/v14_more_custom_css/public/promoted-image.jpg
    A ckanext/example_theme/v14_more_custom_css/templates
    A ckanext/example_theme/v15_fanstatic/__init__.py
    A ckanext/example_theme/v15_fanstatic/fanstatic/example_theme.css
    A ckanext/example_theme/v15_fanstatic/plugin.py
    A ckanext/example_theme/v15_fanstatic/public/promoted-image.jpg
    A ckanext/example_theme/v15_fanstatic/templates/base.html
    A ckanext/example_theme/v15_fanstatic/templates/home
    A ckanext/example_theme/v15_fanstatic/templates/snippets
    A ckanext/example_theme/v16_initialize_a_javascript_module/__init__.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v16_initialize_a_javascript_module/plugin.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    A ckanext/example_theme/v17_popover/__init__.py
    A ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v17_popover/plugin.py
    A ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    A ckanext/example_theme/v18_snippet_api/__init__.py
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v18_snippet_api/plugin.py
    A ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    A ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    A ckanext/example_theme/v19_01_error/__init__.py
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_01_error/plugin.py
    A ckanext/example_theme/v19_01_error/templates
    A ckanext/example_theme/v19_02_error_handling/__init__.py
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_02_error_handling/plugin.py
    A ckanext/example_theme/v19_02_error_handling/templates
    A ckanext/example_theme/v20_pubsub/__init__.py
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v20_pubsub/plugin.py
    A ckanext/example_theme/v20_pubsub/templates
    A ckanext/example_theme/v21_custom_jquery_plugin/__init__.py
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/jquery.greenify.js
    A ckanext/example_theme/v21_custom_jquery_plugin/plugin.py
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/ajax_snippets
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    A ckanext/imageview/__init__.py
    A ckanext/imageview/plugin.py
    A ckanext/imageview/tests/__init__.py
    A ckanext/imageview/tests/test_view.py
    A ckanext/imageview/theme/templates/image_form.html
    A ckanext/imageview/theme/templates/image_view.html
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    R ckanext/pdfpreview/__init__.py
    R ckanext/pdfpreview/plugin.py
    R ckanext/pdfpreview/tests/__init__.py
    R ckanext/pdfpreview/tests/test_preview.py
    R ckanext/pdfpreview/theme/public/css/pdf.css
    R ckanext/pdfpreview/theme/public/css/recline.css
    R ckanext/pdfpreview/theme/public/img/ajaxload-circle.gif
    R ckanext/pdfpreview/theme/public/preview_pdf.js
    R ckanext/pdfpreview/theme/public/resource.config
    R ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    R ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/texture.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/README.md
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/templates/pdf.html
    A ckanext/pdfview/__init__.py
    A ckanext/pdfview/plugin.py
    A ckanext/pdfview/tests/__init__.py
    A ckanext/pdfview/tests/test_view.py
    A ckanext/pdfview/theme/public/css/pdf.css
    A ckanext/pdfview/theme/public/css/recline.css
    A ckanext/pdfview/theme/public/img/ajaxload-circle.gif
    A ckanext/pdfview/theme/public/pdf_view.js
    A ckanext/pdfview/theme/public/resource.config
    A ckanext/pdfview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/zh-TW/viewer.properties
    A ckanext/pdfview/theme/public/vendor/pdfjs/pdf.js
    A ckanext/pdfview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.js
    A ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.min.js
    A ckanext/pdfview/theme/public/vendor/pdfviewer/debugger.js
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/texture.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.css
    A ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.js
    A ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.css
    A ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.js
    A ckanext/pdfview/theme/public/vendor/webL10n/README.md
    A ckanext/pdfview/theme/public/vendor/webL10n/l10n.js
    A ckanext/pdfview/theme/public/vendor/webL10n/l10n.min.js
    A ckanext/pdfview/theme/templates/pdf.html
    R ckanext/reclinepreview/__init__.py
    R ckanext/reclinepreview/plugin.py
    R ckanext/reclinepreview/tests/__init__.py
    R ckanext/reclinepreview/tests/test_preview.py
    R ckanext/reclinepreview/theme/public/css/recline.css
    R ckanext/reclinepreview/theme/public/img/ajaxload-circle.gif
    R ckanext/reclinepreview/theme/public/preview_recline.js
    R ckanext/reclinepreview/theme/public/resource.config
    R ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.js
    R ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.min.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.min.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.min.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.min.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings-white.png
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings.png
    R ckanext/reclinepreview/theme/public/vendor/flot/excanvas.js
    R ckanext/reclinepreview/theme/public/vendor/flot/excanvas.min.js
    R ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.js
    R ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.min.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
    R ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.js
    R ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.min.js
    R ckanext/reclinepreview/theme/public/vendor/json/json2.js
    R ckanext/reclinepreview/theme/public/vendor/json/json2.min.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    R ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.js
    R ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.min.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    R ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.js
    R ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/README.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.css
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.png
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.js
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    R ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.js
    R ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.min.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    R ckanext/reclinepreview/theme/templates/recline.html
    A ckanext/reclineview/__init__.py
    A ckanext/reclineview/plugin.py
    A ckanext/reclineview/tests/__init__.py
    A ckanext/reclineview/tests/test_view.py
    A ckanext/reclineview/theme/public/css/recline.css
    A ckanext/reclineview/theme/public/img/ajaxload-circle.gif
    A ckanext/reclineview/theme/public/recline_view.js
    A ckanext/reclineview/theme/public/resource.config
    A ckanext/reclineview/theme/public/vendor/backbone/1.0.0/backbone.js
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/bootstrap.js
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap-responsive.css
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap.css
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings-white.png
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings.png
    A ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    A ckanext/reclineview/theme/public/vendor/flot/excanvas.js
    A ckanext/reclineview/theme/public/vendor/flot/excanvas.min.js
    A ckanext/reclineview/theme/public/vendor/flot/jquery.flot.js
    A ckanext/reclineview/theme/public/vendor/flot/jquery.flot.time.js
    A ckanext/reclineview/theme/public/vendor/flotr2/flotr2.js
    A ckanext/reclineview/theme/public/vendor/flotr2/flotr2.min.js
    A ckanext/reclineview/theme/public/vendor/jquery/1.7.1/jquery.js
    A ckanext/reclineview/theme/public/vendor/jquery/1.7.1/jquery.min.js
    A ckanext/reclineview/theme/public/vendor/json/json2.js
    A ckanext/reclineview/theme/public/vendor/json/json2.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet-src.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.js
    A ckanext/reclineview/theme/public/vendor/moment/2.0.0/moment.js
    A ckanext/reclineview/theme/public/vendor/mustache/0.5.0-dev/mustache.js
    A ckanext/reclineview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.js
    A ckanext/reclineview/theme/public/vendor/recline/recline.css
    A ckanext/reclineview/theme/public/vendor/recline/recline.dataset.js
    A ckanext/reclineview/theme/public/vendor/recline/recline.js
    A ckanext/reclineview/theme/public/vendor/showdown/20120615/showdown.js
    A ckanext/reclineview/theme/public/vendor/showdown/20120615/showdown.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/README.txt
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowmovemanager.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowselectionmodel.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.js
    A ckanext/reclineview/theme/public/vendor/timeline/css/loading.gif
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.css
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    A ckanext/reclineview/theme/public/vendor/timeline/js/timeline.js
    A ckanext/reclineview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.js
    A ckanext/reclineview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.min.js
    A ckanext/reclineview/theme/public/vendor/underscore/1.4.4/underscore.js
    A ckanext/reclineview/theme/public/widget.recordcount.js
    A ckanext/reclineview/theme/templates/recline_graph_form.html
    A ckanext/reclineview/theme/templates/recline_map_form.html
    A 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/tests/test_stats_plugin.py
    R ckanext/textpreview/__init__.py
    R ckanext/textpreview/plugin.py
    R ckanext/textpreview/tests/__init__.py
    R ckanext/textpreview/tests/test_preview.py
    R ckanext/textpreview/theme/public/LICENSE
    R ckanext/textpreview/theme/public/css/text.css
    R ckanext/textpreview/theme/public/highlight.pack.js
    R ckanext/textpreview/theme/public/preview_text.js
    R ckanext/textpreview/theme/public/resource.config
    R ckanext/textpreview/theme/public/styles/default.css
    R ckanext/textpreview/theme/public/styles/github.css
    R ckanext/textpreview/theme/templates/text.html
    A ckanext/textview/__init__.py
    A ckanext/textview/plugin.py
    A ckanext/textview/tests/__init__.py
    A ckanext/textview/tests/test_view.py
    A ckanext/textview/theme/public/LICENSE
    A ckanext/textview/theme/public/css/text.css
    A ckanext/textview/theme/public/resource.config
    A ckanext/textview/theme/public/styles/default.css
    A ckanext/textview/theme/public/styles/github.css
    A ckanext/textview/theme/public/text_view.js
    A ckanext/textview/theme/public/vendor/highlight.pack.js
    A ckanext/textview/theme/templates/text_form.html
    A ckanext/textview/theme/templates/text_view.html
    A ckanext/webpageview/__init__.py
    A ckanext/webpageview/plugin.py
    A ckanext/webpageview/tests/__init__.py
    A ckanext/webpageview/tests/test_view.py
    A ckanext/webpageview/theme/templates/webpage_form.html
    A ckanext/webpageview/theme/templates/webpage_view.html
    A contrib/docker/apache.conf
    A contrib/docker/apache.wsgi
    A contrib/docker/main.cf
    A contrib/docker/my_init.d/50_configure
    A contrib/docker/my_init.d/70_initdb
    A contrib/docker/nginx.conf
    A contrib/docker/postgresql/Dockerfile
    A contrib/docker/solr/Dockerfile
    A contrib/docker/solr/schema.xml
    A contrib/docker/svc/ckan/run
    A contrib/docker/svc/nginx/run
    A contrib/docker/svc/postfix/run
    M dev-requirements.txt
    A doc/.gitignore
    A doc/_static/ckanlogo.png
    M doc/_templates/footer.html
    R doc/_themes/sphinx-theme-okfn
    M doc/api.rst
    A doc/api/index.rst
    A doc/api/legacy-api.rst
    R doc/apps-ideas.rst
    R doc/authorization.rst
    R doc/background-tasks.rst
    R doc/ckan-coding-standards.rst
    M doc/conf.py
    R doc/configuration.rst
    A doc/contents.rst
    R doc/contributing.rst
    A doc/contributing/architecture.rst
    A doc/contributing/commit-messages.rst
    A doc/contributing/css.rst
    A doc/contributing/database-migrations.rst
    A doc/contributing/documentation.rst
    A doc/contributing/frontend/index.rst
    A doc/contributing/frontend/javascript-module-tutorial.rst
    A doc/contributing/frontend/resources.rst
    A doc/contributing/frontend/template-blocks.rst
    A doc/contributing/frontend/template-tutorial.rst
    A doc/contributing/frontend/templating.rst
    A doc/contributing/html.rst
    A doc/contributing/i18n.rst
    A doc/contributing/index.rst
    A doc/contributing/issues.rst
    A doc/contributing/javascript.rst
    A doc/contributing/pull-requests.rst
    A doc/contributing/python.rst
    A doc/contributing/release-process.rst
    A doc/contributing/reviewing.rst
    A doc/contributing/simple-code-contributions.rst
    A doc/contributing/string-i18n.rst
    A doc/contributing/test.rst
    A doc/contributing/testing.rst
    A doc/contributing/upgrading-dependencies.rst
    R doc/css-coding-standards.rst
    R doc/data-viewer.rst
    R doc/datastore.rst
    R doc/deployment.rst
    R doc/documentation-guidelines.rst
    R doc/email-notifications.rst
    A doc/extensions/adding-custom-fields.rst
    A doc/extensions/best-practices.rst
    A doc/extensions/custom-config-settings.rst
    A doc/extensions/index.rst
    A doc/extensions/plugin-interfaces.rst
    A doc/extensions/plugins-toolkit.rst
    A doc/extensions/testing-extensions.rst
    A doc/extensions/tutorial.rst
    A doc/extensions/validators.rst
    R doc/features.rst
    R doc/filestore.rst
    R doc/form-integration.rst
    R doc/frontend-development.rst
    R doc/getting-started.rst
    R doc/html-coding-standards.rst
    R doc/i18n.rst
    A doc/images/add_dataset_1.jpg
    A doc/images/add_dataset_2.jpg
    A doc/images/add_dataset_3.jpg
    R doc/images/admin-page.png
    A doc/images/ckan_importing_diagram.graphml
    A doc/images/ckan_importing_diagram.png
    R doc/images/ckan_logo_box.png
    A doc/images/create_organization.jpg
    A doc/images/custom-css.png
    A doc/images/customize_look_and_feel.jpg
    A doc/images/debug-footer.png
    A doc/images/edit_dataset.jpg
    A doc/images/example_theme_javascript_popover.png
    A doc/images/example_theme_overlapping_popovers.png
    A doc/images/exploring_datasets.jpg
    A doc/images/extra-public-dir.png
    A doc/images/html_and_css.png
    A doc/images/manage_news_feed.jpg
    A doc/images/manage_organization.jpg
    A doc/images/manage_user_profile.jpg
    A doc/images/manage_users.jpg
    A doc/images/more-custom-css.png
    A doc/images/most-popular-groups-custom-snippet.png
    A doc/images/most-popular-groups-snippet.png
    A doc/images/most-popular-groups.png
    A doc/images/move_dataset_between_organizations.jpg
    A doc/images/recently-changed-packages-activity-stream.png
    A doc/images/register_account.jpg
    A doc/images/search_the_site.jpg
    M doc/index.rst
    R doc/install-from-package.rst
    R doc/install-from-source.rst
    R doc/installing.rst
    R doc/javascript-coding-standards.rst
    R doc/javascript-module-tutorial.rst
    R doc/legacy-api.rst
    R doc/linked-data-and-rdf.rst
    A doc/maintaining/apps-ideas.rst
    A doc/maintaining/authorization.rst
    A doc/maintaining/background-tasks.rst
    A doc/maintaining/configuration.rst
    A doc/maintaining/data-viewer.rst
    A doc/maintaining/datastore.rst
    A doc/maintaining/email-notifications.rst
    A doc/maintaining/filestore.rst
    A doc/maintaining/form-integration.rst
    A doc/maintaining/getting-started.rst
    A doc/maintaining/index.rst
    A doc/maintaining/installing/deployment.rst
    A doc/maintaining/installing/index.rst
    A doc/maintaining/installing/install-from-package.rst
    A doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/installing/install-using-docker.rst
    A doc/maintaining/linked-data-and-rdf.rst
    A doc/maintaining/multilingual.rst
    A doc/maintaining/paster.rst
    A doc/maintaining/solr-multicore.rst
    A doc/maintaining/stats.rst
    A doc/maintaining/tag-vocabularies.rst
    A doc/maintaining/tracking.rst
    A doc/maintaining/upgrading/index.rst
    A doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
    A doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    A doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    A doc/maintaining/upgrading/upgrade-source.rst
    R doc/migration.rst
    R doc/multilingual.rst
    R doc/paster.rst
    R doc/python-coding-standards.rst
    R doc/release-process.rst
    R doc/resources.rst
    R doc/solr-setup.rst
    R doc/stats.rst
    A doc/sysadmin-guide.rst
    R doc/tag-vocabularies.rst
    R doc/template-blocks.rst
    R doc/template-tutorial.rst
    R doc/templating.rst
    R doc/test.rst
    R doc/theming.rst
    A doc/theming/best-practices.rst
    A doc/theming/css.rst
    A doc/theming/fanstatic.rst
    A doc/theming/index.rst
    A doc/theming/javascript-api-client.rst
    A doc/theming/javascript-module-objects-and-methods.rst
    A doc/theming/javascript-sandbox.rst
    A doc/theming/javascript.rst
    A doc/theming/jinja-tags.rst
    A doc/theming/jquery-plugins.rst
    A doc/theming/static-files.rst
    A doc/theming/substitutions.rst
    A doc/theming/template-helper-functions.rst
    A doc/theming/template-snippets.rst
    A doc/theming/templates.rst
    A doc/theming/variables-and-functions.rst
    R doc/toolkit.rst
    R doc/tracking.rst
    R doc/upgrade-package-ckan-1-to-2.rst
    R doc/upgrade-package-to-minor-release.rst
    R doc/upgrade-package-to-patch-release.rst
    R doc/upgrade-source.rst
    R doc/upgrading.rst
    A doc/user-guide.rst
    R doc/writing-extensions.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into package_show-performance-pt3

Conflicts:
	ckan/controllers/api.py
	ckan/logic/action/update.py


  Commit: 3462450d5deb018d5c67d47b7872cfee075f19ee
      https://github.com/ckan/ckan/commit/3462450d5deb018d5c67d47b7872cfee075f19ee
  Author: Ian Ward <ian at excess.org>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/lazyjson.py

  Log Message:
  -----------
  [#1078] smaller simplejson hack: use for_json and pretend to be an int


  Commit: 0afe2dbfbb3155bd5cf7ec4ddf9439a0eb355b08
      https://github.com/ckan/ckan/commit/0afe2dbfbb3155bd5cf7ec4ddf9439a0eb355b08
  Author: Ian Ward <ian at excess.org>
  Date:   2014-12-15 (Mon, 15 Dec 2014)

  Changed paths:
    M ckan/lib/lazyjson.py

  Log Message:
  -----------
  [#1078] inherit from dict to pass some isinstance checks


  Commit: 97620dd84cf87161a9cc85edf70e68c427e04471
      https://github.com/ckan/ckan/commit/97620dd84cf87161a9cc85edf70e68c427e04471
  Author: Ian Ward <ian at excess.org>
  Date:   2014-12-15 (Mon, 15 Dec 2014)

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

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


  Commit: 5bb1349c1b95a3d3ccee7ca27adfc9d8f3ec2a76
      https://github.com/ckan/ckan/commit/5bb1349c1b95a3d3ccee7ca27adfc9d8f3ec2a76
  Author: Ian Ward <ian at excess.org>
  Date:   2014-12-15 (Mon, 15 Dec 2014)

  Changed paths:
    M ckan/lib/lazyjson.py

  Log Message:
  -----------
  [#1078] in my own defense


  Commit: 822fd181e5abb1c039ea33b9a8edd04a9dc8dbb6
      https://github.com/ckan/ckan/commit/822fd181e5abb1c039ea33b9a8edd04a9dc8dbb6
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    A ckan/migration/versions/075_remove_old_authz_model.py
    M ckan/model/__init__.py
    R ckan/model/authz.py
    M ckan/model/user.py
    M ckan/tests/functional/api/model/test_group.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/test_admin.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_user.py

  Log Message:
  -----------
  Removes the old auth models and their use.

Removes all of the old auth models, and contains a migration to delete
the now unused tables.  There are a few components still depending
(secretly behind the scenes) on PackageRole and as a result for this PR
to be complete it needs to re-implement `number_administered_packages``


  Commit: 5578c4254eb821779cdec971d3ae62347929a479
      https://github.com/ckan/ckan/commit/5578c4254eb821779cdec971d3ae62347929a479
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  Remove unused init_configuration_data


  Commit: 13b46c62f09c9251cb9c07da878a441da3d7fd02
      https://github.com/ckan/ckan/commit/13b46c62f09c9251cb9c07da878a441da3d7fd02
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  Remove spurious commit


  Commit: 463bc3e3422ad60a5a00148167115485d93c1bbb
      https://github.com/ckan/ckan/commit/463bc3e3422ad60a5a00148167115485d93c1bbb
  Author: Ian Ward <ian at excess.org>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

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

  Log Message:
  -----------
  [#2382] trust solr package data, don't verify against db


  Commit: 3b21892e806bf0164be2c3974af50db69d620b12
      https://github.com/ckan/ckan/commit/3b21892e806bf0164be2c3974af50db69d620b12
  Author: Ian Ward <ian at excess.org>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M ckan/tests/legacy/functional/api/model/test_group.py
    M ckan/tests/legacy/lib/test_dictization_schema.py

  Log Message:
  -----------
  [#2382] fix broken legacy tests


  Commit: cc2a3332a98f6b9873f89302c854de9fe377c277
      https://github.com/ckan/ckan/commit/cc2a3332a98f6b9873f89302c854de9fe377c277
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M .coveragerc
    M CHANGELOG.rst
    M MANIFEST.in
    M ckan/__init__.py
    A ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/resource_formats.json
    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/related.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/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/dv/LC_MESSAGES/ckan.mo
    M 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
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    A ckan/i18n/eu/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/hr/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/lo/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    A ckan/i18n/my/LC_MESSAGES/ckan.mo
    A ckan/i18n/my/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    A ckan/i18n/ne/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/sw/LC_MESSAGES/ckan.mo
    A ckan/i18n/sw/LC_MESSAGES/ckan.po
    A ckan/i18n/th/LC_MESSAGES/ckan.mo
    A ckan/i18n/th/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/vi_VN/LC_MESSAGES/ckan.mo
    M 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
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.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/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    R ckan/migration/versions/075_remove_old_authz_model.py
    A ckan/migration/versions/075_rename_view_plugins.py
    A ckan/migration/versions/076_rename_view_plugins_2.py
    A ckan/migration/versions/077_remove_old_authz_model.py
    M ckan/model/resource_view.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests.py
    R ckan/new_tests/__init__.py
    R ckan/new_tests/config/__init__.py
    R ckan/new_tests/controllers/__init__.py
    R ckan/new_tests/controllers/test_feed.py
    R ckan/new_tests/controllers/test_group.py
    R ckan/new_tests/controllers/test_package.py
    R ckan/new_tests/controllers/test_util.py
    R ckan/new_tests/factories.py
    R ckan/new_tests/helpers.py
    R ckan/new_tests/lib/__init__.py
    R ckan/new_tests/lib/dictization/__init__.py
    R ckan/new_tests/lib/dictization/test_model_dictize.py
    R ckan/new_tests/lib/navl/__init__.py
    R ckan/new_tests/lib/navl/test_dictization_functions.py
    R ckan/new_tests/lib/navl/test_validators.py
    R ckan/new_tests/lib/search/__init__.py
    R ckan/new_tests/lib/search/test_index.py
    R ckan/new_tests/lib/test_auth_tkt.py
    R ckan/new_tests/lib/test_base.py
    R ckan/new_tests/lib/test_config_tool.py
    R ckan/new_tests/lib/test_helpers.py
    R ckan/new_tests/logic/__init__.py
    R ckan/new_tests/logic/action/__init__.py
    R ckan/new_tests/logic/action/test_create.py
    R ckan/new_tests/logic/action/test_delete.py
    R ckan/new_tests/logic/action/test_get.py
    R ckan/new_tests/logic/action/test_patch.py
    R ckan/new_tests/logic/action/test_update.py
    R ckan/new_tests/logic/auth/__init__.py
    R ckan/new_tests/logic/auth/test_create.py
    R ckan/new_tests/logic/auth/test_delete.py
    R ckan/new_tests/logic/auth/test_init.py
    R ckan/new_tests/logic/auth/test_update.py
    R ckan/new_tests/logic/test_conversion.py
    R ckan/new_tests/logic/test_converters.py
    R ckan/new_tests/logic/test_schema.py
    R ckan/new_tests/logic/test_validators.py
    R ckan/new_tests/migration/__init__.py
    R ckan/new_tests/model/__init__.py
    R ckan/new_tests/model/test_resource.py
    R ckan/new_tests/model/test_resource_view.py
    R ckan/new_tests/model/test_user.py
    R ckan/new_tests/plugins/__init__.py
    R ckan/new_tests/test_authz.py
    R ckan/new_tests/test_coding_standards.py
    R ckan/new_tests/test_factories.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/client.js
    A ckan/public/base/javascript/modules/resource-view-filters-form.js
    A ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/view-filters.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/module.less
    A ckan/public/base/less/resource-view.less
    M ckan/public/base/less/search.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/view-filters.spec.js
    A ckan/public/base/vendor/polyfill-object-keys.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/base.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/snippets/help.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_filters.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/snippets/context.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/tests/__init__.py
    R ckan/tests/ckantestplugins.py
    A ckan/tests/config/__init__.py
    A ckan/tests/config/test_middleware.py
    A ckan/tests/controllers/__init__.py
    A ckan/tests/controllers/test_api.py
    A ckan/tests/controllers/test_feed.py
    A ckan/tests/controllers/test_group.py
    A ckan/tests/controllers/test_package.py
    A ckan/tests/controllers/test_user.py
    A ckan/tests/controllers/test_util.py
    A ckan/tests/factories.py
    R ckan/tests/functional/__init__.py
    R ckan/tests/functional/api/__init__.py
    R ckan/tests/functional/api/base.py
    R ckan/tests/functional/api/model/__init__.py
    R ckan/tests/functional/api/model/test_group.py
    R ckan/tests/functional/api/model/test_group_and_organization_purge.py
    R ckan/tests/functional/api/model/test_licenses.py
    R ckan/tests/functional/api/model/test_package.py
    R ckan/tests/functional/api/model/test_ratings.py
    R ckan/tests/functional/api/model/test_relationships.py
    R ckan/tests/functional/api/model/test_revisions.py
    R ckan/tests/functional/api/model/test_tag.py
    R ckan/tests/functional/api/model/test_vocabulary.py
    R ckan/tests/functional/api/test_activity.py
    R ckan/tests/functional/api/test_api.py
    R ckan/tests/functional/api/test_dashboard.py
    R ckan/tests/functional/api/test_email_notifications.py
    R ckan/tests/functional/api/test_follow.py
    R ckan/tests/functional/api/test_misc.py
    R ckan/tests/functional/api/test_package_search.py
    R ckan/tests/functional/api/test_resource.py
    R ckan/tests/functional/api/test_resource_search.py
    R ckan/tests/functional/api/test_revision_search.py
    R ckan/tests/functional/api/test_user.py
    R ckan/tests/functional/api/test_util.py
    R ckan/tests/functional/base.py
    R ckan/tests/functional/test_activity.py
    R ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_error.py
    R ckan/tests/functional/test_group.py
    R ckan/tests/functional/test_home.py
    R ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_pagination.py
    R ckan/tests/functional/test_preview_interface.py
    R ckan/tests/functional/test_related.py
    R ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_storage.py
    R ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tracking.py
    R ckan/tests/functional/test_user.py
    A ckan/tests/helpers.py
    R ckan/tests/html_check.py
    A ckan/tests/legacy/__init__.py
    A ckan/tests/legacy/ckantestplugins.py
    A ckan/tests/legacy/functional/__init__.py
    A ckan/tests/legacy/functional/api/__init__.py
    A ckan/tests/legacy/functional/api/base.py
    A ckan/tests/legacy/functional/api/model/__init__.py
    A ckan/tests/legacy/functional/api/model/test_group.py
    A ckan/tests/legacy/functional/api/model/test_group_and_organization_purge.py
    A ckan/tests/legacy/functional/api/model/test_licenses.py
    A ckan/tests/legacy/functional/api/model/test_package.py
    A ckan/tests/legacy/functional/api/model/test_ratings.py
    A ckan/tests/legacy/functional/api/model/test_relationships.py
    A ckan/tests/legacy/functional/api/model/test_revisions.py
    A ckan/tests/legacy/functional/api/model/test_tag.py
    A ckan/tests/legacy/functional/api/model/test_vocabulary.py
    A ckan/tests/legacy/functional/api/test_activity.py
    A ckan/tests/legacy/functional/api/test_api.py
    A ckan/tests/legacy/functional/api/test_dashboard.py
    A ckan/tests/legacy/functional/api/test_email_notifications.py
    A ckan/tests/legacy/functional/api/test_follow.py
    A ckan/tests/legacy/functional/api/test_misc.py
    A ckan/tests/legacy/functional/api/test_package_search.py
    A ckan/tests/legacy/functional/api/test_resource.py
    A ckan/tests/legacy/functional/api/test_resource_search.py
    A ckan/tests/legacy/functional/api/test_revision_search.py
    A ckan/tests/legacy/functional/api/test_user.py
    A ckan/tests/legacy/functional/api/test_util.py
    A ckan/tests/legacy/functional/base.py
    A ckan/tests/legacy/functional/test_activity.py
    A ckan/tests/legacy/functional/test_admin.py
    A ckan/tests/legacy/functional/test_error.py
    A ckan/tests/legacy/functional/test_group.py
    A ckan/tests/legacy/functional/test_home.py
    A ckan/tests/legacy/functional/test_package.py
    A ckan/tests/legacy/functional/test_pagination.py
    A ckan/tests/legacy/functional/test_preview_interface.py
    A ckan/tests/legacy/functional/test_related.py
    A ckan/tests/legacy/functional/test_revision.py
    A ckan/tests/legacy/functional/test_storage.py
    A ckan/tests/legacy/functional/test_tag.py
    A ckan/tests/legacy/functional/test_tracking.py
    A ckan/tests/legacy/functional/test_user.py
    A ckan/tests/legacy/html_check.py
    A ckan/tests/legacy/lib/__init__.py
    A ckan/tests/legacy/lib/solr/schema-no-version.xml
    A ckan/tests/legacy/lib/solr/schema-wrong-version.xml
    A ckan/tests/legacy/lib/test_accept.py
    A ckan/tests/legacy/lib/test_alphabet_pagination.py
    A ckan/tests/legacy/lib/test_authenticator.py
    A ckan/tests/legacy/lib/test_cli.py
    A ckan/tests/legacy/lib/test_dictization.py
    A ckan/tests/legacy/lib/test_dictization_schema.py
    A ckan/tests/legacy/lib/test_email_notifications.py
    A ckan/tests/legacy/lib/test_hash.py
    A ckan/tests/legacy/lib/test_helpers.py
    A ckan/tests/legacy/lib/test_i18n.py
    A ckan/tests/legacy/lib/test_mailer.py
    A ckan/tests/legacy/lib/test_navl.py
    A ckan/tests/legacy/lib/test_resource_search.py
    A ckan/tests/legacy/lib/test_simple_search.py
    A ckan/tests/legacy/lib/test_solr_package_search.py
    A ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py
    A ckan/tests/legacy/lib/test_solr_schema_version.py
    A ckan/tests/legacy/lib/test_solr_search_index.py
    A ckan/tests/legacy/lib/test_tag_search.py
    A ckan/tests/legacy/logic/__init__.py
    A ckan/tests/legacy/logic/test_action.py
    A ckan/tests/legacy/logic/test_auth.py
    A ckan/tests/legacy/logic/test_init.py
    A ckan/tests/legacy/logic/test_member.py
    A ckan/tests/legacy/logic/test_tag.py
    A ckan/tests/legacy/logic/test_tag_vocab.py
    A ckan/tests/legacy/logic/test_validators.py
    A ckan/tests/legacy/misc/__init__.py
    A ckan/tests/legacy/misc/test_format_text.py
    A ckan/tests/legacy/misc/test_mock_mail_server.py
    A ckan/tests/legacy/misc/test_sync.py
    A ckan/tests/legacy/mock_mail_server.py
    A ckan/tests/legacy/mock_plugin.py
    A ckan/tests/legacy/models/__init__.py
    A ckan/tests/legacy/models/test_activity.py
    A ckan/tests/legacy/models/test_extras.py
    A ckan/tests/legacy/models/test_follower.py
    A ckan/tests/legacy/models/test_group.py
    A ckan/tests/legacy/models/test_license.py
    A ckan/tests/legacy/models/test_misc.py
    A ckan/tests/legacy/models/test_package.py
    A ckan/tests/legacy/models/test_package_relationships.py
    A ckan/tests/legacy/models/test_purge_revision.py
    A ckan/tests/legacy/models/test_resource.py
    A ckan/tests/legacy/models/test_revision.py
    A ckan/tests/legacy/models/test_user.py
    A ckan/tests/legacy/pylons_controller.py
    A ckan/tests/legacy/schema/__init__.py
    A ckan/tests/legacy/schema/test_schema.py
    A ckan/tests/legacy/test_coding_standards.py
    A ckan/tests/legacy/test_dumper.py
    A ckan/tests/legacy/test_plugins.py
    A ckan/tests/legacy/test_versions.py
    A ckan/tests/legacy/test_wsgi_ckanclient.py
    A ckan/tests/legacy/wsgi_ckanclient.py
    M ckan/tests/lib/__init__.py
    A ckan/tests/lib/dictization/__init__.py
    A ckan/tests/lib/dictization/test_model_dictize.py
    A ckan/tests/lib/navl/__init__.py
    A ckan/tests/lib/navl/test_dictization_functions.py
    A ckan/tests/lib/navl/test_validators.py
    A ckan/tests/lib/search/__init__.py
    A ckan/tests/lib/search/test_index.py
    R ckan/tests/lib/solr/schema-no-version.xml
    R ckan/tests/lib/solr/schema-wrong-version.xml
    R ckan/tests/lib/test_accept.py
    R ckan/tests/lib/test_alphabet_pagination.py
    A ckan/tests/lib/test_auth_tkt.py
    R ckan/tests/lib/test_authenticator.py
    A ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_cli.py
    A ckan/tests/lib/test_config_tool.py
    M ckan/tests/lib/test_datapreview.py
    R ckan/tests/lib/test_dictization.py
    R ckan/tests/lib/test_dictization_schema.py
    R ckan/tests/lib/test_email_notifications.py
    R ckan/tests/lib/test_hash.py
    M ckan/tests/lib/test_helpers.py
    R ckan/tests/lib/test_i18n.py
    R ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_munge.py
    R ckan/tests/lib/test_navl.py
    R ckan/tests/lib/test_resource_search.py
    R ckan/tests/lib/test_simple_search.py
    R ckan/tests/lib/test_solr_package_search.py
    R ckan/tests/lib/test_solr_package_search_synchronous_update.py
    R ckan/tests/lib/test_solr_schema_version.py
    R ckan/tests/lib/test_solr_search_index.py
    R ckan/tests/lib/test_tag_search.py
    A ckan/tests/logic/action/__init__.py
    A ckan/tests/logic/action/test_create.py
    A ckan/tests/logic/action/test_delete.py
    A ckan/tests/logic/action/test_get.py
    A ckan/tests/logic/action/test_patch.py
    A ckan/tests/logic/action/test_update.py
    A ckan/tests/logic/auth/__init__.py
    A ckan/tests/logic/auth/test_create.py
    A ckan/tests/logic/auth/test_delete.py
    A ckan/tests/logic/auth/test_get.py
    A ckan/tests/logic/auth/test_init.py
    A ckan/tests/logic/auth/test_update.py
    R ckan/tests/logic/test_action.py
    R ckan/tests/logic/test_auth.py
    A ckan/tests/logic/test_conversion.py
    A ckan/tests/logic/test_converters.py
    R ckan/tests/logic/test_init.py
    R ckan/tests/logic/test_member.py
    A ckan/tests/logic/test_schema.py
    R ckan/tests/logic/test_tag.py
    R ckan/tests/logic/test_tag_vocab.py
    M ckan/tests/logic/test_validators.py
    A ckan/tests/migration/__init__.py
    R ckan/tests/misc/__init__.py
    R ckan/tests/misc/test_format_text.py
    R ckan/tests/misc/test_mock_mail_server.py
    R ckan/tests/misc/test_sync.py
    R ckan/tests/mock_mail_server.py
    R ckan/tests/mock_plugin.py
    A ckan/tests/model/__init__.py
    A ckan/tests/model/test_resource.py
    A ckan/tests/model/test_resource_view.py
    A ckan/tests/model/test_user.py
    R ckan/tests/models/__init__.py
    R ckan/tests/models/test_activity.py
    R ckan/tests/models/test_extras.py
    R ckan/tests/models/test_follower.py
    R ckan/tests/models/test_group.py
    R ckan/tests/models/test_license.py
    R ckan/tests/models/test_misc.py
    R ckan/tests/models/test_package.py
    R ckan/tests/models/test_package_relationships.py
    R ckan/tests/models/test_purge_revision.py
    R ckan/tests/models/test_resource.py
    R ckan/tests/models/test_revision.py
    R ckan/tests/models/test_user.py
    A ckan/tests/plugins/__init__.py
    R ckan/tests/pylons_controller.py
    R ckan/tests/schema/__init__.py
    R ckan/tests/schema/test_schema.py
    A ckan/tests/test_authz.py
    M ckan/tests/test_coding_standards.py
    R ckan/tests/test_dumper.py
    A ckan/tests/test_factories.py
    R ckan/tests/test_plugins.py
    R ckan/tests/test_versions.py
    R ckan/tests/test_wsgi_ckanclient.py
    R ckan/tests/wsgi_ckanclient.py
    A ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    A ckanext/datapusher/tests/test_default_views.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/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_helpers.py
    A 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/tests/test_example_iauthfunctions.py
    A ckanext/example_iconfigurer/__init__.py
    A ckanext/example_iconfigurer/controller.py
    A ckanext/example_iconfigurer/plugin.py
    A ckanext/example_iconfigurer/templates/admin/myext_config.html
    A ckanext/example_iconfigurer/tests/__init__.py
    A ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    A ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/imageview/theme/templates/image_view.html
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    R ckanext/pdfview/__init__.py
    R ckanext/pdfview/plugin.py
    R ckanext/pdfview/tests/__init__.py
    R ckanext/pdfview/tests/test_view.py
    R ckanext/pdfview/theme/public/css/pdf.css
    R ckanext/pdfview/theme/public/css/recline.css
    R ckanext/pdfview/theme/public/img/ajaxload-circle.gif
    R ckanext/pdfview/theme/public/pdf_view.js
    R ckanext/pdfview/theme/public/resource.config
    R ckanext/pdfview/theme/public/vendor/l10n/ar/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ar/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ca/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/cs/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/cs/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/da/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/de/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/de/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/el/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/es/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/he/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/he/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/it/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/it/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ja/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ko/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/locale.properties.js
    R ckanext/pdfview/theme/public/vendor/l10n/lt/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/lt/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/lt/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/nl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ro/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ro/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ru/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ru/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sv/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/tr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/vi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/viewer.properties
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-small.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/shadow.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/texture.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.js
    R ckanext/pdfview/theme/public/vendor/webL10n/README.md
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/pdfview/theme/templates/pdf.html
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_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
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/templating.rst
    M doc/contributing/test.rst
    M doc/contributing/testing.rst
    M doc/extensions/adding-custom-fields.rst
    A doc/images/image_view.png
    A doc/images/manage_views.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/views_overview.png
    A doc/images/webpage_view.png
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/filestore.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 1903-new-authz-removal

Conflicts:
	ckan/lib/create_test_data.py
	ckan/logic/action/create.py
	ckan/logic/action/get.py
	ckan/model/user.py
	ckan/tests/legacy/logic/test_action.py
	ckan/tests/legacy/models/test_user.py


  Commit: 8c54930584e787407342dbcf6441f2132482b53f
      https://github.com/ckan/ckan/commit/8c54930584e787407342dbcf6441f2132482b53f
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M ckan/tests/legacy/models/test_user.py

  Log Message:
  -----------
  Reenable test that had the code fixed on master.


  Commit: 80225dc908a598f47a30a35ddf1e8f0e06a73f3e
      https://github.com/ckan/ckan/commit/80225dc908a598f47a30a35ddf1e8f0e06a73f3e
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

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

  Log Message:
  -----------
  Clean up a test.


  Commit: 7d72bddb37529f3757c482bb590fc44798d137e9
      https://github.com/ckan/ckan/commit/7d72bddb37529f3757c482bb590fc44798d137e9
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    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

  Log Message:
  -----------
  Fix stats extension.


  Commit: 07544b6cb9c898ad21155986e30aafa19088f32e
      https://github.com/ckan/ckan/commit/07544b6cb9c898ad21155986e30aafa19088f32e
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M ckan/tests/legacy/__init__.py

  Log Message:
  -----------
  Remove reference to deleted table


  Commit: 62a568554bc513c8d8f44ebf20f6656e631f1a01
      https://github.com/ckan/ckan/commit/62a568554bc513c8d8f44ebf20f6656e631f1a01
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M ckan/logic/action/update.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  Remove user_role_update which used the user_object_role table.


  Commit: 274aae4b8aa5cd5d3491468b90ee0c04d80e4996
      https://github.com/ckan/ckan/commit/274aae4b8aa5cd5d3491468b90ee0c04d80e4996
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-04-15 (Wed, 15 Apr 2015)

  Changed paths:
    M ckan/lib/create_test_data.py
    M ckanext/stats/stats.py
    M ckanext/stats/tests/test_stats_lib.py

  Log Message:
  -----------
  package admin has no meaning now, so removed from create_arbitrary(). Fix stat test.


  Commit: b4a99a1b2e2cd5f7d81cd1631aee9159f13c56db
      https://github.com/ckan/ckan/commit/b4a99a1b2e2cd5f7d81cd1631aee9159f13c56db
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-04-15 (Wed, 15 Apr 2015)

  Changed paths:
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/test_package.py

  Log Message:
  -----------
  Fix tests - package admin role has gone.


  Commit: e119ea025a82e8db356877b6fdb16d77f55de39d
      https://github.com/ckan/ckan/commit/e119ea025a82e8db356877b6fdb16d77f55de39d
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2015-05-03 (Sun, 03 May 2015)

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  Delete unused bits of the storage controller


  Commit: 8b0250591a4d960e4aa4a1e8c5ff883658f991ee
      https://github.com/ckan/ckan/commit/8b0250591a4d960e4aa4a1e8c5ff883658f991ee
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2015-05-03 (Sun, 03 May 2015)

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  Remove unused imports in the storage controller


  Commit: 988f06ce8e551ba54e0c3a51e9df2c8c52346975
      https://github.com/ckan/ckan/commit/988f06ce8e551ba54e0c3a51e9df2c8c52346975
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2015-05-03 (Sun, 03 May 2015)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  Remove unused paths from routing


  Commit: 8a5f1bb241653280ba123490de9ca5bd18fa35d9
      https://github.com/ckan/ckan/commit/8a5f1bb241653280ba123490de9ca5bd18fa35d9
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2015-05-03 (Sun, 03 May 2015)

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  Remove more unused bits of storage controller


  Commit: 3c3eafe1b5fd8a37a828b2d29fc6f3bf5f72574d
      https://github.com/ckan/ckan/commit/3c3eafe1b5fd8a37a828b2d29fc6f3bf5f72574d
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2015-05-03 (Sun, 03 May 2015)

  Changed paths:
    R ckan/tests/legacy/functional/test_storage.py

  Log Message:
  -----------
  Remove unnecessary legacy test


  Commit: 45b9413a36fee3dd96ed9d1c2dcfb3a97012b096
      https://github.com/ckan/ckan/commit/45b9413a36fee3dd96ed9d1c2dcfb3a97012b096
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2015-05-03 (Sun, 03 May 2015)

  Changed paths:
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  Remove legacy coding standards test


  Commit: 01c2d139f25607e06a5dd09a489879ea7f1a422a
      https://github.com/ckan/ckan/commit/01c2d139f25607e06a5dd09a489879ea7f1a422a
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-05-15 (Fri, 15 May 2015)

  Changed paths:
    M ckan/plugins/interfaces.py
    M ckan/tests/legacy/ckantestplugins.py
    M ckan/tests/legacy/test_plugins.py

  Log Message:
  -----------
  [#2426] Acknowledge that before_delete only fires on PURGE not DELETE of an object. Adjusted docs and added test.


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

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/model/license.py
    M ckan/plugins/toolkit.py
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/snippets/user_search.html
    A ckan/tests/config/test_environment.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/legacy/functional/test_group.py
    R ckan/tests/legacy/models/test_license.py
    M ckan/tests/logic/action/test_get.py
    A ckan/tests/model/licenses.v1
    A ckan/tests/model/licenses.v2
    A ckan/tests/model/test_license.py
    A ckanext/example_igroupform/__init__.py
    A ckanext/example_igroupform/plugin.py
    A ckanext/example_igroupform/tests/__init__.py
    A ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    M contrib/docker/my_init.d/50_configure
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 1903-new-authz-removal


  Commit: 7d22c0c5a56d6dea314ccd6a29d437ece686a993
      https://github.com/ckan/ckan/commit/7d22c0c5a56d6dea314ccd6a29d437ece686a993
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M ckan/lib/i18n.py
    M ckan/lib/plugins.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#959] add ITranslations interface

This allows extensions to merge in their own translations with the main
ckan mo file. Each extension should have an 'i18n' directory in the root
directory of their repo containing its translations. The gettext domain
(and hence filename) of the .mo files should be ckanext-{extname}


  Commit: 5ffd13a36dc16dfbff76ba5bc29ab22e53c2f640
      https://github.com/ckan/ckan/commit/5ffd13a36dc16dfbff76ba5bc29ab22e53c2f640
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M ckan/lib/i18n.py
    M ckan/lib/plugins.py
    M ckan/plugins/interfaces.py
    A ckanext/example_itranslation/__init__.py
    A ckanext/example_itranslation/babel_mapping.cfg
    A ckanext/example_itranslation/i18n/ckanext-example_translation.pot
    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/templates/home/index.html
    A ckanext/example_itranslation/tests/__init__.py
    A ckanext/example_itranslation/tests/test_plugin.py
    M setup.py

  Log Message:
  -----------
  [#959] Add example ITranslation plugin


  Commit: 4bb5b4291eaf8bd55316751c791b81d423cf3d2b
      https://github.com/ckan/ckan/commit/4bb5b4291eaf8bd55316751c791b81d423cf3d2b
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M ckanext/example_itranslation/tests/test_plugin.py

  Log Message:
  -----------
  [#959] Tests for example_itranslation plugin


  Commit: 0e9dfaac9648835620042dfb99b3bac2c3478e3d
      https://github.com/ckan/ckan/commit/0e9dfaac9648835620042dfb99b3bac2c3478e3d
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M ckanext/example_itranslation/tests/test_plugin.py

  Log Message:
  -----------
  [#959] Add double check for example_itranslation tests


  Commit: 93d3a542e28cbfe0f729fa9cfafae7a618d85ba1
      https://github.com/ckan/ckan/commit/93d3a542e28cbfe0f729fa9cfafae7a618d85ba1
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M ckan/lib/i18n.py
    M ckanext/example_itranslation/tests/test_plugin.py

  Log Message:
  -----------
  [#959] ITranslation interface fix

Only add translations strings for the current locale (instead of all).
Allow 'en' translation strings in extensions to overwrite core strings.


  Commit: 4f199d1a1c97b7ee318209e942bab90e45565350
      https://github.com/ckan/ckan/commit/4f199d1a1c97b7ee318209e942bab90e45565350
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M ckan/lib/i18n.py
    M ckan/lib/plugins.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#959] extra 18n directory, rename interface names

Add config options
  'ckan.i18n.extra_directory'
  'ckan.i18n.extra_gettext_domain'
  'ckan.i18n.extra_locales'

'ckan.i18n.extra_directory' should be a fully qualified path
'ckan.i18n.extra_gettext_domain' should be the filename of mo files
'ckan.i18n.extra_locales' should be a list for each locale handled

Rename the interfaces method names to reduce the risk of clashing
'domain' and 'directory' are too generic and might be used by other
plugins in the future and there is no indication as a plugin writer that
these methods are related to the ITranslation interface. So they have
been changed to 'i18n_domain' etc.


  Commit: c135d4c83ea0333ac6d38e352e19aaef5b0b8cc7
      https://github.com/ckan/ckan/commit/c135d4c83ea0333ac6d38e352e19aaef5b0b8cc7
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

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

  Log Message:
  -----------
  [#959]ITranslations, check config options and docs


  Commit: 10b8db8f387cb518b27748250ed2c5319934e2f2
      https://github.com/ckan/ckan/commit/10b8db8f387cb518b27748250ed2c5319934e2f2
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    A ckanext/example_itranslation/i18n/ckanext-example_itranslation.pot
    R ckanext/example_itranslation/i18n/ckanext-example_translation.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
    M ckanext/example_itranslation/tests/test_plugin.py

  Log Message:
  -----------
  [#959] example_itranslation test for 'en' string replacements

Add a test for checking that 'en' replacement strings which are handled
as a special case work


  Commit: 9793ce98bbebb62137cd314b3f4c0bd060624263
      https://github.com/ckan/ckan/commit/9793ce98bbebb62137cd314b3f4c0bd060624263
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-06-25 (Thu, 25 Jun 2015)

  Changed paths:
    M ckanext/stats/controller.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
    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

  Log Message:
  -----------
  [#2493] Stats extension clean-up

* removed templates_legacy - no-one uses these. Removed associated
  style.css.
* leaderboard goes with it as there is no jinja equiv and no interest.
  Removed associated controller, demo.html and app.js.


  Commit: 55c10f18ba277b0c972f03f28e983fc16824a85e
      https://github.com/ckan/ckan/commit/55c10f18ba277b0c972f03f28e983fc16824a85e
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-06-26 (Fri, 26 Jun 2015)

  Changed paths:
    M ckan/controllers/home.py
    A ckan/tests/controllers/test_home.py
    R ckan/tests/legacy/functional/test_home.py

  Log Message:
  -----------
  Remove open-id related messages. Moved home controller tests from legacy.


  Commit: 5e874a3e84c4326cf0df4329b0ee19b576bd885d
      https://github.com/ckan/ckan/commit/5e874a3e84c4326cf0df4329b0ee19b576bd885d
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-06-30 (Tue, 30 Jun 2015)

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

  Log Message:
  -----------
  An IUploader interface


  Commit: c0c5cd4fd54471c007c67cf197230410a09651d6
      https://github.com/ckan/ckan/commit/c0c5cd4fd54471c007c67cf197230410a09651d6
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-06-30 (Tue, 30 Jun 2015)

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

  Log Message:
  -----------
  [#2510] IUploader for resource_create


  Commit: 88218c2944b34a8d0ef84001ad10a92106cc9076
      https://github.com/ckan/ckan/commit/88218c2944b34a8d0ef84001ad10a92106cc9076
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-06-30 (Tue, 30 Jun 2015)

  Changed paths:
    M ckan/lib/formatters.py
    M doc/maintaining/configuration.rst
    M requirements.txt

  Log Message:
  -----------
  [#2494] New option to change the timezone of displayed datetimes


  Commit: ec775eda559318ca03976a371583224c1bab9d92
      https://github.com/ckan/ckan/commit/ec775eda559318ca03976a371583224c1bab9d92
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-06-30 (Tue, 30 Jun 2015)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/util.py

  Log Message:
  -----------
  [#2494] Add a new API endpoint to set timezone offset


  Commit: 58abf6899e913d0a7e31f65aae249ee6f3db5b0c
      https://github.com/ckan/ckan/commit/58abf6899e913d0a7e31f65aae249ee6f3db5b0c
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-06-30 (Tue, 30 Jun 2015)

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

  Log Message:
  -----------
  [#2494] Make sure the new timezone endpoint gets called in JavaScript


  Commit: dee22ac0e9dc5211fbfe17d888501054e47c9f69
      https://github.com/ckan/ckan/commit/dee22ac0e9dc5211fbfe17d888501054e47c9f69
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-06-30 (Tue, 30 Jun 2015)

  Changed paths:
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#2494] Displayed all datetimes with the users utc offset

- This is either saved in the beaker session
- otherwise it defaults to zero
- The display of a full date also shows the currently used timezone
  incl. the offset (e.g. UTC+2)


  Commit: c622d2367046938d5c26cb28f7536dcfaf7c90f6
      https://github.com/ckan/ckan/commit/c622d2367046938d5c26cb28f7536dcfaf7c90f6
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-01 (Wed, 01 Jul 2015)

  Changed paths:
    M ckan/controllers/util.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#2494] Validate the offset before saving it in the session


  Commit: 53ed142963b02c59de8bf71c5a764f9903bc9e49
      https://github.com/ckan/ckan/commit/53ed142963b02c59de8bf71c5a764f9903bc9e49
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-01 (Wed, 01 Jul 2015)

  Changed paths:
    M ckan/tests/controllers/test_util.py
    M ckan/tests/legacy/lib/test_helpers.py

  Log Message:
  -----------
  [#2494] Add timzone tests for util controller and helper


  Commit: b27e31e3ba423eaf690b7d6c3b482fc67601acb7
      https://github.com/ckan/ckan/commit/b27e31e3ba423eaf690b7d6c3b482fc67601acb7
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-01 (Wed, 01 Jul 2015)

  Changed paths:
    M ckan/controllers/util.py

  Log Message:
  -----------
  [#2494] Make PEP-8 happy


  Commit: f3cf47d77e2674c05d72015de59c96c2a3f93113
      https://github.com/ckan/ckan/commit/f3cf47d77e2674c05d72015de59c96c2a3f93113
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-07-01 (Wed, 01 Jul 2015)

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

  Log Message:
  -----------
  [#2510] Uploader class selection centralised


  Commit: ae10c834f48799085dae131fd113e90444d6b3de
      https://github.com/ckan/ckan/commit/ae10c834f48799085dae131fd113e90444d6b3de
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-01 (Wed, 01 Jul 2015)

  Changed paths:
    M ckan/tests/controllers/test_util.py
    M ckan/tests/legacy/lib/test_helpers.py

  Log Message:
  -----------
  [#2494] Fix broken tests


  Commit: 4aa691a44fb621c97b75df6a56f40a655edde144
      https://github.com/ckan/ckan/commit/4aa691a44fb621c97b75df6a56f40a655edde144
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-01 (Wed, 01 Jul 2015)

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

  Log Message:
  -----------
  Try to fix the session-based test


  Commit: 2863a05ed9c7da1a221e6faafeeb376c21a62301
      https://github.com/ckan/ckan/commit/2863a05ed9c7da1a221e6faafeeb376c21a62301
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-01 (Wed, 01 Jul 2015)

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

  Log Message:
  -----------
  Import assert_true in test


  Commit: 013040bb384e118ea9d84a84881bdd93a2098bcd
      https://github.com/ckan/ckan/commit/013040bb384e118ea9d84a84881bdd93a2098bcd
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-01 (Wed, 01 Jul 2015)

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

  Log Message:
  -----------
  Replace assert_true with assert_in


  Commit: d8d0f79f6d02d2f70421ae11e35b4f8ca01c8e81
      https://github.com/ckan/ckan/commit/d8d0f79f6d02d2f70421ae11e35b4f8ca01c8e81
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-01 (Wed, 01 Jul 2015)

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

  Log Message:
  -----------
  Add PylonsTestCase to test session-based behaviour


  Commit: 5988cef8e79ce6d19f70b3199799a95155e0834f
      https://github.com/ckan/ckan/commit/5988cef8e79ce6d19f70b3199799a95155e0834f
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-07-02 (Thu, 02 Jul 2015)

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

  Log Message:
  -----------
  [#2510] Rename get_uploader interface method.

More specific to resource uploading: get_resource_uploader().


  Commit: 716a89aaed8cc56332ba9e3c3a68d931e37cdd80
      https://github.com/ckan/ckan/commit/716a89aaed8cc56332ba9e3c3a68d931e37cdd80
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-07-02 (Thu, 02 Jul 2015)

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

  Log Message:
  -----------
  [#2510] General file uploader interface


  Commit: f1a1f5a6afa850cb7502d4858c2e375541666d25
      https://github.com/ckan/ckan/commit/f1a1f5a6afa850cb7502d4858c2e375541666d25
  Author: Ian Ward <ian at excess.org>
  Date:   2015-07-03 (Fri, 03 Jul 2015)

  Changed paths:
    R doc/api.rst

  Log Message:
  -----------
  [#2517] remove api.html to allow rtd redirect to work


  Commit: 1896f532f966b341064f099b61b6221764476677
      https://github.com/ckan/ckan/commit/1896f532f966b341064f099b61b6221764476677
  Author: Ian Ward <ian at excess.org>
  Date:   2015-07-03 (Fri, 03 Jul 2015)

  Changed paths:
    M doc/contents.rst
    M doc/index.rst

  Log Message:
  -----------
  [#2517] partial table of contents more useful than section descriptions


  Commit: 0572ec49d8828156ab5a06cf0485ed12c091589b
      https://github.com/ckan/ckan/commit/0572ec49d8828156ab5a06cf0485ed12c091589b
  Author: Ian Ward <ian at excess.org>
  Date:   2015-07-03 (Fri, 03 Jul 2015)

  Changed paths:
    M doc/contributing/reviewing.rst

  Log Message:
  -----------
  [#2517] fix api link in reviewing doc


  Commit: 27fb79b2e6bae199fa4a7ba37b148c0eef6b7151
      https://github.com/ckan/ckan/commit/27fb79b2e6bae199fa4a7ba37b148c0eef6b7151
  Author: Ian Ward <ian at excess.org>
  Date:   2015-07-03 (Fri, 03 Jul 2015)

  Changed paths:
    M doc/index.rst

  Log Message:
  -----------
  [#2517] suppress sphinx warning


  Commit: 0857bbdbf68eb37e2d213d07374f018fa660963d
      https://github.com/ckan/ckan/commit/0857bbdbf68eb37e2d213d07374f018fa660963d
  Author: Ian Ward <ian at excess.org>
  Date:   2015-07-03 (Fri, 03 Jul 2015)

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

  Log Message:
  -----------
  [#2518] render tracebacks from datapusher


  Commit: bf17fbc3b1da557ac9c69f9b50691b03995a8399
      https://github.com/ckan/ckan/commit/bf17fbc3b1da557ac9c69f9b50691b03995a8399
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-07-06 (Mon, 06 Jul 2015)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/tests/controllers/test_api.py
    R ckan/tests/legacy/functional/api/test_revision_search.py
    M doc/api/legacy-api.rst

  Log Message:
  -----------
  Add limit revision search. Redid tests from legacy.


  Commit: 0ae0573724bc79da8865d7890b90b721471f5fd3
      https://github.com/ckan/ckan/commit/0ae0573724bc79da8865d7890b90b721471f5fd3
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-07-06 (Mon, 06 Jul 2015)

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

  Log Message:
  -----------
  [#1431] Add "since_id" and "since_time" to revision_list so that you can page through revisions.


  Commit: 73cd88df87630f56a61c4f17647ae96028abbe0a
      https://github.com/ckan/ckan/commit/73cd88df87630f56a61c4f17647ae96028abbe0a
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-07-06 (Mon, 06 Jul 2015)

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

  Log Message:
  -----------
  [#1431] Docstring.


  Commit: bf64b5689ba6d5dfba3cd0387d2d33e0f5b30c89
      https://github.com/ckan/ckan/commit/bf64b5689ba6d5dfba3cd0387d2d33e0f5b30c89
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-07-06 (Mon, 06 Jul 2015)

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

  Log Message:
  -----------
  [#1431] Revert sort to "newest first" as it always was. Add sort param to allow chronological, which makes more sense.


  Commit: 17ede31f2edeeec1403bf7e343a3e9e5a9e1c1f2
      https://github.com/ckan/ckan/commit/17ede31f2edeeec1403bf7e343a3e9e5a9e1c1f2
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-07-07 (Tue, 07 Jul 2015)

  Changed paths:
    M ckan/authz.py

  Log Message:
  -----------
  Creates reams of logging on the first request - not needed unless working on this specific code.


  Commit: 8796897b8fe021c339eaf108fb9a60ca29b08f77
      https://github.com/ckan/ckan/commit/8796897b8fe021c339eaf108fb9a60ca29b08f77
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M requirements.in

  Log Message:
  -----------
  Add pytz requirement


  Commit: 75db95755a19366870ceb6cf6a43a58f86c0cf71
      https://github.com/ckan/ckan/commit/75db95755a19366870ceb6cf6a43a58f86c0cf71
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/util.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/public/base/javascript/main.js
    M ckan/tests/controllers/test_util.py
    M ckan/tests/legacy/lib/test_helpers.py

  Log Message:
  -----------
  Remove timezone api


  Commit: 777f3d9e080b74c684c6b3d118971096327507fe
      https://github.com/ckan/ckan/commit/777f3d9e080b74c684c6b3d118971096327507fe
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M ckan/config/resource_formats.json
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  Correct msword mimetype. Add alternative mimetypes for recognizing Excel files.


  Commit: 38e4f5071f0eefc2574b5d6462a093f04305ab60
      https://github.com/ckan/ckan/commit/38e4f5071f0eefc2574b5d6462a093f04305ab60
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M ckan/lib/formatters.py

  Log Message:
  -----------
  [#2494] Fix comment of timezone format


  Commit: 5d3f42d3f788820024d2f653165374accd9a8128
      https://github.com/ckan/ckan/commit/5d3f42d3f788820024d2f653165374accd9a8128
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#2494] Move timezone conversion to _datestamp_to_datetime()


  Commit: 7d1d391def7d61fe08d1824ceaa3e0e230f8d21b
      https://github.com/ckan/ckan/commit/7d1d391def7d61fe08d1824ceaa3e0e230f8d21b
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M ckan/lib/formatters.py

  Log Message:
  -----------
  [#2494] Only set UTC if datetime has no timezone info yet


  Commit: 514444ffe077071c9b6925288ab8120d26948ea1
      https://github.com/ckan/ckan/commit/514444ffe077071c9b6925288ab8120d26948ea1
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M ckan/public/base/javascript/main.js
    A ckan/public/base/vendor/moment.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/package/snippets/additional_info.html

  Log Message:
  -----------
  [#2494] Add moment.js and load dates in browser timezone


  Commit: a164ac7ff32642f32bf780462727dacb2953a3bb
      https://github.com/ckan/ckan/commit/a164ac7ff32642f32bf780462727dacb2953a3bb
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

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

  Log Message:
  -----------
  [#2494] Hide dates when JavaScript is active to prevent flickering


  Commit: dabc0c84866eca607d4b0ab22dbd5b570a87c616
      https://github.com/ckan/ckan/commit/dabc0c84866eca607d4b0ab22dbd5b570a87c616
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M ckan/lib/formatters.py

  Log Message:
  -----------
  [#2494] Make sure only 'aware' date objects are compared


  Commit: 7989b55f41e8446f36cb407016c1ba28c02defbd
      https://github.com/ckan/ckan/commit/7989b55f41e8446f36cb407016c1ba28c02defbd
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M ckan/lib/formatters.py

  Log Message:
  -----------
  [#2494] Remove unused imports


  Commit: c01c954c568e7dba73430c1f64e2ca63453f6416
      https://github.com/ckan/ckan/commit/c01c954c568e7dba73430c1f64e2ca63453f6416
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M ckan/lib/formatters.py
    M ckan/public/base/javascript/main.js
    A ckan/public/base/vendor/moment-with-locales.js
    R ckan/public/base/vendor/moment.js
    M ckan/public/base/vendor/resource.config
    M ckan/tests/legacy/lib/test_helpers.py

  Log Message:
  -----------
  [#2494] Cleanup code

- Rename moment to make clear it's moment+locales
- Use attribute name for jquery.data()
- Fix broken test


  Commit: 45ac16ef4856cff17578e2810629db2a5b1ad114
      https://github.com/ckan/ckan/commit/45ac16ef4856cff17578e2810629db2a5b1ad114
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

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

  Log Message:
  -----------
  [#2494] Only replace valid dates with moment.js


  Commit: bdfb3983cf1902d7288f704776cec8245b8a29aa
      https://github.com/ckan/ckan/commit/bdfb3983cf1902d7288f704776cec8245b8a29aa
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/lib/helpers.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#2494] Add support for 'server' timezone

This special timezone uses the local timezone of the server.
In order to do this, the tzlocal module is needed.


  Commit: 67cee127017a2683caaf5f80e647e23e9c88d04d
      https://github.com/ckan/ckan/commit/67cee127017a2683caaf5f80e647e23e9c88d04d
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-10 (Fri, 10 Jul 2015)

  Changed paths:
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/main.js
    M ckan/templates/package/snippets/additional_info.html
    A ckan/templates/snippets/local_friendly_datetime.html

  Log Message:
  -----------
  [#2494] Add snippet for local friendly datetime


  Commit: 2e1287cfc9ce310ab44e827d7d7956d8b9449f81
      https://github.com/ckan/ckan/commit/2e1287cfc9ce310ab44e827d7d7956d8b9449f81
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-07-10 (Fri, 10 Jul 2015)

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

  Log Message:
  -----------
  [#2494] Rename ckan.timezone to ckan.display_timezone


  Commit: f86b2c9b6635f744f1bc4d1dfc889e877c82a2dd
      https://github.com/ckan/ckan/commit/f86b2c9b6635f744f1bc4d1dfc889e877c82a2dd
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-07-13 (Mon, 13 Jul 2015)

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#2510] IUploader interface documentation


  Commit: 6ab23581d8f8b1073aca968deb00a9552e2aebed
      https://github.com/ckan/ckan/commit/6ab23581d8f8b1073aca968deb00a9552e2aebed
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-07-15 (Wed, 15 Jul 2015)

  Changed paths:
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/tests/controllers/test_group.py

  Log Message:
  -----------
  [#2534] Tests for list, add and removal of members


  Commit: 93ba10bf369a18b72c620f86689884e87e10dd2d
      https://github.com/ckan/ckan/commit/93ba10bf369a18b72c620f86689884e87e10dd2d
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-07-15 (Wed, 15 Jul 2015)

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

  Log Message:
  -----------
  [#2534] Fix pep8 issues


  Commit: 9aadab1e7576ba11e2c9681580d40880f50d5448
      https://github.com/ckan/ckan/commit/9aadab1e7576ba11e2c9681580d40880f50d5448
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-07-16 (Thu, 16 Jul 2015)

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

  Log Message:
  -----------
  [#2538] Test searching for an organization


  Commit: b5f42d58e418370b2d6d0f0cb0b4fb2baafab6fc
      https://github.com/ckan/ckan/commit/b5f42d58e418370b2d6d0f0cb0b4fb2baafab6fc
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-07-17 (Fri, 17 Jul 2015)

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

  Log Message:
  -----------
  [#2538] Refactor Org search tests


  Commit: 226c641308a3bdfca21db87f466480d6ed932d7a
      https://github.com/ckan/ckan/commit/226c641308a3bdfca21db87f466480d6ed932d7a
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-07-17 (Fri, 17 Jul 2015)

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

  Log Message:
  -----------
  [#2538] Test search within an organization


  Commit: 7dfbfcf4e8f9b3ad8afefc4982c2d71233e475d7
      https://github.com/ckan/ckan/commit/7dfbfcf4e8f9b3ad8afefc4982c2d71233e475d7
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-07-17 (Fri, 17 Jul 2015)

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

  Log Message:
  -----------
  [#2539] Package search tests


  Commit: 28080ce4b3a547f3fe8a882a3e0f100caba575f7
      https://github.com/ckan/ckan/commit/28080ce4b3a547f3fe8a882a3e0f100caba575f7
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-07-17 (Fri, 17 Jul 2015)

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

  Log Message:
  -----------
  [#2541] Front-end tests for group search.

Basically the same tests as for Organizations in #2538.


  Commit: ab61ee460218950f912d5e69b9d3a2c4b4848e19
      https://github.com/ckan/ckan/commit/ab61ee460218950f912d5e69b9d3a2c4b4848e19
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-07-17 (Fri, 17 Jul 2015)

  Changed paths:
    M ckan/templates/group/confirm_delete.html
    M ckan/tests/controllers/test_group.py

  Log Message:
  -----------
  [#2541] Group delete tests


  Commit: 0c52676c7e838f94532f345a098f5636fb970921
      https://github.com/ckan/ckan/commit/0c52676c7e838f94532f345a098f5636fb970921
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-07-20 (Mon, 20 Jul 2015)

  Changed paths:
    A ckan/tests/controllers/test_tags.py

  Log Message:
  -----------
  [#2542] Front-end tests for tag pages


  Commit: 9ccba42739e7dae243f5858dec7afc2b5f22f0c8
      https://github.com/ckan/ckan/commit/9ccba42739e7dae243f5858dec7afc2b5f22f0c8
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-07-20 (Mon, 20 Jul 2015)

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

  Log Message:
  -----------
  [#2543] Front-end test for logout redirect


  Commit: 08d63d0bb911176e2ea9a83b44b6e9f5375d6133
      https://github.com/ckan/ckan/commit/08d63d0bb911176e2ea9a83b44b6e9f5375d6133
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-07-21 (Tue, 21 Jul 2015)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  Fix "paster db init" when celery is configured with a backend other than database.


  Commit: 7e797b7a53181feacfda1cfaeceb96eaed3531bc
      https://github.com/ckan/ckan/commit/7e797b7a53181feacfda1cfaeceb96eaed3531bc
  Author: amercader <amercadero at gmail.com>
  Date:   2015-07-23 (Thu, 23 Jul 2015)

  Changed paths:
    M ckan/config/resource_formats.json
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  [#2553] Fix autodetect for tsv resources

When you upload or link to a TSV file and don't specify a resource format,
the format that you end up with is text/tab-separated-values.
This is not recognized by the DataPusher and the resource is not uploaded to
 the DataStore.

This patch adds this alternative representation to the canonical resource
format list.


  Commit: 099b571b5062ef77e1f51c5e8103826e29542462
      https://github.com/ckan/ckan/commit/099b571b5062ef77e1f51c5e8103826e29542462
  Author: amercader <amercadero at gmail.com>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/cli.py
    M ckan/plugins/interfaces.py
    R ckan/templates/package/read.n3
    R ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/tests/controllers/test_package.py

  Log Message:
  -----------
  [#2560] Remove rdf/xml and n3 templates in favour of ckanext-dcat


  Commit: b05e4bf0bdcc5d0693a8de016b314d497e7a579c
      https://github.com/ckan/ckan/commit/b05e4bf0bdcc5d0693a8de016b314d497e7a579c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2560] Remove prehistoric code


  Commit: 4afcd7c8412817c27632601f5e97a9d11bb76db0
      https://github.com/ckan/ckan/commit/4afcd7c8412817c27632601f5e97a9d11bb76db0
  Author: amercader <amercadero at gmail.com>
  Date:   2015-07-27 (Mon, 27 Jul 2015)

  Changed paths:
    M doc/maintaining/linked-data-and-rdf.rst

  Log Message:
  -----------
  [#2560] Update RDF documentation to point to ckanext-dcat


  Commit: 7498d0fd995fc1d5cd496bf5249e49df2138e053
      https://github.com/ckan/ckan/commit/7498d0fd995fc1d5cd496bf5249e49df2138e053
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-07-28 (Tue, 28 Jul 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/cli.py
    M ckan/plugins/interfaces.py
    R ckan/templates/package/read.n3
    R ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/tests/controllers/test_package.py
    M doc/maintaining/linked-data-and-rdf.rst

  Log Message:
  -----------
  Merge pull request #2560 from ckan/2560-remove-rdf-stuff

Deprecate and remove the RDF templates in favour of ckanext-dcat


  Commit: 884040e10b22042dc2a974a5969d0d25eb26a575
      https://github.com/ckan/ckan/commit/884040e10b22042dc2a974a5969d0d25eb26a575
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2015-07-28 (Tue, 28 Jul 2015)

  Changed paths:
    M bin/less
    M ckan/lib/app_globals.py
    M doc/contributing/frontend/index.rst

  Log Message:
  -----------
  Removed the main.debug.css

Resolves #2556


  Commit: a286399ccc148139d720cb48e34edd0e76351329
      https://github.com/ckan/ckan/commit/a286399ccc148139d720cb48e34edd0e76351329
  Author: Ian Ward <ian at excess.org>
  Date:   2015-07-30 (Thu, 30 Jul 2015)

  Changed paths:
    M bin/less
    M ckan/lib/app_globals.py
    M doc/contributing/frontend/index.rst

  Log Message:
  -----------
  Merge pull request #2563 from LaurentGoderre/remove-debug-css

Removed the main.debug.css


  Commit: c259b348613ae5f79781a2781e8e7878f3c2da95
      https://github.com/ckan/ckan/commit/c259b348613ae5f79781a2781e8e7878f3c2da95
  Author: joetsoi <joetsoi at users.noreply.github.com>
  Date:   2015-07-30 (Thu, 30 Jul 2015)

  Changed paths:
    M ckan/controllers/api.py
    A ckan/lib/lazyjson.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  Merge branch 'package_show-performance-pt3'

Conflicts:
	ckan/logic/action/get.py


  Commit: 3aadb97acd52ee32db0ba31fc82c158bbf89cf54
      https://github.com/ckan/ckan/commit/3aadb97acd52ee32db0ba31fc82c158bbf89cf54
  Author: amercader <amercadero at gmail.com>
  Date:   2015-07-31 (Fri, 31 Jul 2015)

  Changed paths:
    M ckan/plugins/interfaces.py
    M ckan/tests/legacy/ckantestplugins.py
    M ckan/tests/legacy/test_plugins.py

  Log Message:
  -----------
  Merge branch '2426-imapper-delete'


  Commit: 65abbc3bf3865126dcd9924bdaf14f196c8feb34
      https://github.com/ckan/ckan/commit/65abbc3bf3865126dcd9924bdaf14f196c8feb34
  Author: amercader <amercadero at gmail.com>
  Date:   2015-07-31 (Fri, 31 Jul 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/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/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
    M ckan/model/__init__.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/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/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/ckantestplugins.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_group.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/legacy/models/test_group.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
    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/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 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 1903-new-authz-removal

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


  Commit: 7873851900678fbb9559c4ea6058a66bab67928b
      https://github.com/ckan/ckan/commit/7873851900678fbb9559c4ea6058a66bab67928b
  Author: amercader <amercadero at gmail.com>
  Date:   2015-07-31 (Fri, 31 Jul 2015)

  Changed paths:
    R ckan/migration/versions/077_remove_old_authz_model.py
    A ckan/migration/versions/078_remove_old_authz_model.py

  Log Message:
  -----------
  [#1903] Rename migration script to avoid conlfict with a more recent one


  Commit: 0b318d5ed5fad76c83f8ca3dcd12b70b17298b27
      https://github.com/ckan/ckan/commit/0b318d5ed5fad76c83f8ca3dcd12b70b17298b27
  Author: amercader <amercadero at gmail.com>
  Date:   2015-07-31 (Fri, 31 Jul 2015)

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

  Log Message:
  -----------
  [#1903] Remove unused variables


  Commit: 4f5925962702bfc98ca52e36ac6a61f3db311665
      https://github.com/ckan/ckan/commit/4f5925962702bfc98ca52e36ac6a61f3db311665
  Author: amercader <amercadero at gmail.com>
  Date:   2015-07-31 (Fri, 31 Jul 2015)

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

  Log Message:
  -----------
  [#1903] There are no pseudousers any more


  Commit: 63e3bc9186f02a4bf1cce24b4c5d937e696c04c3
      https://github.com/ckan/ckan/commit/63e3bc9186f02a4bf1cce24b4c5d937e696c04c3
  Author: amercader <amercadero at gmail.com>
  Date:   2015-07-31 (Fri, 31 Jul 2015)

  Changed paths:
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    A ckan/migration/versions/078_remove_old_authz_model.py
    M ckan/model/__init__.py
    R ckan/model/authz.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/legacy/__init__.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/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/logic/test_action.py
    M ckan/tests/legacy/models/test_user.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/logic/action/test_get.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

  Log Message:
  -----------
  Merge branch '1903-new-authz-removal'


  Commit: a7804f9f1db1b6ef8f282a2bb76d69e657f1b222
      https://github.com/ckan/ckan/commit/a7804f9f1db1b6ef8f282a2bb76d69e657f1b222
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-08-04 (Tue, 04 Aug 2015)

  Changed paths:
    M ckan/templates/group/snippets/info.html
    M ckan/templates/organization/snippets/organization_item.html

  Log Message:
  -----------
  [#2557] Fix package count in templates.

This happened when datasets stopped being included by default in #2206.


  Commit: 13b8befcd8a8eed566509179a09f3d31d1a2b60d
      https://github.com/ckan/ckan/commit/13b8befcd8a8eed566509179a09f3d31d1a2b60d
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-08-04 (Tue, 04 Aug 2015)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#2557] Featured grps/orgs should include datasets

`include_datasets` now defaults to False (#2206), so need to include it
when getting the featured groups and orgs for the index page.


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

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/group/snippets/info.html
    M ckan/templates/organization/snippets/organization_item.html

  Log Message:
  -----------
  Merge branch '2557-package-count-issue'


  Commit: c84194cd55134880710b91dc40c50ea77c202b44
      https://github.com/ckan/ckan/commit/c84194cd55134880710b91dc40c50ea77c202b44
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-08-12 (Wed, 12 Aug 2015)

  Changed paths:
    A ckanext/datapusher/interfaces.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/tests/test_interfaces.py
    M setup.py

  Log Message:
  -----------
  Introduces IDataPusher plugin

This new plugin allows users to reject resources for submission,
and also to be notified once a datapush is complete.

The two methods in the interface are:

can_upload: which will abort datapusher_submit calls if they return
True.
after_upload: Called with the resource ID after the upload into the
datastore is complete.


  Commit: 9d3311a315be8d898cfa15243edca447548eb897
      https://github.com/ckan/ckan/commit/9d3311a315be8d898cfa15243edca447548eb897
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-08-12 (Wed, 12 Aug 2015)

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

  Log Message:
  -----------
  Checks for duplicate column names

Before the attempt is made to create the table, checks that there
are no duplicate column names in the record sent to the action method.


  Commit: 1cd105796899992372d5c460cc4aca35395ae00a
      https://github.com/ckan/ckan/commit/1cd105796899992372d5c460cc4aca35395ae00a
  Author: amercader <amercadero at gmail.com>
  Date:   2015-08-12 (Wed, 12 Aug 2015)

  Changed paths:
    M ckan/config/resource_formats.json
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  [#2553] TSV media type is text/tab-separated-values


  Commit: 79b013b9359b588efcbb9d9e4ea8b8d556dbbb84
      https://github.com/ckan/ckan/commit/79b013b9359b588efcbb9d9e4ea8b8d556dbbb84
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-08-12 (Wed, 12 Aug 2015)

  Changed paths:
    M ckan/config/resource_formats.json
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  Merge pull request #2553 from ckan/2553-tsv-autodetect

Wrong format autodetected for TSVs prevents DataPusher from being called


  Commit: e04fbaf859a587a6bb70d154451f92503f6c5018
      https://github.com/ckan/ckan/commit/e04fbaf859a587a6bb70d154451f92503f6c5018
  Author: Alan Tygel <alantygel at gmail.com>
  Date:   2015-08-18 (Tue, 18 Aug 2015)

  Changed paths:
    M ckanext/example_theme/v08_custom_helper_function/plugin.py

  Log Message:
  -----------
  Update plugin.py

The original "packages" sort option was broken ; changed to package_count


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

  Changed paths:
    M ckanext/example_theme/v08_custom_helper_function/plugin.py

  Log Message:
  -----------
  Merge branch 'small-fixes-in-template-docs' of https://github.com/alantygel/ckan into alantygel-small-fixes-in-template-docs


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

  Changed paths:
    M ckanext/example_theme/v08_custom_helper_function/plugin.py

  Log Message:
  -----------
  Merge branch 'alantygel-small-fixes-in-template-docs'


  Commit: 7a6e8e768f2c16fce48f122b11e510d9b8f240ca
      https://github.com/ckan/ckan/commit/7a6e8e768f2c16fce48f122b11e510d9b8f240ca
  Author: Ian Ward <ian at excess.org>
  Date:   2015-08-18 (Tue, 18 Aug 2015)

  Changed paths:
    M ckan/lib/lazyjson.py

  Log Message:
  -----------
  [#2581] fixes for lazyjson


  Commit: 1285d00d901977370668dae0dcf4fddd12bfb385
      https://github.com/ckan/ckan/commit/1285d00d901977370668dae0dcf4fddd12bfb385
  Author: amercader <amercadero at gmail.com>
  Date:   2015-08-19 (Wed, 19 Aug 2015)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  Merge branch 'celery-backend'


  Commit: 4fd2baf4a2718eded60e560c2930505c00a1cd45
      https://github.com/ckan/ckan/commit/4fd2baf4a2718eded60e560c2930505c00a1cd45
  Author: amercader <amercadero at gmail.com>
  Date:   2015-08-19 (Wed, 19 Aug 2015)

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

  Log Message:
  -----------
  [#2554] Don't request all extra fields on group_list

 #2214 replaced the organization/group_list call to group_list_dictize
by a organization/group_show call for each group, but didn't pass the
include_extras, include_users, etc params set to False, so now on each
call of this extra calls are performed by default on all groups.

Updated docstrings to include all params


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

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

  Log Message:
  -----------
  [#2554] Refactor group_list to only query necessary fields

Refactor organization/group_list to only query the necessary fields by default
(id, name, title, package_count) depending on the required sort. This massively
speeds up the default query without all_fields. In part this is because then we
no longer need to get all fields in all groups on all cases to do the sorting.
There is a minor drawback in that then we can't take private datasets into
account when sorting by number of datasets. The actual number displayed will
take private datasets into account, as this comes from the dictization, but
there might be inconsistencies (note that the "order by datasets option" is
not offered by default on the UI)


  Commit: 9be68909e4225d4593b558bf37d8b8c2cca66231
      https://github.com/ckan/ckan/commit/9be68909e4225d4593b558bf37d8b8c2cca66231
  Author: amercader <amercadero at gmail.com>
  Date:   2015-08-19 (Wed, 19 Aug 2015)

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

  Log Message:
  -----------
  [#2554] Add limit/offset support to group_list

So on the Organizations and Groups page we just dictize the groups on
the page (we need two calls to group_list in the controller, one
with all groups to account for the query, ordering, count, etc
and one with `all_fields` with just the ones to be displayed on
the listing).


  Commit: 8ededef46167e1853b12335e1b198918963e7210
      https://github.com/ckan/ckan/commit/8ededef46167e1853b12335e1b198918963e7210
  Author: amercader <amercadero at gmail.com>
  Date:   2015-08-19 (Wed, 19 Aug 2015)

  Changed paths:
    M ckan/controllers/home.py

  Log Message:
  -----------
  [#2554] Remove unused code from home controller

This was probably used on an old variant of the homepage, but it isn't
anymore. It removes the `c.groups` and `c.group_package_stuff` context
vars.


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

  Changed paths:
    M ckanext/datapusher/interfaces.py

  Log Message:
  -----------
  [#2571] Add note about further checks


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

  Changed paths:
    A ckanext/datapusher/interfaces.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/tests/test_interfaces.py
    M setup.py

  Log Message:
  -----------
  Merge branch 'datapusher-plugin'


  Commit: 942a824c85ec2faf0a7c46a44b5d72997f911568
      https://github.com/ckan/ckan/commit/942a824c85ec2faf0a7c46a44b5d72997f911568
  Author: amercader <amercadero at gmail.com>
  Date:   2015-08-19 (Wed, 19 Aug 2015)

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

  Log Message:
  -----------
  Merge branch '2574-stop-500-when-creating-tables'


  Commit: 5cfc6c6e15cc7eebb26ae13c37874273ae0e4ea9
      https://github.com/ckan/ckan/commit/5cfc6c6e15cc7eebb26ae13c37874273ae0e4ea9
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2015-08-24 (Mon, 24 Aug 2015)

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

  Log Message:
  -----------
  Don't use cached values when rendering notes.

Currently, a cached field with the rendered markdown is used in the
package/read template.

This value is set very early in the process (and also results in
rendering markdown when it is not needed).

Since it is set so early, it bypasses all of the hooks designed to allow
these values to be manipulated, such as `before_view`. This breaks
extension on core fields that depend on being able to modify these
fields, like the multi-lingual support extension ckanext-fluent.


  Commit: b180c71f37891482c8ed7e7b58c3a3279fdf7d65
      https://github.com/ckan/ckan/commit/b180c71f37891482c8ed7e7b58c3a3279fdf7d65
  Author: Fabian Kirstein <fabian.kirstein at fokus.fraunhofer.de>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Fixing unqualified exception use in helpers

The function get_organization used unqualified exception types in the except block.
This commit fixes it.


  Commit: ee8d9e9ee2722c30df4898e30cc7ea4ea8705ec6
      https://github.com/ckan/ckan/commit/ee8d9e9ee2722c30df4898e30cc7ea4ea8705ec6
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py

  Log Message:
  -----------
  Use `ckan.site_url` to generate urls of resources


  Commit: 38a985e338c2261711bbba5ab6ef3bf93d593581
      https://github.com/ckan/ckan/commit/38a985e338c2261711bbba5ab6ef3bf93d593581
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Add full domain name in url_for helper


  Commit: 0fe69bcdd968893a37788f35bf9daaa8e80c1d75
      https://github.com/ckan/ckan/commit/0fe69bcdd968893a37788f35bf9daaa8e80c1d75
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py

  Log Message:
  -----------
  Fix typo


  Commit: 04fdd1bf3b128a453ab4689f691ee06200d1b33d
      https://github.com/ckan/ckan/commit/04fdd1bf3b128a453ab4689f691ee06200d1b33d
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Renamed helper to get_site_protocol_and_host and added docstring


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

  Changed paths:
    M ckan/controllers/home.py

  Log Message:
  -----------
  [#2554] Remove unused 'dirty' var


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

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

  Log Message:
  -----------
  [#2554] Fix ranges in group list tests


  Commit: 0c9d24723d8a2df0bf95b1452781bd5a220cafc2
      https://github.com/ckan/ckan/commit/0c9d24723d8a2df0bf95b1452781bd5a220cafc2
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

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

  Log Message:
  -----------
  Add test for full qualified URLs


  Commit: 6b82fd47578293e736e66679ee0ff5de7684eca3
      https://github.com/ckan/ckan/commit/6b82fd47578293e736e66679ee0ff5de7684eca3
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/logic/action/get.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  Merge branch 'ckan-2554-improve-group_list'


  Commit: 549ec2827bf57f4ba3c7bff064811f72ffd53832
      https://github.com/ckan/ckan/commit/549ec2827bf57f4ba3c7bff064811f72ffd53832
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

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

  Log Message:
  -----------
  Import test helpers for change_config decorator


  Commit: 0995d4549def866a7caacad8f08bf8e39e1d32dc
      https://github.com/ckan/ckan/commit/0995d4549def866a7caacad8f08bf8e39e1d32dc
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  Remove pkg_notes_formatted completely.


  Commit: 678e5ff55138a2772072bf9f7709b3f8334048d6
      https://github.com/ckan/ckan/commit/678e5ff55138a2772072bf9f7709b3f8334048d6
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

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

  Log Message:
  -----------
  Fix PEP-8 issue


  Commit: e0732b175559212f166f4bcecfa420a20d934ccd
      https://github.com/ckan/ckan/commit/e0732b175559212f166f4bcecfa420a20d934ccd
  Author: Ian Ward <ian at excess.org>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/templates/package/read.html

  Log Message:
  -----------
  Merge pull request #2595 from TkTech/dont_skip_hooks

Don't use cached values when rendering notes.


  Commit: 691e05a629c32a838d5a40ffc665f0b2ef99d90b
      https://github.com/ckan/ckan/commit/691e05a629c32a838d5a40ffc665f0b2ef99d90b
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-08-26 (Wed, 26 Aug 2015)

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

  Log Message:
  -----------
  Add tests for `ckan.root_path`


  Commit: c3afea6207fb6ce9a494a96ea59a7917c7e1d8a0
      https://github.com/ckan/ckan/commit/c3afea6207fb6ce9a494a96ea59a7917c7e1d8a0
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-08-27 (Thu, 27 Aug 2015)

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

  Log Message:
  -----------
  Create proper locale object


  Commit: 6d0409ed83a573097d01aa31aa2ef34083488d6d
      https://github.com/ckan/ckan/commit/6d0409ed83a573097d01aa31aa2ef34083488d6d
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-08-27 (Thu, 27 Aug 2015)

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

  Log Message:
  -----------
  Set locale to 'de' to be non-default


  Commit: 89336e8ef8b3401d24b08a17a5f58af01d47dd1e
      https://github.com/ckan/ckan/commit/89336e8ef8b3401d24b08a17a5f58af01d47dd1e
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-08-27 (Thu, 27 Aug 2015)

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

  Log Message:
  -----------
  Add additional test for locale without root_path


  Commit: 3a3bcdeca658c38c2dcd978a4244fbfba1025fb1
      https://github.com/ckan/ckan/commit/3a3bcdeca658c38c2dcd978a4244fbfba1025fb1
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-08-27 (Thu, 27 Aug 2015)

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

  Log Message:
  -----------
  Fix broken test


  Commit: bf106b08b39e3952318ae56db2768f2458532d90
      https://github.com/ckan/ckan/commit/bf106b08b39e3952318ae56db2768f2458532d90
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-08-27 (Thu, 27 Aug 2015)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Fix broken root_path implementation


  Commit: c0bae5f081159a18c9b44c9bed2aa4a8eb66b261
      https://github.com/ckan/ckan/commit/c0bae5f081159a18c9b44c9bed2aa4a8eb66b261
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-08-27 (Thu, 27 Aug 2015)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Remove TODO comment


  Commit: 4dac0415d5676a0c408daf8aec4266e04cdc8293
      https://github.com/ckan/ckan/commit/4dac0415d5676a0c408daf8aec4266e04cdc8293
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2015-08-27 (Thu, 27 Aug 2015)

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

  Log Message:
  -----------
  Add test for relative URL with locale


  Commit: f9b39429fc984663585f6dd4b91a64ae37e7c213
      https://github.com/ckan/ckan/commit/f9b39429fc984663585f6dd4b91a64ae37e7c213
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-02 (Wed, 02 Sep 2015)

  Changed paths:
    M ckanext/datastore/helpers.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  format next to format strings, _literal_string helper


  Commit: e17f1781c2fb65db211baa0b3fbd38d72e112c63
      https://github.com/ckan/ckan/commit/e17f1781c2fb65db211baa0b3fbd38d72e112c63
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-02 (Wed, 02 Sep 2015)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  just use unicode in _parse_sort_clause


  Commit: c666976fe93919281a13680bc47a468ca22805e0
      https://github.com/ckan/ckan/commit/c666976fe93919281a13680bc47a468ca22805e0
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-02 (Wed, 02 Sep 2015)

  Changed paths:
    M ckanext/datastore/helpers.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  support quoted sort args for backwards compat


  Commit: 88c70458acc903ffe93ca41535ee97cf2ac45515
      https://github.com/ckan/ckan/commit/88c70458acc903ffe93ca41535ee97cf2ac45515
  Author: amercader <amercadero at gmail.com>
  Date:   2015-09-02 (Wed, 02 Sep 2015)

  Changed paths:
    M CHANGELOG.rst

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


  Commit: eb43d76a12e1b5f0470edb622e3036f2226b4afb
      https://github.com/ckan/ckan/commit/eb43d76a12e1b5f0470edb622e3036f2226b4afb
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2015-09-02 (Wed, 02 Sep 2015)

  Changed paths:
    M ckan/templates/snippets/organization_item.html

  Log Message:
  -----------
  Make the organization_item snippet overridable


  Commit: b10ea0a9a40fe11ca5b3c28d8d945d7e01f2ff88
      https://github.com/ckan/ckan/commit/b10ea0a9a40fe11ca5b3c28d8d945d7e01f2ff88
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    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

  Log Message:
  -----------
  Removed legacy front-end resources

Fixes #2601


  Commit: 9cc059638f8bbf8577bca7c623dbb8ece60b6e7c
      https://github.com/ckan/ckan/commit/9cc059638f8bbf8577bca7c623dbb8ece60b6e7c
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

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

  Log Message:
  -----------
  Merge pull request #2599 from opendatazurich/2592-fix-absolute-uri-when-uploading-master

Use `ckan.site_url` to generate urls of resources


  Commit: 9e8552dddf728face5b512888c87ed36dd85ae6c
      https://github.com/ckan/ckan/commit/9e8552dddf728face5b512888c87ed36dd85ae6c
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ckan/authz.py

  Log Message:
  -----------
  Better to remove the line completely.


  Commit: 29d8a51aadbe5f1d2f5407b38fa503f50ac6416c
      https://github.com/ckan/ckan/commit/29d8a51aadbe5f1d2f5407b38fa503f50ac6416c
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ckan/authz.py

  Log Message:
  -----------
  Merge pull request #2526 from ckan/noisy-logging

Remove noisy log statement


  Commit: c35798928bccf15966614bddb271f5c67712c4f4
      https://github.com/ckan/ckan/commit/c35798928bccf15966614bddb271f5c67712c4f4
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

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

  Log Message:
  -----------
  Merge pull request #2522 from ckan/revision-list-limit

#1431 Add paging to revision_list


  Commit: 9e16366fb1363fc4d464d9f53b7821125525e258
      https://github.com/ckan/ckan/commit/9e16366fb1363fc4d464d9f53b7821125525e258
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/main.js
    A ckan/public/base/vendor/moment-with-locales.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/package/snippets/additional_info.html
    A ckan/templates/snippets/local_friendly_datetime.html
    M ckan/tests/legacy/lib/test_helpers.py
    M doc/maintaining/configuration.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge pull request #2505 from metaodi/2494-timezone-setting

[#2494] New option to change the timezone of displayed datetimes


  Commit: 010274d847720504bd03e71f38800203b6522d11
      https://github.com/ckan/ckan/commit/010274d847720504bd03e71f38800203b6522d11
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M CHANGELOG.rst
    M bin/less
    M ckan/config/resource_formats.json
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.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/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    A ckan/migration/versions/078_remove_old_authz_model.py
    M ckan/model/__init__.py
    R ckan/model/authz.py
    M ckan/plugins/interfaces.py
    M ckan/templates/group/snippets/info.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/user/new_user_form.html
    M ckan/templates/user/snippets/user_search.html
    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_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/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/logic/test_action.py
    M ckan/tests/legacy/models/test_user.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_plugins.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 ckanext/example_theme/v08_custom_helper_function/plugin.py
    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 doc/contributing/frontend/index.rst
    M doc/contributing/frontend/template-blocks.rst
    M doc/contributing/release-process.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/linked-data-and-rdf.rst

  Log Message:
  -----------
  Merge branch 'master' into formats_added

Conflicts:
	ckan/tests/lib/test_helpers.py


  Commit: 4e6c631dd143abbd061a28977de3136670bc5261
      https://github.com/ckan/ckan/commit/4e6c631dd143abbd061a28977de3136670bc5261
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M CHANGELOG.rst
    M bin/less
    M ckan/authz.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/resource_formats.json
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    A ckan/lib/lazyjson.py
    M ckan/lib/plugins.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/update.py
    A ckan/migration/versions/078_remove_old_authz_model.py
    M ckan/model/__init__.py
    R ckan/model/authz.py
    M ckan/pastertemplates/template/README.rst_tmpl
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/main.js
    A ckan/public/base/vendor/moment-with-locales.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/config.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/organization/confirm_delete.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
    M ckan/templates/package/read.html
    R ckan/templates/package/read.n3
    R ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    A ckan/templates/snippets/local_friendly_datetime.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/snippets/user_search.html
    M ckan/tests/controllers/test_admin.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/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/lib/test_helpers.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/models/test_user.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_plugins.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
    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/helpers.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.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/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/tests/test_stats_lib.py
    M dev-requirements.txt
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/template-blocks.rst
    M doc/contributing/release-process.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/linked-data-and-rdf.rst
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 2493-stats

Conflicts:
	ckanext/stats/templates_legacy/ckanext/stats/index.html


  Commit: b160cae1d5c8d0ca8514533bc346b3d6dddd7a3a
      https://github.com/ckan/ckan/commit/b160cae1d5c8d0ca8514533bc346b3d6dddd7a3a
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

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

  Log Message:
  -----------
  [#2581] allow lazyjson to be lazy in package_show


  Commit: 54e05dee877ce4c114880bf4e8b8de5efd218514
      https://github.com/ckan/ckan/commit/54e05dee877ce4c114880bf4e8b8de5efd218514
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

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

  Log Message:
  -----------
  [#2581] test that package_show can be lazy


  Commit: 51b5eaf3354ef7f929d16d2b81cd89d16071907c
      https://github.com/ckan/ckan/commit/51b5eaf3354ef7f929d16d2b81cd89d16071907c
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-04 (Fri, 04 Sep 2015)

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

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


  Commit: a523b44ccbef3b18157d2684137fb0aa92295d32
      https://github.com/ckan/ckan/commit/a523b44ccbef3b18157d2684137fb0aa92295d32
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-04 (Fri, 04 Sep 2015)

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

  Log Message:
  -----------
  Cope with the fact that user is optional in the context (judging by the prevelance of similar lines throughout).


  Commit: 9026c30f5d7024623f1512c926acdcc0c46a0490
      https://github.com/ckan/ckan/commit/9026c30f5d7024623f1512c926acdcc0c46a0490
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-09-04 (Fri, 04 Sep 2015)

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

  Log Message:
  -----------
  Merge branch 'ckan-search_user_context'


  Commit: 5c6ab3161422d10c7187da02720525f781c0c2ec
      https://github.com/ckan/ckan/commit/5c6ab3161422d10c7187da02720525f781c0c2ec
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-04 (Fri, 04 Sep 2015)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  PEP8, lint and log string substitution refinement.


  Commit: 92692e7af5dcb0354479f4b28aedf570ac055bf0
      https://github.com/ckan/ckan/commit/92692e7af5dcb0354479f4b28aedf570ac055bf0
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M ckan/config/routing.py
    R ckan/controllers/related.py
    M ckan/public/base/test/index.html
    R ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/package/read_base.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/tests/legacy/functional/test_related.py

  Log Message:
  -----------
  Removes the front-end parts of related items.


  Commit: 91ddda5392ca84311f0822fdf86a9b81a1b19a23
      https://github.com/ckan/ckan/commit/91ddda5392ca84311f0822fdf86a9b81a1b19a23
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

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

  Log Message:
  -----------
  [#2619] Close form tag in organization form


  Commit: 485e607234b54313e174329ece4315362c66bef0
      https://github.com/ckan/ckan/commit/485e607234b54313e174329ece4315362c66bef0
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-07 (Mon, 07 Sep 2015)

  Changed paths:
    M ckan/config/routing.py
    R ckan/controllers/related.py
    M ckan/public/base/test/index.html
    R ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/package/read_base.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/tests/legacy/functional/test_related.py

  Log Message:
  -----------
  Merge pull request #2618 from ckan/2609-delete-related-items-frontend

Removes the front-end parts of related items.


  Commit: 247dc40315c0f9271e226acd8298de6de4a60d1f
      https://github.com/ckan/ckan/commit/247dc40315c0f9271e226acd8298de6de4a60d1f
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M doc/maintaining/datastore.rst

  Log Message:
  -----------
  Datastore doc improvement
* Removed confusing line-break after the pipe
* Removed 'postgres' keyword - it was removed in the syntax of recent versions of ckan.


  Commit: 156348c1d11a5ceb556f593d4094074f912842a6
      https://github.com/ckan/ckan/commit/156348c1d11a5ceb556f593d4094074f912842a6
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M ckan/model/modification.py

  Log Message:
  -----------
  Stop reraising exceptions caused by notifications. They are secondary errors and should not prevent the change to the dataset occurring. e.g. I am harvesting some data, but because datapusher has an exception, every time the harvester tries to write it has an exception and fails. Admins should look at their logs for these exceptions, and the primary functions should carry on working.


  Commit: 9931159772f6dbd919df73bd443f0858c070e31f
      https://github.com/ckan/ckan/commit/9931159772f6dbd919df73bd443f0858c070e31f
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

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

  Log Message:
  -----------
  Merge pull request #2620 from ckan/2619-close-tag

Close form tag in organization form


  Commit: 8f7caa50c61f8cdc8a100c4ec5963a40e9c7470c
      https://github.com/ckan/ckan/commit/8f7caa50c61f8cdc8a100c4ec5963a40e9c7470c
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  Merge pull request #2616 from ckan/pep8-tidy

PEP8 etc


  Commit: f19705d92da36d77988c7f6ebed6983d3bd0e043
      https://github.com/ckan/ckan/commit/f19705d92da36d77988c7f6ebed6983d3bd0e043
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M ckan/model/modification.py

  Log Message:
  -----------
  Make sure that SearchIndexErrors *are* raised

CKAN relies on the SearchIndexError being raised in the notify() call
of IDomainObjectNotification.  It still only logs most Exceptions, but
explicitly re-raises SearchIndexErrors as they are fatal to CKAN.


  Commit: b47721a068deaa6e6735855be157bf3fe953b680
      https://github.com/ckan/ckan/commit/b47721a068deaa6e6735855be157bf3fe953b680
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M ckan/model/modification.py

  Log Message:
  -----------
  Merge pull request #2623 from ckan/notification-errors

Stop reraising exceptions caused by notifications.


  Commit: 0f516efcf8356c19493ec261b654449c27d2ce88
      https://github.com/ckan/ckan/commit/0f516efcf8356c19493ec261b654449c27d2ce88
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M ckan/model/modification.py

  Log Message:
  -----------
  Added comment to explain.


  Commit: 477d883e1aa34d0387b9b55f451e3a24f1a997a3
      https://github.com/ckan/ckan/commit/477d883e1aa34d0387b9b55f451e3a24f1a997a3
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M ckan/model/modification.py

  Log Message:
  -----------
  Merge branch 'notification-errors'


  Commit: 2154602a52c56e24a4a42d537887a04698130a0a
      https://github.com/ckan/ckan/commit/2154602a52c56e24a4a42d537887a04698130a0a
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    A ckan/tests/controllers/test_tags.py

  Log Message:
  -----------
  Merge pull request #2542 from ckan/2542-tag-tests

Tag page tests


  Commit: d80321c042502bebc1c40924c7e32fd770878a78
      https://github.com/ckan/ckan/commit/d80321c042502bebc1c40924c7e32fd770878a78
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M CHANGELOG.rst
    M bin/less
    M ckan/authz.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    R ckan/controllers/related.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    A ckan/lib/lazyjson.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    A ckan/migration/versions/078_remove_old_authz_model.py
    M ckan/model/__init__.py
    R ckan/model/authz.py
    M ckan/model/modification.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/main.js
    M ckan/public/base/test/index.html
    A ckan/public/base/vendor/moment-with-locales.js
    M ckan/public/base/vendor/resource.config
    R ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/read.html
    R ckan/templates/package/read.n3
    R ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/snippets/additional_info.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
    A ckan/templates/snippets/local_friendly_datetime.html
    M ckan/tests/controllers/test_group.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/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/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_related.py
    M ckan/tests/legacy/lib/test_helpers.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/models/test_user.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_plugins.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/logic/action/test_get.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/helpers.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/example_theme/v08_custom_helper_function/plugin.py
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    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 doc/contributing/frontend/index.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/linked-data-and-rdf.rst
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 2541-group-search-tests

Conflicts:
	ckan/tests/controllers/test_group.py


  Commit: 04c5c2494959cf57238982e27a67b43892ee0227
      https://github.com/ckan/ckan/commit/04c5c2494959cf57238982e27a67b43892ee0227
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

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

  Log Message:
  -----------
  Merge pull request #2539 from ckan/2539-package-search-tests

package search tests


  Commit: 79cd396e129988c25335343d46f81ba8ddf03d76
      https://github.com/ckan/ckan/commit/79cd396e129988c25335343d46f81ba8ddf03d76
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

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

  Log Message:
  -----------
  Merge pull request #2538 from ckan/2538-organization-search

Organization search tests


  Commit: e13d020c04085ee8d157c739335781ff5bd9cce0
      https://github.com/ckan/ckan/commit/e13d020c04085ee8d157c739335781ff5bd9cce0
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M CHANGELOG.rst
    M bin/less
    M ckan/authz.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    R ckan/controllers/related.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    A ckan/lib/lazyjson.py
    M ckan/lib/plugins.py
    M ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    A ckan/migration/versions/078_remove_old_authz_model.py
    M ckan/model/__init__.py
    R ckan/model/authz.py
    M ckan/model/modification.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/main.js
    M ckan/public/base/test/index.html
    A ckan/public/base/vendor/moment-with-locales.js
    M ckan/public/base/vendor/resource.config
    R ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/home/snippets/stats.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
    M ckan/templates/package/read.html
    R ckan/templates/package/read.n3
    R ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/snippets/additional_info.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
    A ckan/templates/snippets/local_friendly_datetime.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/snippets/user_search.html
    M ckan/tests/controllers/test_group.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/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/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_related.py
    M ckan/tests/legacy/lib/test_helpers.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/models/test_user.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_plugins.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
    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/helpers.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/example_theme/v08_custom_helper_function/plugin.py
    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 doc/contributing/frontend/index.rst
    M doc/contributing/frontend/template-blocks.rst
    M doc/contributing/release-process.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/linked-data-and-rdf.rst
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 2534-group-member-tests

Conflicts:
	ckan/tests/controllers/test_group.py


  Commit: f065c5e0b0e3a9c403c42374a479d2a069a60081
      https://github.com/ckan/ckan/commit/f065c5e0b0e3a9c403c42374a479d2a069a60081
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

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

  Log Message:
  -----------
  [#2543] Better test name and comment


  Commit: 35ca145e26eefba28459aa92f6006a09141ac02b
      https://github.com/ckan/ckan/commit/35ca145e26eefba28459aa92f6006a09141ac02b
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/tests/controllers/test_group.py

  Log Message:
  -----------
  Merge pull request #2534 from ckan/2534-group-member-tests

Group Member tests


  Commit: a16261d4a292b11d5cc675f3599816ad7cadb9f5
      https://github.com/ckan/ckan/commit/a16261d4a292b11d5cc675f3599816ad7cadb9f5
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 2541-group-search-tests

Conflicts:
	ckan/tests/controllers/test_group.py


  Commit: 6a1826f5604eabe8019ee5b8e6dacdb109adb160
      https://github.com/ckan/ckan/commit/6a1826f5604eabe8019ee5b8e6dacdb109adb160
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    R doc/api.rst
    M doc/contents.rst
    M doc/contributing/reviewing.rst
    M doc/index.rst

  Log Message:
  -----------
  Merge pull request #2517 from ckan/2517-rtd-toc-redirects

show toc on front of docs, use rtd redirects


  Commit: 1ee1177f5cfb9008f422a8d437a3810eb3be547b
      https://github.com/ckan/ckan/commit/1ee1177f5cfb9008f422a8d437a3810eb3be547b
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

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

  Log Message:
  -----------
  Merge pull request #2518 from ckan/2518-datapusher-tracebacks

render datapusher tracebacks in resource_data.html


  Commit: 46a9144eff9317270ffc49799ab57fe29cc2f004
      https://github.com/ckan/ckan/commit/46a9144eff9317270ffc49799ab57fe29cc2f004
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M ckan/templates/group/confirm_delete.html
    M ckan/tests/controllers/test_group.py

  Log Message:
  -----------
  Merge pull request #2541 from ckan/2541-group-search-tests

Group search page tests


  Commit: 2b178c5b35f362211817cd4a37d4fee061b37724
      https://github.com/ckan/ckan/commit/2b178c5b35f362211817cd4a37d4fee061b37724
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

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

  Log Message:
  -----------
  Merge pull request #2543 from ckan/2543-logout-tests

user logout test


  Commit: bdde94ca99c999b2cf8b176a730e7dabc9099acf
      https://github.com/ckan/ckan/commit/bdde94ca99c999b2cf8b176a730e7dabc9099acf
  Author: joetsoi <joetsoi at users.noreply.github.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/tests/controllers/test_api.py
    R ckan/tests/legacy/functional/api/test_revision_search.py
    M doc/api/legacy-api.rst

  Log Message:
  -----------
  Merge branch 'revision-limit'

Conflicts:
	ckan/controllers/api.py


  Commit: d9ebb7ed92cf9ab08466f2d96642913e3ccbfe05
      https://github.com/ckan/ckan/commit/d9ebb7ed92cf9ab08466f2d96642913e3ccbfe05
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M ckan/controllers/home.py
    A ckan/tests/controllers/test_home.py
    R ckan/tests/legacy/functional/test_home.py

  Log Message:
  -----------
  Merge pull request #2502 from ckan/open-id-removal

Remove open-id related nag messages.


  Commit: 969f7c92fd354d1c3cff765c0f97c93561a46644
      https://github.com/ckan/ckan/commit/969f7c92fd354d1c3cff765c0f97c93561a46644
  Author: joetsoi <joetsoi at users.noreply.github.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M ckan/controllers/api.py

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


  Commit: 23497a01e4d2367dbb129495b7385f08d68e6714
      https://github.com/ckan/ckan/commit/23497a01e4d2367dbb129495b7385f08d68e6714
  Author: joetsoi <joetsoi at users.noreply.github.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M ckan/controllers/home.py
    A ckan/tests/controllers/test_home.py
    R ckan/tests/legacy/functional/test_home.py

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


  Commit: 8d0d27e2a16b40ca0f461a16af92cbe2d6381904
      https://github.com/ckan/ckan/commit/8d0d27e2a16b40ca0f461a16af92cbe2d6381904
  Author: joetsoi <joetsoi at users.noreply.github.com>
  Date:   2015-09-09 (Wed, 09 Sep 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/authz.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/home.py
    M ckan/controllers/package.py
    R ckan/controllers/related.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/formatters.py
    M ckan/lib/helpers.py
    A ckan/lib/lazyjson.py
    M ckan/lib/plugins.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
    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/modification.py
    M ckan/model/system_info.py
    M ckan/pastertemplates/template/README.rst_tmpl
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/main.js
    M ckan/public/base/test/index.html
    A ckan/public/base/vendor/moment-with-locales.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/config.html
    R ckan/templates/ajax_snippets/related-item.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/read.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/home/snippets/stats.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
    M ckan/templates/package/read.html
    R ckan/templates/package/read.n3
    R ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.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
    A ckan/templates/snippets/local_friendly_datetime.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_home.py
    A 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/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
    R ckan/tests/legacy/functional/api/test_revision_search.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
    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_related.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/lib/test_helpers.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
    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/helpers.py
    M ckanext/datastore/plugin.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
    R doc/api.rst
    M doc/api/index.rst
    M doc/api/legacy-api.rst
    M doc/contents.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/template-blocks.rst
    M doc/contributing/release-process.rst
    M doc/contributing/reviewing.rst
    M doc/extensions/index.rst
    A doc/extensions/remote-config-update.rst
    A doc/images/custom_config_fields.png
    M doc/index.rst
    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 itranslation-interface

Conflicts:
	doc/maintaining/configuration.rst
	setup.py


  Commit: 226ca45d01e7787d1e676dfd4017378dcef9b741
      https://github.com/ckan/ckan/commit/226ca45d01e7787d1e676dfd4017378dcef9b741
  Author: amercader <amercadero at gmail.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

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

  Log Message:
  -----------
  Merge branch '2581-fix-lazyjson' of https://github.com/wardi/ckan into wardi-2581-fix-lazyjson


  Commit: 1621c0ab87000e5d0098decec4394fcba2377deb
      https://github.com/ckan/ckan/commit/1621c0ab87000e5d0098decec4394fcba2377deb
  Author: amercader <amercadero at gmail.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

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

  Log Message:
  -----------
  Merge branch 'wardi-2581-fix-lazyjson'


  Commit: 26cdebbd49111d205fce865ef64402af32d5e2f1
      https://github.com/ckan/ckan/commit/26cdebbd49111d205fce865ef64402af32d5e2f1
  Author: amercader <amercadero at gmail.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge branch 'fixing-unqualified-exception-use-in-helpers' of https://github.com/FabiApfelkern/ckan into FabiApfelkern-fixing-unqualified-exception-use-in-helpers

Conflicts:
	ckan/lib/helpers.py


  Commit: 3526ff1f477a7c17a75df448b665266a37ca212f
      https://github.com/ckan/ckan/commit/3526ff1f477a7c17a75df448b665266a37ca212f
  Author: amercader <amercadero at gmail.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge branch 'FabiApfelkern-fixing-unqualified-exception-use-in-helpers'


  Commit: 7764f541cfce1bd24e033bf89cd29a172e887097
      https://github.com/ckan/ckan/commit/7764f541cfce1bd24e033bf89cd29a172e887097
  Author: amercader <amercadero at gmail.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M ckan/templates/snippets/organization_item.html

  Log Message:
  -----------
  Merge branch 'organization_item_override' of https://github.com/open-data/ckan into open-data-organization_item_override


  Commit: 44240d514b6199b3f24ef7bcfe021bb0fc35a408
      https://github.com/ckan/ckan/commit/44240d514b6199b3f24ef7bcfe021bb0fc35a408
  Author: amercader <amercadero at gmail.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M ckan/templates/snippets/organization_item.html

  Log Message:
  -----------
  Merge branch 'open-data-organization_item_override'


  Commit: 419a3242e4c248a316a099dfddae02b6e0d721a8
      https://github.com/ckan/ckan/commit/419a3242e4c248a316a099dfddae02b6e0d721a8
  Author: amercader <amercadero at gmail.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M doc/maintaining/datastore.rst

  Log Message:
  -----------
  Merge branch 'datastore-doc'


  Commit: 39e537e88231dc793616bdd3f2440b318c85dcb9
      https://github.com/ckan/ckan/commit/39e537e88231dc793616bdd3f2440b318c85dcb9
  Author: amercader <amercadero at gmail.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

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

  Log Message:
  -----------
  Merge branch '2510-iuploader-interface'


  Commit: 46b8cc5439c0c9e65d248fa5c7bd9d58574c3e5d
      https://github.com/ckan/ckan/commit/46b8cc5439c0c9e65d248fa5c7bd9d58574c3e5d
  Author: amercader <amercadero at gmail.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/storage.py
    R ckan/tests/legacy/functional/test_storage.py
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  Merge branch 'delete-storage-class' of https://github.com/nigelbabu/ckan into nigelbabu-delete-storage-class


  Commit: 58c6e8f05a7c8e683234655138205b1f4439b017
      https://github.com/ckan/ckan/commit/58c6e8f05a7c8e683234655138205b1f4439b017
  Author: amercader <amercadero at gmail.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  Add note about the file uploads code


  Commit: 0cb66fec97790dcdb503b15504b2ae54f44f34a0
      https://github.com/ckan/ckan/commit/0cb66fec97790dcdb503b15504b2ae54f44f34a0
  Author: amercader <amercadero at gmail.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/storage.py
    R ckan/tests/legacy/functional/test_storage.py
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  Merge branch 'nigelbabu-delete-storage-class'


  Commit: 929f0a2d4499d9af7b9b80bc9e2af55a859482ef
      https://github.com/ckan/ckan/commit/929f0a2d4499d9af7b9b80bc9e2af55a859482ef
  Author: amercader <amercadero at gmail.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  Fix PEP8


  Commit: 4671c9318d99fc775be1329bac608ae05b66c7ab
      https://github.com/ckan/ckan/commit/4671c9318d99fc775be1329bac608ae05b66c7ab
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M ckanext/stats/controller.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
    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

  Log Message:
  -----------
  Merge pull request #2500 from ckan/2493-stats

[#2493] Stats extension clean-up


  Commit: a9c6c0e62a97675dba8f84a5ee58ae3f7b733824
      https://github.com/ckan/ckan/commit/a9c6c0e62a97675dba8f84a5ee58ae3f7b733824
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

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

  Log Message:
  -----------
  [#1572] dataset_purge action added


  Commit: e2fedb6a6870b4c7329899f10c897addd216d9b5
      https://github.com/ckan/ckan/commit/e2fedb6a6870b4c7329899f10c897addd216d9b5
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

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

  Log Message:
  -----------
  [#2631] Also purge Members by table_id.

* purge members instead of delete - I see no reason to keep the Member
  as state=deleted.
* a blank revision was being created - comment explains the removal.


  Commit: 3bbef1b029dcec224c54bafddc00655ac234916d
      https://github.com/ckan/ckan/commit/3bbef1b029dcec224c54bafddc00655ac234916d
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

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

  Log Message:
  -----------
  [#2631] Tests added for auth and orgs.


  Commit: 2f6b9039533ad2c218e22153c19b04edf693cea3
      https://github.com/ckan/ckan/commit/2f6b9039533ad2c218e22153c19b04edf693cea3
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

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

  Log Message:
  -----------
  [#2632] Delete the owner_org field of orphaned datasets. More tests.


  Commit: d5d275d399be99664c653b2cc5d1ca198823326f
      https://github.com/ckan/ckan/commit/d5d275d399be99664c653b2cc5d1ca198823326f
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    R ckan/tests/legacy/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/logic/action/test_delete.py

  Log Message:
  -----------
  [#2632/#2631] All tests migrated now from legacy.


  Commit: 31a28dd62fdd765ac1931463338076758982db9a
      https://github.com/ckan/ckan/commit/31a28dd62fdd765ac1931463338076758982db9a
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

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

  Log Message:
  -----------
  [#1572] More tests.


  Commit: 945aad58088bfea8bdeb18ab2b68738ad96e008a
      https://github.com/ckan/ckan/commit/945aad58088bfea8bdeb18ab2b68738ad96e008a
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/logic/action/delete.py
    A ckan/migration/versions/079_resource_revision_index.py

  Log Message:
  -----------
  [#1572] Fix slow purging using index. Fix CLI.


  Commit: f48a8e67b53933ae3eeab63193b04969587793fc
      https://github.com/ckan/ckan/commit/f48a8e67b53933ae3eeab63193b04969587793fc
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M ckan/migration/versions/079_resource_revision_index.py
    M ckan/tests/logic/action/test_delete.py

  Log Message:
  -----------
  [#1572] Test fixes.


  Commit: 7ca003ff0bbd156d2b8ba44f872a48d1de39b3a4
      https://github.com/ckan/ckan/commit/7ca003ff0bbd156d2b8ba44f872a48d1de39b3a4
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

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

  Log Message:
  -----------
  [#2632] PEP8


  Commit: b5b8cc5daeb23d432d67ae9defa08bbce06c47ac
      https://github.com/ckan/ckan/commit/b5b8cc5daeb23d432d67ae9defa08bbce06c47ac
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-09-11 (Fri, 11 Sep 2015)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/logic/action/delete.py
    M ckan/logic/auth/delete.py
    A ckan/migration/versions/079_resource_revision_index.py
    M ckan/model/group.py
    M ckan/tests/logic/action/test_delete.py

  Log Message:
  -----------
  Merge pull request #2634 from ckan/1572-dataset-purge

dataset_purge


  Commit: 1d885896e99ec73747574f338f99da207bedf2f1
      https://github.com/ckan/ckan/commit/1d885896e99ec73747574f338f99da207bedf2f1
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-09-11 (Fri, 11 Sep 2015)

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

  Log Message:
  -----------
  [#2624] Better err handling resource_status_show.

check auth should be before attempting the celery import. Also wrapped
the sqlalchemy statement in a try/except to catch exceptions raised when
celery is installed, but the celery_taskmeta table hasn't been created.


  Commit: 323c5bcd26dbb1da1a8ff66f096bde764bb1cb49
      https://github.com/ckan/ckan/commit/323c5bcd26dbb1da1a8ff66f096bde764bb1cb49
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-09-11 (Fri, 11 Sep 2015)

  Changed paths:
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_disable.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Allows the disabling of datastore_search_sql

Although the datastore is useful, it may be that some users may will to
disable the specific datastore_search_sql.  This commit allows them to do
that.


  Commit: 7096d6e979acb20b0a0ec025c6d8c7ac5f329246
      https://github.com/ckan/ckan/commit/7096d6e979acb20b0a0ec025c6d8c7ac5f329246
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-11 (Fri, 11 Sep 2015)

  Changed paths:
    M ckan/logic/action/delete.py
    A ckan/migration/versions/080_continuity_id_indexes.py
    M ckan/model/domain_object.py
    M ckan/tests/logic/action/test_delete.py
    M test-core.ini

  Log Message:
  -----------
  [#1572] Improvements
* no revision is needed when purging the package. The only thing being
  created is a Activity, which is not revisioned.
* no need to explicitly delete an object's revision objects. Despite the
  very old comment, it is clear that this does happen naturally through
  cascades. This is verified in the test and by reading the SQL
  produced.
* Added a resource to the test for fullness.
* Added helpful comments to the test-core.ini to show people how to use
  it to see generated SQL commands.


  Commit: 4ca2e6158c4004482b31f0b80382e338feba56b8
      https://github.com/ckan/ckan/commit/4ca2e6158c4004482b31f0b80382e338feba56b8
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-09-11 (Fri, 11 Sep 2015)

  Changed paths:
    M ckan/config/resource_formats.json
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  Merge pull request #2529 from ckan/formats_added

Add mimetypes to resource_formats.json


  Commit: d2c1b8429c56b5c4c68891330803cbab6c1bbad5
      https://github.com/ckan/ckan/commit/d2c1b8429c56b5c4c68891330803cbab6c1bbad5
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-09-11 (Fri, 11 Sep 2015)

  Changed paths:
    M ckan/pastertemplates/__init__.py
    M ckan/pastertemplates/template/setup.py_tmpl

  Log Message:
  -----------
  Fix encoding of setup.py for non-ascii names

Sets the default-encoding so that what the user enters is utf8 and
this stops the paster templates for exploding.  Also sets the encoding
on the setup.py template so that it can be run if it has utf8 chars in it

This should fix #2636


  Commit: ed5fe6e86e520800edcf84d37e5f0c1d8a6ef485
      https://github.com/ckan/ckan/commit/ed5fe6e86e520800edcf84d37e5f0c1d8a6ef485
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-09-14 (Mon, 14 Sep 2015)

  Changed paths:
    M ckan/logic/action/delete.py
    A ckan/migration/versions/080_continuity_id_indexes.py
    M ckan/model/domain_object.py
    M ckan/tests/logic/action/test_delete.py
    M test-core.ini

  Log Message:
  -----------
  Merge pull request #2637 from ckan/1572-dataset-purge

dataset_purge improvements


  Commit: 2c5a25e6b5036af799aae5af9825fe20d17cce52
      https://github.com/ckan/ckan/commit/2c5a25e6b5036af799aae5af9825fe20d17cce52
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-09-14 (Mon, 14 Sep 2015)

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/organization/read_base.html

  Log Message:
  -----------
  [#2640] Add offset param to organization_activity


  Commit: 147ebed683398ef6bc9964c8bb543421ae942e7a
      https://github.com/ckan/ckan/commit/147ebed683398ef6bc9964c8bb543421ae942e7a
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-09-14 (Mon, 14 Sep 2015)

  Changed paths:
    M ckan/config/resource_formats.json
    M ckan/lib/cli.py
    M ckan/logic/action/delete.py
    M ckan/logic/auth/delete.py
    A ckan/migration/versions/079_resource_revision_index.py
    A ckan/migration/versions/080_continuity_id_indexes.py
    M ckan/model/domain_object.py
    M ckan/model/group.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/logic/action/test_delete.py
    M test-core.ini

  Log Message:
  -----------
  Merge with master


  Commit: c991cd6fd35d7b328627a097fdf200ffe0b12765
      https://github.com/ckan/ckan/commit/c991cd6fd35d7b328627a097fdf200ffe0b12765
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-09-14 (Mon, 14 Sep 2015)

  Changed paths:
    M ckan/logic/action/delete.py
    R ckan/tests/legacy/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/logic/action/test_delete.py

  Log Message:
  -----------
  Merge pull request #2633 from ckan/2631-group-purge

group_purge fixes


  Commit: 03c1ce053359603d69d9de4e8a81238171354082
      https://github.com/ckan/ckan/commit/03c1ce053359603d69d9de4e8a81238171354082
  Author: Denis Zgonjanin <deniszgonjanin at gmail.com>
  Date:   2015-09-14 (Mon, 14 Sep 2015)

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

  Log Message:
  -----------
  Search index rebuild takes a while; let's give it a progress counter


  Commit: 2dbd53e59474a56186f85474c51c36710af2a1bf
      https://github.com/ckan/ckan/commit/2dbd53e59474a56186f85474c51c36710af2a1bf
  Author: joetsoi <joetsoi at users.noreply.github.com>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  [#2461] Add custom translation directory after plugins


  Commit: 2d26a841a35509d51e1d16e1c1a69c4d312444b8
      https://github.com/ckan/ckan/commit/2d26a841a35509d51e1d16e1c1a69c4d312444b8
  Author: joetsoi <joetsoi at users.noreply.github.com>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/storage.py
    M ckan/lib/helpers.py
    M ckan/lib/lazyjson.py
    M ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/plugins/interfaces.py
    M ckan/templates/snippets/organization_item.html
    R ckan/tests/legacy/functional/test_storage.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/logic/action/test_get.py
    M ckanext/stats/controller.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
    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 doc/maintaining/datastore.rst

  Log Message:
  -----------
  Merge branch 'master' into itranslation-interface

Conflicts:
	ckan/plugins/interfaces.py


  Commit: 052e3268a39faaa8b4fb06f0e7f90e6601b85245
      https://github.com/ckan/ckan/commit/052e3268a39faaa8b4fb06f0e7f90e6601b85245
  Author: joetsoi <joetsoi at users.noreply.github.com>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    A ckan/pastertemplates/template/setup.cfg_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/interfaces.py
    A ckanext/example_itranslation/plugin_v1.py
    A ckanext/example_itranslation/setup.cfg
    M doc/extensions/index.rst
    A doc/extensions/translating-extensions.rst
    M setup.py

  Log Message:
  -----------
  [#2643] ITranslation docs


  Commit: 50f5e37d3729538fa5b54be45c8011bca83e5c42
      https://github.com/ckan/ckan/commit/50f5e37d3729538fa5b54be45c8011bca83e5c42
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    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

  Log Message:
  -----------
  Merge pull request #2614 from LaurentGoderre/2601-remove-legacy-resources

Removed legacy front-end resources


  Commit: 76f2c48d89bdb38810f8d6a63dc3e3ffda9a6cdf
      https://github.com/ckan/ckan/commit/76f2c48d89bdb38810f8d6a63dc3e3ffda9a6cdf
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M ckan/lib/i18n.py
    M ckan/lib/plugins.py
    M ckan/plugins/interfaces.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/templates/home/index.html
    A ckanext/example_itranslation/tests/__init__.py
    A ckanext/example_itranslation/tests/test_plugin.py
    M doc/maintaining/configuration.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #2461 from joetsoi/itranslation-interface

add ITranslations interface


  Commit: 70751c863ee0eff825111ecd145c51a820105793
      https://github.com/ckan/ckan/commit/70751c863ee0eff825111ecd145c51a820105793
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    A ckan/pastertemplates/template/setup.cfg_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/interfaces.py
    A ckanext/example_itranslation/plugin_v1.py
    A ckanext/example_itranslation/setup.cfg
    M doc/extensions/index.rst
    A doc/extensions/translating-extensions.rst
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'joetsoi/itranslation-docs'


  Commit: 4325eeda5a12ba74104cdf46b9fa2e844b71c763
      https://github.com/ckan/ckan/commit/4325eeda5a12ba74104cdf46b9fa2e844b71c763
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

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

  Log Message:
  -----------
  Merge pull request #2624 from ckan/2624-resource_status_show

resource_status_show action causes wrong exception when celery not installed


  Commit: 35823d807c569626a151a7a938d7f681d13b6014
      https://github.com/ckan/ckan/commit/35823d807c569626a151a7a938d7f681d13b6014
  Author: Denis Zgonjanin <deniszgonjanin at gmail.com>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

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

  Log Message:
  -----------
  add --quiet option to paster search index rebuild progress meter


  Commit: 02965b756a8e3af332c5066af92b649a75fe4521
      https://github.com/ckan/ckan/commit/02965b756a8e3af332c5066af92b649a75fe4521
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Clarify that site_url doesn't set the site's mount path
In response to:
http://stackoverflow.com/questions/32495459/install-ckan-in-a-sub-directory


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

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

  Log Message:
  -----------
  Add missing import


  Commit: 599df452aab1f1e1555f9dab85c582d51847a7e7
      https://github.com/ckan/ckan/commit/599df452aab1f1e1555f9dab85c582d51847a7e7
  Author: amercader <amercadero at gmail.com>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_disable.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch 'disable-datastore-sql'


  Commit: 1028e8a9dff3082b8cf521ff06cdb35f27f9d758
      https://github.com/ckan/ckan/commit/1028e8a9dff3082b8cf521ff06cdb35f27f9d758
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-16 (Wed, 16 Sep 2015)

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

  Log Message:
  -----------
  Merge branch 'search_index_rebuild_progress' of https://github.com/deniszgonjanin/ckan into deniszgonjanin-search_index_rebuild_progress


  Commit: fd9bf893f9c0cfc77043f3b6384a62ee960612ac
      https://github.com/ckan/ckan/commit/fd9bf893f9c0cfc77043f3b6384a62ee960612ac
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-16 (Wed, 16 Sep 2015)

  Changed paths:
    M ckan/tests/legacy/lib/test_cli.py

  Log Message:
  -----------
  Fix test


  Commit: 1414e76f2fe1b810025b6df18d0679c9e878a020
      https://github.com/ckan/ckan/commit/1414e76f2fe1b810025b6df18d0679c9e878a020
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-16 (Wed, 16 Sep 2015)

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

  Log Message:
  -----------
  Merge pull request #2645 from ckan/deniszgonjanin-search_index_rebuild_progress

Deniszgonjanin search index rebuild progress


  Commit: d0081e08068c30b51a1346410af76f9604d4053f
      https://github.com/ckan/ckan/commit/d0081e08068c30b51a1346410af76f9604d4053f
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/organization/read_base.html

  Log Message:
  -----------
  Merge pull request #2640 from ckan/2640-org-offset

Exception when viewing Organizations extended with IGroupForm


  Commit: 0ad2f8a2feaf9ab3781231e456136f43198d30dc
      https://github.com/ckan/ckan/commit/0ad2f8a2feaf9ab3781231e456136f43198d30dc
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge pull request #2644 from ckan/site-url-clarification

Clarify that site_url doesn't set the site's mount path


  Commit: 6296d8813b4b9e174229c32075d16a9f42c024ca
      https://github.com/ckan/ckan/commit/6296d8813b4b9e174229c32075d16a9f42c024ca
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-22 (Tue, 22 Sep 2015)

  Changed paths:
    M ckan/pastertemplates/__init__.py

  Log Message:
  -----------
  [#2636] comment for the scary stuff


  Commit: 9f4de3882c8425f44324d75b759f4c115bca1835
      https://github.com/ckan/ckan/commit/9f4de3882c8425f44324d75b759f4c115bca1835
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-22 (Tue, 22 Sep 2015)

  Changed paths:
    M ckan/pastertemplates/__init__.py
    M ckan/pastertemplates/template/setup.py_tmpl

  Log Message:
  -----------
  Merge branch '2636-fix-encoding-create-ext'


  Commit: 5a287b04e475260356b83f73462bfad17347b052
      https://github.com/ckan/ckan/commit/5a287b04e475260356b83f73462bfad17347b052
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-09-22 (Tue, 22 Sep 2015)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/search/__init__.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/functional/api/model/test_tag.py
    M ckan/tests/legacy/functional/api/test_package_search.py
    M ckan/tests/legacy/functional/test_group.py
    M ckan/tests/legacy/lib/test_cli.py
    M ckan/tests/legacy/lib/test_dictization.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/logic/test_action.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    M ckan/tests/logic/action/test_delete.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py

  Log Message:
  -----------
  Separates search.clear() into two functions


  Commit: 91e41b2e68faa3df5296a632f4862f5a55e69e62
      https://github.com/ckan/ckan/commit/91e41b2e68faa3df5296a632f4862f5a55e69e62
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/search/__init__.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/functional/api/model/test_tag.py
    M ckan/tests/legacy/functional/api/test_package_search.py
    M ckan/tests/legacy/functional/test_group.py
    M ckan/tests/legacy/lib/test_cli.py
    M ckan/tests/legacy/lib/test_dictization.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/logic/test_action.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    M ckan/tests/logic/action/test_delete.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py

  Log Message:
  -----------
  Merge pull request #2653 from ckan/2652-make-search-clear-less-risky

Separates search.clear() into two functions


  Commit: f1ff96f18d121fcba4ca84bda3b2ddbac3381ddd
      https://github.com/ckan/ckan/commit/f1ff96f18d121fcba4ca84bda3b2ddbac3381ddd
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-29 (Tue, 29 Sep 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/authz.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/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    R ckan/controllers/related.py
    M ckan/controllers/storage.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/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    A ckan/lib/lazyjson.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.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/auth/delete.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
    A ckan/migration/versions/079_resource_revision_index.py
    A ckan/migration/versions/080_continuity_id_indexes.py
    M ckan/model/__init__.py
    R ckan/model/authz.py
    M ckan/model/domain_object.py
    M ckan/model/group.py
    M ckan/model/license.py
    M ckan/model/modification.py
    M ckan/model/system_info.py
    M ckan/pastertemplates/__init__.py
    M ckan/pastertemplates/template/README.rst_tmpl
    A ckan/pastertemplates/template/setup.cfg_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/main.js
    M ckan/public/base/test/index.html
    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/admin/config.html
    R ckan/templates/ajax_snippets/related-item.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/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/home/snippets/stats.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/read_base.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
    M ckan/templates/package/read.html
    R ckan/templates/package/read.n3
    R ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.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
    A ckan/templates/snippets/local_friendly_datetime.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/tag/index.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
    A 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_home.py
    A 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/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
    R ckan/tests/legacy/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/legacy/functional/api/model/test_package.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_dashboard.py
    M ckan/tests/legacy/functional/api/test_package_search.py
    R ckan/tests/legacy/functional/api/test_revision_search.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
    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_related.py
    R ckan/tests/legacy/functional/test_storage.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/lib/test_cli.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/legacy/lib/test_helpers.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/logic/test_action.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/legacy/models/test_group.py
    R ckan/tests/legacy/models/test_license.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_delete.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/licenses.v1
    A ckan/tests/model/licenses.v2
    A ckan/tests/model/test_license.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/helpers.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    A ckanext/datastore/tests/test_disable.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_idatasetform/tests/test_example_idatasetform.py
    A ckanext/example_igroupform/__init__.py
    A ckanext/example_igroupform/plugin.py
    A ckanext/example_igroupform/tests/__init__.py
    A ckanext/example_igroupform/tests/test_controllers.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
    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/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    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
    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
    M ckanext/stats/templates/ckanext/stats/index.html
    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/test_stats_lib.py
    M contrib/docker/my_init.d/50_configure
    M dev-requirements.txt
    R doc/api.rst
    M doc/api/index.rst
    M doc/api/legacy-api.rst
    M doc/contents.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/template-blocks.rst
    M doc/contributing/release-process.rst
    M doc/contributing/reviewing.rst
    M doc/extensions/index.rst
    A doc/extensions/remote-config-update.rst
    A doc/extensions/translating-extensions.rst
    A doc/images/custom_config_fields.png
    M doc/index.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.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
    M test-core.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 2382-package-search-performance

Conflicts:
	ckan/logic/action/get.py


  Commit: 3dad5d1af5633fb2de57c5730a2bdaa062e5bedd
      https://github.com/ckan/ckan/commit/3dad5d1af5633fb2de57c5730a2bdaa062e5bedd
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M ckan/tests/legacy/functional/api/model/test_group.py
    M ckan/tests/legacy/lib/test_dictization_schema.py

  Log Message:
  -----------
  [#2382] fix tests


  Commit: 85108d89ebff59fcbf4ee847b8e234c93329bc85
      https://github.com/ckan/ckan/commit/85108d89ebff59fcbf4ee847b8e234c93329bc85
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/tests/legacy/functional/api/model/test_group.py
    M ckan/tests/legacy/lib/test_dictization_schema.py

  Log Message:
  -----------
  Merge pull request #2382 from wardi/2382-package-search-performance

package_search performance


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

  Changed paths:
    M doc/contributing/issues.rst

  Log Message:
  -----------
  Document issue policy


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

  Changed paths:
    M doc/contributing/issues.rst

  Log Message:
  -----------
  Issue policy - formatting


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

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  Document what the options are for CKAN icons.


  Commit: 92f65215c90ef123aa7934c038040e2b60694a34
      https://github.com/ckan/ckan/commit/92f65215c90ef123aa7934c038040e2b60694a34
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-10-08 (Thu, 08 Oct 2015)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  Merge pull request #2672 from ckan/icon-tip

Document what the options are for CKAN icons.


  Commit: a6256ac45ccda03e05e9d01b3c529ac1e236f148
      https://github.com/ckan/ckan/commit/a6256ac45ccda03e05e9d01b3c529ac1e236f148
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-10-08 (Thu, 08 Oct 2015)

  Changed paths:
    M doc/contributing/issues.rst

  Log Message:
  -----------
  Merge pull request #2671 from ckan/doc-issues

Github issues - document our policy


  Commit: 50a98caf02ede59c0f7c6cf7e4aa738424ee49c4
      https://github.com/ckan/ckan/commit/50a98caf02ede59c0f7c6cf7e4aa738424ee49c4
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

  Changed paths:
    M requirements.txt

  Log Message:
  -----------
  [#2561] Run pip-compile again


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

  Changed paths:
    M CHANGELOG.rst
    M bin/less
    M ckan/authz.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    R ckan/controllers/related.py
    M ckan/controllers/storage.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    A ckan/lib/lazyjson.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.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/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/update.py
    A 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
    M ckan/model/__init__.py
    R ckan/model/authz.py
    M ckan/model/domain_object.py
    M ckan/model/group.py
    M ckan/model/modification.py
    M ckan/pastertemplates/__init__.py
    A ckan/pastertemplates/template/setup.cfg_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/main.js
    M ckan/public/base/test/index.html
    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
    R ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/read.html
    R ckan/templates/package/read.n3
    R ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/snippets/additional_info.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
    A ckan/templates/snippets/local_friendly_datetime.html
    M ckan/templates/snippets/organization_item.html
    M ckan/tests/controllers/test_api.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/helpers.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/ckantestplugins.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_package.py
    M ckan/tests/legacy/functional/api/model/test_tag.py
    M ckan/tests/legacy/functional/api/test_package_search.py
    R ckan/tests/legacy/functional/api/test_revision_search.py
    M ckan/tests/legacy/functional/test_admin.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_related.py
    R ckan/tests/legacy/functional/test_storage.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_helpers.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/logic/test_action.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/legacy/models/test_user.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_plugins.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.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/helpers.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    A ckanext/datastore/tests/test_disable.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.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
    M ckanext/example_theme/v08_custom_helper_function/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/stats/controller.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
    M ckanext/stats/templates/ckanext/stats/index.html
    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/test_stats_lib.py
    R doc/api.rst
    M doc/api/legacy-api.rst
    M doc/contents.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/issues.rst
    M doc/contributing/reviewing.rst
    M doc/extensions/index.rst
    A doc/extensions/translating-extensions.rst
    M doc/index.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/linked-data-and-rdf.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into upgrade-requirements

Conflicts:
	requirements.txt


Compare: https://github.com/ckan/ckan/compare/0f1c8582d380...5f10aef6b8bf


More information about the ckan-changes mailing list