[ckan-changes] [okfn/ckan] a62293: Add basic datastore extension skeleton with create...

Wed Sep 12 23:08:30 UTC 2012

  Branch: refs/heads/2375-demo-theme-development
  Home:   https://github.com/okfn/ckan
  Commit: a62293aff9884d9a4b3a5f6e323fffdd7c1d6a10
      https://github.com/okfn/ckan/commit/a62293aff9884d9a4b3a5f6e323fffdd7c1d6a10
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

  Changed paths:
    A ckanext/datastore/__init__.py
    A ckanext/datastore/db.py
    A ckanext/datastore/logic/__init__.py
    A ckanext/datastore/logic/action/__init__.py
    A ckanext/datastore/logic/action/create.py
    A ckanext/datastore/logic/auth/__init__.py
    A ckanext/datastore/logic/auth/create.py
    A ckanext/datastore/logic/schema.py
    A ckanext/datastore/plugin.py
    A ckanext/datastore/tests/__init__.py
    A ckanext/datastore/tests/test_datastore.py
    M setup.py

  Log Message:
  -----------
  Add basic datastore extension skeleton with create logic/auth functions and tests.

  Commit: 1a8709debf5d6b4e89162cc8a38c912585d2d376
      https://github.com/okfn/ckan/commit/1a8709debf5d6b4e89162cc8a38c912585d2d376
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

  Changed paths:
    M ckanext/datastore/logic/action/create.py
    M ckanext/datastore/logic/schema.py

  Log Message:
  -----------
  Bug fix: records field can be empty.

  Commit: ee0cb2dae07281430b784880284999b9c806f7e7
      https://github.com/okfn/ckan/commit/ee0cb2dae07281430b784880284999b9c806f7e7
  Author: kindly <kindly at gmail.com>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action/create.py

  Log Message:
  -----------
  [2733] add engines and basic transaction scaffolding for create

  Commit: 25f5fc5230562ae265b9bba7d11f92c387a506e3
      https://github.com/okfn/ckan/commit/25f5fc5230562ae265b9bba7d11f92c387a506e3
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action/create.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/2733-feature-datastore' into 2733-feature-datastore

  Commit: 9bb2462a8a913e8d0ea75234113bb04f468e70c9
      https://github.com/okfn/ckan/commit/9bb2462a8a913e8d0ea75234113bb04f468e70c9
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action/create.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Check for datastore_write_url at startup, pass to db from logic functions. Don't validate fields and records.

  Commit: cce90af7663ab747426ad9165879ebd6c2c025da
      https://github.com/okfn/ckan/commit/cce90af7663ab747426ad9165879ebd6c2c025da
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action/create.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  Check field types, raise an error if any are invalid.

  Commit: c1926898a885a1e46e7e3931275228dc49cd471c
      https://github.com/okfn/ckan/commit/c1926898a885a1e46e7e3931275228dc49cd471c
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action/create.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2733] Add basic create table functionality.

  Commit: 3a91c400bbedfb601cd7a616eadd16d8125d6c5f
      https://github.com/okfn/ckan/commit/3a91c400bbedfb601cd7a616eadd16d8125d6c5f
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#2733] Bug fix: commit transaction.

  Commit: 5ca857cabe6ef95e128173649af0b2cd450e7899
      https://github.com/okfn/ckan/commit/5ca857cabe6ef95e128173649af0b2cd450e7899
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2733] Add insert_data function and update tests.

  Commit: 0f3319b2fdf43ff25e56a45f9c06bafba4abc6ca
      https://github.com/okfn/ckan/commit/0f3319b2fdf43ff25e56a45f9c06bafba4abc6ca
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#2733] Refactor: tidy up insert sql statement.

  Commit: a5d44a1dcfd45f031bb9365258def080fd02dec5
      https://github.com/okfn/ckan/commit/a5d44a1dcfd45f031bb9365258def080fd02dec5
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#2733] Refactor: tidy up create sql statement.

  Commit: 981cf79e83153bdc4cd75d288939c70077d2b595
      https://github.com/okfn/ckan/commit/981cf79e83153bdc4cd75d288939c70077d2b595
  Author: kindly <kindly at gmail.com>
  Date:   2012-07-28 (Sat, 28 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action/create.py
    M ckanext/datastore/logic/auth/create.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  create finished apart from table update

  Commit: ac3d2610ac4d26603f370d695f501e7bd02ed0ef
      https://github.com/okfn/ckan/commit/ac3d2610ac4d26603f370d695f501e7bd02ed0ef
  Author: kindly <kindly at gmail.com>
  Date:   2012-07-28 (Sat, 28 Jul 2012)

  Changed paths:
    M ckanext/datastore/logic/action/create.py
    M ckanext/datastore/logic/auth/create.py

  Log Message:
  -----------
  change auth to resource update

  Commit: 1195ca73ab20727e29bf239f716ca50bb41bca9b
      https://github.com/okfn/ckan/commit/1195ca73ab20727e29bf239f716ca50bb41bca9b
  Author: kindly <kindly at gmail.com>
  Date:   2012-07-29 (Sun, 29 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [2722] finish datastore create

  Commit: 785cd095c655d8922992d47bf5df78bc2bf93552
      https://github.com/okfn/ckan/commit/785cd095c655d8922992d47bf5df78bc2bf93552
  Author: kindly <kindly at gmail.com>
  Date:   2012-07-29 (Sun, 29 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/auth/create.py

  Log Message:
  -----------
  [2733] start delete

  Commit: 5f9cae9ba7dc3a009f66fef27b88f23227d16306
      https://github.com/okfn/ckan/commit/5f9cae9ba7dc3a009f66fef27b88f23227d16306
  Author: kindly <kindly at gmail.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py
    A ckanext/datastore/logic/action/delete.py
    A ckanext/datastore/logic/auth/delete.py

  Log Message:
  -----------
  [2733] add delete logic files

  Commit: 8a93747b541aac6a3d87f04c96c89af67919a6cd
      https://github.com/okfn/ckan/commit/8a93747b541aac6a3d87f04c96c89af67919a6cd
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action/create.py
    M ckanext/datastore/logic/auth/create.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2733] Datastore PEP8 cleanup.

  Commit: 5daba25f33b9b7c2021c0a879e65e7be3f81e43c
      https://github.com/okfn/ckan/commit/5daba25f33b9b7c2021c0a879e65e7be3f81e43c
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action/create.py
    M ckanext/datastore/logic/action/delete.py
    M ckanext/datastore/logic/auth/delete.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2733] Fix datastore delete (no filters).

Add basic datastore delete test.

Fix bug in create/delete: make sure extra information
that was put into the data_dict is not returned
from the logic function.

  Commit: 7e31f903d23185ac3f34a2b50174e0a10db105eb
      https://github.com/okfn/ckan/commit/7e31f903d23185ac3f34a2b50174e0a10db105eb
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2733] Update basic delete test: make sure table
has actually been deleted.

  Commit: 81816553cc282c8b80de684843e572dff45f2e5c
      https://github.com/okfn/ckan/commit/81816553cc282c8b80de684843e572dff45f2e5c
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckanext/datastore/logic/action/create.py
    M ckanext/datastore/logic/action/delete.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2733] Check that resource ID exists for create/delete
