[ckan-changes] [okfn/ckan] 0c90ea: Merge branch 'master' into feature-1653-i18n_url_r...

Tue Feb 21 15:47:29 UTC 2012

  Branch: refs/heads/enh-1803-clean-up-routes
  Home:   https://github.com/okfn/ckan
  Commit: 0c90eabeb85b23b6a0dde82d626f050a3bbe7a1d
      https://github.com/okfn/ckan/commit/0c90eabeb85b23b6a0dde82d626f050a3bbe7a1d
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/forms/common.py
  M ckan/forms/package_dict.py
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/lib/search/query.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/action/update.py
  M ckan/logic/auth/create.py
  M ckan/logic/auth/delete.py
  A ckan/logic/auth/publisher/__init__.py
  A ckan/logic/auth/publisher/create.py
  A ckan/logic/auth/publisher/delete.py
  A ckan/logic/auth/publisher/get.py
  A ckan/logic/auth/publisher/update.py
  M ckan/logic/auth/update.py
  M ckan/logic/converters.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  A ckan/migration/versions/049_add_group_approval_status.py
  A ckan/migration/versions/050_term_translation_table.py
  A ckan/migration/versions/051_add_tag_vocabulary.py
  M ckan/model/__init__.py
  M ckan/model/group.py
  M ckan/model/package.py
  M ckan/model/tag.py
  A ckan/model/term_translation.py
  M ckan/model/user.py
  A ckan/model/vocabulary.py
  M ckan/new_authz.py
  M ckan/plugins/interfaces.py
  A ckan/public/css/chosen.css
  M ckan/public/css/style.css
  A ckan/public/images/chosen-sprite.png
  M ckan/public/scripts/application.js
  A ckan/public/scripts/vendor/jquery.chosen/0.9.7/chosen.js
  M ckan/templates/_util.html
  M ckan/templates/group/layout.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read.html
  M ckan/templates/package/resource_read.html
  M ckan/tests/forms/test_package.py
  M ckan/tests/functional/api/__init__.py
  M ckan/tests/functional/api/model/test_package.py
  A ckan/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/test_authz.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  A ckan/tests/functional/test_publisher_auth.py
  A ckan/tests/functional/test_tag_vocab.py
  M ckan/tests/lib/test_alphabet_pagination.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/lib/test_solr_package_search.py
  M ckan/tests/logic/test_action.py
  A ckan/tests/logic/test_tag_vocab.py
  A ckan/tests/misc/test_auth_profiles.py
  A ckan/tests/mock_publisher_auth.py
  M ckan/tests/models/test_package.py
  M ckan/tests/models/test_purge_revision.py
  A ckanext/publisher_form/__init__.py
  A ckanext/publisher_form/forms.py
  A ckanext/publisher_form/templates/dataset_form.html
  A ckanext/publisher_form/templates/publisher_form.html
  M doc/configuration.rst
  M setup.py

  Log Message:
  -----------
  Merge branch 'master' into feature-1653-i18n_url_rewriting

