[ckan-changes] [ckan/ckan] 922d0e: docker-compose v3 working

GitHub noreply at github.com
Tue Oct 17 12:35:12 UTC 2017


  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 922d0eb168e1dfd7a2a513f5be5b661b15b9ba08
      https://github.com/ckan/ckan/commit/922d0eb168e1dfd7a2a513f5be5b661b15b9ba08
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M Dockerfile
    M contrib/docker/ckan-entrypoint.sh
    M contrib/docker/docker-compose.yml
    M contrib/docker/postgresql/Dockerfile

  Log Message:
  -----------
  docker-compose v3 working


  Commit: 65ce565fe4e51a31853eb060c02e191130c74912
      https://github.com/ckan/ckan/commit/65ce565fe4e51a31853eb060c02e191130c74912
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  gitignore contrib/docker/.env


  Commit: 648fd6fd7b5c5bf22697aa45b7c4cfecca93ea48
      https://github.com/ckan/ckan/commit/648fd6fd7b5c5bf22697aa45b7c4cfecca93ea48
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M Dockerfile
    M contrib/docker/apache.wsgi
    M contrib/docker/postgresql/Dockerfile

  Log Message:
  -----------
  incorporate #3651


  Commit: a45b5e86bdcf9d9ec04c98ecc1bf96f130a30813
      https://github.com/ckan/ckan/commit/a45b5e86bdcf9d9ec04c98ecc1bf96f130a30813
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M Dockerfile
    M contrib/docker/docker-compose.yml

  Log Message:
  -----------
  ckan Dockerfile: move useradd below mkdir


  Commit: d046e295aaffacafdefcfe57151b68cfdf90bf37
      https://github.com/ckan/ckan/commit/d046e295aaffacafdefcfe57151b68cfdf90bf37
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M Dockerfile

  Log Message:
  -----------
  fix ckan Dockerfile to follow #3651


  Commit: a9d1969d1b16f6a41a167ca65acf1fd99d20e95a
      https://github.com/ckan/ckan/commit/a9d1969d1b16f6a41a167ca65acf1fd99d20e95a
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    A contrib/docker/.env.template

  Log Message:
  -----------
  add .env.template


  Commit: 7e75ec0ebec4f23abfa43dd1199fe82af8535b49
      https://github.com/ckan/ckan/commit/7e75ec0ebec4f23abfa43dd1199fe82af8535b49
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M contrib/docker/.env.template

  Log Message:
  -----------
  add instructions to .env.template


  Commit: d415b0d7a45f771e70e0e1278f81eb0ad049a984
      https://github.com/ckan/ckan/commit/d415b0d7a45f771e70e0e1278f81eb0ad049a984
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M contrib/docker/.env.template
    M contrib/docker/postgresql/Dockerfile

  Log Message:
  -----------
  add comments to docker templates


  Commit: 6283ce8be425a42772083271ccc365673ade41a2
      https://github.com/ckan/ckan/commit/6283ce8be425a42772083271ccc365673ade41a2
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M ckan/lib/helpers.py
    M doc/contributing/test.rst

  Log Message:
  -----------
  merge master


  Commit: c475ab7e99726287125762dc36d6239cb3a696d9
      https://github.com/ckan/ckan/commit/c475ab7e99726287125762dc36d6239cb3a696d9
  Author: florianm <florian.mayer at dpaw.wa.gov.au>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M contrib/docker/.env.template
    M contrib/docker/docker-compose.yml

  Log Message:
  -----------
  factor out POSTGRES_PORT, but docker_ckan cannot see it yet


  Commit: c5d0e3331cc05e7e8368c83623474fc2cae3ac1c
      https://github.com/ckan/ckan/commit/c5d0e3331cc05e7e8368c83623474fc2cae3ac1c
  Author: florianm <florian.mayer at dpaw.wa.gov.au>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M contrib/docker/.env.template

  Log Message:
  -----------
  update .env.template with instructions to update vars


  Commit: 40c6f47606c6a92bba9b6e27869b9ef7afc1d359
      https://github.com/ckan/ckan/commit/40c6f47606c6a92bba9b6e27869b9ef7afc1d359
  Author: florianm <florian.mayer at dpaw.wa.gov.au>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M contrib/docker/.env.template
    M contrib/docker/docker-compose.yml

  Log Message:
  -----------
  working setup with custom CKAN_PORT, but POSTGRES_PORT must be 5432


  Commit: c0ab1e97f6a59d3702477fb3044d337e90bd676f
      https://github.com/ckan/ckan/commit/c0ab1e97f6a59d3702477fb3044d337e90bd676f
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-11 (Tue, 11 Jul 2017)

  Changed paths:
    M contrib/docker/.env.template
    M contrib/docker/docker-compose.yml

  Log Message:
  -----------
  restrict db, redis, solr ports to local connections


  Commit: a756c726bb7284e65175bf23ebb632ef24f12f4b
      https://github.com/ckan/ckan/commit/a756c726bb7284e65175bf23ebb632ef24f12f4b
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-11 (Tue, 11 Jul 2017)

  Changed paths:
    M contrib/docker/docker-compose.yml

  Log Message:
  -----------
  add volume for ckan config


  Commit: bc54bc82b97ad18051ebf34930075565be7fa225
      https://github.com/ckan/ckan/commit/bc54bc82b97ad18051ebf34930075565be7fa225
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-11 (Tue, 11 Jul 2017)

  Changed paths:
    M contrib/docker/docker-compose.yml

  Log Message:
  -----------
  add named data volume ckan_lib to service ckan in docker-compose.yml


  Commit: 34471a9ba72f401d102365a257e44ac1d62f7df7
      https://github.com/ckan/ckan/commit/34471a9ba72f401d102365a257e44ac1d62f7df7
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-11 (Tue, 11 Jul 2017)

  Changed paths:
    M contrib/docker/docker-compose.yml

  Log Message:
  -----------
  docker-compose.yml: add named data volumes for ckan_home, ckan_storage and pg_data


  Commit: 8ebbc5694e192ac877a579d0f9bc695273959d49
      https://github.com/ckan/ckan/commit/8ebbc5694e192ac877a579d0f9bc695273959d49
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-12 (Wed, 12 Jul 2017)

  Changed paths:
    M contrib/docker/ckan-entrypoint.sh
    M contrib/docker/docker-compose.yml

  Log Message:
  -----------
  docker-compose.yml and entrypoint: sanitise port settings


  Commit: ef71f6601fa64f1bf55c22989f81922934b91096
      https://github.com/ckan/ckan/commit/ef71f6601fa64f1bf55c22989f81922934b91096
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-12 (Wed, 12 Jul 2017)

  Changed paths:
    M contrib/docker/.env.template
    M contrib/docker/ckan-entrypoint.sh
    M contrib/docker/docker-compose.yml
    M contrib/docker/postgresql/Dockerfile
    A contrib/docker/postgresql/docker-entrypoint-initdb.d/00_create_datastore.sh

  Log Message:
  -----------
  first steps with datastore


  Commit: 53aac5e8b76b5537b82620e6e8d4f46474540d91
      https://github.com/ckan/ckan/commit/53aac5e8b76b5537b82620e6e8d4f46474540d91
  Author: florianm <florian.mayer at dpaw.wa.gov.au>
  Date:   2017-07-12 (Wed, 12 Jul 2017)

  Changed paths:
    M contrib/docker/postgresql/Dockerfile
    M contrib/docker/postgresql/docker-entrypoint-initdb.d/00_create_datastore.sh

  Log Message:
  -----------
  updates to datastore script


  Commit: ed8745025ae425f0b06a0982c1288a73d7a4d9cd
      https://github.com/ckan/ckan/commit/ed8745025ae425f0b06a0982c1288a73d7a4d9cd
  Author: florianm <florian.mayer at dpaw.wa.gov.au>
  Date:   2017-07-12 (Wed, 12 Jul 2017)

  Changed paths:
    M contrib/docker/postgresql/docker-entrypoint-initdb.d/00_create_datastore.sh

  Log Message:
  -----------
  00_create_datastore.sh works


  Commit: 325ef5c7ed892c4e4ef30c8a8b72a9bf8889a04a
      https://github.com/ckan/ckan/commit/325ef5c7ed892c4e4ef30c8a8b72a9bf8889a04a
  Author: florianm <florian.mayer at dpaw.wa.gov.au>
  Date:   2017-07-12 (Wed, 12 Jul 2017)

  Changed paths:
    M contrib/docker/docker-compose.yml
    M contrib/docker/postgresql/Dockerfile
    R contrib/docker/postgresql/docker-entrypoint-initdb.d/00_create_datastore.sh
    A contrib/docker/postgresql/docker-entrypoint-initdb.d/00_create_datastore.sql
    A contrib/docker/postgresql/docker-entrypoint-initdb.d/10_set_permissions.sql

  Log Message:
  -----------
  datastore works


  Commit: 3d106649834e744be191cac2a8ed8e996dcaabe0
      https://github.com/ckan/ckan/commit/3d106649834e744be191cac2a8ed8e996dcaabe0
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-13 (Thu, 13 Jul 2017)

  Changed paths:
    A doc/maintaining/installing/install-from-docker-compose.rst

  Log Message:
  -----------
  dockermentation first cut


  Commit: eb7d9e106d00e448c0dbf47991624a0389e74e3b
      https://github.com/ckan/ckan/commit/eb7d9e106d00e448c0dbf47991624a0389e74e3b
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-13 (Thu, 13 Jul 2017)

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

  Log Message:
  -----------
  update docs


  Commit: f26bc981e2ad45249bd20144ecdf47dd4586d0f8
      https://github.com/ckan/ckan/commit/f26bc981e2ad45249bd20144ecdf47dd4586d0f8
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-13 (Thu, 13 Jul 2017)

  Changed paths:
    M contrib/docker/docker-compose.yml

  Log Message:
  -----------
  add datapusher, send shoutout to clement the legend mouchet


  Commit: 59571f5fdca853e1947ee7c25a5b642b1503dac5
      https://github.com/ckan/ckan/commit/59571f5fdca853e1947ee7c25a5b642b1503dac5
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M Dockerfile
    M contrib/docker/.env.template
    M contrib/docker/ckan-entrypoint.sh
    M contrib/docker/docker-compose.yml
    M contrib/docker/postgresql/Dockerfile
    M doc/maintaining/installing/install-from-docker-compose.rst

  Log Message:
  -----------
  factor out more config variables


  Commit: 7d01ead6d19a1a25aea525c0e70bbd84a8b605e2
      https://github.com/ckan/ckan/commit/7d01ead6d19a1a25aea525c0e70bbd84a8b605e2
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M Dockerfile
    M contrib/docker/docker-compose.yml

  Log Message:
  -----------
  working vanilla ckan through docker-compose


  Commit: 270ae97aa734a6db904361dd80a53a66bef21051
      https://github.com/ckan/ckan/commit/270ae97aa734a6db904361dd80a53a66bef21051
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M contrib/docker/.env.template
    M contrib/docker/ckan-entrypoint.sh
    M contrib/docker/docker-compose.yml
    M doc/maintaining/installing/install-from-docker-compose.rst

  Log Message:
  -----------
  first working extension, updated docs


  Commit: 71558089115dfea261d193d8a4a0dbafb971737d
      https://github.com/ckan/ckan/commit/71558089115dfea261d193d8a4a0dbafb971737d
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M .gitignore
    M ckan/config/environment.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/middleware/pylons_app.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/cli.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/validators.py
    M ckan/model/modification.py
    M ckan/model/user.py
    M ckan/plugins/interfaces.py
    A ckan/public-bs2/base/css/.gitignore
    A ckan/public-bs2/base/css/fuchsia.css
    A ckan/public-bs2/base/css/green.css
    A ckan/public-bs2/base/css/main.css
    A ckan/public-bs2/base/css/maroon.css
    A ckan/public-bs2/base/css/red.css
    A ckan/public-bs2/base/i18n/.gitignore
    A ckan/public-bs2/base/images/background-tag-ie7.png
    A ckan/public-bs2/base/images/background-tag.png
    A ckan/public-bs2/base/images/background-tile.png
    A ckan/public-bs2/base/images/bg.png
    A ckan/public-bs2/base/images/breadcrumb-slash-ie7.png
    A ckan/public-bs2/base/images/ckan-logo-footer.png
    A ckan/public-bs2/base/images/ckan-logo-white.svg
    A ckan/public-bs2/base/images/ckan-logo.png
    A ckan/public-bs2/base/images/ckan-logo.svg
    A ckan/public-bs2/base/images/ckan.ico
    A ckan/public-bs2/base/images/dashboard-followee-related.png
    A ckan/public-bs2/base/images/dotted.png
    A ckan/public-bs2/base/images/editing.png
    A ckan/public-bs2/base/images/full-width-nav-right.png
    A ckan/public-bs2/base/images/icon-search-27x26.png
    A ckan/public-bs2/base/images/loading-spinner.gif
    A ckan/public-bs2/base/images/nav-active.png
    A ckan/public-bs2/base/images/nav.png
    A ckan/public-bs2/base/images/od_80x15_blue.png
    A ckan/public-bs2/base/images/placeholder-200x125.png
    A ckan/public-bs2/base/images/placeholder-420x220.png
    A ckan/public-bs2/base/images/placeholder-680x400.png
    A ckan/public-bs2/base/images/placeholder-application.png
    A ckan/public-bs2/base/images/placeholder-group.png
    A ckan/public-bs2/base/images/placeholder-image.png
    A ckan/public-bs2/base/images/placeholder-organization.png
    A ckan/public-bs2/base/images/sprite-ckan-icons.png
    A ckan/public-bs2/base/images/sprite-resource-icons.png
    A ckan/public-bs2/base/images/table-seperator.png
    A ckan/public-bs2/base/javascript/client.js
    A ckan/public-bs2/base/javascript/i18n.js
    A ckan/public-bs2/base/javascript/main.js
    A ckan/public-bs2/base/javascript/module.js
    A ckan/public-bs2/base/javascript/modules/activity-stream.js
    A ckan/public-bs2/base/javascript/modules/api-info.js
    A ckan/public-bs2/base/javascript/modules/autocomplete.js
    A ckan/public-bs2/base/javascript/modules/basic-form.js
    A ckan/public-bs2/base/javascript/modules/confirm-action.js
    A ckan/public-bs2/base/javascript/modules/custom-fields.js
    A ckan/public-bs2/base/javascript/modules/dashboard.js
    A ckan/public-bs2/base/javascript/modules/data-viewer.js
    A ckan/public-bs2/base/javascript/modules/dataset-visibility.js
    A ckan/public-bs2/base/javascript/modules/follow.js
    A ckan/public-bs2/base/javascript/modules/image-upload.js
    A ckan/public-bs2/base/javascript/modules/media-grid.js
    A ckan/public-bs2/base/javascript/modules/popover-context.js
    A ckan/public-bs2/base/javascript/modules/resource-form.js
    A ckan/public-bs2/base/javascript/modules/resource-reorder.js
    A ckan/public-bs2/base/javascript/modules/resource-upload-field.js
    A ckan/public-bs2/base/javascript/modules/resource-view-embed.js
    A ckan/public-bs2/base/javascript/modules/resource-view-filters-form.js
    A ckan/public-bs2/base/javascript/modules/resource-view-filters.js
    A ckan/public-bs2/base/javascript/modules/resource-view-reorder.js
    A ckan/public-bs2/base/javascript/modules/select-switch.js
    A ckan/public-bs2/base/javascript/modules/slug-preview.js
    A ckan/public-bs2/base/javascript/modules/table-selectable-rows.js
    A ckan/public-bs2/base/javascript/modules/table-toggle-more.js
    A ckan/public-bs2/base/javascript/notify.js
    A ckan/public-bs2/base/javascript/plugins/jquery.date-helpers.js
    A ckan/public-bs2/base/javascript/plugins/jquery.form-warning.js
    A ckan/public-bs2/base/javascript/plugins/jquery.inherit.js
    A ckan/public-bs2/base/javascript/plugins/jquery.masonry.js
    A ckan/public-bs2/base/javascript/plugins/jquery.proxy-all.js
    A ckan/public-bs2/base/javascript/plugins/jquery.slug-preview.js
    A ckan/public-bs2/base/javascript/plugins/jquery.slug.js
    A ckan/public-bs2/base/javascript/plugins/jquery.truncator.js
    A ckan/public-bs2/base/javascript/plugins/jquery.url-helpers.js
    A ckan/public-bs2/base/javascript/pubsub.js
    A ckan/public-bs2/base/javascript/resource.config
    A ckan/public-bs2/base/javascript/sandbox.js
    A ckan/public-bs2/base/javascript/tracking.js
    A ckan/public-bs2/base/javascript/view-filters.js
    A ckan/public-bs2/base/less/activity.less
    A ckan/public-bs2/base/less/ckan.less
    A ckan/public-bs2/base/less/custom.less
    A ckan/public-bs2/base/less/dashboard.less
    A ckan/public-bs2/base/less/datapusher.less
    A ckan/public-bs2/base/less/dataset.less
    A ckan/public-bs2/base/less/dropdown.less
    A ckan/public-bs2/base/less/footer.less
    A ckan/public-bs2/base/less/forms.less
    A ckan/public-bs2/base/less/group.less
    A ckan/public-bs2/base/less/homepage.less
    A ckan/public-bs2/base/less/icons.less
    A ckan/public-bs2/base/less/iehacks.less
    A ckan/public-bs2/base/less/layout.less
    A ckan/public-bs2/base/less/main.less
    A ckan/public-bs2/base/less/masthead.less
    A ckan/public-bs2/base/less/media.less
    A ckan/public-bs2/base/less/mixins.less
    A ckan/public-bs2/base/less/module.less
    A ckan/public-bs2/base/less/nav.less
    A ckan/public-bs2/base/less/profile.less
    A ckan/public-bs2/base/less/prose.less
    A ckan/public-bs2/base/less/resource-view.less
    A ckan/public-bs2/base/less/search.less
    A ckan/public-bs2/base/less/tables.less
    A ckan/public-bs2/base/less/toolbar.less
    A ckan/public-bs2/base/less/variables.less
    A ckan/public-bs2/base/test/index.html
    A ckan/public-bs2/base/test/primer/index.html
    A ckan/public-bs2/base/test/spec/ckan.spec.js
    A ckan/public-bs2/base/test/spec/ckan.spec.min.js
    A ckan/public-bs2/base/test/spec/client.spec.js
    A ckan/public-bs2/base/test/spec/client.spec.min.js
    A ckan/public-bs2/base/test/spec/i18n.spec.js
    A ckan/public-bs2/base/test/spec/i18n.spec.min.js
    A ckan/public-bs2/base/test/spec/module.spec.js
    A ckan/public-bs2/base/test/spec/module.spec.min.js
    A ckan/public-bs2/base/test/spec/modules/autocomplete.spec.js
    A ckan/public-bs2/base/test/spec/modules/autocomplete.spec.min.js
    A ckan/public-bs2/base/test/spec/modules/basic-form.spec.js
    A ckan/public-bs2/base/test/spec/modules/basic-form.spec.min.js
    A ckan/public-bs2/base/test/spec/modules/confirm-action.spec.js
    A ckan/public-bs2/base/test/spec/modules/confirm-action.spec.min.js
    A ckan/public-bs2/base/test/spec/modules/custom-fields.spec.js
    A ckan/public-bs2/base/test/spec/modules/custom-fields.spec.min.js
    A ckan/public-bs2/base/test/spec/modules/image-upload.spec.js
    A ckan/public-bs2/base/test/spec/modules/image-upload.spec.min.js
    A ckan/public-bs2/base/test/spec/modules/resource-form.spec.js
    A ckan/public-bs2/base/test/spec/modules/resource-form.spec.min.js
    A ckan/public-bs2/base/test/spec/modules/resource-upload-field.spec.js
    A ckan/public-bs2/base/test/spec/modules/resource-upload-field.spec.min.js
    A ckan/public-bs2/base/test/spec/notify.spec.js
    A ckan/public-bs2/base/test/spec/notify.spec.min.js
    A ckan/public-bs2/base/test/spec/plugins/jquery.date-helpers.spec.js
    A ckan/public-bs2/base/test/spec/plugins/jquery.date-helpers.spec.min.js
    A ckan/public-bs2/base/test/spec/plugins/jquery.form-warning.spec.js
    A ckan/public-bs2/base/test/spec/plugins/jquery.form-warning.spec.min.js
    A ckan/public-bs2/base/test/spec/plugins/jquery.inherit.spec.js
    A ckan/public-bs2/base/test/spec/plugins/jquery.inherit.spec.min.js
    A ckan/public-bs2/base/test/spec/plugins/jquery.proxy-all.spec.js
    A ckan/public-bs2/base/test/spec/plugins/jquery.proxy-all.spec.min.js
    A ckan/public-bs2/base/test/spec/plugins/jquery.slug-preview.spec.js
    A ckan/public-bs2/base/test/spec/plugins/jquery.slug-preview.spec.min.js
    A ckan/public-bs2/base/test/spec/plugins/jquery.slug.spec.js
    A ckan/public-bs2/base/test/spec/plugins/jquery.slug.spec.min.js
    A ckan/public-bs2/base/test/spec/plugins/jquery.url-helpers.spec.js
    A ckan/public-bs2/base/test/spec/plugins/jquery.url-helpers.spec.min.js
    A ckan/public-bs2/base/test/spec/pubsub.spec.js
    A ckan/public-bs2/base/test/spec/pubsub.spec.min.js
    A ckan/public-bs2/base/test/spec/sandbox.spec.js
    A ckan/public-bs2/base/test/spec/sandbox.spec.min.js
    A ckan/public-bs2/base/test/spec/view-filters.spec.js
    A ckan/public-bs2/base/test/spec/view-filters.spec.min.js
    A ckan/public-bs2/base/test/vendor/chai.js
    A ckan/public-bs2/base/test/vendor/chai.min.js
    A ckan/public-bs2/base/test/vendor/less.js
    A ckan/public-bs2/base/test/vendor/less.min.js
    A ckan/public-bs2/base/test/vendor/mocha.css
    A ckan/public-bs2/base/test/vendor/mocha.js
    A ckan/public-bs2/base/test/vendor/mocha.min.css
    A ckan/public-bs2/base/test/vendor/mocha.min.js
    A ckan/public-bs2/base/test/vendor/sinon.js
    A ckan/public-bs2/base/test/vendor/sinon.min.js
    A ckan/public-bs2/base/vendor/bootstrap.js
    A ckan/public-bs2/base/vendor/bootstrap.min.js
    A ckan/public-bs2/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public-bs2/base/vendor/bootstrap/img/glyphicons-halflings.png
    A ckan/public-bs2/base/vendor/bootstrap/js/bootstrap.js
    A ckan/public-bs2/base/vendor/bootstrap/js/bootstrap.min.js
    A ckan/public-bs2/base/vendor/bootstrap/less/accordion.less
    A ckan/public-bs2/base/vendor/bootstrap/less/alerts.less
    A ckan/public-bs2/base/vendor/bootstrap/less/bootstrap.less
    A ckan/public-bs2/base/vendor/bootstrap/less/breadcrumbs.less
    A ckan/public-bs2/base/vendor/bootstrap/less/button-groups.less
    A ckan/public-bs2/base/vendor/bootstrap/less/buttons.less
    A ckan/public-bs2/base/vendor/bootstrap/less/carousel.less
    A ckan/public-bs2/base/vendor/bootstrap/less/close.less
    A ckan/public-bs2/base/vendor/bootstrap/less/code.less
    A ckan/public-bs2/base/vendor/bootstrap/less/component-animations.less
    A ckan/public-bs2/base/vendor/bootstrap/less/dropdowns.less
    A ckan/public-bs2/base/vendor/bootstrap/less/forms.less
    A ckan/public-bs2/base/vendor/bootstrap/less/grid.less
    A ckan/public-bs2/base/vendor/bootstrap/less/hero-unit.less
    A ckan/public-bs2/base/vendor/bootstrap/less/labels-badges.less
    A ckan/public-bs2/base/vendor/bootstrap/less/layouts.less
    A ckan/public-bs2/base/vendor/bootstrap/less/media.less
    A ckan/public-bs2/base/vendor/bootstrap/less/mixins.less
    A ckan/public-bs2/base/vendor/bootstrap/less/modals.less
    A ckan/public-bs2/base/vendor/bootstrap/less/navbar.less
    A ckan/public-bs2/base/vendor/bootstrap/less/navs.less
    A ckan/public-bs2/base/vendor/bootstrap/less/pager.less
    A ckan/public-bs2/base/vendor/bootstrap/less/pagination.less
    A ckan/public-bs2/base/vendor/bootstrap/less/popovers.less
    A ckan/public-bs2/base/vendor/bootstrap/less/progress-bars.less
    A ckan/public-bs2/base/vendor/bootstrap/less/reset.less
    A ckan/public-bs2/base/vendor/bootstrap/less/responsive-1200px-min.less
    A ckan/public-bs2/base/vendor/bootstrap/less/responsive-767px-max.less
    A ckan/public-bs2/base/vendor/bootstrap/less/responsive-768px-979px.less
    A ckan/public-bs2/base/vendor/bootstrap/less/responsive-navbar.less
    A ckan/public-bs2/base/vendor/bootstrap/less/responsive-utilities.less
    A ckan/public-bs2/base/vendor/bootstrap/less/responsive.less
    A ckan/public-bs2/base/vendor/bootstrap/less/scaffolding.less
    A ckan/public-bs2/base/vendor/bootstrap/less/sprites.less
    A ckan/public-bs2/base/vendor/bootstrap/less/tables.less
    A ckan/public-bs2/base/vendor/bootstrap/less/tests/buttons.html
    A ckan/public-bs2/base/vendor/bootstrap/less/tests/css-tests.css
    A ckan/public-bs2/base/vendor/bootstrap/less/tests/css-tests.html
    A ckan/public-bs2/base/vendor/bootstrap/less/tests/forms-responsive.html
    A ckan/public-bs2/base/vendor/bootstrap/less/tests/forms.html
    A ckan/public-bs2/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    A ckan/public-bs2/base/vendor/bootstrap/less/tests/navbar-static-top.html
    A ckan/public-bs2/base/vendor/bootstrap/less/tests/navbar.html
    A ckan/public-bs2/base/vendor/bootstrap/less/thumbnails.less
    A ckan/public-bs2/base/vendor/bootstrap/less/tooltip.less
    A ckan/public-bs2/base/vendor/bootstrap/less/type.less
    A ckan/public-bs2/base/vendor/bootstrap/less/utilities.less
    A ckan/public-bs2/base/vendor/bootstrap/less/variables.less
    A ckan/public-bs2/base/vendor/bootstrap/less/wells.less
    A ckan/public-bs2/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public-bs2/base/vendor/font-awesome/css/font-awesome.min.css
    A ckan/public-bs2/base/vendor/font-awesome/fonts/FontAwesome.otf
    A ckan/public-bs2/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    A ckan/public-bs2/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    A ckan/public-bs2/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    A ckan/public-bs2/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    A ckan/public-bs2/base/vendor/font-awesome/less/bordered-pulled.less
    A ckan/public-bs2/base/vendor/font-awesome/less/core.less
    A ckan/public-bs2/base/vendor/font-awesome/less/extras.less
    A ckan/public-bs2/base/vendor/font-awesome/less/fixed-width.less
    A ckan/public-bs2/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public-bs2/base/vendor/font-awesome/less/icons.less
    A ckan/public-bs2/base/vendor/font-awesome/less/larger.less
    A ckan/public-bs2/base/vendor/font-awesome/less/list.less
    A ckan/public-bs2/base/vendor/font-awesome/less/mixins.less
    A ckan/public-bs2/base/vendor/font-awesome/less/path.less
    A ckan/public-bs2/base/vendor/font-awesome/less/rotated-flipped.less
    A ckan/public-bs2/base/vendor/font-awesome/less/spinning.less
    A ckan/public-bs2/base/vendor/font-awesome/less/stacked.less
    A ckan/public-bs2/base/vendor/font-awesome/less/variables.less
    A ckan/public-bs2/base/vendor/html5.js
    A ckan/public-bs2/base/vendor/html5.min.js
    A ckan/public-bs2/base/vendor/jed.js
    A ckan/public-bs2/base/vendor/jed.min.js
    A ckan/public-bs2/base/vendor/jquery-fileupload/jquery.fileupload-ui.js
    A ckan/public-bs2/base/vendor/jquery-fileupload/jquery.fileupload-ui.min.js
    A ckan/public-bs2/base/vendor/jquery-fileupload/jquery.fileupload.js
    A ckan/public-bs2/base/vendor/jquery-fileupload/jquery.fileupload.min.js
    A ckan/public-bs2/base/vendor/jquery-fileupload/jquery.iframe-transport.js
    A ckan/public-bs2/base/vendor/jquery-fileupload/jquery.iframe-transport.min.js
    A ckan/public-bs2/base/vendor/jquery.js
    A ckan/public-bs2/base/vendor/jquery.min.js
    A ckan/public-bs2/base/vendor/jquery.ui.core.js
    A ckan/public-bs2/base/vendor/jquery.ui.mouse.js
    A ckan/public-bs2/base/vendor/jquery.ui.sortable.js
    A ckan/public-bs2/base/vendor/jquery.ui.widget.js
    A ckan/public-bs2/base/vendor/moment-with-locales.js
    A ckan/public-bs2/base/vendor/polyfill-object-keys.js
    A ckan/public-bs2/base/vendor/resource.config
    A ckan/public-bs2/base/vendor/select2/.gitignore
    A ckan/public-bs2/base/vendor/select2/LICENSE
    A ckan/public-bs2/base/vendor/select2/README.md
    A ckan/public-bs2/base/vendor/select2/bower.json
    A ckan/public-bs2/base/vendor/select2/component.json
    A ckan/public-bs2/base/vendor/select2/composer.json
    A ckan/public-bs2/base/vendor/select2/package.json
    A ckan/public-bs2/base/vendor/select2/release.sh
    A ckan/public-bs2/base/vendor/select2/select2-bootstrap.css
    A ckan/public-bs2/base/vendor/select2/select2-spinner.gif
    A ckan/public-bs2/base/vendor/select2/select2.css
    A ckan/public-bs2/base/vendor/select2/select2.jquery.json
    A ckan/public-bs2/base/vendor/select2/select2.js
    A ckan/public-bs2/base/vendor/select2/select2.min.js
    A ckan/public-bs2/base/vendor/select2/select2.png
    A ckan/public-bs2/base/vendor/select2/select2_locale_ar.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_bg.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_ca.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_cs.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_da.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_de.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_el.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_en.js.template
    A ckan/public-bs2/base/vendor/select2/select2_locale_es.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_et.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_eu.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_fa.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_fi.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_fr.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_gl.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_he.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_hr.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_hu.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_id.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_is.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_it.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_ja.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_ka.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_ko.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_lt.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_lv.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_mk.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_ms.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_nl.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_no.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_pl.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_pt-BR.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_pt-PT.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_ro.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_rs.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_ru.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_sk.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_sv.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_th.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_tr.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_uk.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_vi.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_zh-CN.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_zh-TW.js
    A ckan/public-bs2/base/vendor/select2/select2x2.png
    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/confirm-action.js
    M ckan/public/base/javascript/modules/dashboard.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/javascript/plugins/jquery.slug-preview.js
    M ckan/public/base/less/activity.less
    A ckan/public/base/less/alerts.less
    A ckan/public/base/less/bootstrap-variables.less
    A ckan/public/base/less/bootstrap.less
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/datapusher.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/dropdown.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/icons.less
    R ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/main.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/prose.less
    M ckan/public/base/less/resource-view.less
    M ckan/public/base/less/search.less
    M ckan/public/base/less/tables.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/less/variables.less
    A ckan/public/base/test/spec/ckan.spec.min.js
    A ckan/public/base/test/spec/client.spec.min.js
    A ckan/public/base/test/spec/i18n.spec.min.js
    A ckan/public/base/test/spec/module.spec.min.js
    A ckan/public/base/test/spec/modules/autocomplete.spec.min.js
    A ckan/public/base/test/spec/modules/basic-form.spec.min.js
    A ckan/public/base/test/spec/modules/confirm-action.spec.min.js
    A ckan/public/base/test/spec/modules/custom-fields.spec.min.js
    M ckan/public/base/test/spec/modules/image-upload.spec.js
    A ckan/public/base/test/spec/modules/image-upload.spec.min.js
    A ckan/public/base/test/spec/modules/resource-form.spec.min.js
    A ckan/public/base/test/spec/modules/resource-upload-field.spec.min.js
    A ckan/public/base/test/spec/notify.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.date-helpers.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.form-warning.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.inherit.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.proxy-all.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.slug-preview.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.slug.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.url-helpers.spec.min.js
    A ckan/public/base/test/spec/pubsub.spec.min.js
    A ckan/public/base/test/spec/sandbox.spec.min.js
    A ckan/public/base/test/spec/view-filters.spec.min.js
    A ckan/public/base/vendor/bootstrap/fonts/glyphicons-halflings-regular.eot
    A ckan/public/base/vendor/bootstrap/fonts/glyphicons-halflings-regular.svg
    A ckan/public/base/vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf
    A ckan/public/base/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff
    A ckan/public/base/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff2
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    M ckan/public/base/vendor/bootstrap/js/bootstrap.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    R ckan/public/base/vendor/bootstrap/less/accordion.less
    M ckan/public/base/vendor/bootstrap/less/alerts.less
    A ckan/public/base/vendor/bootstrap/less/badges.less
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/breadcrumbs.less
    M ckan/public/base/vendor/bootstrap/less/button-groups.less
    M ckan/public/base/vendor/bootstrap/less/buttons.less
    M ckan/public/base/vendor/bootstrap/less/carousel.less
    M ckan/public/base/vendor/bootstrap/less/close.less
    M ckan/public/base/vendor/bootstrap/less/code.less
    M ckan/public/base/vendor/bootstrap/less/component-animations.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/forms.less
    A ckan/public/base/vendor/bootstrap/less/glyphicons.less
    M ckan/public/base/vendor/bootstrap/less/grid.less
    R ckan/public/base/vendor/bootstrap/less/hero-unit.less
    A ckan/public/base/vendor/bootstrap/less/input-groups.less
    A ckan/public/base/vendor/bootstrap/less/jumbotron.less
    R ckan/public/base/vendor/bootstrap/less/labels-badges.less
    A ckan/public/base/vendor/bootstrap/less/labels.less
    R ckan/public/base/vendor/bootstrap/less/layouts.less
    A ckan/public/base/vendor/bootstrap/less/list-group.less
    M ckan/public/base/vendor/bootstrap/less/media.less
    M ckan/public/base/vendor/bootstrap/less/mixins.less
    A ckan/public/base/vendor/bootstrap/less/mixins/alerts.less
    A ckan/public/base/vendor/bootstrap/less/mixins/background-variant.less
    A ckan/public/base/vendor/bootstrap/less/mixins/border-radius.less
    A ckan/public/base/vendor/bootstrap/less/mixins/buttons.less
    A ckan/public/base/vendor/bootstrap/less/mixins/center-block.less
    A ckan/public/base/vendor/bootstrap/less/mixins/clearfix.less
    A ckan/public/base/vendor/bootstrap/less/mixins/forms.less
    A ckan/public/base/vendor/bootstrap/less/mixins/gradients.less
    A ckan/public/base/vendor/bootstrap/less/mixins/grid-framework.less
    A ckan/public/base/vendor/bootstrap/less/mixins/grid.less
    A ckan/public/base/vendor/bootstrap/less/mixins/hide-text.less
    A ckan/public/base/vendor/bootstrap/less/mixins/image.less
    A ckan/public/base/vendor/bootstrap/less/mixins/labels.less
    A ckan/public/base/vendor/bootstrap/less/mixins/list-group.less
    A ckan/public/base/vendor/bootstrap/less/mixins/nav-divider.less
    A ckan/public/base/vendor/bootstrap/less/mixins/nav-vertical-align.less
    A ckan/public/base/vendor/bootstrap/less/mixins/opacity.less
    A ckan/public/base/vendor/bootstrap/less/mixins/pagination.less
    A ckan/public/base/vendor/bootstrap/less/mixins/panels.less
    A ckan/public/base/vendor/bootstrap/less/mixins/progress-bar.less
    A ckan/public/base/vendor/bootstrap/less/mixins/reset-filter.less
    A ckan/public/base/vendor/bootstrap/less/mixins/reset-text.less
    A ckan/public/base/vendor/bootstrap/less/mixins/resize.less
    A ckan/public/base/vendor/bootstrap/less/mixins/responsive-visibility.less
    A ckan/public/base/vendor/bootstrap/less/mixins/size.less
    A ckan/public/base/vendor/bootstrap/less/mixins/tab-focus.less
    A ckan/public/base/vendor/bootstrap/less/mixins/table-row.less
    A ckan/public/base/vendor/bootstrap/less/mixins/text-emphasis.less
    A ckan/public/base/vendor/bootstrap/less/mixins/text-overflow.less
    A ckan/public/base/vendor/bootstrap/less/mixins/vendor-prefixes.less
    M ckan/public/base/vendor/bootstrap/less/modals.less
    M ckan/public/base/vendor/bootstrap/less/navbar.less
    M ckan/public/base/vendor/bootstrap/less/navs.less
    A ckan/public/base/vendor/bootstrap/less/normalize.less
    M ckan/public/base/vendor/bootstrap/less/pager.less
    M ckan/public/base/vendor/bootstrap/less/pagination.less
    A ckan/public/base/vendor/bootstrap/less/panels.less
    M ckan/public/base/vendor/bootstrap/less/popovers.less
    A ckan/public/base/vendor/bootstrap/less/print.less
    M ckan/public/base/vendor/bootstrap/less/progress-bars.less
    R ckan/public/base/vendor/bootstrap/less/reset.less
    R ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
    R ckan/public/base/vendor/bootstrap/less/responsive-767px-max.less
    R ckan/public/base/vendor/bootstrap/less/responsive-768px-979px.less
    A ckan/public/base/vendor/bootstrap/less/responsive-embed.less
    R ckan/public/base/vendor/bootstrap/less/responsive-navbar.less
    M ckan/public/base/vendor/bootstrap/less/responsive-utilities.less
    R ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/bootstrap/less/scaffolding.less
    R ckan/public/base/vendor/bootstrap/less/sprites.less
    M ckan/public/base/vendor/bootstrap/less/tables.less
    R ckan/public/base/vendor/bootstrap/less/tests/buttons.html
    R ckan/public/base/vendor/bootstrap/less/tests/css-tests.css
    R ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
    R ckan/public/base/vendor/bootstrap/less/tests/forms-responsive.html
    R ckan/public/base/vendor/bootstrap/less/tests/forms.html
    R ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    R ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
    R ckan/public/base/vendor/bootstrap/less/tests/navbar.html
    A ckan/public/base/vendor/bootstrap/less/theme.less
    M ckan/public/base/vendor/bootstrap/less/thumbnails.less
    M ckan/public/base/vendor/bootstrap/less/tooltip.less
    M ckan/public/base/vendor/bootstrap/less/type.less
    M ckan/public/base/vendor/bootstrap/less/utilities.less
    M ckan/public/base/vendor/bootstrap/less/variables.less
    M ckan/public/base/vendor/bootstrap/less/wells.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.css.map
    M ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    M ckan/public/base/vendor/font-awesome/fonts/FontAwesome.otf
    M ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    M ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    M ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    M ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff2
    A ckan/public/base/vendor/font-awesome/less/animated.less
    M ckan/public/base/vendor/font-awesome/less/bordered-pulled.less
    M ckan/public/base/vendor/font-awesome/less/core.less
    R ckan/public/base/vendor/font-awesome/less/extras.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    M ckan/public/base/vendor/font-awesome/less/icons.less
    M 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
    M ckan/public/base/vendor/font-awesome/less/rotated-flipped.less
    A ckan/public/base/vendor/font-awesome/less/screen-reader.less
    R ckan/public/base/vendor/font-awesome/less/spinning.less
    M ckan/public/base/vendor/font-awesome/less/variables.less
    A ckan/templates-bs2/activity_streams/activity_stream_email_notifications.text
    A ckan/templates-bs2/activity_streams/activity_stream_items.html
    A ckan/templates-bs2/admin/base.html
    A ckan/templates-bs2/admin/config.html
    A ckan/templates-bs2/admin/confirm_reset.html
    A ckan/templates-bs2/admin/index.html
    A ckan/templates-bs2/admin/trash.html
    A ckan/templates-bs2/ajax_snippets/custom_fields.html
    A ckan/templates-bs2/ajax_snippets/follow_button.html
    A ckan/templates-bs2/base.html
    A ckan/templates-bs2/dataviewer/base.html
    A ckan/templates-bs2/dataviewer/snippets/data_preview.html
    A ckan/templates-bs2/dataviewer/snippets/no_preview.html
    A ckan/templates-bs2/development/markup.html
    A ckan/templates-bs2/development/primer.html
    A ckan/templates-bs2/development/snippets/actions.html
    A ckan/templates-bs2/development/snippets/breadcrumb.html
    A ckan/templates-bs2/development/snippets/context.html
    A ckan/templates-bs2/development/snippets/facet.html
    A ckan/templates-bs2/development/snippets/form.html
    A ckan/templates-bs2/development/snippets/form_stages.html
    A ckan/templates-bs2/development/snippets/list.html
    A ckan/templates-bs2/development/snippets/markup.html
    A ckan/templates-bs2/development/snippets/media_grid.html
    A ckan/templates-bs2/development/snippets/module.html
    A ckan/templates-bs2/development/snippets/nav.html
    A ckan/templates-bs2/development/snippets/page_header.html
    A ckan/templates-bs2/development/snippets/pagination.html
    A ckan/templates-bs2/development/snippets/simple-input.html
    A ckan/templates-bs2/emails/invite_user.txt
    A ckan/templates-bs2/emails/invite_user_subject.txt
    A ckan/templates-bs2/emails/reset_password.txt
    A ckan/templates-bs2/emails/reset_password_subject.txt
    A ckan/templates-bs2/error_document_template.html
    A ckan/templates-bs2/footer.html
    A ckan/templates-bs2/group/about.html
    A ckan/templates-bs2/group/activity_stream.html
    A ckan/templates-bs2/group/admins.html
    A ckan/templates-bs2/group/base_form_page.html
    A ckan/templates-bs2/group/confirm_delete.html
    A ckan/templates-bs2/group/confirm_delete_member.html
    A ckan/templates-bs2/group/edit.html
    A ckan/templates-bs2/group/edit_base.html
    A ckan/templates-bs2/group/followers.html
    A ckan/templates-bs2/group/history.html
    A ckan/templates-bs2/group/index.html
    A ckan/templates-bs2/group/member_new.html
    A ckan/templates-bs2/group/members.html
    A ckan/templates-bs2/group/new.html
    A ckan/templates-bs2/group/new_group_form.html
    A ckan/templates-bs2/group/read.html
    A ckan/templates-bs2/group/read_base.html
    A ckan/templates-bs2/group/snippets/feeds.html
    A ckan/templates-bs2/group/snippets/group_form.html
    A ckan/templates-bs2/group/snippets/group_item.html
    A ckan/templates-bs2/group/snippets/group_list.html
    A ckan/templates-bs2/group/snippets/helper.html
    A ckan/templates-bs2/group/snippets/history_revisions.html
    A ckan/templates-bs2/group/snippets/info.html
    A ckan/templates-bs2/group/snippets/revisions_table.html
    A ckan/templates-bs2/header.html
    A ckan/templates-bs2/home/about.html
    A ckan/templates-bs2/home/index.html
    A ckan/templates-bs2/home/layout1.html
    A ckan/templates-bs2/home/layout2.html
    A ckan/templates-bs2/home/layout3.html
    A ckan/templates-bs2/home/snippets/about_text.html
    A ckan/templates-bs2/home/snippets/featured_group.html
    A ckan/templates-bs2/home/snippets/featured_organization.html
    A ckan/templates-bs2/home/snippets/promoted.html
    A ckan/templates-bs2/home/snippets/search.html
    A ckan/templates-bs2/home/snippets/stats.html
    A ckan/templates-bs2/macros/autoform.html
    A ckan/templates-bs2/macros/form.html
    A ckan/templates-bs2/organization/about.html
    A ckan/templates-bs2/organization/activity_stream.html
    A ckan/templates-bs2/organization/admins.html
    A ckan/templates-bs2/organization/base_form_page.html
    A ckan/templates-bs2/organization/bulk_process.html
    A ckan/templates-bs2/organization/confirm_delete.html
    A ckan/templates-bs2/organization/confirm_delete_member.html
    A ckan/templates-bs2/organization/edit.html
    A ckan/templates-bs2/organization/edit_base.html
    A ckan/templates-bs2/organization/index.html
    A ckan/templates-bs2/organization/member_new.html
    A ckan/templates-bs2/organization/members.html
    A ckan/templates-bs2/organization/new.html
    A ckan/templates-bs2/organization/new_organization_form.html
    A ckan/templates-bs2/organization/read.html
    A ckan/templates-bs2/organization/read_base.html
    A ckan/templates-bs2/organization/snippets/feeds.html
    A ckan/templates-bs2/organization/snippets/help.html
    A ckan/templates-bs2/organization/snippets/helper.html
    A ckan/templates-bs2/organization/snippets/info.html
    A ckan/templates-bs2/organization/snippets/organization_form.html
    A ckan/templates-bs2/organization/snippets/organization_item.html
    A ckan/templates-bs2/organization/snippets/organization_list.html
    A ckan/templates-bs2/package/activity.html
    A ckan/templates-bs2/package/base.html
    A ckan/templates-bs2/package/base_form_page.html
    A ckan/templates-bs2/package/confirm_delete.html
    A ckan/templates-bs2/package/confirm_delete_resource.html
    A ckan/templates-bs2/package/edit.html
    A ckan/templates-bs2/package/edit_base.html
    A ckan/templates-bs2/package/edit_view.html
    A ckan/templates-bs2/package/followers.html
    A ckan/templates-bs2/package/group_list.html
    A ckan/templates-bs2/package/history.html
    A ckan/templates-bs2/package/new.html
    A ckan/templates-bs2/package/new_package_form.html
    A ckan/templates-bs2/package/new_resource.html
    A ckan/templates-bs2/package/new_resource_not_draft.html
    A ckan/templates-bs2/package/new_view.html
    A ckan/templates-bs2/package/read.html
    A ckan/templates-bs2/package/read_base.html
    A ckan/templates-bs2/package/resource_edit.html
    A ckan/templates-bs2/package/resource_edit_base.html
    A ckan/templates-bs2/package/resource_read.html
    A ckan/templates-bs2/package/resource_views.html
    A ckan/templates-bs2/package/resources.html
    A ckan/templates-bs2/package/search.html
    A ckan/templates-bs2/package/snippets/additional_info.html
    A ckan/templates-bs2/package/snippets/cannot_create_package.html
    A ckan/templates-bs2/package/snippets/history_revisions.html
    A ckan/templates-bs2/package/snippets/info.html
    A ckan/templates-bs2/package/snippets/new_package_breadcrumb.html
    A ckan/templates-bs2/package/snippets/package_basic_fields.html
    A ckan/templates-bs2/package/snippets/package_context.html
    A ckan/templates-bs2/package/snippets/package_form.html
    A ckan/templates-bs2/package/snippets/package_metadata_fields.html
    A ckan/templates-bs2/package/snippets/resource_edit_form.html
    A ckan/templates-bs2/package/snippets/resource_form.html
    A ckan/templates-bs2/package/snippets/resource_help.html
    A ckan/templates-bs2/package/snippets/resource_info.html
    A ckan/templates-bs2/package/snippets/resource_item.html
    A ckan/templates-bs2/package/snippets/resource_view.html
    A ckan/templates-bs2/package/snippets/resource_view_embed.html
    A ckan/templates-bs2/package/snippets/resource_view_filters.html
    A ckan/templates-bs2/package/snippets/resource_views_list.html
    A ckan/templates-bs2/package/snippets/resource_views_list_item.html
    A ckan/templates-bs2/package/snippets/resources.html
    A ckan/templates-bs2/package/snippets/resources_list.html
    A ckan/templates-bs2/package/snippets/revisions_table.html
    A ckan/templates-bs2/package/snippets/stages.html
    A ckan/templates-bs2/package/snippets/tags.html
    A ckan/templates-bs2/package/snippets/view_form.html
    A ckan/templates-bs2/package/snippets/view_form_filters.html
    A ckan/templates-bs2/package/snippets/view_help.html
    A ckan/templates-bs2/package/view_edit_base.html
    A ckan/templates-bs2/page.html
    A ckan/templates-bs2/revision/__init__.py
    A ckan/templates-bs2/revision/diff.html
    A ckan/templates-bs2/revision/list.html
    A ckan/templates-bs2/revision/read.html
    A ckan/templates-bs2/revision/read_base.html
    A ckan/templates-bs2/revision/snippets/revisions_list.html
    A ckan/templates-bs2/robots.txt
    A ckan/templates-bs2/snippets/activity_item.html
    A ckan/templates-bs2/snippets/additional_info.html
    A ckan/templates-bs2/snippets/context.html
    A ckan/templates-bs2/snippets/context/dataset.html
    A ckan/templates-bs2/snippets/context/group.html
    A ckan/templates-bs2/snippets/context/user.html
    A ckan/templates-bs2/snippets/custom_form_fields.html
    A ckan/templates-bs2/snippets/datapreview_embed_dialog.html
    A ckan/templates-bs2/snippets/datapusher_status.html
    A ckan/templates-bs2/snippets/debug.html
    A ckan/templates-bs2/snippets/disqus_trackback.html
    A ckan/templates-bs2/snippets/facet_list.html
    A ckan/templates-bs2/snippets/follow_button.html
    A ckan/templates-bs2/snippets/group.html
    A ckan/templates-bs2/snippets/group_item.html
    A ckan/templates-bs2/snippets/home_breadcrumb_item.html
    A ckan/templates-bs2/snippets/language_selector.html
    A ckan/templates-bs2/snippets/license.html
    A ckan/templates-bs2/snippets/local_friendly_datetime.html
    A ckan/templates-bs2/snippets/organization.html
    A ckan/templates-bs2/snippets/organization_item.html
    A ckan/templates-bs2/snippets/package_grid.html
    A ckan/templates-bs2/snippets/package_item.html
    A ckan/templates-bs2/snippets/package_list.html
    A ckan/templates-bs2/snippets/popular.html
    A ckan/templates-bs2/snippets/private.html
    A ckan/templates-bs2/snippets/search_form.html
    A ckan/templates-bs2/snippets/search_result_text.html
    A ckan/templates-bs2/snippets/simple_search.html
    A ckan/templates-bs2/snippets/social.html
    A ckan/templates-bs2/snippets/sort_by.html
    A ckan/templates-bs2/snippets/subscribe.html
    A ckan/templates-bs2/snippets/tag_list.html
    A ckan/templates-bs2/tag/index.html
    A ckan/templates-bs2/tests/broken_helper_as_attribute.html
    A ckan/templates-bs2/tests/broken_helper_as_item.html
    A ckan/templates-bs2/tests/flash_messages.html
    A ckan/templates-bs2/tests/helper_as_attribute.html
    A ckan/templates-bs2/tests/helper_as_item.html
    A ckan/templates-bs2/tests/mock_json_resource_preview_template.html
    A ckan/templates-bs2/tests/mock_resource_preview_template.html
    A ckan/templates-bs2/user/activity_stream.html
    A ckan/templates-bs2/user/dashboard.html
    A ckan/templates-bs2/user/dashboard_datasets.html
    A ckan/templates-bs2/user/dashboard_groups.html
    A ckan/templates-bs2/user/dashboard_organizations.html
    A ckan/templates-bs2/user/edit.html
    A ckan/templates-bs2/user/edit_base.html
    A ckan/templates-bs2/user/edit_user_form.html
    A ckan/templates-bs2/user/followers.html
    A ckan/templates-bs2/user/list.html
    A ckan/templates-bs2/user/login.html
    A ckan/templates-bs2/user/logout.html
    A ckan/templates-bs2/user/logout_first.html
    A ckan/templates-bs2/user/new.html
    A ckan/templates-bs2/user/new_user_form.html
    A ckan/templates-bs2/user/perform_reset.html
    A ckan/templates-bs2/user/read.html
    A ckan/templates-bs2/user/read_base.html
    A ckan/templates-bs2/user/request_reset.html
    A ckan/templates-bs2/user/snippets/followee_dropdown.html
    A ckan/templates-bs2/user/snippets/followers.html
    A ckan/templates-bs2/user/snippets/login_form.html
    A ckan/templates-bs2/user/snippets/recaptcha.html
    A ckan/templates-bs2/user/snippets/user_search.html
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/confirm_reset.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/form.html
    M ckan/templates/development/snippets/list.html
    M ckan/templates/development/snippets/markup.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/pagination.html
    M ckan/templates/development/snippets/simple-input.html
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/edit.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/history_revisions.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/layout1.html
    M ckan/templates/home/layout2.html
    M ckan/templates/home/layout3.html
    M ckan/templates/home/snippets/promoted.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/confirm_delete.html
    M ckan/templates/organization/confirm_delete_member.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/info.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/group_list.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/history_revisions.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_view.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/package/view_edit_base.html
    M ckan/templates/page.html
    A ckan/templates/snippets/add_dataset.html
    M ckan/templates/snippets/datapreview_embed_dialog.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/language_selector.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/sort_by.html
    M ckan/templates/snippets/subscribe.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/dashboard_datasets.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/login_form.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckan/templates/user/snippets/user_search.html
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/factories.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/functional/api/test_dashboard.py
    M ckan/tests/legacy/functional/api/test_email_notifications.py
    M ckan/tests/legacy/functional/api/test_user.py
    M ckan/tests/legacy/functional/test_activity.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_auth.py
    M ckan/tests/legacy/models/test_user.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/auth/test_init.py
    M ckan/tests/logic/test_validators.py
    A ckan/tests/test_none_root.py
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/templates-bs2/datapusher/resource_data.html
    A ckanext/datapusher/templates-bs2/package/resource_edit_base.html
    M ckanext/datapusher/templates/datapusher/resource_data.html
    M ckanext/datastore/plugin.py
    A ckanext/datastore/templates-bs2/ajax_snippets/api_info.html
    A ckanext/datastore/templates-bs2/datastore/dictionary.html
    A ckanext/datastore/templates-bs2/package/resource_edit_base.html
    A ckanext/datastore/templates-bs2/package/resource_read.html
    A ckanext/datastore/templates-bs2/package/snippets/data_api_button.html
    M ckanext/datastore/templates/ajax_snippets/api_info.html
    M ckanext/datatablesview/plugin.py
    A ckanext/reclineview/theme/public/css/recline.min.css
    A ckanext/reclineview/theme/public/recline_view.min.js
    A ckanext/reclineview/theme/public/widget.recordcount.min.js
    M doc/maintaining/configuration.rst
    M doc/theming/index.rst

  Log Message:
  -----------
  merge upstream/master


  Commit: bdd1faca782ad6bd1f62a4560ff7afd67476cc39
      https://github.com/ckan/ckan/commit/bdd1faca782ad6bd1f62a4560ff7afd67476cc39
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

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

  Log Message:
  -----------
  spellcheck docs


  Commit: 852f935e36d8553478980e99d28230359617760b
      https://github.com/ckan/ckan/commit/852f935e36d8553478980e99d28230359617760b
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

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

  Log Message:
  -----------
  fix typo in docs


  Commit: 8d198999ce87adebafce3b0f784dfdeeb49f7bb5
      https://github.com/ckan/ckan/commit/8d198999ce87adebafce3b0f784dfdeeb49f7bb5
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

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

  Log Message:
  -----------
  fix broken crossref in docs


  Commit: 32c976adc687c1cc1046940c2b2865962a29928f
      https://github.com/ckan/ckan/commit/32c976adc687c1cc1046940c2b2865962a29928f
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

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

  Log Message:
  -----------
  update docker compose installation docs following feedback from @vanuan

