[ckan-changes] [ckan/ckan] 6e5fa2: [#3196] Common session object using LocalProxy

GitHub noreply at github.com
Fri Mar 31 18:05:34 UTC 2017 

  Branch: refs/heads/3384-datastore-cli
  Home:   https://github.com/ckan/ckan
  Commit: 6e5fa2b93bd27b046bae078f6d4913643f88c40c
      https://github.com/ckan/ckan/commit/6e5fa2b93bd27b046bae078f6d4913643f88c40c
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-18 (Thu, 18 Aug 2016)

  Changed paths:
    M ckan/common.py
    M ckan/lib/base.py
    M ckan/tests/legacy/lib/test_i18n.py

  Log Message:
  -----------
  [#3196] Common session object using LocalProxy


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

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

  Log Message:
  -----------
  [#3196] Use Beaker as the Flask Session interface

To allow support both on Pylons and Flask.

Full credit to @brew (d4367d4 and 28bc9c4)


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

  Changed paths:
    A ckan/templates/tests/flash_messages.html
    A ckan/tests/config/test_sessions.py
    M setup.py

  Log Message:
  -----------
  [#3196] Add tests for common sessions support


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

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

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

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

Changed wrong reference in a test


  Commit: df6acf2035a009e576b050a813ac0457f05d9885
      https://github.com/ckan/ckan/commit/df6acf2035a009e576b050a813ac0457f05d9885
  Author: Gleb <gleb.rudenko at linkdigital.com.au>
  Date:   2016-08-30 (Tue, 30 Aug 2016)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Redirect to login page instead of Page not found 404 when anonymous user is trying to access to /dashboard page and all user related pages


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

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

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

Conflicts:
	ckan/config/middleware/flask_app.py


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

  Changed paths:
    M ckan/controllers/feed.py

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


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

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

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

Conflicts:
	ckan/plugins/interfaces.py


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

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

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

Clarify what app will you get on the interface docstrings

Conflicts:
	ckan/plugins/interfaces.py


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

  Changed paths:
    M ckan/tests/config/test_sessions.py

  Log Message:
  -----------
  [#3196] Import common redirect function in tests


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

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

  Log Message:
  -----------
  Rename deleted datasets

When user creates new dataset with the same name as in previously
removed, old dataset renamed - its id writed into name, in order
to prevent feature conflicts


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

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

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


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

  Changed paths:
    M ckan/common.py

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


  Commit: 78257ad105525d449d73452093da073aafe0a7da
      https://github.com/ckan/ckan/commit/78257ad105525d449d73452093da073aafe0a7da
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-09 (Mon, 09 Jan 2017)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    M ckan/logic/schema.py
    M ckan/templates/macros/autoform.html

  Log Message:
  -----------
  Changes to the way of uploading the CKAN logo image. In the form we will have image upload control.


  Commit: e0448feeb63d6892d355e29f5c0b4ae6b6253e1e
      https://github.com/ckan/ckan/commit/e0448feeb63d6892d355e29f5c0b4ae6b6253e1e
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-10 (Tue, 10 Jan 2017)

  Changed paths:
    A .travis.yml
    M Dockerfile
    M ckan/authz.py
    M ckan/common.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware/flask_app.py
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/maintain.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/update.py
    M ckan/model/dashboard.py
    M ckan/model/system_info.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/images/background-tag-ie7.png
    M ckan/public/base/images/background-tag.png
    M ckan/public/base/images/background-tile.png
    M ckan/public/base/images/bg.png
    M ckan/public/base/images/breadcrumb-slash-ie7.png
    M ckan/public/base/images/ckan-logo-footer.png
    M ckan/public/base/images/ckan-logo.png
    M ckan/public/base/images/dashboard-followee-related.png
    M ckan/public/base/images/dotted.png
    M ckan/public/base/images/editing.png
    M ckan/public/base/images/full-width-nav-right.png
    M ckan/public/base/images/icon-search-27x26.png
    M ckan/public/base/images/nav-active.png
    M ckan/public/base/images/nav.png
    M ckan/public/base/images/od_80x15_blue.png
    M ckan/public/base/images/placeholder-200x125.png
    M ckan/public/base/images/placeholder-420x220.png
    M ckan/public/base/images/placeholder-680x400.png
    M ckan/public/base/images/placeholder-application.png
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-image.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/images/sprite-ckan-icons.png
    M ckan/public/base/images/sprite-resource-icons.png
    M ckan/public/base/images/table-seperator.png
    M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    M ckan/public/base/vendor/select2/select2.png
    M ckan/public/base/vendor/select2/select2x2.png
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/helpers.py
    M ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po
    M ckan/tests/lib/test_base.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/test_common.py
    A ckan/views/__init__.py
    A ckan/views/api.py
    A ckanext/example_flask_iblueprint/__init__.py
    A ckanext/example_flask_iblueprint/plugin.py
    A ckanext/example_flask_iblueprint/templates/about.html
    A ckanext/example_flask_iblueprint/templates/about_base.html
    A ckanext/example_flask_iblueprint/tests/__init__.py
    A ckanext/example_flask_iblueprint/tests/test_routes.py
    M ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
    M ckanext/imageview/plugin.py
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_222222_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_2e83ff_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_454545_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_888888_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_cd0a0a_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_redo.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_peppermint.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_spearmint.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_undo.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_blue.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_star.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/drag-handle.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/help.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-asc.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-desc.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/stripes.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tag_red.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tick.png
    M ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    M ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    M ckanext/test_tag_vocab_plugin.py
    A contrib/docker/ckan-entrypoint.sh
    M contrib/docker/docker-cloud.yml
    M contrib/docker/docker-compose.yml
    M contrib/docker/solr/Dockerfile
    M dev-requirements.txt
    M doc/_static/ckanlogo.png
    M doc/images/9.png
    M doc/images/add_dataset_1.jpg
    M doc/images/add_dataset_2.jpg
    M doc/images/add_dataset_3.jpg
    M doc/images/architecture.png
    M doc/images/ckan_importing_diagram.png
    M doc/images/create_organization.jpg
    M doc/images/custom-css.png
    M doc/images/custom_config_fields.png
    M doc/images/customize_look_and_feel.jpg
    M doc/images/debug-footer.png
    M doc/images/edit_dataset.jpg
    M doc/images/example_theme_javascript_popover.png
    M doc/images/example_theme_overlapping_popovers.png
    M doc/images/exploring_datasets.jpg
    M doc/images/extra-public-dir.png
    M doc/images/html_and_css.png
    M doc/images/image_view.png
    M doc/images/manage_news_feed.jpg
    M doc/images/manage_organization.jpg
    M doc/images/manage_user_profile.jpg
    M doc/images/manage_users.jpg
    M doc/images/manage_views.png
    M doc/images/more-custom-css.png
    M doc/images/most-popular-groups-custom-snippet.png
    M doc/images/most-popular-groups-snippet.png
    M doc/images/most-popular-groups.png
    M doc/images/move_dataset_between_organizations.jpg
    M doc/images/popular-dataset.png
    M doc/images/popular-resource.png
    M doc/images/recently-changed-packages-activity-stream.png
    M doc/images/recline_graph_view.png
    M doc/images/recline_grid_view.png
    M doc/images/recline_map_view.png
    M doc/images/recline_view.png
    M doc/images/register_account.jpg
    M doc/images/search_the_site.jpg
    M doc/images/sort-datasets-by-popularity.png
    M doc/images/text_view.png
    M doc/images/views_overview.png
    M doc/images/webpage_view.png
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/ckan/ckan into ckan-logo-upload


  Commit: 56d171b5a4610292b723cdf14c7d3c46c8d2d23b
      https://github.com/ckan/ckan/commit/56d171b5a4610292b723cdf14c7d3c46c8d2d23b
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-16 (Mon, 16 Jan 2017)

  Changed paths:
    M .circleci-matrix.yml
    M CHANGELOG.rst
    M ckan/ckan_nose_plugin.py
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/i18n/+dot+gitignore
    M ckan/templates/user/dashboard_organizations.html
    M ckanext/datastore/controller.py
    A ckanext/datastore/writer.py
    M doc/maintaining/datastore.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into ckan-logo-upload


  Commit: b27468f42b7a46c138091d70c7e5e7664c9516cc
      https://github.com/ckan/ckan/commit/b27468f42b7a46c138091d70c7e5e7664c9516cc
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-01-16 (Mon, 16 Jan 2017)

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

  Log Message:
  -----------
  Fix for package_update exception when id is missing. Modernize tests for package_create, package_update, resource_create, resource_update where its straightforward.


  Commit: 7f62cd293bbf79e4b73072f1a3059ea95b2c940d
      https://github.com/ckan/ckan/commit/7f62cd293bbf79e4b73072f1a3059ea95b2c940d
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-01-16 (Mon, 16 Jan 2017)

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

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


  Commit: c236fede8bcdbfbed7cb9dc70dd5c72d499dcc7b
      https://github.com/ckan/ckan/commit/c236fede8bcdbfbed7cb9dc70dd5c72d499dcc7b
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/logic/action/update.py
    M ckan/templates/macros/autoform.html

  Log Message:
  -----------
  added logic for uploading the logo image


  Commit: 9975f46788c2c7682583a0d65ccabd281eb7d956
      https://github.com/ckan/ckan/commit/9975f46788c2c7682583a0d65ccabd281eb7d956
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

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

  Log Message:
  -----------
  Tidy tests.


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

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

  Log Message:
  -----------
  Merge pull request #3399 from ckan/package_update_missing_id_exception

Fix for package_update exception when id is missing.


  Commit: 2a4cc29b37606e3cce5567a1337a63b9d76e465d
      https://github.com/ckan/ckan/commit/2a4cc29b37606e3cce5567a1337a63b9d76e465d
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/controllers/group.py
    M ckan/lib/app_globals.py
    M ckan/templates/admin/config.html
    M ckan/templates/macros/autoform.html

  Log Message:
  -----------
   Image upload at admin config form enabled


  Commit: cba5a9b4dc9763d23a30180e9a48a45449d85ea8
      https://github.com/ckan/ckan/commit/cba5a9b4dc9763d23a30180e9a48a45449d85ea8
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M ckan/controllers/admin.py

  Log Message:
  -----------
   Image upload at admin config form enabled


  Commit: 9ed8c525da9a85ba7a878dd2f108a2c39411546a
      https://github.com/ckan/ckan/commit/9ed8c525da9a85ba7a878dd2f108a2c39411546a
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
   Image upload at admin config form enabled


  Commit: 55782c32892147bf127f33866ddc168a430fbfe7
      https://github.com/ckan/ckan/commit/55782c32892147bf127f33866ddc168a430fbfe7
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
   Image upload at admin config form enabled


  Commit: 61f2b46b46910d2e8a0daa5d67a944732de6b7be
      https://github.com/ckan/ckan/commit/61f2b46b46910d2e8a0daa5d67a944732de6b7be
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    A .editorconfig

  Log Message:
  -----------
  Added EditorConfig File


  Commit: f458954d42cae1eead10b801289df1902b6b5104
      https://github.com/ckan/ckan/commit/f458954d42cae1eead10b801289df1902b6b5104
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M ckan/lib/fanstatic_resources.py

  Log Message:
  -----------
  [depends] section if resource.config

Now groups in resource.config['depends'] can
define another groups from the same file as
their dependencies


  Commit: d5a636c1ffcc2a430a691a7eb96fdf8fb6aea799
      https://github.com/ckan/ckan/commit/d5a636c1ffcc2a430a691a7eb96fdf8fb6aea799
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M ckan/lib/fanstatic_resources.py

  Log Message:
  -----------
  Forget about sets - they can change order of items


  Commit: 01547b579477e8b85a348e20a647ee8fe5d97921
      https://github.com/ckan/ckan/commit/01547b579477e8b85a348e20a647ee8fe5d97921
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

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

  Log Message:
  -----------
   Fix in test case, instead of ckan.site_logo is used image_url


  Commit: 82b7a18b0719e8f2a895503032b0265888857cbb
      https://github.com/ckan/ckan/commit/82b7a18b0719e8f2a895503032b0265888857cbb
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    R ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/fonts/FontAwesome.otf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/less/bordered-pulled.less
    A ckan/public/base/vendor/font-awesome/less/less/core.less
    A ckan/public/base/vendor/font-awesome/less/less/extras.less
    A ckan/public/base/vendor/font-awesome/less/less/fixed-width.less
    A ckan/public/base/vendor/font-awesome/less/less/font-awesome-ie7.less
    A ckan/public/base/vendor/font-awesome/less/less/font-awesome.less
    A ckan/public/base/vendor/font-awesome/less/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/less/larger.less
    A ckan/public/base/vendor/font-awesome/less/less/list.less
    A ckan/public/base/vendor/font-awesome/less/less/mixins.less
    A ckan/public/base/vendor/font-awesome/less/less/path.less
    A ckan/public/base/vendor/font-awesome/less/less/rotated-flipped.less
    A ckan/public/base/vendor/font-awesome/less/less/spinning.less
    A ckan/public/base/vendor/font-awesome/less/less/stacked.less
    A ckan/public/base/vendor/font-awesome/less/less/variables.less

  Log Message:
  -----------
  upgrade font-awesome to v4.0.3


  Commit: 19ef8ee5d9686a4dd24dc94ad51da35c02274446
      https://github.com/ckan/ckan/commit/19ef8ee5d9686a4dd24dc94ad51da35c02274446
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    A ckan/public/base/vendor/font-awesome/less/bordered-pulled.less
    M ckan/public/base/vendor/font-awesome/less/core.less
    M ckan/public/base/vendor/font-awesome/less/extras.less
    A ckan/public/base/vendor/font-awesome/less/fixed-width.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    M ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/larger.less
    R ckan/public/base/vendor/font-awesome/less/less/bootstrap.less
    R ckan/public/base/vendor/font-awesome/less/less/bordered-pulled.less
    R ckan/public/base/vendor/font-awesome/less/less/core.less
    R ckan/public/base/vendor/font-awesome/less/less/extras.less
    R ckan/public/base/vendor/font-awesome/less/less/fixed-width.less
    R ckan/public/base/vendor/font-awesome/less/less/font-awesome-ie7.less
    R ckan/public/base/vendor/font-awesome/less/less/font-awesome.less
    R ckan/public/base/vendor/font-awesome/less/less/icons.less
    R ckan/public/base/vendor/font-awesome/less/less/larger.less
    R ckan/public/base/vendor/font-awesome/less/less/list.less
    R ckan/public/base/vendor/font-awesome/less/less/mixins.less
    R ckan/public/base/vendor/font-awesome/less/less/path.less
    R ckan/public/base/vendor/font-awesome/less/less/rotated-flipped.less
    R ckan/public/base/vendor/font-awesome/less/less/spinning.less
    R ckan/public/base/vendor/font-awesome/less/less/stacked.less
    R ckan/public/base/vendor/font-awesome/less/less/variables.less
    A ckan/public/base/vendor/font-awesome/less/list.less
    M ckan/public/base/vendor/font-awesome/less/mixins.less
    M ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/rotated-flipped.less
    A ckan/public/base/vendor/font-awesome/less/spinning.less
    A ckan/public/base/vendor/font-awesome/less/stacked.less
    M ckan/public/base/vendor/font-awesome/less/variables.less

  Log Message:
  -----------
  fix directory for font-awesome


  Commit: 7cae1c84fd4cdbe0e4bd48a8bdacb2012567d889
      https://github.com/ckan/ckan/commit/7cae1c84fd4cdbe0e4bd48a8bdacb2012567d889
  Author: fanjinfei <fanjinfei at hotmail.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/admin/trash.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/primer.html
    M ckan/templates/development/snippets/actions.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/list.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/development/snippets/simple-input.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/snippets/help.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/organization/snippets/info.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/new_resource_not_draft.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/resource_views.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_help.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.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.html
    M ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/package/snippets/view_help.html
    M ckan/templates/package/view_edit_base.html
    M ckan/templates/revision/read.html
    M ckan/templates/snippets/activity_item.html
    M 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/home_breadcrumb_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/user_search.html
    M ckanext/datastore/templates/package/snippets/data_api_button.html
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    M ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    M ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M ckanext/stats/templates/ckanext/stats/index.html
    M doc/_templates/footer.html

  Log Message:
  -----------
  update templates for font-awesome 4


  Commit: 83ff40e40a43c4fa4e9f27c7769bd434b0a57277
      https://github.com/ckan/ckan/commit/83ff40e40a43c4fa4e9f27c7769bd434b0a57277
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/members.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/search.html
    M ckan/templates/user/dashboard_datasets.html
    M ckan/templates/user/dashboard_groups.html
    M ckan/templates/user/dashboard_organizations.html

  Log Message:
  -----------
  additional icon update


  Commit: 6ef85695e47c5e3e0b87869916d9b6e681a523d1
      https://github.com/ckan/ckan/commit/6ef85695e47c5e3e0b87869916d9b6e681a523d1
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M ckan/config/routing.py
    M ckan/lib/plugins.py

  Log Message:
  -----------
  icon update for fontawesome 4.x


  Commit: e458c59179c6c0b501a707f27707c96ce8db73a8
      https://github.com/ckan/ckan/commit/e458c59179c6c0b501a707f27707c96ce8db73a8
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M ckan/plugins/interfaces.py
    M ckanext/reclineview/plugin.py

  Log Message:
  -----------
  icon update for font-awesome 4.x -- part 2


  Commit: 6e12b6a23b4e8ce481ee3439a19d3d26db5b10fc
      https://github.com/ckan/ckan/commit/6e12b6a23b4e8ce481ee3439a19d3d26db5b10fc
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M ckan/lib/activity_streams.py
    M ckanext/example_iconfigurer/plugin.py
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    M ckanext/imageview/plugin.py
    M ckanext/textview/plugin.py

  Log Message:
  -----------
  icon update for font-awesome 4.x -- part 3


  Commit: 0a06d22e9f67420c08b84ebb38b7cbacead68774
      https://github.com/ckan/ckan/commit/0a06d22e9f67420c08b84ebb38b7cbacead68774
  Author: Mark Gregson <mark.gregson at linkdigital.com.au>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M ckan/lib/email_notifications.py

  Log Message:
  -----------
  Use UTC when selecting activities for notification emails

Activity timestamps are stored in UTC since #3240 and Dashboard.activity_stream_last_viewed stored in UTC since #3374. All dates that can be used as the starting boundary for selecting activities must also be UTC in order to calculate the correct date and time range for the notification being sent.


  Commit: 73ba6ff46a8b7b1a3bb9220089b36a439663a65c
      https://github.com/ckan/ckan/commit/73ba6ff46a8b7b1a3bb9220089b36a439663a65c
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M ckan/lib/email_notifications.py

  Log Message:
  -----------
  Merge pull request #3410 from DataShades/notification-since-date-fix

Use UTC when selecting activities for notification emails


  Commit: 32b2bd446b16e7e49e099e72bd0d4896dc98adc2
      https://github.com/ckan/ckan/commit/32b2bd446b16e7e49e099e72bd0d4896dc98adc2
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M .editorconfig

  Log Message:
  -----------
  Updated .editorconfig


  Commit: a5d3e46318f412bf182d91eda9831ffd43052757
      https://github.com/ckan/ckan/commit/a5d3e46318f412bf182d91eda9831ffd43052757
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

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

  Log Message:
  -----------
  [#3365] Dispose database engine before forking a worker

rq's workers perform their tasks in separate processes. When a worker is
forked, it inherits the global state of the parent, which in our case
included SQLAlchemy's database engine and its associated connections.
The new worker process then initializes its own engine, thereby losing
the reference to its copy of the parent's engine. The latter is now not
referenced anymore and therefore eventually garbage collected, which
includes closing the associated connections. However, these connections
have been copied from the parent and may still be in use there, so
closing them in the worker leads to errors in the main process.

This commit resolves the issue by explicitly disposing the engine and
all its associated connections before the fork. This rolls back all
non-committed changes. The engine automatically re-initializes itself
once it is used again in the parent after the fork (the worker
initializes its own separate engine directly after the fork).

While this solution is clean and deterministic it still implies that you
cannot re-use session instances and ORM instances from before the fork
after the fork. However, since workers are only started in separate
paster processes and in test cases this is not an issue in normal code.


  Commit: e8e3c7d7fe59ea92ffd0bdcebbf93edd250ab63a
      https://github.com/ckan/ckan/commit/e8e3c7d7fe59ea92ffd0bdcebbf93edd250ab63a
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/templates/organization/members.html

  Log Message:
  -----------
  update css, js file for font-awesome 4.x


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

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

  Log Message:
  -----------
  Merge pull request #3377 from torfsen/3365-background-job-test-failures

[#3365] Fix intermittent test failures in test_jobs


  Commit: 75338d4834a74a7fac9ec4bfc820a95c5b1df93c
      https://github.com/ckan/ckan/commit/75338d4834a74a7fac9ec4bfc820a95c5b1df93c
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    R ckan/public/base/vendor/font-awesome/less/bootstrap.less

  Log Message:
  -----------
  remove font-awesome 3.2.1 file


  Commit: a41168bf33e309e4ab43f9659b69d55d8e1c6345
      https://github.com/ckan/ckan/commit/a41168bf33e309e4ab43f9659b69d55d8e1c6345
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/slug-preview.js
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    R ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/resource.config

  Log Message:
  -----------
  remove ie7 support for font-awesome 4.x


  Commit: 2c3a888012092b7f160bd5ba3ba8c3e9bd1ab357
      https://github.com/ckan/ckan/commit/2c3a888012092b7f160bd5ba3ba8c3e9bd1ab357
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/templates/macros/autoform.html
    M ckan/tests/controllers/test_admin.py

  Log Message:
  -----------
  Ckan logo uload fixed


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

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#3414] package_search: return field info


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

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/schema.py

  Log Message:
  -----------
  [#3414] datastore_create: set/update field info


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

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/templates/admin/config.html
    M ckan/templates/macros/autoform.html

  Log Message:
  -----------
  Merge branch 'ckan-logo-upload' of https://github.com/tino097/ckan into tino097-ckan-logo-upload


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

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/templates/admin/config.html
    M ckan/templates/macros/autoform.html

  Log Message:
  -----------
  Merge branch 'tino097-ckan-logo-upload'


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

  Changed paths:
    M .circleci-matrix.yml
    A .travis.yml
    M CHANGELOG.rst
    M Dockerfile
    M ckan/ckan_nose_plugin.py
    M ckan/controllers/admin.py
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/jobs.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/i18n/+dot+gitignore
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/templates/admin/config.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/user/dashboard_organizations.html
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/lib/test_jobs.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_update.py
    M ckanext/datastore/controller.py
    A ckanext/datastore/writer.py
    A contrib/docker/ckan-entrypoint.sh
    M contrib/docker/docker-cloud.yml
    M contrib/docker/docker-compose.yml
    M contrib/docker/solr/Dockerfile
    M doc/maintaining/datastore.rst

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


  Commit: e047d2223b54f562dd6972ef3c28e67c1c1fb8e0
      https://github.com/ckan/ckan/commit/e047d2223b54f562dd6972ef3c28e67c1c1fb8e0
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2017-01-25 (Wed, 25 Jan 2017)

  Changed paths:
    M .circleci-matrix.yml
    A .travis.yml
    M CHANGELOG.rst
    M Dockerfile
    M ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/common.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware/flask_app.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/lib/base.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/jobs.py
    M ckan/lib/maintain.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/model/dashboard.py
    M ckan/model/system_info.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/i18n/+dot+gitignore
    M ckan/plugins/interfaces.py
    M ckan/public/base/images/background-tag-ie7.png
    M ckan/public/base/images/background-tag.png
    M ckan/public/base/images/background-tile.png
    M ckan/public/base/images/bg.png
    M ckan/public/base/images/breadcrumb-slash-ie7.png
    M ckan/public/base/images/ckan-logo-footer.png
    M ckan/public/base/images/ckan-logo.png
    M ckan/public/base/images/dashboard-followee-related.png
    M ckan/public/base/images/dotted.png
    M ckan/public/base/images/editing.png
    M ckan/public/base/images/full-width-nav-right.png
    M ckan/public/base/images/icon-search-27x26.png
    M ckan/public/base/images/nav-active.png
    M ckan/public/base/images/nav.png
    M ckan/public/base/images/od_80x15_blue.png
    M ckan/public/base/images/placeholder-200x125.png
    M ckan/public/base/images/placeholder-420x220.png
    M ckan/public/base/images/placeholder-680x400.png
    M ckan/public/base/images/placeholder-application.png
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-image.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/images/sprite-ckan-icons.png
    M ckan/public/base/images/sprite-resource-icons.png
    M ckan/public/base/images/table-seperator.png
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    M ckan/public/base/vendor/select2/select2.png
    M ckan/public/base/vendor/select2/select2x2.png
    M ckan/templates/admin/config.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/user/dashboard_organizations.html
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po
    M ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_jobs.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/test_common.py
    A ckan/views/__init__.py
    A ckan/views/api.py
    M ckanext/datastore/controller.py
    A ckanext/datastore/writer.py
    A ckanext/example_flask_iblueprint/__init__.py
    A ckanext/example_flask_iblueprint/plugin.py
    A ckanext/example_flask_iblueprint/templates/about.html
    A ckanext/example_flask_iblueprint/templates/about_base.html
    A ckanext/example_flask_iblueprint/tests/__init__.py
    A ckanext/example_flask_iblueprint/tests/test_routes.py
    M ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
    M ckanext/imageview/plugin.py
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_222222_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_2e83ff_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_454545_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_888888_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_cd0a0a_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_redo.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_peppermint.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_spearmint.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_undo.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_blue.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_star.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/drag-handle.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/help.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-asc.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-desc.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/stripes.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tag_red.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tick.png
    M ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    M ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    M ckanext/test_tag_vocab_plugin.py
    A contrib/docker/ckan-entrypoint.sh
    M contrib/docker/docker-cloud.yml
    M contrib/docker/docker-compose.yml
    M contrib/docker/solr/Dockerfile
    M dev-requirements.txt
    M doc/_static/ckanlogo.png
    M doc/images/9.png
    M doc/images/add_dataset_1.jpg
    M doc/images/add_dataset_2.jpg
    M doc/images/add_dataset_3.jpg
    M doc/images/architecture.png
    M doc/images/ckan_importing_diagram.png
    M doc/images/create_organization.jpg
    M doc/images/custom-css.png
    M doc/images/custom_config_fields.png
    M doc/images/customize_look_and_feel.jpg
    M doc/images/debug-footer.png
    M doc/images/edit_dataset.jpg
    M doc/images/example_theme_javascript_popover.png
    M doc/images/example_theme_overlapping_popovers.png
    M doc/images/exploring_datasets.jpg
    M doc/images/extra-public-dir.png
    M doc/images/html_and_css.png
    M doc/images/image_view.png
    M doc/images/manage_news_feed.jpg
    M doc/images/manage_organization.jpg
    M doc/images/manage_user_profile.jpg
    M doc/images/manage_users.jpg
    M doc/images/manage_views.png
    M doc/images/more-custom-css.png
    M doc/images/most-popular-groups-custom-snippet.png
    M doc/images/most-popular-groups-snippet.png
    M doc/images/most-popular-groups.png
    M doc/images/move_dataset_between_organizations.jpg
    M doc/images/popular-dataset.png
    M doc/images/popular-resource.png
    M doc/images/recently-changed-packages-activity-stream.png
    M doc/images/recline_graph_view.png
    M doc/images/recline_grid_view.png
    M doc/images/recline_map_view.png
    M doc/images/recline_view.png
    M doc/images/register_account.jpg
    M doc/images/search_the_site.jpg
    M doc/images/sort-datasets-by-popularity.png
    M doc/images/text_view.png
    M doc/images/views_overview.png
    M doc/images/webpage_view.png
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/datastore.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  conflict with master


  Commit: 56ab0a670cc965c54fa710fc506487ae177593f5
      https://github.com/ckan/ckan/commit/56ab0a670cc965c54fa710fc506487ae177593f5
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-25 (Wed, 25 Jan 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  update changelog for font-awesome 4.0.3


  Commit: 0bb141ae43b51f2c095fba87750c5fdaa00ee816
      https://github.com/ckan/ckan/commit/0bb141ae43b51f2c095fba87750c5fdaa00ee816
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-01-25 (Wed, 25 Jan 2017)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/routing.py
    M ckan/lib/activity_streams.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar.html
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    R ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/fonts/FontAwesome.otf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    R ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/bordered-pulled.less
    M ckan/public/base/vendor/font-awesome/less/core.less
    M ckan/public/base/vendor/font-awesome/less/extras.less
    A ckan/public/base/vendor/font-awesome/less/fixed-width.less
    R ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    M ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/larger.less
    A ckan/public/base/vendor/font-awesome/less/list.less
    M ckan/public/base/vendor/font-awesome/less/mixins.less
    M ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/rotated-flipped.less
    A ckan/public/base/vendor/font-awesome/less/spinning.less
    A ckan/public/base/vendor/font-awesome/less/stacked.less
    M ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/admin/trash.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/primer.html
    M ckan/templates/development/snippets/actions.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/list.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/development/snippets/simple-input.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/bulk_process.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/snippets/help.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/organization/snippets/info.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/new_resource_not_draft.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_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_help.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.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.html
    M ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/package/snippets/view_help.html
    M ckan/templates/package/view_edit_base.html
    M ckan/templates/revision/read.html
    M ckan/templates/snippets/activity_item.html
    M 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/home_breadcrumb_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/dashboard_datasets.html
    M ckan/templates/user/dashboard_groups.html
    M ckan/templates/user/dashboard_organizations.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/user_search.html
    M ckanext/datastore/templates/package/snippets/data_api_button.html
    M ckanext/example_iconfigurer/plugin.py
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    M ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    M ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M ckanext/imageview/plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/textview/plugin.py
    M doc/_templates/footer.html

  Log Message:
  -----------
  Merge pull request #3400 from fanjinfei/master

upgrade font-awesome to v4.0.3


  Commit: 07f2acc4a6d2af3f58c9416a65edfd257b9c3c8c
      https://github.com/ckan/ckan/commit/07f2acc4a6d2af3f58c9416a65edfd257b9c3c8c
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2017-01-26 (Thu, 26 Jan 2017)

  Changed paths:
    M ckan/lib/dictization/__init__.py
    M ckan/logic/validators.py
    M ckan/tests/logic/action/test_create.py

  Log Message:
  -----------
  rename deleted dataset just before creating new one, after validation


  Commit: 0c1f9ccda891d8e4a98fd50c305600daa7c8d08f
      https://github.com/ckan/ckan/commit/0c1f9ccda891d8e4a98fd50c305600daa7c8d08f
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2017-01-26 (Thu, 26 Jan 2017)

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

  Log Message:
  -----------
  removed redundand blank line(pep8)


  Commit: a5976f40b331014ec002801b8a0011a85381876e
      https://github.com/ckan/ckan/commit/a5976f40b331014ec002801b8a0011a85381876e
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2017-01-27 (Fri, 27 Jan 2017)

  Changed paths:
    M ckan/pastertemplates/template/bin/travis-run.sh_tmpl

  Log Message:
  -----------
  [#3417] Missing `--ckan` option in extension template's Travis config


  Commit: 10b60d555df30a4be8240450d031fbc6079084ca
      https://github.com/ckan/ckan/commit/10b60d555df30a4be8240450d031fbc6079084ca
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-27 (Fri, 27 Jan 2017)

  Changed paths:
    M ckan/templates/package/resource_edit_base.html
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/templates/package/resource_edit_base.html

  Log Message:
  -----------
  [#3414] remove if datapusher in g.plugins from core templates


  Commit: 7ebfe61423e0d42477297c71184606bc4f13642d
      https://github.com/ckan/ckan/commit/7ebfe61423e0d42477297c71184606bc4f13642d
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-27 (Fri, 27 Jan 2017)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/lib/activity_streams.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar.html
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    R ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/fonts/FontAwesome.otf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    R ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/bordered-pulled.less
    M ckan/public/base/vendor/font-awesome/less/core.less
    M ckan/public/base/vendor/font-awesome/less/extras.less
    A ckan/public/base/vendor/font-awesome/less/fixed-width.less
    R ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    M ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/larger.less
    A ckan/public/base/vendor/font-awesome/less/list.less
    M ckan/public/base/vendor/font-awesome/less/mixins.less
    M ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/rotated-flipped.less
    A ckan/public/base/vendor/font-awesome/less/spinning.less
    A ckan/public/base/vendor/font-awesome/less/stacked.less
    M ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/admin/trash.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/primer.html
    M ckan/templates/development/snippets/actions.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/list.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/development/snippets/simple-input.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/bulk_process.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/snippets/help.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/organization/snippets/info.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/new_resource_not_draft.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_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_help.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.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.html
    M ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/package/snippets/view_help.html
    M ckan/templates/package/view_edit_base.html
    M ckan/templates/revision/read.html
    M ckan/templates/snippets/activity_item.html
    M 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/home_breadcrumb_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/dashboard_datasets.html
    M ckan/templates/user/dashboard_groups.html
    M ckan/templates/user/dashboard_organizations.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/user_search.html
    M ckanext/datastore/templates/package/snippets/data_api_button.html
    M ckanext/example_iconfigurer/plugin.py
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    M ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    M ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M ckanext/imageview/plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/textview/plugin.py
    M doc/_templates/footer.html

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 3414-datastore-info


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

  Changed paths:
    R ckan/templates/package/resource_data.html
    A ckanext/datapusher/templates/package/resource_data.html

  Log Message:
  -----------
  [#3414] resource_data is a datapusher template


  Commit: fc151b9b3d7a898e53a8fba1873b488f5c5a79e7
      https://github.com/ckan/ckan/commit/fc151b9b3d7a898e53a8fba1873b488f5c5a79e7
  Author: Sergey <tonnydexter at gmail.com>
  Date:   2017-01-27 (Fri, 27 Jan 2017)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  Correct indentation


  Commit: 4d588e000a620ff0fa12533e751ea8957a8c1aa8
      https://github.com/ckan/ckan/commit/4d588e000a620ff0fa12533e751ea8957a8c1aa8
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-27 (Fri, 27 Jan 2017)

  Changed paths:
    M ckan/lib/dictization/__init__.py
    M ckan/logic/validators.py
    M ckan/tests/logic/action/test_create.py

  Log Message:
  -----------
  Merge pull request #3370 from smotornyuk/2438-rename-removed-dataset-when-it-conflicts-with-new-one

Rename deleted datasets


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

  Changed paths:
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/templates/datapusher/resource_data.html
    R ckanext/datapusher/templates/package/resource_data.html

  Log Message:
  -----------
  [#3414] resource_data is a datapusher template


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

  Changed paths:
    M ckanext/datapusher/templates/package/resource_edit_base.html
    M ckanext/datastore/controller.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/templates/datastore/dictionary.html
    A ckanext/datastore/templates/package/resource_edit_base.html

  Log Message:
  -----------
  [#3414] display Data Dictionary form


  Commit: 209204257f4b3c30e388ee632b528c9525cf755e
      https://github.com/ckan/ckan/commit/209204257f4b3c30e388ee632b528c9525cf755e
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-29 (Sun, 29 Jan 2017)

  Changed paths:
    M ckanext/datastore/controller.py
    M ckanext/datastore/templates/datastore/dictionary.html

  Log Message:
  -----------
  [#3414] working Data Dictionary form


  Commit: 3294362bdf6630a7c488c86de6726abed8ad78d0
      https://github.com/ckan/ckan/commit/3294362bdf6630a7c488c86de6726abed8ad78d0
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-01-30 (Mon, 30 Jan 2017)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/middleware/flask_app.py
    M ckan/lib/jinja_extensions.py

  Log Message:
  -----------
  Jinja's truncate is better than ours, don't try to override it.


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

  Changed paths:
    M ckan/pastertemplates/template/bin/travis-run.sh_tmpl

  Log Message:
  -----------
  Merge pull request #3418 from torfsen/3417-extension-template-travis-nosetests

[#3417] Missing `--ckan` option in extension template's Travis config


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

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/middleware/flask_app.py
    M ckan/lib/jinja_extensions.py

  Log Message:
  -----------
  Merge pull request #3420 from open-data/3419_fix_truncate

Jinja's truncate is better than ours, don't try to override it.


  Commit: 9533d7a6fe7ec6cbda530c3bca39bfc0de022584
      https://github.com/ckan/ckan/commit/9533d7a6fe7ec6cbda530c3bca39bfc0de022584
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-view-filters.js
    M ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js

  Log Message:
  -----------
  [#3315] Mark remaining strings in JS modules as translatable


  Commit: cbe8962c002ab9aae410cf8a89a951f598dfa0c2
      https://github.com/ckan/ckan/commit/cbe8962c002ab9aae410cf8a89a951f598dfa0c2
  Author: tino097 <konstantin.sivakov at gmail.com>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

  Changed paths:
    M doc/images/exploring_datasets.jpg
    M doc/user-guide.rst

  Log Message:
  -----------
  Removing mention to "related items tab". Adding mention to "groups" with brief explanation


  Commit: 69094fff3b7f2f582cfad7db8e541093c2426ae6
      https://github.com/ckan/ckan/commit/69094fff3b7f2f582cfad7db8e541093c2426ae6
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_delete.py

  Log Message:
  -----------
  Datastore deleted inside `after_delete` of IResourceController


  Commit: 8202e191b6b5d16c3b13fd71a30e08f548e25852
      https://github.com/ckan/ckan/commit/8202e191b6b5d16c3b13fd71a30e08f548e25852
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2017-02-01 (Wed, 01 Feb 2017)

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

  Log Message:
  -----------
  added blank line in tests


  Commit: 821aa593c1df753dfdb130e2137986de1be35abd
      https://github.com/ckan/ckan/commit/821aa593c1df753dfdb130e2137986de1be35abd
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-02-02 (Thu, 02 Feb 2017)

  Changed paths:
    M doc/images/exploring_datasets.jpg
    M doc/user-guide.rst

  Log Message:
  -----------
  Merge pull request #3424 from tino097/3412-update-documentation

Removing mention to "related items tab". Adding mention to "groups" w…


  Commit: 69c39d84531caef728698b850993584daae026cc
      https://github.com/ckan/ckan/commit/69c39d84531caef728698b850993584daae026cc
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-02-02 (Thu, 02 Feb 2017)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-view-filters.js
    M ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js

  Log Message:
  -----------
  Merge pull request #3423 from torfsen/3315-untranslatable-js-strings

[#3315] Mark remaining strings in JS modules as translatable


  Commit: 28234dc3293a9df91dbe9f45b97166ae2fe412ba
      https://github.com/ckan/ckan/commit/28234dc3293a9df91dbe9f45b97166ae2fe412ba
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-02-02 (Thu, 02 Feb 2017)

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

  Log Message:
  -----------
  allow package_search to return id/name only instead of full dataset dictionary


  Commit: 8541f225c752ab33de9bc9e0806c1e33c4f360cd
      https://github.com/ckan/ckan/commit/8541f225c752ab33de9bc9e0806c1e33c4f360cd
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M ckanext/datastore/helpers.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/templates/package/resource_edit_base.html
    M ckanext/datastore/templates/package/resource_read.html

  Log Message:
  -----------
  [#3414] Data Dictionary display on resource page


  Commit: 88282291c50b675988e748e612a29ef167fdff8b
      https://github.com/ckan/ckan/commit/88282291c50b675988e748e612a29ef167fdff8b
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Remove datastore directly


  Commit: e43f068eed07c5f7533d5617beb333ebf076a0af
      https://github.com/ckan/ckan/commit/e43f068eed07c5f7533d5617beb333ebf076a0af
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M .editorconfig

  Log Message:
  -----------
  [#3404] remove tab_width setting


  Commit: 7190281c12e4b65a9dbcace774c3d224aeaf5026
      https://github.com/ckan/ckan/commit/7190281c12e4b65a9dbcace774c3d224aeaf5026
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    A .editorconfig

  Log Message:
  -----------
  Merge branch '3404-editorconfig'


  Commit: 895b7ede841fdccd8165571a2f481beb8d98b16b
      https://github.com/ckan/ckan/commit/895b7ede841fdccd8165571a2f481beb8d98b16b
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

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

  Log Message:
  -----------
  allow package_search to return specified fields


  Commit: bab3b109a27713b68752187fb14bc3906909696e
      https://github.com/ckan/ckan/commit/bab3b109a27713b68752187fb14bc3906909696e
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M ckan/model/resource.py
    M ckan/model/user.py

  Log Message:
  -----------
  Query performance improvements.

Removes a forced order_by on revisions that causes poor query
performance on many other table queries.

Replaced `count()` queries on number_of_edits and number_of_packages
with vastly improved queries. SQLAlchemy uses subqueries for `count()`,
along with an odd default unindexed order_by on the table mapper
causing even trivial counts to perform unindexed table scans.

This change reduces the average query time for a user with 500k
revisions from 15 *seconds* to under 20ms.


  Commit: 3fdb4c171625ea6e6d32fc5132b43f63b24883e8
      https://github.com/ckan/ckan/commit/3fdb4c171625ea6e6d32fc5132b43f63b24883e8
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-02-08 (Wed, 08 Feb 2017)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  add 'fl' in default_package_search_schema


  Commit: 870aff94e4a058a690f86b6f9524376a304cac46
      https://github.com/ckan/ckan/commit/870aff94e4a058a690f86b6f9524376a304cac46
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-02-08 (Wed, 08 Feb 2017)

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

  Log Message:
  -----------
  add test case for package_search() 'fl' support


  Commit: 8b2c01a861ea608edcff7cc351d854f0794f19ed
      https://github.com/ckan/ckan/commit/8b2c01a861ea608edcff7cc351d854f0794f19ed
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-02-09 (Thu, 09 Feb 2017)

  Changed paths:
    M ckan/lib/fanstatic_resources.py

  Log Message:
  -----------
  Merge pull request #3406 from smotornyuk/3398-depend-on-group-in-resource-config

Groups inside resource.config can't be dependent on another groups


  Commit: bd03c7ba992e480c477b0981bb79dc103635f898
      https://github.com/ckan/ckan/commit/bd03c7ba992e480c477b0981bb79dc103635f898
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-09 (Thu, 09 Feb 2017)

  Changed paths:
    M ckanext/datapusher/templates/package/resource_edit_base.html
    M ckanext/datastore/controller.py

  Log Message:
  -----------
  [#3414] review clean-up


  Commit: 107bc894d05d8f2fc0fbcbeddc4b444c20267139
      https://github.com/ckan/ckan/commit/107bc894d05d8f2fc0fbcbeddc4b444c20267139
  Author: Lupco Kotev <lupco.kotev at keitaro.info>
  Date:   2017-02-10 (Fri, 10 Feb 2017)

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

  Log Message:
  -----------
  Move capacity filter query to first position


  Commit: dc94a5e08f9bde3151795e38cb1164b7d8338ceb
      https://github.com/ckan/ckan/commit/dc94a5e08f9bde3151795e38cb1164b7d8338ceb
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-02-10 (Fri, 10 Feb 2017)

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

  Log Message:
  -----------
  fix test case


  Commit: 2b1ede337d9666022cccd3e5f7e876ba23cbea37
      https://github.com/ckan/ckan/commit/2b1ede337d9666022cccd3e5f7e876ba23cbea37
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-02-10 (Fri, 10 Feb 2017)

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

  Log Message:
  -----------
  Merge pull request #3433 from keitaroinc/solr-fix

Move capacity filter query to first position


  Commit: 4dcbf7df60407aa25c4cd406f6926d5f9c9db567
      https://github.com/ckan/ckan/commit/4dcbf7df60407aa25c4cd406f6926d5f9c9db567
  Author: Artem Bazykin <artem.bazykin at linkdigital.com.au>
  Date:   2017-02-13 (Mon, 13 Feb 2017)

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

  Log Message:
  -----------
  Fix group, org member tables in mobile view


  Commit: 6bb8e41e8e4cbe9300caede9397b4fb3028ddbc0
      https://github.com/ckan/ckan/commit/6bb8e41e8e4cbe9300caede9397b4fb3028ddbc0
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-02-13 (Mon, 13 Feb 2017)

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

  Log Message:
  -----------
  Instead of truncating invalid URLs on display, display and wrap cleanly.


  Commit: 5d6949ca7602eb5039227229a0113269d213f856
      https://github.com/ckan/ckan/commit/5d6949ca7602eb5039227229a0113269d213f856
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-02-13 (Mon, 13 Feb 2017)

  Changed paths:
    M ckan/templates/package/resources.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources_list.html

  Log Message:
  -----------
  Move an expensive, repetitive check_access outside of the resource_item.html loop.


  Commit: f8098d51732f6a9910175e344a41dad6777efd74
      https://github.com/ckan/ckan/commit/f8098d51732f6a9910175e344a41dad6777efd74
  Author: Artem Bazykin <artem.bazykin at linkdigital.com.au>
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
    M ckan/public/base/less/group.less
    M ckan/templates/group/members.html
    M ckan/templates/organization/members.html

  Log Message:
  -----------
  Use class in template instead col tag


  Commit: cb498fc3d08ca54d1677609ad6e2caccb001e3e8
      https://github.com/ckan/ckan/commit/cb498fc3d08ca54d1677609ad6e2caccb001e3e8
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
    M ckan/model/resource.py
    M ckan/model/user.py
    M ckan/templates/package/resources.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources_list.html

  Log Message:
  -----------
  Merge pull request #3430 from open-data/query_performance

Query performance improvements.


  Commit: 00eec1c488402435192a092619dba2ffbfe0beca
      https://github.com/ckan/ckan/commit/00eec1c488402435192a092619dba2ffbfe0beca
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-02-14 (Tue, 14 Feb 2017)

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

  Log Message:
  -----------
  Merge pull request #3436 from open-data/3434_fix_long_url_truncation

Instead of truncating invalid URLs on display, display and wrap cleanly.


  Commit: ef6cf50daec17dc56fa56eb4d3a3becbcc0afb2d
      https://github.com/ckan/ckan/commit/ef6cf50daec17dc56fa56eb4d3a3becbcc0afb2d
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_delete.py

  Log Message:
  -----------
  Merge pull request #3425 from smotornyuk/3422-delete-corresponding-datastore-alongside-with-resource

Datastore deleted inside `after_delete` of IResourceController


  Commit: c337a3e275c682a7c676e29c6f2bdf6712e03ffa
      https://github.com/ckan/ckan/commit/c337a3e275c682a7c676e29c6f2bdf6712e03ffa
  Author: German Bortoli <germanazo at gmail.com>
  Date:   2017-02-16 (Thu, 16 Feb 2017)

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

  Log Message:
  -----------
  Added private parameter on package create method.


  Commit: a519ba231d1c95588501d14b7278ecd25f8f3c7a
      https://github.com/ckan/ckan/commit/a519ba231d1c95588501d14b7278ecd25f8f3c7a
  Author: German Bortoli <germanazo at gmail.com>
  Date:   2017-02-16 (Thu, 16 Feb 2017)

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

  Log Message:
  -----------
  [DOC] Updated data type for private method

Updated data type boolean for package create method


  Commit: b582c7a9501d0241458790ba9c4b2e7734d2cf41
      https://github.com/ckan/ckan/commit/b582c7a9501d0241458790ba9c4b2e7734d2cf41
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-16 (Thu, 16 Feb 2017)

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

  Log Message:
  -----------
  Merge pull request #3440 from Germanaz0/bugfix/private-param-package-create

[DOC] Added private parameter on package create method.


  Commit: 6d51cd27d584662970597de6414bddd8c5f965ee
      https://github.com/ckan/ckan/commit/6d51cd27d584662970597de6414bddd8c5f965ee
  Author: amercader <amercadero at gmail.com>
  Date:   2017-02-17 (Fri, 17 Feb 2017)

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

  Log Message:
  -----------
  [#3196] Use all session options from the ini file

Rather than hardcode some


  Commit: 088d807e924ddac63715d743b1ea25c728b7644c
      https://github.com/ckan/ckan/commit/088d807e924ddac63715d743b1ea25c728b7644c
  Author: Jukka Heino <jukka.heino at gofore.com>
  Date:   2017-02-17 (Fri, 17 Feb 2017)

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

  Log Message:
  -----------
  Use the url_for() helper for datapusher URLs


  Commit: c60f2a68d483527566bb188b9d538f6d2db0ddba
      https://github.com/ckan/ckan/commit/c60f2a68d483527566bb188b9d538f6d2db0ddba
  Author: Artem Bazykin <artem.bazykin at linkdigital.com.au>
  Date:   2017-02-19 (Sun, 19 Feb 2017)

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

  Log Message:
  -----------
  Delete css styles


  Commit: 3ec395eadd964ca6574fc2915aef9804afbac0c1
      https://github.com/ckan/ckan/commit/3ec395eadd964ca6574fc2915aef9804afbac0c1
  Author: Artem Bazykin <artem.bazykin at linkdigital.com.au>
  Date:   2017-02-19 (Sun, 19 Feb 2017)

  Changed paths:
    M ckan/templates/group/members.html
    M ckan/templates/organization/members.html

  Log Message:
  -----------
  Delete classes


  Commit: d194f64b4b6f204ec02593324d694a28c62d184d
      https://github.com/ckan/ckan/commit/d194f64b4b6f204ec02593324d694a28c62d184d
  Author: Yan <yan.rudneko at linkdigital.com.au>
  Date:   2017-02-20 (Mon, 20 Feb 2017)

  Changed paths:
    M ckan/model/resource.py

  Log Message:
  -----------
  [#3447] Resource creation date use datetime.utcnow()


  Commit: e9d58bbef27a0ad4e6ee5c6958104e99754b5911
      https://github.com/ckan/ckan/commit/e9d58bbef27a0ad4e6ee5c6958104e99754b5911
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-20 (Mon, 20 Feb 2017)

  Changed paths:
    M ckan/model/resource.py

  Log Message:
  -----------
  Merge pull request #3448 from Engerrs/3447-resource_creation_date_dont_use_utcnow

[#3447] Resource creation date use datetime.utcnow()


  Commit: 2d7c20408cfc943ccfa4c2ab137217ab849df536
      https://github.com/ckan/ckan/commit/2d7c20408cfc943ccfa4c2ab137217ab849df536
  Author: Florian Brucker <florian.brucker at it.karlsruhe.de>
  Date:   2017-02-20 (Mon, 20 Feb 2017)

  Changed paths:
    M ckan/lib/celery_app.py
    A ckan/tests/lib/test_celery_app.py

  Log Message:
  -----------
  [#3443] Raise exception if Celery version is not supported

Our current code only supports Celery 3.x, Celery 4 is already
available. Since Celery is an optional dependency we cannot simply pin
its version in requirements.in. Hence we check upon import time if the
correct version is installed and raise an exception otherwise.


  Commit: 90338329bac9c5f10675f9526f69f61e8680c334
      https://github.com/ckan/ckan/commit/90338329bac9c5f10675f9526f69f61e8680c334
  Author: Gleb <gleb.rudenko at linkdigital.com.au>
  Date:   2017-02-21 (Tue, 21 Feb 2017)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/templates/organization/index.html

  Log Message:
  -----------
  #3259 / Organizations are sorted by title


  Commit: e0cf5358bfd74653a9182c5128e49888a316063b
      https://github.com/ckan/ckan/commit/e0cf5358bfd74653a9182c5128e49888a316063b
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-02-21 (Tue, 21 Feb 2017)

  Changed paths:
    M ckan/templates/group/members.html
    M ckan/templates/organization/members.html

  Log Message:
  -----------
  Merge pull request #3435 from wildcatzita/group-org-members-table-mobile-view-fix

Fix group, org member tables in mobile view


  Commit: 1c2a0571b4ea34c728c0eb5a66545b0d4cf54ba9
      https://github.com/ckan/ckan/commit/1c2a0571b4ea34c728c0eb5a66545b0d4cf54ba9
  Author: Artem Bazykin <artem.bazykin at linkdigital.com.au>
  Date:   2017-02-21 (Tue, 21 Feb 2017)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#2651] Fix for delete resource on draft dataset should redirect to new_resource page


  Commit: 536111fe96fb6e362a6f08f79144301c627a611c
      https://github.com/ckan/ckan/commit/536111fe96fb6e362a6f08f79144301c627a611c
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

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

  Log Message:
  -----------
  Merge pull request #3442 from jheino/2866-fix-datapusher-urls

Use the url_for() helper for datapusher URLs


  Commit: 760d1fb3d789497c582272b86dad3a955536fc60
      https://github.com/ckan/ckan/commit/760d1fb3d789497c582272b86dad3a955536fc60
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

  Changed paths:
    M ckan/common.py
    M ckan/config/middleware/flask_app.py
    M ckan/lib/base.py
    A ckan/templates/tests/flash_messages.html
    A ckan/tests/config/test_sessions.py
    M ckan/tests/legacy/lib/test_i18n.py
    M setup.py

  Log Message:
  -----------
  Merge pull request #3208 from ckan/3196-common-session

[#3196] Common session for Flask and Pylons


  Commit: e60c204ca9961ef0ecefd03db2996be9134fe218
      https://github.com/ckan/ckan/commit/e60c204ca9961ef0ecefd03db2996be9134fe218
  Author: Gleb <gleb.rudenko at linkdigital.com.au>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

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

  Log Message:
  -----------
  #3028 / UI labels for the last_modified and revision_timestamp fields


  Commit: 6c428a5646bdeb0978e07bc358bb4496bd492bde
      https://github.com/ckan/ckan/commit/6c428a5646bdeb0978e07bc358bb4496bd492bde
  Author: amercader <amercadero at gmail.com>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

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

  Log Message:
  -----------
  Pull translations from Transifex before 2.6.1


  Commit: 0b1aa2f2fce4d86b23b464e6bbb6228faf4c43d9
      https://github.com/ckan/ckan/commit/0b1aa2f2fce4d86b23b464e6bbb6228faf4c43d9
  Author: amercader <amercadero at gmail.com>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

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

  Log Message:
  -----------
  Compiled translations after 2.6.1 release


  Commit: 5fdfbaedd2ab0bb6846403bcea6b9528fa7493c2
      https://github.com/ckan/ckan/commit/5fdfbaedd2ab0bb6846403bcea6b9528fa7493c2
  Author: amercader <amercadero at gmail.com>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update CHANGELOG ahead of 2.6.1


  Commit: 28c68abbe38700e26296c57986b92606cf27ba6a
      https://github.com/ckan/ckan/commit/28c68abbe38700e26296c57986b92606cf27ba6a
  Author: amercader <amercadero at gmail.com>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Minor change in CHANGELOG


  Commit: 47b0122379eb8ee7a3659f78f76c7079e5b3629f
      https://github.com/ckan/ckan/commit/47b0122379eb8ee7a3659f78f76c7079e5b3629f
  Author: Artem Bazykin <artem.bazykin at linkdigital.com.au>
  Date:   2017-02-23 (Thu, 23 Feb 2017)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Use None in package_show instead context


  Commit: 363619b5aa17ec1b4b9f5a9d0033bc82b1eb23ee
      https://github.com/ckan/ckan/commit/363619b5aa17ec1b4b9f5a9d0033bc82b1eb23ee
  Author: Artem Bazykin <artem.bazykin at linkdigital.com.au>
  Date:   2017-02-24 (Fri, 24 Feb 2017)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Fix tags on org/group read pages


  Commit: 8b0cf9b5c2e2ec6d0638b2de7f4d31277cef85b1
      https://github.com/ckan/ckan/commit/8b0cf9b5c2e2ec6d0638b2de7f4d31277cef85b1
  Author: Gleb <gleb.rudenko at linkdigital.com.au>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    M .circleci-matrix.yml
    A .editorconfig
    M .gitattributes
    A .travis.yml
    M CHANGELOG.rst
    M Dockerfile
    M ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/common.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware/__init__.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    R ckan/config/solr/schema-1.2.xml
    R ckan/config/solr/schema-1.3.xml
    R ckan/config/solr/schema-1.4.xml
    R ckan/config/solr/schema-2.0.xml
    M ckan/config/solr/schema.xml
    A ckan/config/supervisor-ckan-worker.conf
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/check_po_files.py
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tl/LC_MESSAGES/ckan.mo
    M ckan/i18n/tl/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/auth_tkt.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/email_notifications.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/jinja_extensions.py
    A ckan/lib/jobs.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    M ckan/lib/plugins.py
    A ckan/lib/redis.py
    M ckan/lib/render.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/common.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    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/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/085_adjust_activity_timestamps.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/core.py
    M ckan/model/dashboard.py
    M ckan/model/resource.py
    M ckan/model/system_info.py
    M ckan/model/user.py
    M ckan/pastertemplates/template/bin/travis-run.sh_tmpl
    A ckan/pastertemplates/template/ckanext/+project_shortname+/i18n/+dot+gitignore
    M ckan/pastertemplates/template/setup.cfg_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/plugins/toolkit_sphinx_extension.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    A ckan/public/base/i18n/.gitignore
    R ckan/public/base/i18n/bg.js
    R ckan/public/base/i18n/ca.js
    R ckan/public/base/i18n/cs_CZ.js
    R ckan/public/base/i18n/de.js
    R ckan/public/base/i18n/el.js
    R ckan/public/base/i18n/es.js
    R ckan/public/base/i18n/fi.js
    R ckan/public/base/i18n/fr.js
    R ckan/public/base/i18n/hu.js
    R ckan/public/base/i18n/it.js
    R ckan/public/base/i18n/lt.js
    R ckan/public/base/i18n/lv.js
    R ckan/public/base/i18n/nl.js
    R ckan/public/base/i18n/no.js
    R ckan/public/base/i18n/pl.js
    R ckan/public/base/i18n/pt_BR.js
    R ckan/public/base/i18n/ro.js
    R ckan/public/base/i18n/ru.js
    R ckan/public/base/i18n/sk.js
    R ckan/public/base/i18n/sl.js
    R ckan/public/base/i18n/sq.js
    R ckan/public/base/i18n/sr.js
    R ckan/public/base/i18n/sr_Latn.js
    R ckan/public/base/i18n/sv.js
    R ckan/public/base/i18n/zh_TW.js
    M ckan/public/base/images/background-tag-ie7.png
    M ckan/public/base/images/background-tag.png
    M ckan/public/base/images/background-tile.png
    M ckan/public/base/images/bg.png
    M ckan/public/base/images/breadcrumb-slash-ie7.png
    M ckan/public/base/images/ckan-logo-footer.png
    M ckan/public/base/images/ckan-logo.png
    M ckan/public/base/images/dashboard-followee-related.png
    M ckan/public/base/images/dotted.png
    M ckan/public/base/images/editing.png
    M ckan/public/base/images/full-width-nav-right.png
    M ckan/public/base/images/icon-search-27x26.png
    M ckan/public/base/images/nav-active.png
    M ckan/public/base/images/nav.png
    M ckan/public/base/images/od_80x15_blue.png
    M ckan/public/base/images/placeholder-200x125.png
    M ckan/public/base/images/placeholder-420x220.png
    M ckan/public/base/images/placeholder-680x400.png
    M ckan/public/base/images/placeholder-application.png
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-image.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/images/sprite-ckan-icons.png
    M ckan/public/base/images/sprite-resource-icons.png
    M ckan/public/base/images/table-seperator.png
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/i18n.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/module.js
    M ckan/public/base/javascript/modules/activity-stream.js
    M ckan/public/base/javascript/modules/api-info.js
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/confirm-action.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/dashboard.js
    M ckan/public/base/javascript/modules/dataset-visibility.js
    M ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/popover-context.js
    M ckan/public/base/javascript/modules/resource-form.js
    M ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/public/base/javascript/modules/resource-view-embed.js
    M ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/modules/table-selectable-rows.js
    M ckan/public/base/javascript/modules/table-toggle-more.js
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/i18n.spec.js
    M ckan/public/base/test/spec/module.spec.js
    M ckan/public/base/test/spec/modules/confirm-action.spec.js
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/test/spec/sandbox.spec.js
    M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    M ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar.html
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    R ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/fonts/FontAwesome.otf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    R ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/bordered-pulled.less
    M ckan/public/base/vendor/font-awesome/less/core.less
    M ckan/public/base/vendor/font-awesome/less/extras.less
    A ckan/public/base/vendor/font-awesome/less/fixed-width.less
    R ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    M ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/larger.less
    A ckan/public/base/vendor/font-awesome/less/list.less
    M ckan/public/base/vendor/font-awesome/less/mixins.less
    M ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/rotated-flipped.less
    A ckan/public/base/vendor/font-awesome/less/spinning.less
    A ckan/public/base/vendor/font-awesome/less/stacked.less
    M ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/moment-with-locales.js
    M ckan/public/base/vendor/resource.config
    M ckan/public/base/vendor/select2/select2.png
    M ckan/public/base/vendor/select2/select2x2.png
    R ckan/public/robots.txt
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/admin/trash.html
    R ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/primer.html
    M ckan/templates/development/snippets/actions.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/list.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/development/snippets/simple-input.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/bulk_process.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/snippets/help.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/organization/snippets/info.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/base_form_page.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/new_resource_not_draft.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_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/resources.html
    M ckan/templates/package/search.html
    R ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_help.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.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.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/package/snippets/view_help.html
    M ckan/templates/package/view_edit_base.html
    M ckan/templates/revision/read.html
    A ckan/templates/robots.txt
    M ckan/templates/snippets/activity_item.html
    M 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/home_breadcrumb_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    M ckan/templates/tag/index.html
    A ckan/templates/tests/flash_messages.html
    M ckan/templates/user/dashboard_datasets.html
    M ckan/templates/user/dashboard_groups.html
    M ckan/templates/user/dashboard_organizations.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/user_search.html
    M ckan/tests/config/test_environment.py
    M ckan/tests/config/test_middleware.py
    A ckan/tests/config/test_sessions.py
    M ckan/tests/controllers/test_feed.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_tags.py
    A ckan/tests/controllers/test_template.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/controllers/test_util.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/lib/test_i18n.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_tag_vocab.py
    M ckan/tests/legacy/test_coding_standards.py
    A ckan/tests/lib/_i18n_build_js_translations/ckanext-test_js_translations.pot
    A ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po
    M ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_helpers.py
    A ckan/tests/lib/test_i18n.py
    A ckan/tests/lib/test_jobs.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/test_update.py
    M ckan/tests/logic/test_validators.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_common.py
    A ckan/tests/test_robots_txt.py
    A ckan/views/__init__.py
    A ckan/views/api.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/set_permissions.sql
    A ckanext/datastore/templates/ajax_snippets/api_info.html
    A ckanext/datastore/templates/package/resource_read.html
    A ckanext/datastore/templates/package/snippets/data_api_button.html
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    A ckanext/datastore/writer.py
    A ckanext/example_flask_iblueprint/__init__.py
    A ckanext/example_flask_iblueprint/plugin.py
    A ckanext/example_flask_iblueprint/templates/about.html
    A ckanext/example_flask_iblueprint/templates/about_base.html
    A ckanext/example_flask_iblueprint/tests/__init__.py
    A ckanext/example_flask_iblueprint/tests/test_routes.py
    M ckanext/example_iconfigurer/plugin.py
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_idatasetform/plugin_v1.py
    M ckanext/example_idatasetform/plugin_v2.py
    M ckanext/example_idatasetform/plugin_v4.py
    M ckanext/example_igroupform/plugin.py
    M ckanext/example_igroupform/tests/test_controllers.py
    A ckanext/example_ipermissionlabels/__init__.py
    A ckanext/example_ipermissionlabels/plugin.py
    A ckanext/example_ipermissionlabels/tests/__init__.py
    A ckanext/example_ipermissionlabels/tests/test_example_ipermissionlabels.py
    M ckanext/example_theme/custom_config_setting/plugin.py
    M ckanext/example_theme/custom_emails/tests.py
    M ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
    M ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    M ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    M ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    M ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    M ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M ckanext/imageview/plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_222222_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_2e83ff_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_454545_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_888888_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_cd0a0a_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_redo.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_peppermint.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_spearmint.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_undo.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_blue.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_star.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/drag-handle.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/help.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-asc.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-desc.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/stripes.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tag_red.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tick.png
    M ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    M ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    M ckanext/reclineview/theme/templates/recline_view.html
    M ckanext/stats/public/ckanext/stats/javascript/modules/plot.js
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/test_tag_vocab_plugin.py
    M ckanext/textview/plugin.py
    M ckanext/textview/theme/public/text_view.js
    A contrib/docker/ckan-entrypoint.sh
    M contrib/docker/docker-cloud.yml
    M contrib/docker/docker-compose.yml
    M contrib/docker/my_init.d/50_configure
    M contrib/docker/postgresql/Dockerfile
    M contrib/docker/solr/Dockerfile
    M dev-requirements.txt
    M doc/_static/ckanlogo.png
    M doc/_templates/footer.html
    M doc/api/index.rst
    M doc/contributing/architecture.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/javascript-module-tutorial.rst
    M doc/contributing/frontend/templating.rst
    M doc/contributing/javascript.rst
    M doc/contributing/release-process.rst
    M doc/contributing/string-i18n.rst
    M doc/contributing/test.rst
    M doc/extensions/best-practices.rst
    M doc/extensions/custom-config-settings.rst
    M doc/extensions/plugins-toolkit.rst
    M doc/extensions/translating-extensions.rst
    M doc/extensions/tutorial.rst
    M doc/images/9.png
    M doc/images/add_dataset_1.jpg
    M doc/images/add_dataset_2.jpg
    M doc/images/add_dataset_3.jpg
    A doc/images/architecture.png
    A doc/images/architecture.svg
    M doc/images/ckan_importing_diagram.png
    M doc/images/create_organization.jpg
    M doc/images/custom-css.png
    M doc/images/custom_config_fields.png
    M doc/images/customize_look_and_feel.jpg
    M doc/images/debug-footer.png
    M doc/images/edit_dataset.jpg
    M doc/images/example_theme_javascript_popover.png
    M doc/images/example_theme_overlapping_popovers.png
    M doc/images/exploring_datasets.jpg
    M doc/images/extra-public-dir.png
    M doc/images/html_and_css.png
    M doc/images/image_view.png
    M doc/images/manage_news_feed.jpg
    M doc/images/manage_organization.jpg
    M doc/images/manage_user_profile.jpg
    M doc/images/manage_users.jpg
    M doc/images/manage_views.png
    M doc/images/more-custom-css.png
    M doc/images/most-popular-groups-custom-snippet.png
    M doc/images/most-popular-groups-snippet.png
    M doc/images/most-popular-groups.png
    M doc/images/move_dataset_between_organizations.jpg
    M doc/images/popular-dataset.png
    M doc/images/popular-resource.png
    M doc/images/recently-changed-packages-activity-stream.png
    M doc/images/recline_graph_view.png
    M doc/images/recline_grid_view.png
    M doc/images/recline_map_view.png
    M doc/images/recline_view.png
    M doc/images/register_account.jpg
    M doc/images/search_the_site.jpg
    M doc/images/sort-datasets-by-popularity.png
    M doc/images/text_view.png
    M doc/images/views_overview.png
    M doc/images/webpage_view.png
    M doc/maintaining/authorization.rst
    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/index.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/installing/postgres.rst
    A doc/maintaining/installing/solr.rst
    M doc/maintaining/paster.rst
    R doc/maintaining/solr-multicore.rst
    M doc/maintaining/upgrading/index.rst
    A doc/maintaining/upgrading/upgrade-postgres.rst
    M doc/theming/best-practices.rst
    M doc/theming/javascript-module-objects-and-methods.rst
    M doc/theming/javascript.rst
    M doc/theming/templates.rst
    M doc/user-guide.rst
    M requirements.in
    M requirements.txt
    M setup.cfg
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 3220-anonymous-user-should-be-redirected-to-login-page-when-trying-to-access-dashboard-instead-of-404


  Commit: aabda97067460dbb30022b50370085549052cfa5
      https://github.com/ckan/ckan/commit/aabda97067460dbb30022b50370085549052cfa5
  Author: Gleb <gleb.rudenko at linkdigital.com.au>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

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

  Log Message:
  -----------
   tests fix, msg change


  Commit: f9124dafd75338b62dc6e423e543fda5b1a404b6
      https://github.com/ckan/ckan/commit/f9124dafd75338b62dc6e423e543fda5b1a404b6
  Author: Gleb <gleb.rudenko at linkdigital.com.au>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

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

  Log Message:
  -----------
  tests fix


  Commit: a8329ea03cedcf518a433a401fdb897f0e021211
      https://github.com/ckan/ckan/commit/a8329ea03cedcf518a433a401fdb897f0e021211
  Author: Gleb <gleb.rudenko at linkdigital.com.au>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

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

  Log Message:
  -----------
  tests changes


  Commit: ecb553eb6f4d150b67b0a577a9491caef8ec8c86
      https://github.com/ckan/ckan/commit/ecb553eb6f4d150b67b0a577a9491caef8ec8c86
  Author: Gleb <gleb.rudenko at linkdigital.com.au>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

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

  Log Message:
  -----------
  tests check change


  Commit: f0a56d5d6bf5e81c5d39884d3f659c62481c536c
      https://github.com/ckan/ckan/commit/f0a56d5d6bf5e81c5d39884d3f659c62481c536c
  Author: Gleb <gleb.rudenko at linkdigital.com.au>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

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

  Log Message:
  -----------
  test change assert_contains -> assert_in


  Commit: 7102445911d88b850b9449860eb920c1387b3b4e
      https://github.com/ckan/ckan/commit/7102445911d88b850b9449860eb920c1387b3b4e
  Author: Jukka Heino <jukka.heino at gofore.com>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

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

  Log Message:
  -----------
  [#3195] Move RootPathMiddleware up the WSGI stack

Adapted from #3090.


  Commit: 7f6528c50c9d033402166493c9cd2b7c42716e21
      https://github.com/ckan/ckan/commit/7f6528c50c9d033402166493c9cd2b7c42716e21
  Author: Gleb <gleb.rudenko at linkdigital.com.au>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

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

  Log Message:
  -----------
  test response get headers


  Commit: 21783c02830a9cacbe25164e4ef2e0e8a32a073d
      https://github.com/ckan/ckan/commit/21783c02830a9cacbe25164e4ef2e0e8a32a073d
  Author: Gleb <gleb.rudenko at linkdigital.com.au>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

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

  Log Message:
  -----------
  test change follow response to 302 instead of 404


  Commit: f306e382be0dc07a5471754c5865b511b145a906
      https://github.com/ckan/ckan/commit/f306e382be0dc07a5471754c5865b511b145a906
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

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

  Log Message:
  -----------
  Merge pull request #3463 from jheino/3195-move-rootpath-middleware

[#3195] Move RootPathMiddleware up the WSGI stack


  Commit: 6a89535e74ea74785ecb2d19cb127b7d12fc277b
      https://github.com/ckan/ckan/commit/6a89535e74ea74785ecb2d19cb127b7d12fc277b
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M ckan/lib/celery_app.py
    A ckan/tests/lib/test_celery_app.py

  Log Message:
  -----------
  Merge pull request #3449 from torfsen/3443-missing-celery-requirement

[#3443] Raise exception if Celery version is not supported


  Commit: efcfe979e5adefb657903ce17af150f3b8d29036
      https://github.com/ckan/ckan/commit/efcfe979e5adefb657903ce17af150f3b8d29036
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

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

  Log Message:
  -----------
  Merge pull request #3224 from gleb-rudenko/3220-anonymous-user-should-be-redirected-to-login-page-when-trying-to-access-dashboard-instead-of-404

Redirect to login page instead of Page not found 404 when anonymous user is trying to access to /dashboard page and all user related pages


  Commit: e4fabc5ddd49ec07e368a8effcb8a1cef523a720
      https://github.com/ckan/ckan/commit/e4fabc5ddd49ec07e368a8effcb8a1cef523a720
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Fix an incorrect error message.


  Commit: 72eb146bcdc2ee709ca7f2c02ec3f920961166e8
      https://github.com/ckan/ckan/commit/72eb146bcdc2ee709ca7f2c02ec3f920961166e8
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-03-04 (Sat, 04 Mar 2017)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  Performance improvements in group_activity_query


  Commit: 609d54b2996848eb13e3dba64c189f80c672ddbf
      https://github.com/ckan/ckan/commit/609d54b2996848eb13e3dba64c189f80c672ddbf
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-05 (Sun, 05 Mar 2017)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#3467] separate total calculation + include_total param


  Commit: 060307a42c6efe69d9766884ca9a41028c90ad23
      https://github.com/ckan/ckan/commit/060307a42c6efe69d9766884ca9a41028c90ad23
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  Activity queries should return *all* activity events, not just those related to packages.


  Commit: 5739eb867301311dec6846d01c3d8e92556ce2f3
      https://github.com/ckan/ckan/commit/5739eb867301311dec6846d01c3d8e92556ce2f3
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-09 (Thu, 09 Mar 2017)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  Merge pull request #3466 from ckan/fix_group_activity_performance

Performance improvements in group_activity_query


  Commit: 4fb48e52fc2e1fa51f6ba4bebc72e0f86936028d
      https://github.com/ckan/ckan/commit/4fb48e52fc2e1fa51f6ba4bebc72e0f86936028d
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  fix edit resource of draft dataset


  Commit: 3efd082210e30c3c5b2d5d9c7d95c315bb42af81
      https://github.com/ckan/ckan/commit/3efd082210e30c3c5b2d5d9c7d95c315bb42af81
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

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

  Log Message:
  -----------
  Merge pull request #3427 from fanjinfei/master

allow package_search to return id/name instead of full dataset dictionary


  Commit: 017491fd729c0a96930ad42ed6710f1d866ed5c7
      https://github.com/ckan/ckan/commit/017491fd729c0a96930ad42ed6710f1d866ed5c7
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    R ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit_base.html
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/templates/datapusher/resource_data.html
    A ckanext/datapusher/templates/package/resource_edit_base.html
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/templates/datastore/dictionary.html
    A ckanext/datastore/templates/package/resource_edit_base.html
    M ckanext/datastore/templates/package/resource_read.html

  Log Message:
  -----------
  Merge pull request #3414 from ckan/3414-datastore-info

datastore Data Dictionary as postgresql comments


  Commit: 42406b15de78bff6e486a0e263f98114c644fffc
      https://github.com/ckan/ckan/commit/42406b15de78bff6e486a0e263f98114c644fffc
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/templates/organization/index.html

  Log Message:
  -----------
  Merge pull request #3451 from gleb-rudenko/organizations-are-sorted-by-name-instead-of-title

#3259 / Organizations are sorted by title


  Commit: 6e7789d5fe7043a60955c25da1b6f5f9b0b65da3
      https://github.com/ckan/ckan/commit/6e7789d5fe7043a60955c25da1b6f5f9b0b65da3
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Merge pull request #3460 from wildcatzita/3456-fix-tags-org-group-read-pages

Fix tags on org/group read pages


  Commit: 9c67d7ef8d7bcc219008394484fcc03f23293b2d
      https://github.com/ckan/ckan/commit/9c67d7ef8d7bcc219008394484fcc03f23293b2d
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge pull request #3480 from fanjinfei/ckanmaster

fix edit resource of draft dataset


  Commit: 81d9e44b71f9ed6ec607cb0eb966265a2c524b90
      https://github.com/ckan/ckan/commit/81d9e44b71f9ed6ec607cb0eb966265a2c524b90
  Author: Jana Sloukova <jana.techlib at gmail.com>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

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

  Log Message:
  -----------
  Setting of datastore_active flag moved to separate function


  Commit: 99cdca143f1b99eece7269fe20d6b478df96d5f7
      https://github.com/ckan/ckan/commit/99cdca143f1b99eece7269fe20d6b478df96d5f7
  Author: Jari Voutilainen <jari.voutilainen at iki.fi>
  Date:   2017-03-15 (Wed, 15 Mar 2017)

  Changed paths:
    M ckan/lib/mailer.py

  Log Message:
  -----------
  Use h.url_for and qualified=True for reset mails


  Commit: 927d729b084424458db3a342fc4b296ddcca5914
      https://github.com/ckan/ckan/commit/927d729b084424458db3a342fc4b296ddcca5914
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M ckanext/datastore/controller.py
    M ckanext/datastore/tests/test_dump.py

  Log Message:
  -----------
  nested columns serialized with json instead of python str representation


  Commit: 0e35ecf1e267c62faea85d46b6190a281a378557
      https://github.com/ckan/ckan/commit/0e35ecf1e267c62faea85d46b6190a281a378557
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

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

  Log Message:
  -----------
  [#3481] comment explaining approach


  Commit: a860a9761f3235bb481b0dd9cb7ecbde3bc207fe
      https://github.com/ckan/ckan/commit/a860a9761f3235bb481b0dd9cb7ecbde3bc207fe
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

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

  Log Message:
  -----------
  Merge branch 'singularita-corp-master'


  Commit: fe968a99dbac23506aad76d857135e6a7b9d5083
      https://github.com/ckan/ckan/commit/fe968a99dbac23506aad76d857135e6a7b9d5083
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M ckanext/datastore/controller.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/writer.py

  Log Message:
  -----------
  move dump function to writers


  Commit: ea7b59055606dc1d269e6a858d4193755c30fa61
      https://github.com/ckan/ckan/commit/ea7b59055606dc1d269e6a858d4193755c30fa61
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M ckanext/datastore/writer.py

  Log Message:
  -----------
  unicode literals


  Commit: 51d14e84b9c23fd56ef2489388a09173a8ad4ba7
      https://github.com/ckan/ckan/commit/51d14e84b9c23fd56ef2489388a09173a8ad4ba7
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-17 (Fri, 17 Mar 2017)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge pull request #3454 from wildcatzita/2651-fix-delete-resource-redirect-draft-dataset

[#2651] Fix for delete resource on draft dataset should redirect to new_resource page


  Commit: b4dc4c73d634ddeebcffa2405bdaa44983642a1d
      https://github.com/ckan/ckan/commit/b4dc4c73d634ddeebcffa2405bdaa44983642a1d
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-03-21 (Tue, 21 Mar 2017)

  Changed paths:
    M ckan/lib/mailer.py

  Log Message:
  -----------
  Merge pull request #3486 from Zharktas/master

Use h.url_for and qualified=True for reset mails


  Commit: a8792a07e179a2557992f09efd1203fdd13c6db2
      https://github.com/ckan/ckan/commit/a8792a07e179a2557992f09efd1203fdd13c6db2
  Author: John <mohnjatthews at users.noreply.github.com>
  Date:   2017-03-21 (Tue, 21 Mar 2017)

  Changed paths:
    M doc/maintaining/installing/install-from-source.rst

  Log Message:
  -----------
  Fixed link for Jetty.

Old Jetty link (http://jetty.codehaus.org/jetty/) was non-responsive. Replaced with link to the Eclipse Jetty documentation.


  Commit: fe59582134367f1471a86a26127d07c0f1cd1020
      https://github.com/ckan/ckan/commit/fe59582134367f1471a86a26127d07c0f1cd1020
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-03-21 (Tue, 21 Mar 2017)

  Changed paths:
    M doc/maintaining/installing/install-from-source.rst

  Log Message:
  -----------
  Merge pull request #3497 from mohnjatthews/patch-1

Fixed link for Jetty.


  Commit: bf0f683d48a31e3b82d4cc2fb35c36f4ce3849d7
      https://github.com/ckan/ckan/commit/bf0f683d48a31e3b82d4cc2fb35c36f4ce3849d7
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-03-21 (Tue, 21 Mar 2017)

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckanext/datastore/tests/test_chained_action.py
    M setup.py

  Log Message:
  -----------
  support chained action in plugins


  Commit: 9df0c7b3aa5b7e03b97682223f82d947697d36dc
      https://github.com/ckan/ckan/commit/9df0c7b3aa5b7e03b97682223f82d947697d36dc
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-24 (Fri, 24 Mar 2017)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/mailer.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/model/activity.py
    M ckan/templates/organization/index.html
    R ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/tests/logic/action/test_get.py
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/templates/datapusher/resource_data.html
    A ckanext/datapusher/templates/package/resource_edit_base.html
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/templates/datastore/dictionary.html
    A ckanext/datastore/templates/package/resource_edit_base.html
    M ckanext/datastore/templates/package/resource_read.html
    M doc/maintaining/installing/install-from-source.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 3467-datastore-total


  Commit: af2f061fdd08219d5070415be118d6063d38341f
      https://github.com/ckan/ckan/commit/af2f061fdd08219d5070415be118d6063d38341f
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-03-24 (Fri, 24 Mar 2017)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Merge pull request #3467 from ckan/3467-datastore-total

faster datastore total calculation + make optional


  Commit: b78c85cddc392e5fcac8295d2f91d9f2d3061e0c
      https://github.com/ckan/ckan/commit/b78c85cddc392e5fcac8295d2f91d9f2d3061e0c
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-03-27 (Mon, 27 Mar 2017)

  Changed paths:
    M ckanext/datastore/tests/test_chained_action.py
    M setup.py

  Log Message:
  -----------
  change test name to ExampleDataStoreDeletedWithCountPlugin


  Commit: 711e42609ae62c5ad671ea812e35f983740c21fe
      https://github.com/ckan/ckan/commit/711e42609ae62c5ad671ea812e35f983740c21fe
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge pull request #3464 from ckan/fix_template_error

Fix an incorrect error message.


  Commit: 61f9a44cb65daf39d5c37842c291bb067a1ba4e3
      https://github.com/ckan/ckan/commit/61f9a44cb65daf39d5c37842c291bb067a1ba4e3
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M ckanext/datastore/controller.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/writer.py

  Log Message:
  -----------
  Merge pull request #3487 from smotornyuk/3477-datastore-dump-of-nested-json

Nested columns serialized with json.dumps instead of python str representation


  Commit: 949c657c62eb8446c7e2523a467f0bb316b227c4
      https://github.com/ckan/ckan/commit/949c657c62eb8446c7e2523a467f0bb316b227c4
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

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

  Log Message:
  -----------
  Merge pull request #3455 from gleb-rudenko/ui-labels-for-the-last_modified-and-revision_timestamp-fields

#3028 / UI labels for the last_modified and revision_timestamp fields


  Commit: 5d4d5891810fab886c4ec26ac2cfabca6c01cf94
      https://github.com/ckan/ckan/commit/5d4d5891810fab886c4ec26ac2cfabca6c01cf94
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M ckan/plugins/interfaces.py
    M ckanext/datastore/tests/test_chained_action.py

  Log Message:
  -----------
  fix test case for chained_action


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

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckanext/datastore/tests/test_chained_action.py
    M setup.py

  Log Message:
  -----------
  Merge pull request #3494 from fanjinfei/ckanmaster

support chained action in plugins


  Commit: c676647b031e002b42f5f65c737bf10c0b99a462
      https://github.com/ckan/ckan/commit/c676647b031e002b42f5f65c737bf10c0b99a462
  Author: amercader <amercadero at gmail.com>
  Date:   2017-03-30 (Thu, 30 Mar 2017)

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

  Log Message:
  -----------
  [#3520] Import DebugToolbar only in debug mode


  Commit: ebb4d22d6571b0daba9c9cc1be4a9e13eae4d3b5
      https://github.com/ckan/ckan/commit/ebb4d22d6571b0daba9c9cc1be4a9e13eae4d3b5
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-03-30 (Thu, 30 Mar 2017)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  [#3520] Also mention that dev-requirements.txt is required for running ckan in debug mode.


  Commit: 3560b6a367f217d3655af46d2d770d7e773b7da3
      https://github.com/ckan/ckan/commit/3560b6a367f217d3655af46d2d770d7e773b7da3
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-03-30 (Thu, 30 Mar 2017)

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

  Log Message:
  -----------
  Merge pull request #3521 from ckan/3520-flask-debugtoolbar

[#3520] Import DebugToolbar only in debug mode


  Commit: e09ef9b54af6a2fc840cffe75824c6fb2b22d429
      https://github.com/ckan/ckan/commit/e09ef9b54af6a2fc840cffe75824c6fb2b22d429
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-31 (Fri, 31 Mar 2017)

  Changed paths:
    A .editorconfig
    M CHANGELOG.rst
    M ckan/common.py
    M ckan/config/environment.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/middleware/pylons_app.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/group.py
    M ckan/controllers/package.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/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/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/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/email_notifications.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/jobs.py
    M ckan/lib/mailer.py
    M ckan/lib/plugins.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/schema.py
    M ckan/logic/validators.py
    M ckan/model/activity.py
    M ckan/model/resource.py
    M ckan/model/user.py
    M ckan/pastertemplates/template/bin/travis-run.sh_tmpl
    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
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar.html
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    R ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/fonts/FontAwesome.otf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    R ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/bordered-pulled.less
    M ckan/public/base/vendor/font-awesome/less/core.less
    M ckan/public/base/vendor/font-awesome/less/extras.less
    A ckan/public/base/vendor/font-awesome/less/fixed-width.less
    R ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    M ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/larger.less
    A ckan/public/base/vendor/font-awesome/less/list.less
    M ckan/public/base/vendor/font-awesome/less/mixins.less
    M ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/rotated-flipped.less
    A ckan/public/base/vendor/font-awesome/less/spinning.less
    A ckan/public/base/vendor/font-awesome/less/stacked.less
    M ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/admin/trash.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/primer.html
    M ckan/templates/development/snippets/actions.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/list.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/development/snippets/simple-input.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/bulk_process.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/snippets/help.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/organization/snippets/info.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    R ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/resources.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_help.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.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.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/package/snippets/view_help.html
    M ckan/templates/package/view_edit_base.html
    M ckan/templates/revision/read.html
    M ckan/templates/snippets/activity_item.html
    M 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/home_breadcrumb_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    M ckan/templates/tag/index.html
    A ckan/templates/tests/flash_messages.html
    M ckan/templates/user/dashboard_datasets.html
    M ckan/templates/user/dashboard_groups.html
    M ckan/templates/user/dashboard_organizations.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/user_search.html
    A ckan/tests/config/test_sessions.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/legacy/lib/test_i18n.py
    M ckan/tests/legacy/logic/test_action.py
    A ckan/tests/lib/test_celery_app.py
    M ckan/tests/lib/test_jobs.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 ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/templates/datapusher/resource_data.html
    A ckanext/datapusher/templates/package/resource_edit_base.html
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/templates/datastore/dictionary.html
    A ckanext/datastore/templates/package/resource_edit_base.html
    M ckanext/datastore/templates/package/resource_read.html
    M ckanext/datastore/templates/package/snippets/data_api_button.html
    A ckanext/datastore/tests/test_chained_action.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/writer.py
    M ckanext/example_iconfigurer/plugin.py
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    M ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    M ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    M ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M ckanext/imageview/plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/textview/plugin.py
    M dev-requirements.txt
    M doc/_templates/footer.html
    M doc/images/exploring_datasets.jpg
    M doc/maintaining/installing/install-from-source.rst
    M doc/user-guide.rst
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 3384-datastore-cli


  Commit: c1132574ef974b797aef8653a15fc87f43c9bd2d
      https://github.com/ckan/ckan/commit/c1132574ef974b797aef8653a15fc87f43c9bd2d
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-31 (Fri, 31 Mar 2017)

  Changed paths:
    M ckanext/datastore/commands.py
    M ckanext/datastore/controller.py

  Log Message:
  -----------
  [#3384] datastore dump cli command


Compare: https://github.com/ckan/ckan/compare/c7bd2ab4aa7f...c1132574ef97

More information about the ckan-changes mailing list