logic functions. Add test for deleting invalid
resource ID.

  Commit: e1c00b7b9bf02e4d9aa06a30fb77617a8b8d3684
      https://github.com/okfn/ckan/commit/e1c00b7b9bf02e4d9aa06a30fb77617a8b8d3684
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    R ckanext/datastore/logic/schema.py

  Log Message:
  -----------
  [#2733] Remove schema for now as not used.

  Commit: d8fb53323ce4ddf3a8a845c01e6f685aa6ba2d32
      https://github.com/okfn/ckan/commit/d8fb53323ce4ddf3a8a845c01e6f685aa6ba2d32
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2733] Test datastore delete filters.

  Commit: 99e53587423e4a972ba1c4253b5aaf6475b0bd2f
      https://github.com/okfn/ckan/commit/99e53587423e4a972ba1c4253b5aaf6475b0bd2f
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py
    A ckanext/datastore/logic/action/get.py
    M ckanext/datastore/logic/auth/create.py
    M ckanext/datastore/logic/auth/delete.py
    A ckanext/datastore/logic/auth/get.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2733] Add code skeleton for datastore_search.

  Commit: 50b636b3839c0101d69514a860536e2c75c08f60
      https://github.com/okfn/ckan/commit/50b636b3839c0101d69514a860536e2c75c08f60
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    A ckanext/datastore/logic/action.py
    R ckanext/datastore/logic/action/__init__.py
    R ckanext/datastore/logic/action/create.py
    R ckanext/datastore/logic/action/delete.py
    R ckanext/datastore/logic/action/get.py
    A ckanext/datastore/logic/auth.py
    R ckanext/datastore/logic/auth/__init__.py
    R ckanext/datastore/logic/auth/create.py
    R ckanext/datastore/logic/auth/delete.py
    R ckanext/datastore/logic/auth/get.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#2733] Refactor: Move auth/action into single files,
