[ckan-changes] [okfn/ckan] e7fc0b: [hotfix][xxs]: Moving an HTML comment to fix an IE...

Sun Mar 25 17:17:50 UTC 2012

  Branch: refs/heads/release-v1.6.1
  Home:   https://github.com/okfn/ckan
  Commit: e7fc0ba775a07acafc46435dff161b5e3fd81966
      https://github.com/okfn/ckan/commit/e7fc0ba775a07acafc46435dff161b5e3fd81966
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-23 (Fri, 23 Mar 2012)

  Changed paths:
    M ckan/templates/facets.html

  Log Message:
  -----------
  [hotfix][xxs]: Moving an HTML comment to fix an IE7 bug.


  Commit: e28afd5a9d86bbce28a05366496191e87a896caa
      https://github.com/okfn/ckan/commit/e28afd5a9d86bbce28a05366496191e87a896caa
  Author: kindly <kindly at gmail.com>
  Date:   2012-03-23 (Fri, 23 Mar 2012)

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

  Log Message:
  -----------
  [2223] fix so that delete/change state not in form for unorthorized users


  Commit: d3857e030ac0fbb282969dd9e78cd2a6cb4c71f6
      https://github.com/okfn/ckan/commit/d3857e030ac0fbb282969dd9e78cd2a6cb4c71f6
  Author: kindly <kindly at gmail.com>
  Date:   2012-03-23 (Fri, 23 Mar 2012)

  Changed paths:
    M ckan/templates/facets.html

  Log Message:
  -----------
  Merge branch 'feature-2223-bootstrap' of github.com:okfn/ckan into feature-2223-bootstrap


  Commit: 0bf4b33955df3806785f9b42a55acaeb45596e25
      https://github.com/okfn/ckan/commit/0bf4b33955df3806785f9b42a55acaeb45596e25
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-23 (Fri, 23 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py
  R ckan/public/css/blueprint/ie.css
  R ckan/public/css/blueprint/print.css
  R ckan/public/css/blueprint/screen.css
  R ckan/public/css/bootstrap.css
  A ckan/public/css/bootstrap.min.css
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  R ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
  A ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js
  M ckan/templates/_util.html
  M ckan/templates/admin/authz.html
  M ckan/templates/admin/trash.html
  M ckan/templates/authorization_group/edit_form.html
  M ckan/templates/facets.html
  M ckan/templates/group/authz.html
  M ckan/templates/group/edit.html
  M ckan/templates/group/history.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/home/index.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/authz.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/editresources.html
  M ckan/templates/package/history.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_form.html
  M ckan/templates/revision/diff.html
  M ckan/templates/revision/list.html
  M ckan/templates/revision/read.html
  M ckan/templates/user/edit_user_form.html
  M ckan/templates/user/list.html
  M ckan/templates/user/login.html
  M ckan/templates/user/new_user_form.html
  M ckan/templates/user/perform_reset.html
  M ckan/templates/user/read.html
  M ckan/templates/user/request_reset.html
  M ckan/tests/functional/test_authz.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckanext/publisher_form/templates/dataset_form.html
  M ckanext/publisher_form/templates/publisher_form.html
  M ckanext/publisher_form/templates/publisher_read.html

  Log Message:
  -----------
  Merge branch 'feature-2223-bootstrap'


  Commit: ecd4cb2081afb2c7bb1e2f566977bc23fa0cd5ce
      https://github.com/okfn/ckan/commit/ecd4cb2081afb2c7bb1e2f566977bc23fa0cd5ce
  Author: kindly <kindly at gmail.com>
  Date:   2012-03-23 (Fri, 23 Mar 2012)

  Changed paths:
    M README.rst
  M ckan/ckan_nose_plugin.py
  M ckan/config/environment.py
  M ckan/config/middleware.py
  M ckan/config/routing.py
  M ckan/controllers/admin.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/controllers/home.py
  M ckan/controllers/package.py
  M ckan/controllers/storage.py
  M ckan/controllers/template.py
  M ckan/controllers/user.py
  M ckan/exceptions.py
  M ckan/i18n/bg/LC_MESSAGES/ckan.mo
  M ckan/i18n/ca/LC_MESSAGES/ckan.mo
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
  M ckan/i18n/de/LC_MESSAGES/ckan.mo
  M ckan/i18n/el/LC_MESSAGES/ckan.mo
  M ckan/i18n/es/LC_MESSAGES/ckan.mo
  M ckan/i18n/fi/LC_MESSAGES/ckan.mo
  M ckan/i18n/fr/LC_MESSAGES/ckan.mo
  M ckan/i18n/hu/LC_MESSAGES/ckan.mo
  M ckan/i18n/it/LC_MESSAGES/ckan.mo
  M ckan/i18n/lt/LC_MESSAGES/ckan.mo
  M ckan/i18n/lv/LC_MESSAGES/ckan.mo
  M ckan/i18n/nl/LC_MESSAGES/ckan.mo
  M ckan/i18n/no/LC_MESSAGES/ckan.mo
  M ckan/i18n/pl/LC_MESSAGES/ckan.mo
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
  M ckan/i18n/ro/LC_MESSAGES/ckan.mo
  M ckan/i18n/ru/LC_MESSAGES/ckan.mo
  M ckan/i18n/sk/LC_MESSAGES/ckan.mo
  M ckan/i18n/sl/LC_MESSAGES/ckan.mo
  M ckan/i18n/sq/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
  M ckan/i18n/sv/LC_MESSAGES/ckan.mo
  M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
  M ckan/lib/base.py
  M ckan/lib/cli.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/i18n.py
  M ckan/lib/plugins.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/index.py
  M ckan/lib/search/query.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
  M ckan/migration/versions/027_adjust_harvester.py
  M ckan/model/meta.py
  M ckan/model/package.py
  A ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore
  R ckan/public/css/blueprint/ie.css
  R ckan/public/css/blueprint/print.css
  R ckan/public/css/blueprint/screen.css
  R ckan/public/css/bootstrap.css
  A ckan/public/css/bootstrap.min.css
  M ckan/public/css/style.css
  A ckan/public/img/glyphicons-halflings-white.png
  A ckan/public/img/glyphicons-halflings.png
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  R ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
  A ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/_snippet/data-api-help.html
  M ckan/templates/_util.html
  A ckan/templates/_util_activity_div.html
  M ckan/templates/activity_streams/added_tag.html
  M ckan/templates/activity_streams/changed_group.html
  M ckan/templates/activity_streams/changed_package.html
  M ckan/templates/activity_streams/changed_package_extra.html
  M ckan/templates/activity_streams/changed_resource.html
  M ckan/templates/activity_streams/changed_user.html
  M ckan/templates/activity_streams/deleted_group.html
  M ckan/templates/activity_streams/deleted_package.html
  M ckan/templates/activity_streams/deleted_package_extra.html
  M ckan/templates/activity_streams/deleted_resource.html
  M ckan/templates/activity_streams/new_group.html
  M ckan/templates/activity_streams/new_package.html
  M ckan/templates/activity_streams/new_package_extra.html
  M ckan/templates/activity_streams/new_resource.html
  M ckan/templates/activity_streams/new_user.html
  M ckan/templates/activity_streams/removed_tag.html
  M ckan/templates/admin/authz.html
  M ckan/templates/admin/index.html
  M ckan/templates/admin/trash.html
  M ckan/templates/authorization_group/edit_form.html
  M ckan/templates/group/authz.html
  M ckan/templates/group/edit.html
  M ckan/templates/group/history.html
  M ckan/templates/group/layout.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/home/about.html
  M ckan/templates/home/index.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/authz.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/editresources.html
  M ckan/templates/package/history.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read.html
  A ckan/templates/package/read.n3
  A ckan/templates/package/read.rdf
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/search_form.html
  M ckan/templates/revision/diff.html
  M ckan/templates/revision/list.html
  M ckan/templates/revision/read.html
  M ckan/templates/user/edit_user_form.html
  M ckan/templates/user/layout.html
  M ckan/templates/user/list.html
  M ckan/templates/user/login.html
  M ckan/templates/user/new_user_form.html
  M ckan/templates/user/perform_reset.html
  M ckan/templates/user/read.html
  M ckan/templates/user/request_reset.html
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/api/test_activity.py
  M ckan/tests/functional/test_admin.py
  M ckan/tests/functional/test_authz.py
  M ckan/tests/functional/test_autoneg.py
  M ckan/tests/functional/test_datastore.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_storage.py
  M ckan/tests/functional/test_tag_vocab.py
  M ckan/tests/functional/test_user.py
  M ckan/tests/lib/test_cli.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/lib/test_mailer.py
  M ckan/tests/lib/test_solr_search_index.py
  M ckan/tests/logic/test_action.py
  M ckan/tests/misc/test_mock_mail_server.py
  M ckan/tests/mock_mail_server.py
  M ckan/tests/models/test_package.py
  M ckanext/publisher_form/templates/dataset_form.html
  M ckanext/publisher_form/templates/publisher_form.html
  M ckanext/publisher_form/templates/publisher_read.html
  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/authorization.rst
  A doc/background-tasks.rst
  R doc/ckan-features.png
  R doc/ckan-vision.png
  A doc/commenting.rst
  M doc/conf.py
  M doc/configuration.rst
  A doc/database-dumps.rst
  R doc/database_dumps.rst
  M doc/datastore.rst
  A doc/deployment.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
  R doc/editing_the_database_ownership.rst
  M doc/extensions.rst
  R doc/file-upload.rst
  A doc/filestore.rst
  M doc/forms.rst
  A doc/howto-editing-database-ownership.rst
  M doc/index.rst
  M doc/install-from-source.rst
  A doc/linked-data-and-rdf.rst
  A doc/loading-data.rst
  R doc/loading_data.rst
  M doc/paster.rst
  M doc/post-installation.rst
  A doc/publisher-profile.rst
  R doc/publisher_auth_profile.rst
  M doc/writing-extensions.rst
  A pip-requirements-docs.txt
  R pip-requirements-prerelease.txt
  A profile_tests.py
  M requires/lucid_present.txt
  M test-core.ini

  Log Message:
  -----------
  fix merge conflicts and search error


Compare: https://github.com/okfn/ckan/compare/c617ac4...ecd4cb2