[ckan-changes] [okfn/ckan] c61727: Merge branch 'master' into defect-1401-mount-non-r...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: c6172731365666241692dc54fd3eb37c283d8aec
      https://github.com/okfn/ckan/commit/c6172731365666241692dc54fd3eb37c283d8aec
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-01-30 (Mon, 30 Jan 2012)

  Changed paths:
    A bin/canada.py
  A bin/status.py
  M ckan/authz.py
  M ckan/ckan_nose_plugin.py
  M ckan/config/deployment.ini_tmpl
  M ckan/config/environment.py
  M ckan/config/middleware.py
  M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  A ckan/controllers/storage.py
  M ckan/forms/group.py
  M ckan/lib/app_globals.py
  M ckan/lib/cli.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dumper.py
  M ckan/lib/hash.py
  M ckan/lib/helpers.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/lib/repoze_patch.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/common.py
  M ckan/lib/search/index.py
  M ckan/lib/search/query.py
  M ckan/lib/search/sql.py
  M ckan/logic/action/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/create.py
  M ckan/logic/auth/delete.py
  M ckan/logic/auth/update.py
  M ckan/logic/schema.py
  M ckan/migration/versions/034_resource_group_table.py
  M ckan/migration/versions/047_rename_package_group_member.py
  M ckan/model/__init__.py
  M ckan/model/authz.py
  M ckan/model/package.py
  M ckan/plugins/interfaces.py
  M ckan/public/css/style.css
  A ckan/public/images/icons/ckan.ico
  A ckan/public/images/icons/star.png
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  A ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
  A ckan/public/scripts/vendor/recline/css/data-explorer.css
  A ckan/public/scripts/vendor/recline/css/graph-flot.css
  A ckan/public/scripts/vendor/recline/css/images/edit-map.png
  A ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
  A ckan/public/scripts/vendor/recline/recline.js
  A ckan/templates/facets.html
  M ckan/templates/group/layout.html
  M ckan/templates/group/read.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  R ckan/templates/package/facets.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/search.html
  M ckan/templates/package/search_form.html
  A ckan/templates/storage/index.html
  A ckan/templates/storage/success.html
  M ckan/templates/user/edit.html
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/model/test_relationships.py
  M ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_pagination.py
  A ckan/tests/functional/test_storage.py
  A ckan/tests/functional/test_upload.py
  A ckan/tests/lib/test_cli.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  A ckan/tests/lib/test_simple_search.py
  M ckan/tests/lib/test_solr_search_index.py
  M ckan/tests/models/test_repo.py
  M ckan_deb/usr/bin/ckan-create-instance
  M ckan_deb/usr/lib/ckan/common.sh
  M doc/api.rst
  M doc/common-error-messages.rst
  M doc/configuration.rst
  A doc/file-upload.rst
  M doc/index.rst
  M doc/install-from-package.rst
  M doc/paster.rst
  M doc/solr-setup.rst
  M requires/lucid_missing.txt

  Log Message:
  -----------
  Merge branch 'master' into defect-1401-mount-non-root


  Commit: 42e8efc53d68032cfa847b36b4f82d3a54b000d0
      https://github.com/okfn/ckan/commit/42e8efc53d68032cfa847b36b4f82d3a54b000d0
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-01-31 (Tue, 31 Jan 2012)

  Changed paths:
    M ckan/public/css/style.css

  Log Message:
  -----------
  [#1401,css][xs]: correct non relative links to images in css (which caused problems with non-root mounting of the app).


  Commit: 5f120a8fc8e9fbfc29cd5c5c0ab2d19b96c4920c
      https://github.com/okfn/ckan/commit/5f120a8fc8e9fbfc29cd5c5c0ab2d19b96c4920c
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-01-31 (Tue, 31 Jan 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [#1401,templates][xs]: set js global CKAN.SITE_URL with h.url('/') rather than g.site_url.


  Commit: abb99cae9972d45f4b3acfbf8ea711da398d8a4a
      https://github.com/okfn/ckan/commit/abb99cae9972d45f4b3acfbf8ea711da398d8a4a
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-01-31 (Tue, 31 Jan 2012)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  Merge branch 'defect-1401-mount-non-root'


Compare: https://github.com/okfn/ckan/compare/76d9bce...abb99ca