remove use of virtualenv
discuss environment variables vs docker secrets
combine docker-compose build and up into up --build
discuss restarting ckan container
discuss named volumes vs mapped local drives
add todo on automating adding extensions


  Commit: 6f7869fea10e9850cfa54557cc64dae73fcd1a38
      https://github.com/ckan/ckan/commit/6f7869fea10e9850cfa54557cc64dae73fcd1a38
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M Dockerfile
    M contrib/docker/postgresql/Dockerfile
    A contrib/docker/postgresql/docker-entrypoint-initdb.d/20_postgis_permissions.sql
    M doc/maintaining/installing/install-from-docker-compose.rst

  Log Message:
  -----------
  prepare docker-compose for ckanext-spatial

modify CKAN Dockerfile to install system packages required for ckanext-spatial
modify postgres Dockerfile to use postgis image
add postgres Dockerfile script to set permissions for postgis tables to ckan user
add working installation steps to docs


  Commit: 0d929aecd13fce2608d4ba6b19d00a39464aebf9
      https://github.com/ckan/ckan/commit/0d929aecd13fce2608d4ba6b19d00a39464aebf9
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

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

  Log Message:
  -----------
  reword compose docs following PR comments


  Commit: 1192f8eae3b61729b71dcc95d2c5d5f39b96b72c
      https://github.com/ckan/ckan/commit/1192f8eae3b61729b71dcc95d2c5d5f39b96b72c
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-19 (Wed, 19 Jul 2017)

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

  Log Message:
  -----------
  compose docs: add option to install extensions from pypi


  Commit: cdbc68f3e617d53a04125c9656fbcb135b261b35
      https://github.com/ckan/ckan/commit/cdbc68f3e617d53a04125c9656fbcb135b261b35
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

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

  Log Message:
  -----------
  docker compose docs: add steps towards production


  Commit: 5f4e049d121e3e79a4f843612541cb731ad305df
      https://github.com/ckan/ckan/commit/5f4e049d121e3e79a4f843612541cb731ad305df
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-21 (Fri, 21 Jul 2017)

  Changed paths:
    M doc/maintaining/installing/index.rst
    M doc/maintaining/installing/install-from-docker-compose.rst

  Log Message:
  -----------
  update installation docs with link to compose docs; expand on development setup for extensions


  Commit: 9329a81d3f74183c3f626cbcad38e574add91c50
      https://github.com/ckan/ckan/commit/9329a81d3f74183c3f626cbcad38e574add91c50
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-21 (Fri, 21 Jul 2017)

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

  Log Message:
  -----------
  working extensions development setup documented


  Commit: 95ef011f56f52d49ec3ce80a650bc34dc7b2bae0
      https://github.com/ckan/ckan/commit/95ef011f56f52d49ec3ce80a650bc34dc7b2bae0
  Author: florianm <florian.mayer at dpaw.wa.gov.au>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M Dockerfile
    M doc/maintaining/installing/install-from-docker-compose.rst

  Log Message:
  -----------
  Dockerfile: remove duplicate apt-get install python-dev


  Commit: 97d914fe805ff324325d83f57050f0cdb9de4acd
      https://github.com/ckan/ckan/commit/97d914fe805ff324325d83f57050f0cdb9de4acd
  Author: florianm <florian.mayer at dpaw.wa.gov.au>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

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

  Log Message:
  -----------
  compose docs: new section on env vars for named volume path


  Commit: 93e5fb74eed7599c4d902cef21a47727d6cea6e4
      https://github.com/ckan/ckan/commit/93e5fb74eed7599c4d902cef21a47727d6cea6e4
  Author: florianm <florian.mayer at dpaw.wa.gov.au>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/cli.py
    M ckan/lib/fanstatic_resources.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/public-bs2/base/css/fuchsia.css
    M ckan/public-bs2/base/css/green.css
    M ckan/public-bs2/base/css/main.css
    M ckan/public-bs2/base/css/maroon.css
    M ckan/public-bs2/base/css/red.css
    M ckan/public-bs2/base/less/icons.less
    R ckan/public-bs2/base/test/spec/ckan.spec.min.js
    R ckan/public-bs2/base/test/spec/client.spec.min.js
    R ckan/public-bs2/base/test/spec/i18n.spec.min.js
    R ckan/public-bs2/base/test/spec/module.spec.min.js
    R ckan/public-bs2/base/test/spec/modules/autocomplete.spec.min.js
    R ckan/public-bs2/base/test/spec/modules/basic-form.spec.min.js
    R ckan/public-bs2/base/test/spec/modules/confirm-action.spec.min.js
    R ckan/public-bs2/base/test/spec/modules/custom-fields.spec.min.js
    R ckan/public-bs2/base/test/spec/modules/image-upload.spec.min.js
    R ckan/public-bs2/base/test/spec/modules/resource-form.spec.min.js
    R ckan/public-bs2/base/test/spec/modules/resource-upload-field.spec.min.js
    R ckan/public-bs2/base/test/spec/notify.spec.min.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.date-helpers.spec.min.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.form-warning.spec.min.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.inherit.spec.min.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.proxy-all.spec.min.js
    M ckan/public-bs2/base/test/spec/plugins/jquery.slug-preview.spec.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.slug-preview.spec.min.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.slug.spec.min.js
    R ckan/public-bs2/base/test/spec/plugins/jquery.url-helpers.spec.min.js
    R ckan/public-bs2/base/test/spec/pubsub.spec.min.js
    R ckan/public-bs2/base/test/spec/sandbox.spec.min.js
    R ckan/public-bs2/base/test/spec/view-filters.spec.min.js
    R ckan/public-bs2/base/test/vendor/chai.min.js
    R ckan/public-bs2/base/test/vendor/less.min.js
    R ckan/public-bs2/base/test/vendor/mocha.min.css
    R ckan/public-bs2/base/test/vendor/mocha.min.js
    R ckan/public-bs2/base/test/vendor/sinon.min.js
    M ckan/public-bs2/base/vendor/jquery.js
    M ckan/public-bs2/base/vendor/jquery.min.js
    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/autocomplete.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/search.less
    R ckan/public/base/test/spec/ckan.spec.min.js
    R ckan/public/base/test/spec/client.spec.min.js
    R ckan/public/base/test/spec/i18n.spec.min.js
    R ckan/public/base/test/spec/module.spec.min.js
    R ckan/public/base/test/spec/modules/autocomplete.spec.min.js
    R ckan/public/base/test/spec/modules/basic-form.spec.min.js
    R ckan/public/base/test/spec/modules/confirm-action.spec.min.js
    R ckan/public/base/test/spec/modules/custom-fields.spec.min.js
    R ckan/public/base/test/spec/modules/image-upload.spec.min.js
    R ckan/public/base/test/spec/modules/resource-form.spec.min.js
    R ckan/public/base/test/spec/modules/resource-upload-field.spec.min.js
    R ckan/public/base/test/spec/notify.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.date-helpers.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.form-warning.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.inherit.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.proxy-all.spec.min.js
    M ckan/public/base/test/spec/plugins/jquery.slug-preview.spec.js
    R ckan/public/base/test/spec/plugins/jquery.slug-preview.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.slug.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.url-helpers.spec.min.js
    R ckan/public/base/test/spec/pubsub.spec.min.js
    R ckan/public/base/test/spec/sandbox.spec.min.js
    R ckan/public/base/test/spec/view-filters.spec.min.js
    R ckan/public/base/test/vendor/chai.min.js
    R ckan/public/base/test/vendor/less.min.js
    R ckan/public/base/test/vendor/mocha.min.css
    R ckan/public/base/test/vendor/mocha.min.js
    R ckan/public/base/test/vendor/sinon.min.js
    R ckan/public/base/vendor/html5.js
    R ckan/public/base/vendor/html5.min.js
    M ckan/public/base/vendor/jquery.js
    M ckan/public/base/vendor/jquery.min.js
    R ckan/public/base/vendor/polyfill-object-keys.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates-bs2/snippets/social.html
    M ckan/templates/base.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/social.html
    M ckanext/datapusher/logic/action.py
    M ckanext/datastore/plugin.py
    M doc/.gitignore

  Log Message:
  -----------
  merge upstream/master


  Commit: 097c4f2ce47028018fab23b1939b9c3b79be4c53
      https://github.com/ckan/ckan/commit/097c4f2ce47028018fab23b1939b9c3b79be4c53
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M Dockerfile

  Log Message:
  -----------
  CKAN Dockerfile: install vim


  Commit: a2baa9f4ca2c2e65e58b5ecfcf3ad01cec23b4de
      https://github.com/ckan/ckan/commit/a2baa9f4ca2c2e65e58b5ecfcf3ad01cec23b4de
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-27 (Thu, 27 Jul 2017)

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

  Log Message:
  -----------
  docker install docs: fix indent


  Commit: 56eb18e2c5bc3f088ffd53bf4cc32ea958a230a2
      https://github.com/ckan/ckan/commit/56eb18e2c5bc3f088ffd53bf4cc32ea958a230a2
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-27 (Thu, 27 Jul 2017)

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

  Log Message:
  -----------
  docker install docs: add working example of editing extension templates


  Commit: 6e4aaba3e546b4f981e180442df520549db8bf97
      https://github.com/ckan/ckan/commit/6e4aaba3e546b4f981e180442df520549db8bf97
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

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

  Log Message:
  -----------
  compose docs: clarify development workflow and version control


  Commit: 2d713e12a52c611276ed815a6de9ad3105840e90
      https://github.com/ckan/ckan/commit/2d713e12a52c611276ed815a6de9ad3105840e90
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M Dockerfile

  Log Message:
  -----------
  add wget to CKAN Dockerfile


  Commit: 0ca47a6645f7acd59a1fe9e73efba6e5419ed1a0
      https://github.com/ckan/ckan/commit/0ca47a6645f7acd59a1fe9e73efba6e5419ed1a0
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M Dockerfile

  Log Message:
  -----------
  CKAN Dockerfile: factor out CKAN_CONFIG


  Commit: 22227e2570b7e98f36c85d748f158a14019ea5af
      https://github.com/ckan/ckan/commit/22227e2570b7e98f36c85d748f158a14019ea5af
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

  Changed paths:
    M Dockerfile

  Log Message:
  -----------
  CKAN Dockerfile: hardcode /etc/ckan to fix entrypoint


  Commit: a3bd2a5f8fe5aca563f708d9986b760a28854830
      https://github.com/ckan/ckan/commit/a3bd2a5f8fe5aca563f708d9986b760a28854830
  Author: florianm <florian.mayer at dpaw.wa.gov.au>
  Date:   2017-08-04 (Fri, 04 Aug 2017)

  Changed paths:
    M .gitignore
    M ckan/config/middleware/__init__.py
    M ckan/config/middleware/flask_app.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/mk/LC_MESSAGES/ckan.mo
    A ckan/i18n/mk/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
    A ckan/i18n/uk/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk/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/alphabet_paginate.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/logic/schema.py
    M ckan/templates-bs2/header.html
    M ckan/templates-bs2/package/snippets/resource_item.html
    M ckan/tests/config/test_middleware.py
    M ckan/tests/config/test_sessions.py
    M ckan/tests/controllers/test_admin.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_feed.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_home.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_tags.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/controllers/test_util.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/functional/api/base.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/model/test_relationships.py
    M ckan/tests/legacy/functional/api/model/test_vocabulary.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/functional/api/test_dashboard.py
    M ckan/tests/legacy/functional/api/test_email_notifications.py
    M ckan/tests/legacy/functional/api/test_follow.py
    M ckan/tests/legacy/functional/api/test_resource.py
    M ckan/tests/legacy/functional/api/test_user.py
    M ckan/tests/legacy/functional/api/test_util.py
    M ckan/tests/legacy/functional/test_activity.py
    M ckan/tests/legacy/functional/test_admin.py
    M ckan/tests/legacy/functional/test_group.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/legacy/functional/test_preview_interface.py
    M ckan/tests/legacy/functional/test_revision.py
    M ckan/tests/legacy/functional/test_tag.py
    M ckan/tests/legacy/functional/test_tracking.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/html_check.py
    M ckan/tests/legacy/lib/test_alphabet_pagination.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_auth.py
    M ckan/tests/legacy/misc/test_format_text.py
    M ckan/tests/legacy/models/test_package.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_update.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datapusher/tests/test_action.py
    M ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/example_itranslation/tests/test_plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/css/recline.css
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/textview/tests/test_view.py
    M doc/contributing/frontend/templating.rst
    A doc/extensions/flask-migration.rst
    M doc/extensions/index.rst
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/installing/install-from-source.rst
    M requirement-setuptools.txt

  Log Message:
  -----------
  merge master


  Commit: dd1c554130a32a7d59c475fe0900929c21b4a1da
      https://github.com/ckan/ckan/commit/dd1c554130a32a7d59c475fe0900929c21b4a1da
  Author: florianm <florian.mayer at dpaw.wa.gov.au>
  Date:   2017-08-04 (Fri, 04 Aug 2017)

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

  Log Message:
  -----------
  update install docs with fix for ckan bash $TERM


  Commit: bd85e546d055640b5af7f178ded7e393f86e507e
      https://github.com/ckan/ckan/commit/bd85e546d055640b5af7f178ded7e393f86e507e
  Author: florianm <florian.mayer at dpaw.wa.gov.au>
  Date:   2017-09-20 (Wed, 20 Sep 2017)

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

  Log Message:
  -----------
  set datastore permissions live


  Commit: bda8860bf4e52d9a6f9f33ee9865be652f2c5668
      https://github.com/ckan/ckan/commit/bda8860bf4e52d9a6f9f33ee9865be652f2c5668
  Author: florianm <florian.mayer at dpaw.wa.gov.au>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M CHANGELOG.rst
    M Dockerfile
    M LICENSE.txt
    M README.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware/__init__.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/routing.py
    M ckan/config/supervisor-ckan-worker.conf
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/jsonp.py
    M ckan/lib/mailer.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    A ckan/migration/versions/086_drop_openid_column.py
    M ckan/model/group.py
    M ckan/model/user.py
    M ckan/pastertemplates/template/+dot+travis.yml_tmpl
    M ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    M ckan/plugins/interfaces.py
    M ckan/public-bs2/base/css/fuchsia.css
    M ckan/public-bs2/base/css/green.css
    M ckan/public-bs2/base/css/main.css
    M ckan/public-bs2/base/css/maroon.css
    M ckan/public-bs2/base/css/red.css
    M ckan/public-bs2/base/javascript/modules/autocomplete.js
    M ckan/public-bs2/base/javascript/modules/basic-form.js
    M ckan/public-bs2/base/javascript/modules/follow.js
    A ckan/public-bs2/base/javascript/modules/followers-counter.js
    M ckan/public-bs2/base/javascript/modules/image-upload.js
    M ckan/public-bs2/base/javascript/modules/resource-reorder.js
    M ckan/public-bs2/base/javascript/modules/resource-view-filters.js
    M ckan/public-bs2/base/javascript/modules/slug-preview.js
    M ckan/public-bs2/base/javascript/plugins/jquery.url-helpers.js
    M ckan/public-bs2/base/javascript/resource.config
    M ckan/public-bs2/base/less/forms.less
    M ckan/public-bs2/base/less/search.less
    M ckan/public-bs2/base/test/index.html
    M ckan/public-bs2/base/test/spec/modules/basic-form.spec.js
    A ckan/public-bs2/base/test/spec/modules/followers-counter.spec.js
    M ckan/public-bs2/base/test/spec/plugins/jquery.url-helpers.spec.js
    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/basic-form.js
    M ckan/public/base/javascript/modules/resource-view-embed.js
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/input-groups.less
    M ckan/public/base/less/variables.less
    M ckan/public/base/test/spec/modules/basic-form.spec.js
    M ckan/templates-bs2/group/read.html
    M ckan/templates-bs2/group/snippets/group_item.html
    M ckan/templates-bs2/group/snippets/info.html
    M ckan/templates-bs2/macros/form.html
    M ckan/templates-bs2/organization/read.html
    M ckan/templates-bs2/package/snippets/info.html
    M ckan/templates-bs2/package/snippets/resource_form.html
    M ckan/templates-bs2/snippets/organization.html
    M ckan/templates-bs2/user/edit_user_form.html
    M ckan/templates-bs2/user/new_user_form.html
    M ckan/templates-bs2/user/read_base.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/page.html
    M ckan/templates/snippets/popular.html
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/test_admin.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_feed.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_home.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_tags.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/controllers/test_util.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/functional/api/base.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/model/test_relationships.py
    M ckan/tests/legacy/functional/api/model/test_vocabulary.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/functional/api/test_dashboard.py
    M ckan/tests/legacy/functional/api/test_email_notifications.py
    M ckan/tests/legacy/functional/api/test_follow.py
    R ckan/tests/legacy/functional/api/test_misc.py
    M ckan/tests/legacy/functional/api/test_resource.py
    M ckan/tests/legacy/functional/api/test_user.py
    M ckan/tests/legacy/functional/api/test_util.py
    M ckan/tests/legacy/functional/test_activity.py
    M ckan/tests/legacy/functional/test_admin.py
    M ckan/tests/legacy/functional/test_group.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/legacy/functional/test_preview_interface.py
    M ckan/tests/legacy/functional/test_revision.py
    M ckan/tests/legacy/functional/test_tag.py
    M ckan/tests/legacy/functional/test_tracking.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/html_check.py
    M ckan/tests/legacy/lib/test_alphabet_pagination.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_auth.py
    M ckan/tests/legacy/misc/test_format_text.py
    M ckan/tests/legacy/models/test_package.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/test_none_root.py
    M ckan/views/api.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/backend/postgres.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/set_permissions.sql
    M ckanext/datastore/templates-bs2/ajax_snippets/api_info.html
    M ckanext/datastore/templates/ajax_snippets/api_info.html
    M ckanext/datastore/templates/datastore/dictionary.html
    A ckanext/datastore/templates/datastore/snippets/dictionary_form.html
    M ckanext/datastore/templates/package/resource_read.html
    M ckanext/datastore/templates/package/snippets/data_api_button.html
    A ckanext/datastore/templates/package/snippets/dictionary_table.html
    M ckanext/datastore/tests/helpers.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    M ckanext/example_itranslation/tests/test_plugin.py
    M ckanext/example_iuploader/test/test_plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/tests/__init__.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/tests/test_view.py
    M doc/conf.py
    M doc/contributing/test.rst
    M doc/extensions/flask-migration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/getting-started.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-source.rst

  Log Message:
  -----------
  merge upstream


  Commit: 9b3ed5a4dfc0ef5bc29a1d5fd048836c51de2699
      https://github.com/ckan/ckan/commit/9b3ed5a4dfc0ef5bc29a1d5fd048836c51de2699
  Author: florianm <florian.mayer at dpaw.wa.gov.au>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M contrib/docker/postgresql/Dockerfile
    R contrib/docker/postgresql/docker-entrypoint-initdb.d/10_set_permissions.sql
    M doc/maintaining/installing/install-from-docker-compose.rst

  Log Message:
  -----------
  remove duplicate set_permissions.sql in favour of setting perms on the fly


  Commit: bbe6eefbff1749bc5cab3fea687022b2d50d0cb0
      https://github.com/ckan/ckan/commit/bbe6eefbff1749bc5cab3fea687022b2d50d0cb0
  Author: florianm <florian.mayer at dpaw.wa.gov.au>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

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

  Log Message:
  -----------
  fix circleci test failure: indent test_api.py:284


  Commit: 34fe6d1ef0c028f0123d29a007d98ca1da585d05
      https://github.com/ckan/ckan/commit/34fe6d1ef0c028f0123d29a007d98ca1da585d05
  Author: florianm <florian.mayer at dpaw.wa.gov.au>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

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

  Log Message:
  -----------
  add missing template ajax_snippets/api_info.html


  Commit: 997e85a57f642a86f0da1c6a1746503a3d91e2cf
      https://github.com/ckan/ckan/commit/997e85a57f642a86f0da1c6a1746503a3d91e2cf
  Author: florianm <florian.mayer at dpaw.wa.gov.au>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

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

  Log Message:
  -----------
  drop templates/axaj_snippets/api_info.html - failing test should load datastore/.../api_info.html


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

  Changed paths:
    M .gitignore
    M Dockerfile
    A contrib/docker/.env.template
    M contrib/docker/apache.wsgi
    M contrib/docker/ckan-entrypoint.sh
    M contrib/docker/docker-compose.yml
    M contrib/docker/postgresql/Dockerfile
    A contrib/docker/postgresql/docker-entrypoint-initdb.d/00_create_datastore.sql
    A contrib/docker/postgresql/docker-entrypoint-initdb.d/20_postgis_permissions.sql
    M doc/maintaining/installing/index.rst
    A doc/maintaining/installing/install-from-docker-compose.rst

  Log Message:
  -----------
  Merge pull request #3692 from parksandwildlife/3649-docker-upgrade

3649 docker upgrade


Compare: https://github.com/ckan/ckan/compare/415039446ddb...fe71b7edfdcf


More information about the ckan-changes mailing list