[ckan-changes] [ckan/ckan] 6b9797: add group blueprint

• Previous message: [ckan-changes] [ckan/ckan] b2342b: [#4316] Redirect /dataset/[id] -> /dataset/[name] ...
• Next message: [ckan-changes] [ckan/ckan] 6b9797: add group blueprint
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/flask-group-blueprint
  Home:   https://github.com/ckan/ckan
  Commit: 6b97972ce5986f34f74fd25911e17b706393952d
      https://github.com/ckan/ckan/commit/6b97972ce5986f34f74fd25911e17b706393952d
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

  Changed paths:
    A ckan/views/group.py

  Log Message:
  -----------
  add group blueprint


  Commit: 8f420ed5f3f714ff3884499ec467478c1088b041
      https://github.com/ckan/ckan/commit/8f420ed5f3f714ff3884499ec467478c1088b041
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  remove group/org pylons routes


  Commit: 320b34ccba8d39eafe7a33e79def80cf319e9794
      https://github.com/ckan/ckan/commit/320b34ccba8d39eafe7a33e79def80cf319e9794
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

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

  Log Message:
  -----------
  register custom routes to flask_app


  Commit: 5e35e2b0b03287169b3270f50f2839f033581484
      https://github.com/ckan/ckan/commit/5e35e2b0b03287169b3270f50f2839f033581484
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  custom group/org blueprint in plugins.py


  Commit: b661b5f30cd809ddecdc1841f0a5cc9474046b40
      https://github.com/ckan/ckan/commit/b661b5f30cd809ddecdc1841f0a5cc9474046b40
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  setup of template variables fix for flask requests


  Commit: b5c72c2274e77005dc53314cb6d0b819897507c2
      https://github.com/ckan/ckan/commit/b5c72c2274e77005dc53314cb6d0b819897507c2
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

  Changed paths:
    M ckan/templates-bs2/group/base_form_page.html
    M ckan/templates-bs2/group/confirm_delete.html
    M ckan/templates-bs2/group/confirm_delete_member.html
    M ckan/templates-bs2/group/edit.html
    M ckan/templates-bs2/group/edit_base.html
    M ckan/templates-bs2/group/index.html
    M ckan/templates-bs2/group/member_new.html
    M ckan/templates-bs2/group/members.html
    M ckan/templates-bs2/group/new.html
    M ckan/templates-bs2/group/read_base.html
    M ckan/templates-bs2/group/snippets/group_form.html
    M ckan/templates-bs2/group/snippets/info.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/edit.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/info.html

  Log Message:
  -----------
  group templates changed to address flask url_for


  Commit: 47e850d22f7c9ba47a0c30adcf50a3ca600969f0
      https://github.com/ckan/ckan/commit/47e850d22f7c9ba47a0c30adcf50a3ca600969f0
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/lib/app_globals.py
    M ckan/lib/captcha.py
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/media.less
    M doc/maintaining/configuration.rst

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


  Commit: ff1afa59ca81d36a946b04a9adb0604d2e3b109c
      https://github.com/ckan/ckan/commit/ff1afa59ca81d36a946b04a9adb0604d2e3b109c
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

  Changed paths:
    M ckan/templates-bs2/organization/confirm_delete.html
    M ckan/templates-bs2/organization/confirm_delete_member.html
    M ckan/templates-bs2/organization/edit_base.html
    M ckan/templates-bs2/organization/index.html
    M ckan/templates-bs2/organization/member_new.html
    M ckan/templates-bs2/organization/members.html
    M ckan/templates-bs2/organization/new.html
    M ckan/templates-bs2/organization/read_base.html
    M ckan/templates-bs2/organization/snippets/info.html
    M ckan/templates-bs2/organization/snippets/organization_form.html
    M ckan/templates-bs2/organization/snippets/organization_item.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/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/new.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

  Log Message:
  -----------
   ogranziation templates set to use flask 'url_for'


  Commit: 4a3028ba6803c3c7155b23af9d0b4a59f6a26856
      https://github.com/ckan/ckan/commit/4a3028ba6803c3c7155b23af9d0b4a59f6a26856
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/tests/legacy/functional/api/model/test_group.py
    M ckan/tests/legacy/functional/api/model/test_licenses.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/model/test_ratings.py
    M ckan/tests/legacy/functional/api/model/test_relationships.py
    M ckan/tests/legacy/functional/api/model/test_revisions.py
    M ckan/tests/legacy/functional/api/model/test_tag.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/test_coding_standards.py

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


  Commit: 68e88880688c90afb691390706ac9b8cf52c3302
      https://github.com/ckan/ckan/commit/68e88880688c90afb691390706ac9b8cf52c3302
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

  Changed paths:
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_organization.py
    M ckanext/example_igroupform/tests/test_controllers.py

  Log Message:
  -----------
  updated tests for group blueprint


  Commit: d8555d8617c02d18281145525fb26cc9c14cbda4
      https://github.com/ckan/ckan/commit/d8555d8617c02d18281145525fb26cc9c14cbda4
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  added lookup_group_blueprints method


  Commit: 96d1f18974bfd5517cca0dc4f54c43a2b3e86438
      https://github.com/ckan/ckan/commit/96d1f18974bfd5517cca0dc4f54c43a2b3e86438
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  helpers updated for group/org blueprint


  Commit: ecb404bd8aa7305bbbf17eb7d0760a97bf313134
      https://github.com/ckan/ckan/commit/ecb404bd8aa7305bbbf17eb7d0760a97bf313134
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

  Changed paths:
    M ckan/templates-bs2/header.html
    M ckan/templates/header.html

  Log Message:
  -----------
  update navigation menu


  Commit: fdc6b190a471cb66823a3607d8ea9d17b5d2ad48
      https://github.com/ckan/ckan/commit/fdc6b190a471cb66823a3607d8ea9d17b5d2ad48
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

  Changed paths:
    M ckan/views/group.py

  Log Message:
  -----------
  add return before redirects


  Commit: 4313aea240b4a0a07d2b29fe4c60e404b5202a55
      https://github.com/ckan/ckan/commit/4313aea240b4a0a07d2b29fe4c60e404b5202a55
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

  Changed paths:
    M ckan/templates-bs2/group/snippets/feeds.html
    M ckan/templates-bs2/organization/edit_base.html
    M ckan/templates-bs2/organization/snippets/feeds.html
    M ckan/templates/group/snippets/feeds.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/snippets/feeds.html

  Log Message:
  -----------
   fix links block for feeds


  Commit: 0f13926f8ba4cdaeb063d82eb7399212f45f4145
      https://github.com/ckan/ckan/commit/0f13926f8ba4cdaeb063d82eb7399212f45f4145
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

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

  Log Message:
  -----------
  fix index to 20


  Commit: 871a53edcf165f87459e40fd13e94bf9d2934c35
      https://github.com/ckan/ckan/commit/871a53edcf165f87459e40fd13e94bf9d2934c35
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

  Changed paths:
    M ckan/views/group.py

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


  Commit: 4fc3a13a435e642695eb28d91b9948fc5bea663b
      https://github.com/ckan/ckan/commit/4fc3a13a435e642695eb28d91b9948fc5bea663b
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-21 (Wed, 21 Mar 2018)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  reset package plugins in routing


  Commit: 46365c61fb07b539a36ddfd4a81d700dea9ff64a
      https://github.com/ckan/ckan/commit/46365c61fb07b539a36ddfd4a81d700dea9ff64a
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-21 (Wed, 21 Mar 2018)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  check for blueprint duplicate names


  Commit: e4e90da3eb5d3e0722d92bdfb65cf4d3f9f2af82
      https://github.com/ckan/ckan/commit/e4e90da3eb5d3e0722d92bdfb65cf4d3f9f2af82
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-21 (Wed, 21 Mar 2018)

  Changed paths:
    M ckan/views/group.py

  Log Message:
  -----------
  check if c has param action


  Commit: 75dfe245aead73d7995d9287afac7762383fac43
      https://github.com/ckan/ckan/commit/75dfe245aead73d7995d9287afac7762383fac43
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-21 (Wed, 21 Mar 2018)

  Changed paths:
    M ckanext/example_igroupform/tests/test_controllers.py

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


  Commit: fc0366011498ca0e0ef37d6a321e9ff1ca2fef5a
      https://github.com/ckan/ckan/commit/fc0366011498ca0e0ef37d6a321e9ff1ca2fef5a
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-22 (Thu, 22 Mar 2018)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/routing.py

  Log Message:
  -----------
  move lib_plugins.reset_package_plugins() to update_config in environment


  Commit: 427542482947141956fa4af219511c57ede17b39
      https://github.com/ckan/ckan/commit/427542482947141956fa4af219511c57ede17b39
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-22 (Thu, 22 Mar 2018)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/public-bs2/base/javascript/modules/resource-view-filters.js
    A ckan/public-bs2/base/vendor/select2/CONTRIBUTING.md
    M ckan/public-bs2/base/vendor/select2/LICENSE
    M ckan/public-bs2/base/vendor/select2/README.md
    M ckan/public-bs2/base/vendor/select2/bower.json
    M ckan/public-bs2/base/vendor/select2/component.json
    M ckan/public-bs2/base/vendor/select2/composer.json
    M ckan/public-bs2/base/vendor/select2/package.json
    M ckan/public-bs2/base/vendor/select2/release.sh
    M ckan/public-bs2/base/vendor/select2/select2.css
    M ckan/public-bs2/base/vendor/select2/select2.jquery.json
    M ckan/public-bs2/base/vendor/select2/select2.js
    M ckan/public-bs2/base/vendor/select2/select2.min.js
    M ckan/public-bs2/base/vendor/select2/select2.png
    M ckan/public-bs2/base/vendor/select2/select2_locale_ar.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_az.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_bg.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_ca.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_cs.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_da.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_de.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_el.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_en.js.template
    M ckan/public-bs2/base/vendor/select2/select2_locale_es.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_et.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_eu.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_fa.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_fi.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_fr.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_gl.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_he.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_hr.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_hu.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_id.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_is.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_it.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_ja.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_ka.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_ko.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_lt.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_lv.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_mk.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_ms.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_nb.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_nl.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_no.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_pl.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_pt-BR.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_pt-PT.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_ro.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_rs.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_ru.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_sk.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_sv.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_th.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_tr.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_ug-CN.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_uk.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_vi.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_zh-CN.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_zh-TW.js
    M ckan/public-bs2/base/vendor/select2/select2x2.png
    M ckan/public/base/javascript/modules/resource-view-filters.js
    A ckan/public/base/vendor/select2/CONTRIBUTING.md
    M ckan/public/base/vendor/select2/LICENSE
    M ckan/public/base/vendor/select2/README.md
    M ckan/public/base/vendor/select2/bower.json
    M ckan/public/base/vendor/select2/component.json
    M ckan/public/base/vendor/select2/composer.json
    M ckan/public/base/vendor/select2/package.json
    M ckan/public/base/vendor/select2/release.sh
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.jquery.json
    M ckan/public/base/vendor/select2/select2.js
    M ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/base/vendor/select2/select2.png
    M ckan/public/base/vendor/select2/select2_locale_ar.js
    A ckan/public/base/vendor/select2/select2_locale_az.js
    M ckan/public/base/vendor/select2/select2_locale_bg.js
    M ckan/public/base/vendor/select2/select2_locale_ca.js
    M ckan/public/base/vendor/select2/select2_locale_cs.js
    M ckan/public/base/vendor/select2/select2_locale_da.js
    M ckan/public/base/vendor/select2/select2_locale_de.js
    M ckan/public/base/vendor/select2/select2_locale_el.js
    M ckan/public/base/vendor/select2/select2_locale_en.js.template
    M ckan/public/base/vendor/select2/select2_locale_es.js
    M ckan/public/base/vendor/select2/select2_locale_et.js
    M ckan/public/base/vendor/select2/select2_locale_eu.js
    M ckan/public/base/vendor/select2/select2_locale_fa.js
    M ckan/public/base/vendor/select2/select2_locale_fi.js
    M ckan/public/base/vendor/select2/select2_locale_fr.js
    M ckan/public/base/vendor/select2/select2_locale_gl.js
    M ckan/public/base/vendor/select2/select2_locale_he.js
    M ckan/public/base/vendor/select2/select2_locale_hr.js
    M ckan/public/base/vendor/select2/select2_locale_hu.js
    M ckan/public/base/vendor/select2/select2_locale_id.js
    M ckan/public/base/vendor/select2/select2_locale_is.js
    M ckan/public/base/vendor/select2/select2_locale_it.js
    M ckan/public/base/vendor/select2/select2_locale_ja.js
    M ckan/public/base/vendor/select2/select2_locale_ka.js
    M ckan/public/base/vendor/select2/select2_locale_ko.js
    M ckan/public/base/vendor/select2/select2_locale_lt.js
    M ckan/public/base/vendor/select2/select2_locale_lv.js
    M ckan/public/base/vendor/select2/select2_locale_mk.js
    M ckan/public/base/vendor/select2/select2_locale_ms.js
    A ckan/public/base/vendor/select2/select2_locale_nb.js
    M ckan/public/base/vendor/select2/select2_locale_nl.js
    R ckan/public/base/vendor/select2/select2_locale_no.js
    M ckan/public/base/vendor/select2/select2_locale_pl.js
    M ckan/public/base/vendor/select2/select2_locale_pt-BR.js
    M ckan/public/base/vendor/select2/select2_locale_pt-PT.js
    M ckan/public/base/vendor/select2/select2_locale_ro.js
    M ckan/public/base/vendor/select2/select2_locale_rs.js
    M ckan/public/base/vendor/select2/select2_locale_ru.js
    M ckan/public/base/vendor/select2/select2_locale_sk.js
    M ckan/public/base/vendor/select2/select2_locale_sv.js
    M ckan/public/base/vendor/select2/select2_locale_th.js
    M ckan/public/base/vendor/select2/select2_locale_tr.js
    A ckan/public/base/vendor/select2/select2_locale_ug-CN.js
    M ckan/public/base/vendor/select2/select2_locale_uk.js
    M ckan/public/base/vendor/select2/select2_locale_vi.js
    M ckan/public/base/vendor/select2/select2_locale_zh-CN.js
    M ckan/public/base/vendor/select2/select2_locale_zh-TW.js
    M ckan/public/base/vendor/select2/select2x2.png

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


  Commit: 4c9cbda3eabd078b81b64ea93d7df088d2d72363
      https://github.com/ckan/ckan/commit/4c9cbda3eabd078b81b64ea93d7df088d2d72363
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-27 (Tue, 27 Mar 2018)

  Changed paths:
    M .tx/config
    M ckan/__init__.py
    M ckan/lib/helpers.py
    M ckan/lib/search/common.py
    M ckan/migration/versions/023_add_harvesting.py
    M doc/maintaining/datastore.rst

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


  Commit: c327c7c2d0fac6776e8a94b4a16305aaf0eeebd6
      https://github.com/ckan/ckan/commit/c327c7c2d0fac6776e8a94b4a16305aaf0eeebd6
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-28 (Wed, 28 Mar 2018)

  Changed paths:
    M ckan/model/package.py
    M ckan/tests/legacy/logic/test_action.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/example_idatastorebackend/test/test_plugin.py
    M ckanext/multilingual/plugin.py

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


  Commit: e8fd6ab998882fd4030e0935ca538fe7cbb169b3
      https://github.com/ckan/ckan/commit/e8fd6ab998882fd4030e0935ca538fe7cbb169b3
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/views/group.py

  Log Message:
  -----------
  move group/org blueprints to custom class


  Commit: 5493ad0612a91eaa6ab2a2e621f384a51a673f93
      https://github.com/ckan/ckan/commit/5493ad0612a91eaa6ab2a2e621f384a51a673f93
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M ckan/authz.py
    M ckan/lib/mailer.py
    M ckan/model/__init__.py
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/search.less
    M ckan/templates/group/member_new.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/package/group_list.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/request_reset.html
    M ckan/tests/controllers/test_api.py
    R ckan/tests/legacy/functional/api/model/test_licenses.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/tests/helpers.py
    M ckanext/datastore/tests/test_chained_action.py
    M ckanext/datastore/tests/test_chained_auth_functions.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_info.py
    M ckanext/datastore/tests/test_interface.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/reclineview/theme/public/recline_view.js

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


  Commit: 39c09a14b65d2939b303b5c7445f322210094ae9
      https://github.com/ckan/ckan/commit/39c09a14b65d2939b303b5c7445f322210094ae9
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M CHANGELOG.rst
    M Dockerfile
    M MANIFEST.in
    M ckan/config/environment.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/routing.py
    M ckan/controllers/error.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    R ckan/controllers/storage.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mk/LC_MESSAGES/ckan.mo
    M 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/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/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk/LC_MESSAGES/ckan.mo
    M 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/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/get.py
    M ckan/public-bs2/base/javascript/modules/resource-view-filters-form.js
    M ckan/public-bs2/base/javascript/modules/resource-view-filters.js
    M ckan/public-bs2/base/javascript/modules/resource-view-reorder.js
    A ckan/public-bs2/base/javascript/plugins/jquery.images-loaded.js
    M ckan/public-bs2/base/javascript/resource.config
    M ckan/public-bs2/base/less/masthead.less
    M ckan/public-bs2/base/less/variables.less
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/resource-view-filters-form.js
    M ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    A ckan/public/base/javascript/plugins/jquery.images-loaded.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/bootstrap.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/resource-view.less
    M ckan/public/base/less/variables.less
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates-bs2/error_document_template.html
    M ckan/templates-bs2/group/snippets/group_form.html
    M ckan/templates-bs2/organization/snippets/feeds.html
    M ckan/templates-bs2/organization/snippets/organization_form.html
    M ckan/templates-bs2/snippets/license.html
    M ckan/templates/error_document_template.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/snippets/license.html
    M ckan/tests/controllers/test_feed.py
    M ckan/tests/controllers/test_home.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/legacy/functional/api/base.py
    M ckan/tests/legacy/functional/api/model/test_group.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/model/test_ratings.py
    R ckan/tests/legacy/functional/api/model/test_relationships.py
    M ckan/tests/legacy/functional/api/test_api.py
    M ckan/tests/legacy/functional/api/test_package_search.py
    M ckan/tests/legacy/functional/api/test_resource_search.py
    M ckan/tests/legacy/misc/test_sync.py
    M ckan/tests/logic/auth/test_get.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_none_root.py
    M ckan/views/admin.py
    M ckanext/example_igroupform/tests/test_controllers.py
    M dev-requirements.txt
    M doc/_static/ckanlogo.png
    A doc/_static/css/custom.css
    A doc/_templates/layout.html
    M doc/api/index.rst
    M doc/api/legacy-api.rst
    M doc/conf.py
    M doc/contributing/documentation.rst
    M doc/contributing/release-process.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/database-management.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/filestore.rst
    M doc/maintaining/installing/install-from-docker-compose.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/linked-data-and-rdf.rst
    M doc/maintaining/stats.rst
    M doc/user-guide.rst
    M scripts/4042_fix_resource_extras.py

  Log Message:
  -----------
  Merge branch 'master' into group-blueprint


  Commit: 6d5b634356506e082e03ae74c0ca333ba3b3364a
      https://github.com/ckan/ckan/commit/6d5b634356506e082e03ae74c0ca333ba3b3364a
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

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

  Log Message:
  -----------
  bad merge fix


  Commit: 359d88fb9c3286ccb27fe22fd01f7ce3ace0ca51
      https://github.com/ckan/ckan/commit/359d88fb9c3286ccb27fe22fd01f7ce3ace0ca51
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/middleware/__init__.py
    M ckan/lib/plugins.py
    M ckan/views/group.py

  Log Message:
  -----------
  configuration of the app after environment load


  Commit: c1a6ca435c26fe98996176625431b639119aeb9c
      https://github.com/ckan/ckan/commit/c1a6ca435c26fe98996176625431b639119aeb9c
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-06-14 (Thu, 14 Jun 2018)

  Changed paths:
    M ckan/common.py
    M ckan/config/environment.py
    M ckan/config/middleware/__init__.py
    M ckan/config/routing.py
    M ckan/lib/plugins.py
    M ckan/views/group.py

  Log Message:
  -----------
  trying to fix group plugins


  Commit: fd13fae6ac0aa0b66e996a2ece0059f8d8b9a737
      https://github.com/ckan/ckan/commit/fd13fae6ac0aa0b66e996a2ece0059f8d8b9a737
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-06-14 (Thu, 14 Jun 2018)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  trying to fix group plugins


  Commit: d118fae4249e64e08bff36b42b26ef29a9de8cf4
      https://github.com/ckan/ckan/commit/d118fae4249e64e08bff36b42b26ef29a9de8cf4
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-06-14 (Thu, 14 Jun 2018)

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

  Log Message:
  -----------
  apply fix patch


  Commit: bde689be3ddce76b4402c25b4fb90b3d56caa2a9
      https://github.com/ckan/ckan/commit/bde689be3ddce76b4402c25b4fb90b3d56caa2a9
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/views/group.py

  Log Message:
  -----------
  set group_type and is_org on blueprint creation


  Commit: 95cd73ae0f3a5b40af0807133ddd1e0774357dfe
      https://github.com/ckan/ckan/commit/95cd73ae0f3a5b40af0807133ddd1e0774357dfe
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  Move checking of 'is_organization' one level up


  Commit: aeca2f82e0a2d472431b2aed79d200db4aee6650
      https://github.com/ckan/ckan/commit/aeca2f82e0a2d472431b2aed79d200db4aee6650
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

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

  Log Message:
  -----------
  Changes to the test for flask routes


  Commit: 963962f346721b4925b4cd4d77646afa98bdf9f3
      https://github.com/ckan/ckan/commit/963962f346721b4925b4cd4d77646afa98bdf9f3
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M ckan/views/group.py

  Log Message:
  -----------
  add required params to view functions


  Commit: 7eb65de6c4f24cb5ddec0ed69a007a2a6d1b7688
      https://github.com/ckan/ckan/commit/7eb65de6c4f24cb5ddec0ed69a007a2a6d1b7688
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M ckan/config/middleware/flask_app.py
    A ckan/migration/versions/087_remove_old_authorization_tables.py
    M ckan/templates-bs2/macros/form.html
    M ckan/templates/macros/form.html
    M ckan/templates/user/new_user_form.html
    M ckan/tests/test_coding_standards.py
    M ckan/views/api.py
    M ckanext/datastore/templates-bs2/ajax_snippets/api_info.html
    M ckanext/datastore/templates/ajax_snippets/api_info.html
    M dev-requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into group-blueprint


  Commit: 97ef3cd35356f2536e5c5b14fe087eef1fdfea09
      https://github.com/ckan/ckan/commit/97ef3cd35356f2536e5c5b14fe087eef1fdfea09
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M ckan/views/group.py

  Log Message:
  -----------
  add global 'is_org' param, to correctly replace group and organization strings, fix some tests


  Commit: 3173322f931fa46205ff925b8c70451347c7ae60
      https://github.com/ckan/ckan/commit/3173322f931fa46205ff925b8c70451347c7ae60
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/environment.py
    M ckan/config/middleware/__init__.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/controllers/tag.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/model/modification.py
    M ckan/templates-bs2/admin/trash.html
    M ckan/templates-bs2/dataviewer/base.html
    M ckan/templates-bs2/header.html
    M ckan/templates-bs2/home/snippets/search.html
    M ckan/templates-bs2/home/snippets/stats.html
    M ckan/templates-bs2/organization/bulk_process.html
    M ckan/templates-bs2/organization/read.html
    M ckan/templates-bs2/package/activity.html
    M ckan/templates-bs2/package/base.html
    M ckan/templates-bs2/package/base_form_page.html
    M ckan/templates-bs2/package/confirm_delete.html
    M ckan/templates-bs2/package/confirm_delete_resource.html
    M ckan/templates-bs2/package/edit.html
    M ckan/templates-bs2/package/edit_base.html
    M ckan/templates-bs2/package/edit_view.html
    M ckan/templates-bs2/package/followers.html
    M ckan/templates-bs2/package/group_list.html
    M ckan/templates-bs2/package/new_package_form.html
    M ckan/templates-bs2/package/new_view.html
    M ckan/templates-bs2/package/read_base.html
    M ckan/templates-bs2/package/resource_edit.html
    M ckan/templates-bs2/package/resource_edit_base.html
    M ckan/templates-bs2/package/resource_read.html
    M ckan/templates-bs2/package/resource_views.html
    M ckan/templates-bs2/package/resources.html
    M ckan/templates-bs2/package/search.html
    M ckan/templates-bs2/package/snippets/new_package_breadcrumb.html
    M ckan/templates-bs2/package/snippets/package_basic_fields.html
    R ckan/templates-bs2/package/snippets/package_context.html
    M ckan/templates-bs2/package/snippets/package_form.html
    M ckan/templates-bs2/package/snippets/resource_form.html
    M ckan/templates-bs2/package/snippets/resource_item.html
    M ckan/templates-bs2/package/snippets/resource_view.html
    M ckan/templates-bs2/package/snippets/resource_views_list.html
    M ckan/templates-bs2/package/snippets/resource_views_list_item.html
    M ckan/templates-bs2/package/snippets/resources.html
    M ckan/templates-bs2/package/snippets/resources_list.html
    M ckan/templates-bs2/package/snippets/revisions_table.html
    M ckan/templates-bs2/package/snippets/stages.html
    M ckan/templates-bs2/package/view_edit_base.html
    M ckan/templates-bs2/revision/diff.html
    M ckan/templates-bs2/revision/read.html
    M ckan/templates-bs2/revision/snippets/revisions_list.html
    M ckan/templates-bs2/snippets/facet_list.html
    M ckan/templates-bs2/snippets/package_item.html
    M ckan/templates-bs2/snippets/tag_list.html
    M ckan/templates-bs2/tag/index.html
    M ckan/templates-bs2/user/dashboard_datasets.html
    M ckan/templates-bs2/user/read.html
    M ckan/templates/admin/trash.html
    M ckan/templates/dataviewer/base.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/group_list.html
    M ckan/templates/package/new_package_form.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/resources.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/new_package_breadcrumb.html
    M ckan/templates/package/snippets/package_basic_fields.html
    R ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/package/snippets/stages.html
    M ckan/templates/package/view_edit_base.html
    M ckan/templates/revision/diff.html
    M ckan/templates/revision/read.html
    M ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/add_dataset.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/tag_list.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/dashboard_datasets.html
    M ckan/templates/user/read.html
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_tags.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_tracking.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/logic/action/test_get.py
    M ckan/views/__init__.py
    A ckan/views/dataset.py
    M ckan/views/feed.py
    A ckan/views/resource.py
    M ckanext/datastore/templates-bs2/package/resource_read.html
    M ckanext/datastore/templates-bs2/package/snippets/data_api_button.html
    A ckanext/example_idatasetform/plugin_v5.py
    M ckanext/example_idatasetform/templates/package/search.html
    M ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_iuploader/test/test_plugin.py
    M ckanext/example_theme_docs/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    M ckanext/imageview/tests/test_view.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/tests/test_view.py
    M doc/contributing/frontend/template-tutorial.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into group-blueprint


  Commit: 551d6918f4df208b983b38dabc607681ccfbf569
      https://github.com/ckan/ckan/commit/551d6918f4df208b983b38dabc607681ccfbf569
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M ckan/templates-bs2/header.html
    M ckan/templates/header.html

  Log Message:
  -----------
  fix the typo when resolving conflicts


  Commit: 0a0fe246d70414d26927c634dfb6c6fa753e6405
      https://github.com/ckan/ckan/commit/0a0fe246d70414d26927c634dfb6c6fa753e6405
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/views/group.py

  Log Message:
  -----------
  fix legacy test by moving '_group_controllers' to 'set_default_group_pugins'


  Commit: c4c4421b7ac5dd8e90d550681a826aa20f33207c
      https://github.com/ckan/ckan/commit/c4c4421b7ac5dd8e90d550681a826aa20f33207c
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  small code refactor according comments in 'package' migration PR #4062'


  Commit: 5b68826b563325917d9c64d344fbe8b42e7eb688
      https://github.com/ckan/ckan/commit/5b68826b563325917d9c64d344fbe8b42e7eb688
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  Small fix to specify if we are using IGroupForm  with default group_type


  Commit: c5d5c33d849e99e4a682c8025ef7a23dcd1b8b31
      https://github.com/ckan/ckan/commit/c5d5c33d849e99e4a682c8025ef7a23dcd1b8b31
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-07-12 (Thu, 12 Jul 2018)

  Changed paths:
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/functional/api/base.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/test_resource.py
    M ckan/tests/legacy/functional/api/test_user.py
    M ckan/tests/legacy/functional/test_activity.py
    M ckan/tests/legacy/functional/test_group.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/html_check.py
    M ckan/tests/legacy/logic/test_action.py

  Log Message:
  -----------
  legacy test fixes


  Commit: 7a5f178d2a96a9d4164eebef4882824668060383
      https://github.com/ckan/ckan/commit/7a5f178d2a96a9d4164eebef4882824668060383
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-07-13 (Fri, 13 Jul 2018)

  Changed paths:
    M ckan/config/routing.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/legacy/html_check.py

  Log Message:
  -----------
  rest of the legacy tests fixes


  Commit: 383696a1ed2f95470f76a85b53eb7663c6311517
      https://github.com/ckan/ckan/commit/383696a1ed2f95470f76a85b53eb7663c6311517
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-07-13 (Fri, 13 Jul 2018)

  Changed paths:
    M ckan/config/middleware/__init__.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/views/group.py

  Log Message:
  -----------
  fix pep8 and failing test


  Commit: c5db0e2a8687a563502ff169e2bcdaacad29845e
      https://github.com/ckan/ckan/commit/c5db0e2a8687a563502ff169e2bcdaacad29845e
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/views/group.py

  Log Message:
  -----------
  pep-8 and legacy test fix


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/views/dataset.py
    M ckan/views/resource.py

  Log Message:
  -----------
  Merge branch 'master' into flask-group-blueprint


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

  Changed paths:
    M ckan/views/group.py

  Log Message:
  -----------
  Set strict_slashes=False otherwisw /group returns an exception


Compare: https://github.com/ckan/ckan/compare/6b97972ce598^...feaac777d678
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

• Previous message: [ckan-changes] [ckan/ckan] b2342b: [#4316] Redirect /dataset/[id] -> /dataset/[name] ...
• Next message: [ckan-changes] [ckan/ckan] 6b9797: add group blueprint
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]