[ckan-changes] [okfn/ckan] 74fc91: Merge branch '2375-demo-theme-development' of http...

GitHub noreply at github.com
Tue Sep 4 11:17:03 UTC 2012 

  Branch: refs/heads/2375-demo-theme-development
  Home:   https://github.com/okfn/ckan
  Commit: 74fc91b81b15d6f0b749b8da2eb24defd13ed0ea
      https://github.com/okfn/ckan/commit/74fc91b81b15d6f0b749b8da2eb24defd13ed0ea
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M .tx/config
    M CHANGELOG.txt
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/storage.py
    M ckan/controllers/user.py
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/check_po_files.py
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    A ckan/i18n/ja/LC_MESSAGES/ckan.mo
    A ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/maintain.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/sql.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/model/__init__.py
    M ckan/model/license.py
    M ckan/model/resource.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/datapreview/vendor/recline/recline.js
    M ckan/public/scripts/application.js
    R ckan/templates_legacy/_snippet/add-related.html
    M ckan/templates_legacy/_util.html
    M ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/authorization_group/__init__.py
    R ckan/templates_legacy/authorization_group/authz.html
    R ckan/templates_legacy/authorization_group/edit.html
    R ckan/templates_legacy/authorization_group/edit_form.html
    R ckan/templates_legacy/authorization_group/index.html
    R ckan/templates_legacy/authorization_group/layout.html
    R ckan/templates_legacy/authorization_group/new.html
    R ckan/templates_legacy/authorization_group/read.html
    M ckan/templates_legacy/group/authz.html
    M ckan/templates_legacy/package/authz.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/related_list.html
    M ckan/templates_legacy/user/layout.html
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_related.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_simple_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/misc/test_auth_profiles.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/organizations/forms.py
    A ckanext/organizations/templates/organization_edit.html
    M doc/conf.py
    M doc/configuration.rst
    M doc/datastore.rst
    M doc/filestore.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' of https://github.com/okfn/ckan into 2375-demo-theme-development


  Commit: 93980c341202caf455ae32679793fbe395ee9c16
      https://github.com/okfn/ckan/commit/93980c341202caf455ae32679793fbe395ee9c16
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/extract.py
    M ckan/lib/jinja_extensions.py

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' of https://github.com/okfn/ckan into 2375-demo-theme-development


  Commit: 33cd96478d129b24735abe1d4e2f0a1ce59b8572
      https://github.com/okfn/ckan/commit/33cd96478d129b24735abe1d4e2f0a1ce59b8572
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/authz.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    R ckan/controllers/authorization_group.py
    M ckan/forms/__init__.py
    M ckan/forms/authorization_group.py
    M ckan/forms/authz.py
    M ckan/lib/authztool.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/logic/action/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/auth/publisher/update.py
    M ckan/logic/auth/update.py
    M ckan/migration/versions/025_add_authorization_groups.py
    M ckan/model/__init__.py
    R ckan/model/authorization_group.py
    M ckan/model/authz.py
    M ckan/plugins/interfaces.py
    R ckan/public/images/icons/authorization_group.png
    R ckan/public/images/icons/authorization_group_add.png
    R ckan/public/images/icons/authorization_group_edit.png
    A ckan/public/images/icons/followers.png
    M ckan/public/scripts/application.js
    M ckan/templates/admin/authz.html
    M ckan/tests/__init__.py
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/functional/api/test_authorization_group.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_authorization_group.py
    M ckan/tests/functional/test_authz.py
    M ckan/tests/functional/test_edit_authz.py
    M ckan/tests/functional/test_package_edit_authz.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_authz.py
    M ckan/tests/models/test_repo.py
    M ckan/tests/test_authz.py

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' of https://github.com/okfn/ckan into 2375-demo-theme-development


  Commit: 4711f5f4ff34ec26051098babd9c644946cee0b7
      https://github.com/okfn/ckan/commit/4711f5f4ff34ec26051098babd9c644946cee0b7
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/tests/lib/test_resource_search.py

  Log Message:
  -----------
  Temporary fix to resolve problem with resource format botching.


Compare: https://github.com/okfn/ckan/compare/17f0094aef84...4711f5f4ff34

More information about the ckan-changes mailing list