[ckan-changes] [okfn/ckan] 4e1453: Merge branch 'master' of https://github.com/okfn/c...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 4e1453f8bfe5b4d5f0509b81ff2edaccea723189
      https://github.com/okfn/ckan/commit/4e1453f8bfe5b4d5f0509b81ff2edaccea723189
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/ckan_nose_plugin.py
  M ckan/config/environment.py
  M ckan/config/routing.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/lib/plugins.py
  M ckan/logic/action/create.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  A ckan/public/img/glyphicons-halflings-white.png
  A ckan/public/img/glyphicons-halflings.png
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/package/resource_read.html
  M ckan/templates/user/read.html
  M ckan/tests/functional/test_datastore.py
  M ckan/tests/functional/test_tag_vocab.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/logic/test_action.py
  M ckanext/test_tag_vocab_plugin.py
  M doc/_templates/footer.html
  M doc/_themes/sphinx-theme-okfn
  A doc/administrative-dashboard.rst
  A doc/api-tutorial.rst
  A doc/api-util.rst
  A doc/api-v2.rst
  M doc/api.rst
  M doc/apiv3.rst
  M doc/conf.py
  M doc/configuration.rst
  A doc/domain-model-dataset.rst
  A doc/domain-model-resource.rst
  A doc/domain-model-task-status.rst
  A doc/domain-model.rst
  M doc/index.rst
  M doc/install-from-source.rst
  A doc/linked-data-and-rdf.rst
  M doc/paster.rst
  A doc/publisher-profile.rst
  R doc/publisher_auth_profile.rst

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/okfn/ckan


  Commit: 670a3e3318bffbe5bde43acefa445914d95cfa9d
      https://github.com/okfn/ckan/commit/670a3e3318bffbe5bde43acefa445914d95cfa9d
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [xs,bug] Recent changes to package_show killed Package controller, fixed


Compare: https://github.com/okfn/ckan/compare/e812e21...670a3e3