currently small functions with duplicated code.

  Commit: 68574937d3023367f22607b9c3e4b35e30db4ae2
      https://github.com/okfn/ckan/commit/68574937d3023367f22607b9c3e4b35e30db4ae2
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2733] Add basic search (just processing filters and fields parameters).

  Commit: 23447062f6c4d0e88ffdbb8665d0e85b1a392678
      https://github.com/okfn/ckan/commit/23447062f6c4d0e88ffdbb8665d0e85b1a392678
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2733] Implement datastore_search offset and limit.

  Commit: e3918114010e60c88fe0884c2572b688cfe6dd1d
      https://github.com/okfn/ckan/commit/e3918114010e60c88fe0884c2572b688cfe6dd1d
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2733] Implement full text search in datastore_search ('q').

  Commit: 67e6f4c385a414d19192a93f6fd8553593886cba
      https://github.com/okfn/ckan/commit/67e6f4c385a414d19192a93f6fd8553593886cba
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2733] Implement datastore_search sort parameter.

  Commit: b264dcbc84a912b0476dba3f126c88209ab3b428
      https://github.com/okfn/ckan/commit/b264dcbc84a912b0476dba3f126c88209ab3b428
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2733] Check that limit and offset are integers.

  Commit: 697ed53a35f7a177c08203dd5f6b45e3c3414ae4
      https://github.com/okfn/ckan/commit/697ed53a35f7a177c08203dd5f6b45e3c3414ae4
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#2733] Bug fix: pass 'q' as %s instead of inserting value into string.

  Commit: abd25e415cd49be39d2814ef3924fff127b12621
      https://github.com/okfn/ckan/commit/abd25e415cd49be39d2814ef3924fff127b12621
  Author: John Glover <j at johnglover.net>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#2733] Tidy up: remove unneeded 'factor' call.

  Commit: f411b79d9eecb734461405722068451371e74394
      https://github.com/okfn/ckan/commit/f411b79d9eecb734461405722068451371e74394
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-07 (Tue, 07 Aug 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2733] parse and validate sort

  Commit: 2fc489dc9913babb7d9d04a08c7f4c9c216850b9
      https://github.com/okfn/ckan/commit/2fc489dc9913babb7d9d04a08c7f4c9c216850b9
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-07 (Tue, 07 Aug 2012)

  Changed paths:
    M ckanext/datastore/logic/auth.py

  Log Message:
  -----------
  [#2733] make search permission more liberal

  Commit: b609677a3c3cd54e0a906380f976f5b8c4fab815
      https://github.com/okfn/ckan/commit/b609677a3c3cd54e0a906380f976f5b8c4fab815
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-07 (Tue, 07 Aug 2012)

  Changed paths:
    M LICENSE.txt
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/model/authz.py
    M ckan/model/license.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/tests/forms/test_package.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_revision.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_resource.py

  Log Message:
  -----------
  Merge branch 'master' into 2733-feature-datastore

  Commit: 7f96408939a1324875f483104f887e1e9e010831
      https://github.com/okfn/ckan/commit/7f96408939a1324875f483104f887e1e9e010831
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-07 (Tue, 07 Aug 2012)

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

  Commit: aedb12450977a102be479611044af184ee98e2b9
      https://github.com/okfn/ckan/commit/aedb12450977a102be479611044af184ee98e2b9
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-07 (Tue, 07 Aug 2012)

  Changed paths:
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#2733] fix issue with auth change

  Commit: 97782d9d30dd93e9b1dcf05066375f0e9e15c9d1
      https://github.com/okfn/ckan/commit/97782d9d30dd93e9b1dcf05066375f0e9e15c9d1
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-08 (Wed, 08 Aug 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2733] add json type

  Commit: e5d95b7b47160545af1ea0aebac16327447954b4
      https://github.com/okfn/ckan/commit/e5d95b7b47160545af1ea0aebac16327447954b4
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-08 (Wed, 08 Aug 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#2733] add extra date types, make sure side effect free queries

  Commit: 5501b1350e9cd92b6d956ff0f2e71df9e1702f65
      https://github.com/okfn/ckan/commit/5501b1350e9cd92b6d956ff0f2e71df9e1702f65
  Author: Daniel Lewis <daniel at vanirsystems.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M doc/datastore.rst

  Log Message:
  -----------
  modified: doc/datastore.rst

Changed datastore.rst to detail most recent datastore api changes

  Commit: fdec7089b49a3dcd1859e11222427609b4d7a418
      https://github.com/okfn/ckan/commit/fdec7089b49a3dcd1859e11222427609b4d7a418
  Author: Daniel Lewis <daniel at vanirsystems.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M doc/datastore.rst
    M doc/using-data-api.rst

  Log Message:
  -----------
  Modified datastore.rst and changed using-data-api.rst to reflect new datastore api

  Commit: ab7ded798bde1b09ed3769c6b8f91ee44fd411a9
      https://github.com/okfn/ckan/commit/ab7ded798bde1b09ed3769c6b8f91ee44fd411a9
  Author: Daniel Lewis <daniel at vanirsystems.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M doc/using-data-api.rst

  Log Message:
  -----------
  Added python code to using-data-api.rst and made some other minor adjustments on the page, including some detail about creating a dataset+resource

  Commit: 31a751969c5209a5db7c9dd4d4c96497c5efb16d
      https://github.com/okfn/ckan/commit/31a751969c5209a5db7c9dd4d4c96497c5efb16d
  Author: Daniel Lewis <daniel at vanirsystems.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M doc/datastore.rst
    M doc/using-data-api.rst

  Log Message:
  -----------
  Changed around some things in datastore and using the data api pages, as requested by Rufus

  Commit: 0525c9862129a85e55b859e6236614b55075d891
      https://github.com/okfn/ckan/commit/0525c9862129a85e55b859e6236614b55075d891
  Author: Daniel Lewis <daniel at vanirsystems.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M doc/using-data-api.rst

  Log Message:
  -----------
  Using Data API documentation now reflects GET-based datastore_search, and also includes a Python URLLib2 example

  Commit: b8eb66d861121c3cb7775370d7ff742c600321c7
      https://github.com/okfn/ckan/commit/b8eb66d861121c3cb7775370d7ff742c600321c7
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M doc/datastore.rst
    M doc/using-data-api.rst

  Log Message:
  -----------
  [doc/datastore][s]: minor refactoring and tidying of the docs.

  Commit: c09fc64278ee99e7fa663b6db77b735ab05120b2
      https://github.com/okfn/ckan/commit/c09fc64278ee99e7fa663b6db77b735ab05120b2
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M .tx/config
    M CHANGELOG.txt
    M ckan/__init__.py
    M ckan/config/routing.py
    M ckan/controllers/group.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/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
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    R ckan/lib/activity.py
    A ckan/lib/activity_streams.py
    A ckan/lib/activity_streams_session_extension.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.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/publisher/create.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/059_add_related_count_and_flag.py
    M ckan/model/meta.py
    M ckan/model/related.py
    M ckan/public/scripts/application.js
    M ckan/public/scripts/templates.js
    A ckan/public/scripts/vendor/moment/1.6.2/moment.js
    A ckan/public/scripts/vendor/mustache/0.5.0-dev/mustache.js
    R ckan/public/scripts/vendor/recline/css/data-explorer.css
    R ckan/public/scripts/vendor/recline/css/graph.css
    R ckan/public/scripts/vendor/recline/css/grid.css
    R ckan/public/scripts/vendor/recline/css/images/edit-map.png
    R ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
    R ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
    R ckan/public/scripts/vendor/recline/css/map.css
    A ckan/public/scripts/vendor/recline/css/recline.css
    M ckan/public/scripts/vendor/recline/recline.js
    A ckan/public/scripts/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    A ckan/public/scripts/vendor/slickgrid/2.0.1/README.txt
    A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-asc.gif
    A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-desc.gif
    A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.css
    A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckan/public/scripts/vendor/slickgrid/images/actions.gif
    R ckan/public/scripts/vendor/slickgrid/images/ajax-loader-small.gif
    R ckan/public/scripts/vendor/slickgrid/images/arrow_redo.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_right_peppermint.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_right_spearmint.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_undo.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_blue.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_star.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_minus.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_plus.png
    R ckan/public/scripts/vendor/slickgrid/images/calendar.gif
    R ckan/public/scripts/vendor/slickgrid/images/collapse.gif
    R ckan/public/scripts/vendor/slickgrid/images/comment_yellow.gif
    R ckan/public/scripts/vendor/slickgrid/images/down.gif
    R ckan/public/scripts/vendor/slickgrid/images/drag-handle.png
    R ckan/public/scripts/vendor/slickgrid/images/editor-helper-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/expand.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-columns-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-columns-over-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/help.png
    R ckan/public/scripts/vendor/slickgrid/images/info.gif
    R ckan/public/scripts/vendor/slickgrid/images/listview.gif
    R ckan/public/scripts/vendor/slickgrid/images/pencil.gif
    R ckan/public/scripts/vendor/slickgrid/images/row-over-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-asc.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-asc.png
    R ckan/public/scripts/vendor/slickgrid/images/sort-desc.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-desc.png
    R ckan/public/scripts/vendor/slickgrid/images/stripes.png
    R ckan/public/scripts/vendor/slickgrid/images/tag_red.png
    R ckan/public/scripts/vendor/slickgrid/images/tick.png
    R ckan/public/scripts/vendor/slickgrid/images/user_identity.gif
    R ckan/public/scripts/vendor/slickgrid/images/user_identity_plus.gif
    R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.css
    R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.js
    R ckan/public/scripts/vendor/slickgrid/slick.grid.css
    R ckan/public/scripts/vendor/slickgrid/slick.grid.js
    R ckan/templates/_snippet/add-related.html
    M ckan/templates/_util.html
    A ckan/templates/activity_streams/activity_stream_items.html
    R ckan/templates/activity_streams/added_tag.html
    R ckan/templates/activity_streams/changed_group.html
    R ckan/templates/activity_streams/changed_package.html
    R ckan/templates/activity_streams/changed_package_extra.html
    R ckan/templates/activity_streams/changed_resource.html
    R ckan/templates/activity_streams/changed_user.html
    R ckan/templates/activity_streams/deleted_group.html
    R ckan/templates/activity_streams/deleted_package.html
    R ckan/templates/activity_streams/deleted_package_extra.html
    R ckan/templates/activity_streams/deleted_resource.html
    R ckan/templates/activity_streams/follow_dataset.html
    R ckan/templates/activity_streams/follow_user.html
    R ckan/templates/activity_streams/new_group.html
    R ckan/templates/activity_streams/new_package.html
    R ckan/templates/activity_streams/new_package_extra.html
    R ckan/templates/activity_streams/new_resource.html
    R ckan/templates/activity_streams/new_user.html
    R ckan/templates/activity_streams/removed_tag.html
    M ckan/templates/js_strings.html
    M ckan/templates/package/layout.html
    R ckan/templates/package/related_list.html
    M ckan/templates/package/resource_embedded_dataviewer.html
    A ckan/templates/related/add-related.html
    A ckan/templates/related/dashboard.html
    A ckan/templates/related/related_list.html
    M ckan/templates/snippets/recline-extra-footer.html
    M ckan/templates/snippets/recline-extra-header.html
    M ckan/templates/user/read.html
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_datastore.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M doc/_themes/sphinx-theme-okfn
    A doc/apps-ideas.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/paster.rst
    M doc/solr-setup.rst

  Log Message:
  -----------
  Merge branch 'master' into 2733-feature-datastore

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

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/sql.py
    M ckan/tests/lib/test_simple_search.py
    M doc/datastore.rst

  Log Message:
  -----------
  [#2733,merge][s]: Merge branch 'master' into 2733-feature-datastore and resolve minor conflict in doc/datastore.rst.

  Commit: 067431895f98496e6ad15a46357620bdbc7e9cde
      https://github.com/okfn/ckan/commit/067431895f98496e6ad15a46357620bdbc7e9cde
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#2733] add 60 second query time out

  Commit: 6e376d535b217c00c24e1fac83f327b7e2b2d840
      https://github.com/okfn/ckan/commit/6e376d535b217c00c24e1fac83f327b7e2b2d840
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/sql.py
    M ckan/tests/lib/test_simple_search.py
    M doc/datastore.rst

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

  Commit: fceeed074c8dd6a97a817819aabbca8f5f4fbb2a
      https://github.com/okfn/ckan/commit/fceeed074c8dd6a97a817819aabbca8f5f4fbb2a
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Fixed prettyfication of ValidationErrors and typo

  Commit: 0309f90c83349145e220d2b18cd049bcfbba9deb
      https://github.com/okfn/ckan/commit/0309f90c83349145e220d2b18cd049bcfbba9deb
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2733] sort out unicode

  Commit: 708b332375e24bd6267f1f8e4f10e253b25a20fb
      https://github.com/okfn/ckan/commit/708b332375e24bd6267f1f8e4f10e253b25a20fb
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#2733] remove empty line

  Commit: d7f791e5946d3a8191b2c397609eeb0fc8375b8a
      https://github.com/okfn/ckan/commit/d7f791e5946d3a8191b2c397609eeb0fc8375b8a
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2733] merge conflicts

  Commit: baed742b733b738f73cff2d2c0a1c1a81f8cedb1
      https://github.com/okfn/ckan/commit/baed742b733b738f73cff2d2c0a1c1a81f8cedb1
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-21 (Tue, 21 Aug 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2733] sort out full text indexing

  Commit: f82c5d105f84e65d030574f1b5fcb3c082458e1d
      https://github.com/okfn/ckan/commit/f82c5d105f84e65d030574f1b5fcb3c082458e1d
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-23 (Thu, 23 Aug 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/public/scripts/application.js
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2733] turn echo is off

  Commit: cdae2b78ca46b69b874e2a329fea5f28a3d28b5c
      https://github.com/okfn/ckan/commit/cdae2b78ca46b69b874e2a329fea5f28a3d28b5c
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-23 (Thu, 23 Aug 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/public/scripts/application.js
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  Revert "[#2733] turn echo is off"

This reverts commit f82c5d105f84e65d030574f1b5fcb3c082458e1d.

  Commit: db9bfe6b258e06037c1b35de689a8fe3ae13fcba
      https://github.com/okfn/ckan/commit/db9bfe6b258e06037c1b35de689a8fe3ae13fcba
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-23 (Thu, 23 Aug 2012)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#2733] turn echo is off

  Commit: 2e491fd8b743a4be060a17046124e093b55b4c66
      https://github.com/okfn/ckan/commit/2e491fd8b743a4be060a17046124e093b55b4c66
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-23 (Thu, 23 Aug 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/public/scripts/application.js
    A ckan/templates/package/datapreview.html
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2888] first attempt and datapreview on its own

  Commit: 74584927e1ec3f1e6f391aa79316b97a3e0ce441
      https://github.com/okfn/ckan/commit/74584927e1ec3f1e6f391aa79316b97a3e0ce441
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-23 (Thu, 23 Aug 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/public/scripts/application.js
    R ckan/templates/package/datapreview.html
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  Revert "[#2888] first attempt and datapreview on its own"

This reverts commit 2e491fd8b743a4be060a17046124e093b55b4c66.

  Commit: 35eef77e3366f17658b98a9153f0a313d2103dbd
      https://github.com/okfn/ckan/commit/35eef77e3366f17658b98a9153f0a313d2103dbd
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-23 (Thu, 23 Aug 2012)

  Changed paths:
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  [#2733] add datastore_active flag to resource dicts

  Commit: 95c97528e67de2bd8221449d0f574c4759b48a05
      https://github.com/okfn/ckan/commit/95c97528e67de2bd8221449d0f574c4759b48a05
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M ckan/public/scripts/application.js
    M ckan/public/scripts/vendor/recline/recline.js

  Log Message:
  -----------
  [#2733,js][s]: data viewer working with new (v2) DataStore.

* Upgraded to latest recline.js which has support for new CKAN datastore
* Refactor application.js setup code to use this plus new datastore_active flag

  Commit: 08b779f5bf6d493e2c06086c4e90163a09d2edff
      https://github.com/okfn/ckan/commit/08b779f5bf6d493e2c06086c4e90163a09d2edff
  Author: kindly <kindly at gmail.com>
  Date:   2012-09-11 (Tue, 11 Sep 2012)

  Changed paths:
    M ckan/authz.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    R ckan/controllers/authorization_group.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/forms/__init__.py
    M ckan/forms/authorization_group.py
    M ckan/forms/authz.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/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
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M 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/authztool.py
    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/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/__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/model/domain_object.py
    M ckan/model/license.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/_util.html
    M ckan/templates/admin/authz.html
    R ckan/templates/authorization_group/__init__.py
    R ckan/templates/authorization_group/authz.html
    R ckan/templates/authorization_group/edit.html
    R ckan/templates/authorization_group/edit_form.html
    R ckan/templates/authorization_group/index.html
    R ckan/templates/authorization_group/layout.html
    R ckan/templates/authorization_group/new.html
    R ckan/templates/authorization_group/read.html
    M ckan/templates/group/authz.html
    M ckan/templates/package/authz.html
    M ckan/templates/package/layout.html
    M ckan/templates/package/new_package_form.html
    M ckan/templates/package/read.rdf
    M ckan/templates/user/layout.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_group.py
    M ckan/tests/functional/test_package_edit_authz.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_cli.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
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/organizations/forms.py
    A ckanext/organizations/templates/organization_edit.html
    M doc/configuration.rst
    M doc/filestore.rst

  Log Message:
  -----------
  Merge branch 'master' into 2733-feature-datastore

  Commit: 1281373721786b0ac532c722888a97fdc4ab7742
      https://github.com/okfn/ckan/commit/1281373721786b0ac532c722888a97fdc4ab7742
  Author: kindly <kindly at gmail.com>
  Date:   2012-09-11 (Tue, 11 Sep 2012)

  Changed paths:
    M ckan/public/scripts/application.js
    M ckan/public/scripts/vendor/recline/recline.js
    A ckanext/datastore/__init__.py
    A ckanext/datastore/db.py
    A ckanext/datastore/logic/__init__.py
    A ckanext/datastore/logic/action.py
    A ckanext/datastore/logic/auth.py
    A ckanext/datastore/plugin.py
    A ckanext/datastore/tests/__init__.py
    A ckanext/datastore/tests/test_datastore.py
    M doc/datastore.rst
    M doc/using-data-api.rst
    M setup.py

  Log Message:
  -----------
  Merge branch '2733-feature-datastore'

  Commit: c31c8466f40f29edb63263bd36d714f6a9eb7994
      https://github.com/okfn/ckan/commit/c31c8466f40f29edb63263bd36d714f6a9eb7994
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-12 (Wed, 12 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/vendor/recline/recline.js
    M ckan/public/scripts/application.js
    A ckanext/datastore/__init__.py
    A ckanext/datastore/db.py
    A ckanext/datastore/logic/__init__.py
    A ckanext/datastore/logic/action.py
    A ckanext/datastore/logic/auth.py
    A ckanext/datastore/plugin.py
    A ckanext/datastore/tests/__init__.py
    A ckanext/datastore/tests/test_datastore.py
    M doc/datastore.rst
    M doc/using-data-api.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 2375-demo-theme-development

Compare: https://github.com/okfn/ckan/compare/11389bfd0ed9...c31c8466f40f