[ckan-changes] [okfn/ckan] 3d7cbf: [#1057][xs] escape pjson callback

• Previous message: [ckan-changes] [okfn/ckan] 3d7cbf: [#1057][xs] escape pjson callback
• Next message: [ckan-changes] [okfn/ckan] bf88c4: [1767][tests] move test_tag_list_vocab to test_act...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/feature-1653-i18n_url_rewriting
  Home:   https://github.com/okfn/ckan
  Commit: 3d7cbf02f0eb2130c13a67e8a66259701b40cfe5
      https://github.com/okfn/ckan/commit/3d7cbf02f0eb2130c13a67e8a66259701b40cfe5
  Author: Toby <toby at potatolondon.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  [#1057][xs] escape pjson callback


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

  Changed paths:
    M ckan/tests/logic/test_action.py
  M ckan/tests/logic/test_tag_vocab.py

  Log Message:
  -----------
  [1767][tests] move test_tag_list_vocab to test_action.py.

Update it to use action API.


  Commit: 9d808a98debd046928031e930167c1fd3bc2d2d2
      https://github.com/okfn/ckan/commit/9d808a98debd046928031e930167c1fd3bc2d2d2
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/model/group.py

  Log Message:
  -----------
  [xs] Minor tweak to how group members are accessed by type in Group model


  Commit: c1e723cfc25efd5994cd4d8edec4f532edf764dc
      https://github.com/okfn/ckan/commit/c1e723cfc25efd5994cd4d8edec4f532edf764dc
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/okfn/ckan


  Commit: dc5ca52ab053b7d214dc946ccc229990abb91047
      https://github.com/okfn/ckan/commit/dc5ca52ab053b7d214dc946ccc229990abb91047
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M ckan/model/group.py

  Log Message:
  -----------
  [xs] Fix the query to fetch group members of a particular model type


  Commit: 45ac98451800b9be45cfc25a02c48ab20808251c
      https://github.com/okfn/ckan/commit/45ac98451800b9be45cfc25a02c48ab20808251c
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M ckanext/publisher_form/templates/publisher_form.html

  Log Message:
  -----------
  [1794] Reducing the amount of user clutter


  Commit: db71e3072786a6718ecbe28130d89165aa96513e
      https://github.com/okfn/ckan/commit/db71e3072786a6718ecbe28130d89165aa96513e
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M ckan/lib/alphabet_paginate.py

  Log Message:
  -----------
  [xs] Fix for alpha pagination when using strings rather than objects


  Commit: c26a74186a7a1290abd976d80696c75e58152433
      https://github.com/okfn/ckan/commit/c26a74186a7a1290abd976d80696c75e58152433
  Author: kindly <kindly at gmail.com>
  Date:   2012-02-14 (Tue, 14 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/lib/alphabet_paginate.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/logic/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/auth/create.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/schema.py
  A ckan/migration/versions/0049_add_group_approval_status.py
  M ckan/model/group.py
  M ckan/model/package.py
  M ckan/model/user.py
  M ckan/new_authz.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/group/layout.html
  M ckan/templates/layout_base.html
  M ckan/tests/functional/api/__init__.py
  M ckan/tests/functional/test_group.py
  A ckan/tests/functional/test_publisher_auth.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/logic/test_action.py
  A ckan/tests/misc/test_auth_profiles.py
  A ckan/tests/mock_publisher_auth.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-1781-add-term-translation-table


  Commit: fb967293b5935671c32e93a557a4b42dbeead865
      https://github.com/okfn/ckan/commit/fb967293b5935671c32e93a557a4b42dbeead865
  Author: kindly <kindly at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    R ckan/migration/versions/049_term_translation_table.py
  A ckan/migration/versions/050_term_translation_table.py

  Log Message:
  -----------
  [1781] change migration number due to merge


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

  Changed paths:
    M ckan/tests/logic/test_tag_vocab.py

  Log Message:
  -----------
  [1767][tests] test that vocab tags are passed to dataset view page


  Commit: 7f029ce19b619b103104a646d84b52dbf9ca8f88
      https://github.com/okfn/ckan/commit/7f029ce19b619b103104a646d84b52dbf9ca8f88
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Code (whitespace) cleanup


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

  Changed paths:
    M ckan/logic/action/get.py
  M ckan/model/tag.py
  M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#1723] Update tag_search() and tag_autocomplete() for vocabularies.

Update tag_search() logic action function to filter by vocabulary.

Update tag_autocomplete() logic action function to filter by vocabulary.
Removed most of the code from this method as it seemed unnecessary, it just
calls tag_search() after doing its own auth check and then transforms the
result a little and returns it.

test_action.py: Add tests for tag_autocomplete() with vocabs.

Fix a mistake in model.Tag.all(), if no vocab specified return only free tags.


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

  Changed paths:
    M ckan/tests/logic/test_action.py
  M ckan/tests/logic/test_tag_vocab.py

  Log Message:
  -----------
  Merge branch 'feature-1698-tag-taxonomies' of github.com:okfn/ckan into feature-1698-tag-taxonomies


  Commit: 643a800bfa7b76074203f332218506d1db3da854
      https://github.com/okfn/ckan/commit/643a800bfa7b76074203f332218506d1db3da854
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/model/group.py
  M ckan/public/scripts/application.js

  Log Message:
  -----------
  [1794] Added autocomplete for groups


  Commit: 0546a5ed1be7f090d1eb3f8ebeb2071b2f324c10
      https://github.com/okfn/ckan/commit/0546a5ed1be7f090d1eb3f8ebeb2071b2f324c10
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M ckan/controllers/group.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py

  Log Message:
  -----------
  [1794] Allowing group create/update to optionally add the parent group


  Commit: 64900fae93d617f442b46a250e50d9c083644916
      https://github.com/okfn/ckan/commit/64900fae93d617f442b46a250e50d9c083644916
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    R ckan/migration/versions/0049_add_group_approval_status.py
  A ckan/migration/versions/049_add_group_approval_status.py

  Log Message:
  -----------
  [1794] Fixed dodgy migration name


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

  Changed paths:
    M ckan/logic/converters.py

  Log Message:
  -----------
  [1720][converters] return a list of tags instead of a tag string from convert_from_tags


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

  Changed paths:
    M ckan/tests/logic/test_tag_vocab.py

  Log Message:
  -----------
  [1767][tests] Add vocab tag select to edit form in plugin.
Tidy up TestWUI.


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

  Changed paths:
    M ckan/logic/action/get.py
  M ckan/model/tag.py
  M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch 'feature-1698-tag-taxonomies' of github.com:okfn/ckan into feature-1698-tag-taxonomies


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

  Changed paths:
    M ckan/logic/action/get.py
  M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#1724] Add tests for tag_search() logic action function

And fix a couple of bugs found in tag_search() and tag_list() in the process,
and factor out some code repetition, and add some docstrings.


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

  Changed paths:
    M ckan/logic/converters.py
  M ckan/tests/logic/test_tag_vocab.py

  Log Message:
  -----------
  Merge branch 'feature-1698-tag-taxonomies' of github.com:okfn/ckan into feature-1698-tag-taxonomies


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

  Changed paths:
    M ckan/tests/logic/test_tag_vocab.py

  Log Message:
  -----------
  [1767][tests] add WUI test for changing the vocab tags on a dataset


  Commit: 4f64b254fa02010b0713dab79c32edcd3493cc9e
      https://github.com/okfn/ckan/commit/4f64b254fa02010b0713dab79c32edcd3493cc9e
  Author: John Glover <j at johnglover.net>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M ckan/tests/logic/test_tag_vocab.py

  Log Message:
  -----------
  [1767][tests] update tag vocab WUI tests - remove vocab tags after each test


  Commit: 5cfdb52c5f3b123d6854f55c9818a95d4f0b4b7f
      https://github.com/okfn/ckan/commit/5cfdb52c5f3b123d6854f55c9818a95d4f0b4b7f
  Author: John Glover <j at johnglover.net>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M ckan/tests/logic/test_tag_vocab.py

  Log Message:
  -----------
  [1767][tests] update tag vocab tests - rename test


  Commit: 718d0f79aa12ce5e5926eb2d9b82d846b65d1599
      https://github.com/okfn/ckan/commit/718d0f79aa12ce5e5926eb2d9b82d846b65d1599
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py
  R ckan/migration/versions/0049_add_group_approval_status.py
  A ckan/migration/versions/049_add_group_approval_status.py
  M ckan/model/group.py
  M ckan/public/scripts/application.js

  Log Message:
  -----------
  Merge branch 'feature-1794-publisher-changes'


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

  Changed paths:
    M ckan/tests/logic/test_tag_vocab.py

  Log Message:
  -----------
  [1767][tests] update tag vocab tests - add WUI tests for removing and changing vocab tags


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

  Changed paths:
    A ckan/tests/functional/test_tag_vocab.py
  M ckan/tests/logic/test_tag_vocab.py

  Log Message:
  -----------
  [1767][tests] Move tag vocab WUI tests to tests/functional


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

  Changed paths:
    M ckan/logic/action/delete.py
  M ckan/tests/functional/api/model/test_vocabulary.py

  Log Message:
  -----------
  [#1776] Fix tag_delete() arguments

Accept an 'id' key  that can be either the tag id or the tag name, and a
'vocabulary_id' that can be the vocab id or the vocab name.

Update the tests.


  Commit: 9da2756d6395f98b4c458cf7e5f000aa8553d7ce
      https://github.com/okfn/ckan/commit/9da2756d6395f98b4c458cf7e5f000aa8553d7ce
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    A ckan/tests/functional/test_tag_vocab.py
  M ckan/tests/logic/test_tag_vocab.py

  Log Message:
  -----------
  Merge branch 'feature-1698-tag-taxonomies' of github.com:okfn/ckan into feature-1698-tag-taxonomies


  Commit: 0446c0c5e21944df9aa2d68c22edbe989e6c4d0a
      https://github.com/okfn/ckan/commit/0446c0c5e21944df9aa2d68c22edbe989e6c4d0a
  Author: John Glover <j at johnglover.net>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

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

  Log Message:
  -----------
  [1767][tests] Update tag vocab WUI tests - handle multiple values from select object. Add test for adding multiple tags.


  Commit: 8c3bfaf45c16ee265afaee5f6533a88351f1d2c9
      https://github.com/okfn/ckan/commit/8c3bfaf45c16ee265afaee5f6533a88351f1d2c9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

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

  Log Message:
  -----------
  Merge branch 'feature-1698-tag-taxonomies' of github.com:okfn/ckan into feature-1698-tag-taxonomies


  Commit: 40d3f5a0363658e48b74a43bb693f285082de973
      https://github.com/okfn/ckan/commit/40d3f5a0363658e48b74a43bb693f285082de973
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M ckan/logic/action/delete.py
  M ckan/tests/functional/api/model/test_vocabulary.py

  Log Message:
  -----------
  [#1776] Allow deleting free tags via tag_delete()


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

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

  Log Message:
  -----------
  [1767][tests] quick fix for problem that plugins.unload() does not remove a plugin from the plugins.PluginImplementations(IDatasetForm) list.


  Commit: 66993a277fcc2876be82f91cee81b382801373fc
      https://github.com/okfn/ckan/commit/66993a277fcc2876be82f91cee81b382801373fc
  Author: John Glover <j at johnglover.net>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

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

  Log Message:
  -----------
  [1767][tests] bug fix: only use custom select class for TestWUI


  Commit: 88bcb8d4c9325ba0d0976d66e832a37c59a1d78c
      https://github.com/okfn/ckan/commit/88bcb8d4c9325ba0d0976d66e832a37c59a1d78c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

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

  Log Message:
  -----------
  Merge branch 'feature-1698-tag-taxonomies' of github.com:okfn/ckan into feature-1698-tag-taxonomies


  Commit: 00c071ff8cb972201e582ca98e99a4f2f948750e
      https://github.com/okfn/ckan/commit/00c071ff8cb972201e582ca98e99a4f2f948750e
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

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

  Log Message:
  -----------
  [xs] Fixing publisher group test that had not run under sqlite


  Commit: 3c5e5a268ac5dc69dfe00dcb034e7d456062ddd6
      https://github.com/okfn/ckan/commit/3c5e5a268ac5dc69dfe00dcb034e7d456062ddd6
  Author: John Glover <j at johnglover.net>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M ckan/controllers/package.py
  M ckan/tests/functional/test_tag_vocab.py

  Log Message:
  -----------
  [1767][controllers][tests] fix issues with tag vocab test mock plugin interfering with other tests

update package controller register pluggable behaviour function to clear controller behaviour list and default behaviour at the start of each run


  Commit: 979ca6eef8eead70655b3b18d58dda4629e4bc94
      https://github.com/okfn/ckan/commit/979ca6eef8eead70655b3b18d58dda4629e4bc94
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M ckan/controllers/package.py
  M ckan/tests/functional/test_tag_vocab.py

  Log Message:
  -----------
  Merge branch 'feature-1698-tag-taxonomies' of github.com:okfn/ckan into feature-1698-tag-taxonomies


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

  Changed paths:
    M ckan/__init__.py
  M ckan/config/deployment.ini_tmpl
  M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/lib/search/__init__.py
  M ckan/logic/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/create.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/schema.py
  A ckan/migration/versions/049_add_group_approval_status.py
  M ckan/model/group.py
  M ckan/model/license.py
  M ckan/model/package.py
  M ckan/model/user.py
  M ckan/new_authz.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/group/layout.html
  M ckan/templates/layout_base.html
  M ckan/tests/forms/test_package.py
  M ckan/tests/functional/api/__init__.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  A ckan/tests/functional/test_publisher_auth.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/logic/test_action.py
  A ckan/tests/misc/test_auth_profiles.py
  A ckan/tests/mock_publisher_auth.py
  M ckan/tests/models/test_license.py
  M ckan/tests/models/test_package.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/common-error-messages.rst
  M doc/configuration.rst
  M doc/extensions.rst
  M doc/index.rst
  M doc/install-from-source.rst
  M doc/paster.rst
  R doc/plugins.rst
  R doc/prepare-extensions.rst
  A doc/writing-extensions.rst
  M requires/lucid_missing.txt
  M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-1698-tag-taxonomies


  Commit: 1a61d3e6c470009136448becc27bc247e19c4286
      https://github.com/okfn/ckan/commit/1a61d3e6c470009136448becc27bc247e19c4286
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M ckan/logic/auth/publisher/create.py
  M ckan/logic/auth/publisher/delete.py
  M ckan/logic/auth/publisher/update.py

  Log Message:
  -----------
  Import tag and vocab logic/auth functions in logic/auth/publisher modules


  Commit: 22a2ea2ffd240ecc98ca4fbb1a25d2403db7634a
      https://github.com/okfn/ckan/commit/22a2ea2ffd240ecc98ca4fbb1a25d2403db7634a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    R ckan/migration/versions/049_add_tag_vocabulary.py
  A ckan/migration/versions/050_add_tag_vocabulary.py

  Log Message:
  -----------
  Rename tag vocab migration script

It clashed with the group approval status migration script


  Commit: 91e9a2d44ad4c33f5cac6626ea49609401c94637
      https://github.com/okfn/ckan/commit/91e9a2d44ad4c33f5cac6626ea49609401c94637
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [#1608,bugfix][xs]: minor, but important bugfix for blob storage.

* Bug: we had merged ckanext-storage into core as part of #1608 but the JS was checking CKAN.Plugins list in javascript (build from ckan.plugins in config) when determining whether to show Upload button. Thus new users would not have known how to enable uploading.
* Fixed this by adding 'storage' to CKAN.Plugins in JS if ckan.storage.bucket config option is set.


  Commit: d59cd9c9d9fa406b6cec091d1699f0a7c62a9d50
      https://github.com/okfn/ckan/commit/d59cd9c9d9fa406b6cec091d1699f0a7c62a9d50
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

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

  Log Message:
  -----------
  [bugfix,js][xs]: make sure we do *not* genshi HTML escape json package and resource data we are inserting into pages (dataset edit and resource read).

* Had run into this via an odd bug whereby a resource url that was an html page was not previewing and reason was & had been converted to &


  Commit: e1864007a058e493c2e12f42c6eb726f0a39faf4
      https://github.com/okfn/ckan/commit/e1864007a058e493c2e12f42c6eb726f0a39faf4
  Author: kindly <kindly at gmail.com>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/helpers.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py
  R ckan/migration/versions/0049_add_group_approval_status.py
  A ckan/migration/versions/049_add_group_approval_status.py
  M ckan/model/group.py
  M ckan/public/scripts/application.js
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/resource_read.html
  M ckan/tests/functional/test_group.py
  M ckanext/publisher_form/templates/publisher_form.html

  Log Message:
  -----------
  Merge branch 'master' into feature-1781-add-term-translation-table


  Commit: 9d04f4fc95690bd2e1a3d2100a37143576322340
      https://github.com/okfn/ckan/commit/9d04f4fc95690bd2e1a3d2100a37143576322340
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

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

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-1698-tag-taxonomies


  Commit: 5075ed268dd4bf5c7c498947ccf081f27a2ac721
      https://github.com/okfn/ckan/commit/5075ed268dd4bf5c7c498947ccf081f27a2ac721
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M ckan/lib/search/query.py
  M ckan/model/package.py
  M ckan/tests/functional/test_authz.py
  M ckan/tests/lib/test_solr_package_search.py

  Log Message:
  -----------
  [#1698] Fix some failing psql tests


  Commit: 6acb26385688367e86af0a37c905cc4e61c660d0
      https://github.com/okfn/ckan/commit/6acb26385688367e86af0a37c905cc4e61c660d0
  Author: kindly <kindly at gmail.com>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/publisher/update.py
  M ckan/logic/auth/update.py
  M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [1781]  add api and tests


  Commit: 669a8e9f7a768b147b1668940842b72b2a302088
      https://github.com/okfn/ckan/commit/669a8e9f7a768b147b1668940842b72b2a302088
  Author: kindly <kindly at gmail.com>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/publisher/update.py
  M ckan/logic/auth/update.py
  A ckan/migration/versions/050_term_translation_table.py
  M ckan/model/__init__.py
  A ckan/model/term_translation.py
  M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch 'feature-1781-add-term-translation-table'


  Commit: a4aa80529e8b962b766427739bc581535ce0577a
      https://github.com/okfn/ckan/commit/a4aa80529e8b962b766427739bc581535ce0577a
  Author: kindly <kindly at gmail.com>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M ckan/__init__.py
  M ckan/config/deployment.ini_tmpl
  M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/authorization_group.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/controllers/user.py
  A ckan/lib/activity.py
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/base.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/hash.py
  M ckan/lib/helpers.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/index.py
  M ckan/logic/__init__.py
  M ckan/logic/action/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/create.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/schema.py
  M ckan/logic/validators.py
  A ckan/migration/versions/048_add_activity_streams_tables.py
  A ckan/migration/versions/049_add_group_approval_status.py
  A ckan/migration/versions/050_term_translation_table.py
  M ckan/model/__init__.py
  A ckan/model/activity.py
  M ckan/model/authorization_group.py
  M ckan/model/authz.py
  M ckan/model/group.py
  M ckan/model/license.py
  M ckan/model/meta.py
  M ckan/model/package.py
  M ckan/model/package_extra.py
  M ckan/model/resource.py
  M ckan/model/tag.py
  A ckan/model/term_translation.py
  M ckan/model/user.py
  M ckan/new_authz.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
  M ckan/public/scripts/templates.js
  A ckan/public/scripts/vendor/jquery.chosen/0.9.7/chosen.js
  M ckan/templates/_util.html
  A ckan/templates/activity_streams/added_tag.html
  A ckan/templates/activity_streams/changed_group.html
  A ckan/templates/activity_streams/changed_package.html
  A ckan/templates/activity_streams/changed_package_extra.html
  A ckan/templates/activity_streams/changed_resource.html
  A ckan/templates/activity_streams/changed_user.html
  A ckan/templates/activity_streams/deleted_group.html
  A ckan/templates/activity_streams/deleted_package.html
  A ckan/templates/activity_streams/deleted_package_extra.html
  A ckan/templates/activity_streams/deleted_resource.html
  A ckan/templates/activity_streams/new_group.html
  A ckan/templates/activity_streams/new_package.html
  A ckan/templates/activity_streams/new_package_extra.html
  A ckan/templates/activity_streams/new_resource.html
  A ckan/templates/activity_streams/new_user.html
  A ckan/templates/activity_streams/removed_tag.html
  M ckan/templates/group/layout.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/history.html
  M ckan/templates/package/read.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/user/read.html
  M ckan/tests/forms/test_package.py
  M ckan/tests/functional/api/__init__.py
  M ckan/tests/functional/api/base.py
  A ckan/tests/functional/api/test_activity.py
  A ckan/tests/functional/test_activity.py
  M ckan/tests/functional/test_edit_authz.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_package_edit_authz.py
  A ckan/tests/functional/test_publisher_auth.py
  M ckan/tests/functional/test_user.py
  M ckan/tests/lib/test_alphabet_pagination.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  A ckan/tests/lib/test_hash.py
  M ckan/tests/lib/test_helpers.py
  M ckan/tests/logic/test_action.py
  A ckan/tests/misc/test_auth_profiles.py
  A ckan/tests/mock_publisher_auth.py
  M ckan/tests/models/test_license.py
  M ckan/tests/models/test_package.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/apiv3.rst
  M doc/common-error-messages.rst
  M doc/configuration.rst
  M doc/extensions.rst
  M doc/index.rst
  M doc/install-from-source.rst
  M doc/paster.rst
  R doc/plugins.rst
  R doc/prepare-extensions.rst
  A doc/writing-extensions.rst
  M requires/lucid_missing.txt
  M setup.py

  Log Message:
  -----------
  Merge branch 'master' into feature-1741-add-datasetview-extension


  Commit: 7825caed3361e88a245b5dd2f946da8bedb160e0
      https://github.com/okfn/ckan/commit/7825caed3361e88a245b5dd2f946da8bedb160e0
  Author: kindly <kindly at gmail.com>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M ckan/controllers/group.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/plugins/interfaces.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [1741] add group view, fix tests


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

  Changed paths:
    M ckan/logic/action/get.py
  M ckan/model/tag.py
  M ckan/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/test_tag_vocab.py
  M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#1698] Tag and vocab logic functions tweaks

Fix tag_list() and Tag.all() to handle both the optional query and
vocabulary_id correctly, and change 'vocabulary_name' arguments in tag
and vocab logic functions to 'vocabulary_id' arguments that can be
either name or ID (to be consistent with other logic functions).


  Commit: 5a5f78793d90a4d79aeb575acb10c1ed2b0e44a9
      https://github.com/okfn/ckan/commit/5a5f78793d90a4d79aeb575acb10c1ed2b0e44a9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/publisher/update.py
  M ckan/logic/auth/update.py
  R ckan/migration/versions/050_add_tag_vocabulary.py
  A ckan/migration/versions/050_term_translation_table.py
  A ckan/migration/versions/051_add_tag_vocabulary.py
  M ckan/model/__init__.py
  A ckan/model/term_translation.py
  M ckan/plugins/interfaces.py
  M ckan/templates/package/read.html
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-1698-tag-taxonomies

Conflicts:
	ckan/logic/auth/update.py


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

  Changed paths:
    M ckan/controllers/api.py
  M ckan/controllers/package.py
  M ckan/forms/common.py
  M ckan/forms/package_dict.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/search/query.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
  M ckan/logic/auth/publisher/create.py
  M ckan/logic/auth/publisher/delete.py
  M 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/051_add_tag_vocabulary.py
  M ckan/model/__init__.py
  M ckan/model/package.py
  M ckan/model/tag.py
  A ckan/model/vocabulary.py
  M ckan/templates/_util.html
  M ckan/templates/package/new_package_form.html
  M ckan/tests/forms/test_package.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_package.py
  A ckan/tests/functional/test_tag_vocab.py
  M ckan/tests/lib/test_dictization.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
  M ckan/tests/models/test_package.py
  M ckan/tests/models/test_purge_revision.py

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


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

  Changed paths:
    M ckan/logic/action/get.py
  M ckan/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/test_tag_vocab.py

  Log Message:
  -----------
  Tweak vocabulary_show() arguments

Be consistent with other *_show() logic functions: accept an 'id'
argument that can be either the vocab ID or the name.


  Commit: 0e892f8cbfbc95d0754a9bd781586fd46053bd3b
      https://github.com/okfn/ckan/commit/0e892f8cbfbc95d0754a9bd781586fd46053bd3b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M ckan/logic/action/delete.py
  M ckan/logic/action/update.py

  Log Message:
  -----------
  Tweak vocab API error messages

Make them all use the same string, easier to translate


  Commit: 05f1273389b0ba8ef94dd4a461ef082631fd8378
      https://github.com/okfn/ckan/commit/05f1273389b0ba8ef94dd4a461ef082631fd8378
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M ckan/logic/action/update.py
  M ckan/tests/functional/api/model/test_vocabulary.py

  Log Message:
  -----------
  Fix vocabulary_update() when no id given


  Commit: 9e6872aa80adc911d4e17a28c862e2956db6c506
      https://github.com/okfn/ckan/commit/9e6872aa80adc911d4e17a28c862e2956db6c506
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M ckan/logic/action/delete.py
  M ckan/tests/functional/api/model/test_vocabulary.py

  Log Message:
  -----------
  Fix vocabulary_delete() when no id given


  Commit: 8b20b91da9e238fd7142d4a120ac87d591c9d1b7
      https://github.com/okfn/ckan/commit/8b20b91da9e238fd7142d4a120ac87d591c9d1b7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M ckan/logic/action/delete.py
  M ckan/tests/functional/api/model/test_vocabulary.py

  Log Message:
  -----------
  Tweak tag_delete() error messages

Make them more consistent with those of other logic functions


  Commit: 277dc15a60bdd9f9355b3b7614cd87f07eb57806
      https://github.com/okfn/ckan/commit/277dc15a60bdd9f9355b3b7614cd87f07eb57806
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M ckan/logic/action/get.py
  M ckan/logic/action/update.py

  Log Message:
  -----------
  Remove some unnecessary lines of code


  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


Compare: https://github.com/okfn/ckan/compare/a82bd69...950a9f0

• Previous message: [ckan-changes] [okfn/ckan] 3d7cbf: [#1057][xs] escape pjson callback
• Next message: [ckan-changes] [okfn/ckan] bf88c4: [1767][tests] move test_tag_list_vocab to test_act...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]