[ckan-changes] [okfn/ckan] 897f01: [master, resource/read][xs]: put open data button a...

[GitHub]

  Branch: refs/heads/feature-1821-multilingual-extension
  Home:   https://github.com/okfn/ckan
  Commit: 897f01282f92e05f0a03a33f716e41928096a91f
      https://github.com/okfn/ckan/commit/897f01282f92e05f0a03a33f716e41928096a91f
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-13 (Tue, 13 Mar 2012)

  Changed paths:
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [master,resource/read][xs]: put open data button after license again as o/w css is wrong.


  Commit: 1153aa876f54c22289e460aeececea22d1d4d51d
      https://github.com/okfn/ckan/commit/1153aa876f54c22289e460aeececea22d1d4d51d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-03-13 (Tue, 13 Mar 2012)

  Changed paths:
    M README.rst
  M ckan/config/deployment.ini_tmpl
  M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/datastore.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/controllers/storage.py
  M ckan/controllers/user.py
  M ckan/i18n/bg/LC_MESSAGES/ckan.po
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/authenticator.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/__init__.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/lib/plugins.py
  M ckan/lib/search/index.py
  M ckan/logic/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/get.py
  M ckan/logic/auth/create.py
  M ckan/logic/auth/publisher/create.py
  M ckan/logic/auth/publisher/get.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/model/group.py
  M ckan/model/user.py
  M ckan/new_authz.py
  M ckan/plugins/interfaces.py
  M ckan/public/css/bootstrap.css
  M ckan/public/css/forms.css
  M ckan/public/css/style.css
  A ckan/public/images/chevron-down.png
  A ckan/public/images/chevron-up.png
  A ckan/public/images/icons/package_add.png
  A ckan/public/images/icons/page_white.png
  A ckan/public/images/icons/page_white_add.png
  A ckan/public/images/icons/page_white_code.png
  A ckan/public/images/icons/page_white_compressed.png
  A ckan/public/images/icons/page_white_cup.png
  A ckan/public/images/icons/page_white_database.png
  A ckan/public/images/icons/page_white_error.png
  A ckan/public/images/icons/page_white_excel.png
  A ckan/public/images/icons/page_white_gear.png
  A ckan/public/images/icons/page_white_link.png
  A ckan/public/images/icons/page_white_text.png
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  A ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
  R ckan/public/scripts/vendor/jquery/1.6.2/jquery.js
  A ckan/public/scripts/vendor/jquery/1.7.1/jquery.js
  A ckan/templates/_snippet/data-api-help.html
  M ckan/templates/_util.html
  M ckan/templates/facets.html
  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/edit.html
  A ckan/templates/package/editresources.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new.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/tests/__init__.py
  M ckan/tests/functional/api/model/test_group.py
  M ckan/tests/functional/api/test_resource.py
  M ckan/tests/functional/api/test_util.py
  M ckan/tests/functional/test_authz.py
  M ckan/tests/functional/test_datastore.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_storage.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/lib/test_helpers.py
  A ckan/tests/logic/test_member.py
  M ckanext/multilingual/plugin.py
  M ckanext/publisher_form/forms.py
  M ckanext/publisher_form/templates/dataset_form.html
  M ckanext/publisher_form/templates/publisher_form.html
  M ckanext/test_tag_vocab_plugin.py
  M doc/authorization.rst
  M doc/configuration.rst
  M doc/datastore.rst
  A doc/publisher_auth_profile.rst
  M setup.py
  M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-1821-multilingual-extension

Conflicts:
	ckan/lib/dictization/model_dictize.py
	ckan/lib/helpers.py
	ckan/logic/action/get.py
	ckan/templates/_util.html
	ckan/templates/facets.html
	ckan/tests/lib/test_dictization.py
	setup.py


Compare: https://github.com/okfn/ckan/compare/0c0c813...1153aa8