Conflicts:
	ckan/templates/layout_base.html

  Commit: 4768cca2402dd7e5c23f68f19b49393d07e55970
      https://github.com/okfn/ckan/commit/4768cca2402dd7e5c23f68f19b49393d07e55970
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  fix bad merge

  Commit: 950a9f0d94170078930f90f5a8b429c778f23bea
      https://github.com/okfn/ckan/commit/950a9f0d94170078930f90f5a8b429c778f23bea
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  do not try to detect browser language preferences

  Commit: 11cd73cfa9198dfd87a51b9f6bd816da2dd724a0
      https://github.com/okfn/ckan/commit/11cd73cfa9198dfd87a51b9f6bd816da2dd724a0
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  fix typo

  Commit: e6925dee919ee0efda97e7364da2a159a2eb1afa
      https://github.com/okfn/ckan/commit/e6925dee919ee0efda97e7364da2a159a2eb1afa
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M ckan/tests/functional/test_home.py

  Log Message:
  -----------
  remove redundant default language tests

  Commit: ea73bc4fc647b90c8b2a6dd2a5f48414bcd44da8
      https://github.com/okfn/ckan/commit/ea73bc4fc647b90c8b2a6dd2a5f48414bcd44da8
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  remove unused import

  Commit: 1b6eb8aeb7ff6b70947d911671813bec2e1ea3c4
      https://github.com/okfn/ckan/commit/1b6eb8aeb7ff6b70947d911671813bec2e1ea3c4
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

  Changed paths:
    M ckan/tests/functional/test_home.py

  Log Message:
  -----------
  disable failing test till full middleware stack is active in tests

  Commit: 067d95d27190d201e81a102572f60e98a253bf32
      https://github.com/okfn/ckan/commit/067d95d27190d201e81a102572f60e98a253bf32
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py
  M ckan/logic/schema.py
  M ckan/model/tag.py
  M ckan/model/vocabulary.py
  M ckan/tests/functional/api/model/test_vocabulary.py

  Log Message:
  -----------
  [#1775] Implement mass editing of vocab tags via API

You pass key a list of tag dicts with key 'tags' to vocabulary_create or vocabulary_update, new tags will be created and completely replace the vocabulary's existing tags.

  Commit: 017feb0bafc03a4bb905b057669b282217acc1f1
      https://github.com/okfn/ckan/commit/017feb0bafc03a4bb905b057669b282217acc1f1
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  add current url into environ

  Commit: d6cce9036d2f9cff622afc796c1aa42a2b1119e0
      https://github.com/okfn/ckan/commit/d6cce9036d2f9cff622afc796c1aa42a2b1119e0
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  bug fix for when app in subdir

  Commit: dbbe13e6d393836942a5f01c8273582d2d249fde
      https://github.com/okfn/ckan/commit/dbbe13e6d393836942a5f01c8273582d2d249fde
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  template fixes for app in subdir

  Commit: 1ac8351251f6338987b472ad1fefe03056dbe21a
      https://github.com/okfn/ckan/commit/1ac8351251f6338987b472ad1fefe03056dbe21a
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  supress warning

  Commit: 81e2816daff68702d9ade97a392da413a387bb71
      https://github.com/okfn/ckan/commit/81e2816daff68702d9ade97a392da413a387bb71
  Author: John Glover <j at johnglover.net>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

  Changed paths:
    M ckan/lib/navl/dictization_functions.py
  M ckan/logic/converters.py
  M ckan/tests/functional/test_tag_vocab.py

  Log Message:
  -----------
  [1720][dictization_functions, converters, tests] Update unflatten function so that dict numbers (for extras, tags, etc) don't need to be contiguous from 0.

  Commit: 2ff67da0d47b1ad8c6d17665d1df35cc0fc3367c
      https://github.com/okfn/ckan/commit/2ff67da0d47b1ad8c6d17665d1df35cc0fc3367c
  Author: John Glover <j at johnglover.net>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py
  M ckan/logic/schema.py
  M ckan/model/tag.py
  M ckan/model/vocabulary.py
  M ckan/tests/functional/api/model/test_vocabulary.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/feature-1698-tag-taxonomies' into feature-1698-tag-taxonomies

  Commit: 2844c94d5f47c30012ea2e71bc129953d35f338f
      https://github.com/okfn/ckan/commit/2844c94d5f47c30012ea2e71bc129953d35f338f
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  I18nMiddleware: only process once for 404 pages etcetc

  Commit: 857647e87ddee076e06860933c6ae29a71c2c8d1
      https://github.com/okfn/ckan/commit/857647e87ddee076e06860933c6ae29a71c2c8d1
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  minor clean up helpers.py

  Commit: d98c1b0af92ceb82136f055903e8afe4cf90748c
      https://github.com/okfn/ckan/commit/d98c1b0af92ceb82136f055903e8afe4cf90748c
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  lib.i18n.py cleanup

  Commit: 2a1284a8648259fa250e5f2f293ca7c491a143e5
      https://github.com/okfn/ckan/commit/2a1284a8648259fa250e5f2f293ca7c491a143e5
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/lib/i18n.py

  Log Message:
  -----------
  new get_locales_dict helper function

  Commit: e67cbef3592e562d0f1be3d91f24fa3a749ca266
      https://github.com/okfn/ckan/commit/e67cbef3592e562d0f1be3d91f24fa3a749ca266
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  fix h.icon_url for url language selection

  Commit: 5886a539c713ee91f8346e1c73fa7320f55fb124
      https://github.com/okfn/ckan/commit/5886a539c713ee91f8346e1c73fa7320f55fb124
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

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

  Log Message:
  -----------
  fix template to use h.url_for_static()

  Commit: abb7317597a1c9bd8acf2be46c9a031141edc5b2
      https://github.com/okfn/ckan/commit/abb7317597a1c9bd8acf2be46c9a031141edc5b2
  Author: John Glover <j at johnglover.net>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M ckan/lib/navl/dictization_functions.py

  Log Message:
  -----------
  [1720][dictization] unflatten update - handle case where data already contains an unflattened list (eg: of extras)

  Commit: c5a90d841c448a90e16701f7a6d37e5db31ca501
      https://github.com/okfn/ckan/commit/c5a90d841c448a90e16701f7a6d37e5db31ca501
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py
  M ckan/logic/converters.py
  M ckan/logic/schema.py
  M ckan/model/tag.py
  M ckan/model/vocabulary.py
  M ckan/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/test_tag_vocab.py

  Log Message:
  -----------
  Merge branch 'feature-1698-tag-taxonomies'

  Commit: 309e3609696ff68facb7fe61ededbbc50f9b64ed
      https://github.com/okfn/ckan/commit/309e3609696ff68facb7fe61ededbbc50f9b64ed
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py
  M ckan/logic/converters.py
  M ckan/logic/schema.py
  M ckan/model/tag.py
  M ckan/model/vocabulary.py
  M ckan/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/test_tag_vocab.py

  Log Message:
  -----------
  Merge branch 'master' into feature-1653-i18n_url_rewriting

  Commit: f4345bb1a60f73ba9da50d65cd6c4c48e42a8555
      https://github.com/okfn/ckan/commit/f4345bb1a60f73ba9da50d65cd6c4c48e42a8555
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  fix redirect_to via helper function

  Commit: 326d3e1ec249da595b15bf8102bc5c06beafb551
      https://github.com/okfn/ckan/commit/326d3e1ec249da595b15bf8102bc5c06beafb551
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  fix I18nMiddleware for tests

  Commit: 30b28eb0969315246e99b0ed1d30a64196c07cd4
      https://github.com/okfn/ckan/commit/30b28eb0969315246e99b0ed1d30a64196c07cd4
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M ckan/config/middleware.py
  M ckan/config/routing.py
  M ckan/controllers/home.py
  M ckan/lib/base.py
  M ckan/lib/helpers.py
  M ckan/lib/i18n.py
  M ckan/templates/group/history.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/history.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read.html
  M ckan/tests/functional/test_home.py
  M ckan/tests/lib/test_i18n.py

  Log Message:
  -----------
  Merge branch 'feature-1653-i18n_url_rewriting'

  Commit: 31e2f8dc84cc48682e774633bfaafb9b9662edab
      https://github.com/okfn/ckan/commit/31e2f8dc84cc48682e774633bfaafb9b9662edab
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M ckan/config/middleware.py
  M ckan/config/routing.py
  M ckan/controllers/home.py
  M ckan/lib/base.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/navl/dictization_functions.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py
  M ckan/logic/converters.py
  M ckan/logic/schema.py
  M ckan/model/tag.py
  M ckan/model/vocabulary.py
  M ckan/templates/group/history.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/history.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read.html
  M ckan/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/test_home.py
  M ckan/tests/functional/test_tag_vocab.py
  M ckan/tests/lib/test_i18n.py

  Log Message:
  -----------
  Merge branch 'master' into enh-1803-clean-up-routes

Compare: https://github.com/okfn/ckan/compare/e80e581...31e2f8d