[ckan-changes] [okfn/ckan] c5a90d: Merge branch 'feature-1698-tag-taxonomies'

[GitHub]

  Branch: refs/heads/feature-1821-multilingual-extension
  Home:   https://github.com/okfn/ckan
  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: b77af903407d1f467d0b792363a0d50ae0a39106
      https://github.com/okfn/ckan/commit/b77af903407d1f467d0b792363a0d50ae0a39106
  Author: Sean Hammond <seanhammond at lavabit.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 feature-1821-multilingual-extension


Compare: https://github.com/okfn/ckan/compare/e165974...b77af90