[ckan-changes] [okfn/ckan] 3dbaf0: [merge] master

[noreply at github.com]

  Branch: refs/heads/feature-1485-package-form-extension
  Home:   https://github.com/okfn/ckan

  Commit: 3dbaf06ca0b318141fa65c9868d2c9752a0e801c
      https://github.com/okfn/ckan/commit/3dbaf06ca0b318141fa65c9868d2c9752a0e801c
  Author: kindly <kindly at gmail.com>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    R ckan/config/celeryconfig.py
  M ckan/config/environment.py
  M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/home.py
  M ckan/controllers/package.py
  M ckan/lib/alphabet_paginate.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/search/__init__.py
  M ckan/lib/search/query.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/model/__init__.py
  M ckan/model/meta.py
  M ckan/model/types.py
  M ckan/public/css/style.css
  A ckan/public/images/icons/arrow-down-16.png
  A ckan/public/images/icons/arrow-down-32.png
  A ckan/public/images/icons/arrow-right-16-black.png
  A ckan/public/images/icons/arrow-right-16.png
  A ckan/public/images/icons/arrow-right-32.png
  A ckan/public/images/icons/package-disabled.png
  A ckan/public/images/ldquo.png
  M ckan/public/scripts/application.js
  A ckan/public/scripts/dataexplorer/icon-sprite.png
  A ckan/public/scripts/dataexplorer/loading.gif
  A ckan/public/scripts/dataexplorer/table-view-template.js
  A ckan/public/scripts/dataexplorer/table-view.css
  A ckan/public/scripts/dataexplorer/table-view.js
  A ckan/public/scripts/dataexplorer/table-view.ui.js
  M ckan/public/scripts/templates.js
  M ckan/templates/group/layout.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/read.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/resources.html
  M ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/api/test_util.py
  M ckan/tests/functional/test_home.py
  M ckan/tests/functional/test_package.py
  A ckan/tests/functional/test_pagination.py
  M ckan/tests/functional/test_user.py
  M doc/api.rst
  M doc/apiv3.rst
  M doc/buildbot.rst
  M doc/common-error-messages.rst
  M doc/extensions.rst
  M doc/i18n.rst
  M doc/loading_data.rst
  M doc/plugins.rst
  M doc/prepare-extensions.rst
  M pip-requirements-test.txt
  M setup.py

  Log Message:
  -----------
  [merge] master


  Commit: 4e660f8f201c1f8598b894cd9b0883472147af69
      https://github.com/okfn/ckan/commit/4e660f8f201c1f8598b894cd9b0883472147af69
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    M ckan/controllers/authorization_group.py
  M ckan/controllers/group_formalchemy.py
  M ckan/controllers/home.py
  M ckan/controllers/package.py
  M ckan/forms/common.py
  M ckan/forms/group.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/dumper.py
  M ckan/lib/helpers.py
  M ckan/lib/stats.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/create.py
  A ckan/migration/versions/047_rename_package_group_member.py
  M ckan/model/__init__.py
  M ckan/model/group.py
  M ckan/model/meta.py
  M ckan/model/package.py
  M ckan/public/css/style.css
  A ckan/public/images/icons/arrow-down-16.png
  A ckan/public/images/icons/arrow-down-32.png
  A ckan/public/images/icons/arrow-right-16-black.png
  A ckan/public/images/icons/arrow-right-16.png
  A ckan/public/images/icons/arrow-right-32.png
  A ckan/public/images/icons/package-disabled.png
  A ckan/public/images/ldquo.png
  M ckan/public/scripts/application.js
  A ckan/public/scripts/dataexplorer/icon-sprite.png
  A ckan/public/scripts/dataexplorer/loading.gif
  A ckan/public/scripts/dataexplorer/table-view-template.js
  A ckan/public/scripts/dataexplorer/table-view.css
  A ckan/public/scripts/dataexplorer/table-view.js
  A ckan/public/scripts/dataexplorer/table-view.ui.js
  M ckan/public/scripts/templates.js
  M ckan/templates/group/layout.html
  M ckan/templates/group/read.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/read.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/resources.html
  M ckan/tests/functional/api/model/test_group.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_home.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_user.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/misc/test_stats.py
  M ckan/tests/models/test_group.py
  M ckan/tests/test_dumper.py
  M doc/api.rst
  M doc/apiv3.rst
  M pip-requirements-test.txt

  Log Message:
  -----------
  Merge branch 'feature-1478-change-package-group-to-members-table' of https://github.com/okfn/ckan into feature-1485-package-form-extension


  Commit: 0ec041e89a8bf8fca0921a4f8b983877fb532d4c
      https://github.com/okfn/ckan/commit/0ec041e89a8bf8fca0921a4f8b983877fb532d4c
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2011-12-09 (Fri, 09 Dec 2011)

  Changed paths:
    M ckan/migration/versions/047_rename_package_group_member.py

  Log Message:
  -----------
  Added my migration to the merged migration


Compare: https://github.com/okfn/ckan/compare/5a7a978...0ec041e