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

Fri Sep 14 11:19:43 UTC 2012

  Branch: refs/heads/2375-demo-organizations
  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: 90239263877217f742042c5ddf2ccbd5beba29dc
      https://github.com/okfn/ckan/commit/90239263877217f742042c5ddf2ccbd5beba29dc
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  [#2618] Debug status now sets fanstatic response

  Commit: 61984f932e1a4b5088733c688945d78b57412d44
      https://github.com/okfn/ckan/commit/61984f932e1a4b5088733c688945d78b57412d44
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] Fanstatic auto setup changes

  Commit: 9a0a27254b4e718cd6a006890c45103a73e7779b
      https://github.com/okfn/ckan/commit/9a0a27254b4e718cd6a006890c45103a73e7779b
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M ckan/templates/snippets/scripts.html

  Log Message:
  -----------
  [#2618] Use fanstatic

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

  Changed paths:
    M ckan/controllers/home.py

  Log Message:
  -----------
  [#2375] Minor pep8 fix

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

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] Bundle patches for fanstatic

  Commit: 1ec5a2bbdd7baa71f1483f84c3e2bdebd2dde4e2
      https://github.com/okfn/ckan/commit/1ec5a2bbdd7baa71f1483f84c3e2bdebd2dde4e2
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-07 (Tue, 07 Aug 2012)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/i18n/ckan.pot
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/cli.py
    M ckan/public/base/i18n/bg.js
    M ckan/public/base/i18n/ca.js
    M ckan/public/base/i18n/cs_CZ.js
    M ckan/public/base/i18n/de.js
    M ckan/public/base/i18n/el.js
    M ckan/public/base/i18n/es.js
    M ckan/public/base/i18n/fi.js
    M ckan/public/base/i18n/fr.js
    M ckan/public/base/i18n/hu.js
    M ckan/public/base/i18n/it.js
    M ckan/public/base/i18n/lt.js
    M ckan/public/base/i18n/lv.js
    M ckan/public/base/i18n/nl.js
    M ckan/public/base/i18n/no.js
    M ckan/public/base/i18n/pl.js
    M ckan/public/base/i18n/pt_BR.js
    M ckan/public/base/i18n/ro.js
    M ckan/public/base/i18n/ru.js
    M ckan/public/base/i18n/sk.js
    M ckan/public/base/i18n/sl.js
    M ckan/public/base/i18n/sq.js
    M ckan/public/base/i18n/sr.js
    M ckan/public/base/i18n/sr_Latn.js
    M ckan/public/base/i18n/sv.js
    M ckan/public/base/i18n/zh_TW.js
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/i18n.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/api-info.js
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/confirm-delete.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    M ckan/public/base/test/spec/ckan.spec.js
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/user/read.html
    A ckanext/stats/public/ckanext/stats/javascript/modules/stats-nav.js
    M ckanext/stats/public/ckanext/stats/test/index.html
    A ckanext/stats/public/ckanext/stats/test/spec/modules/stats-nav.spec.js
    M ckanext/stats/templates/ckanext/stats/index.html
    A doc/javascript-module-tutorial.rst

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' into 2618-nested-resources

  Commit: 43ef93bbf4dbb8c027bc0358f5396113e707b0a9
      https://github.com/okfn/ckan/commit/43ef93bbf4dbb8c027bc0358f5396113e707b0a9
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-07 (Tue, 07 Aug 2012)

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] Allow resource order to be forced

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

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] Set resource order on lib creation

  Commit: 1259a518f688bc2ce1c1c0dbdf959e4ca49de615
      https://github.com/okfn/ckan/commit/1259a518f688bc2ce1c1c0dbdf959e4ca49de615
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-07 (Tue, 07 Aug 2012)

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] Better naming in fanstatic patch

  Commit: 26f43360ab66972709a55b5fbd1c3d910d3660ae
      https://github.com/okfn/ckan/commit/26f43360ab66972709a55b5fbd1c3d910d3660ae
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-07 (Tue, 07 Aug 2012)

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] Custom render order added to Fanstatic Resource

  Commit: 81025bfca9b24db2287ce7d020742d9214ae5ba8
      https://github.com/okfn/ckan/commit/81025bfca9b24db2287ce7d020742d9214ae5ba8
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-07 (Tue, 07 Aug 2012)

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] Better passing of vars in fanstatic

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

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] Use correct param when creating resource

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

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] Get minified files in sub dirs

  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: f9f8b3049ff956eaead72b161644745493a76c5f
      https://github.com/okfn/ckan/commit/f9f8b3049ff956eaead72b161644745493a76c5f
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] Rename config.ini resource.config to avoid .gitignore rules

  Commit: 07305f6894f696b5b830cdbf3fc3c7b9b86cece2
      https://github.com/okfn/ckan/commit/07305f6894f696b5b830cdbf3fc3c7b9b86cece2
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    A ckan/public/base/javascript/resource.config

  Log Message:
  -----------
  [#2618] Add resource.config for javascript dir

  Commit: 0c700248d634e15f1a15cbb6380fcee404221601
      https://github.com/okfn/ckan/commit/0c700248d634e15f1a15cbb6380fcee404221601
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] Use order of groups if supplied

  Commit: 4e8195a4dcfa28fef8018b832155bff77a1bdf0e
      https://github.com/okfn/ckan/commit/4e8195a4dcfa28fef8018b832155bff77a1bdf0e
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] Improve ordering of libs

  Commit: 987dde50d52a330641f737ba89f6e9e736d1c012
      https://github.com/okfn/ckan/commit/987dde50d52a330641f737ba89f6e9e736d1c012
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/html_resources/__init__.py
    M ckan/templates/base.html

  Log Message:
  -----------
  [#2618] Look at html shim and other vender stuff

  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: abfd030629661d3e4f179ebbb107acd470075ea7
      https://github.com/okfn/ckan/commit/abfd030629661d3e4f179ebbb107acd470075ea7
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/__init__.py
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/storage.py
    M ckan/controllers/user.py
    R ckan/lib/activity.py
    A ckan/lib/activity_streams.py
    A ckan/lib/activity_streams_session_extension.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    A ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/__init__.py
    M ckan/model/domain_object.py
    M ckan/model/meta.py
    M ckan/public/base/css/main.css
    M ckan/public/base/images/flags.png
    M ckan/public/base/javascript/client.js
    A ckan/public/base/javascript/config.ini
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/module.js
    M ckan/public/base/javascript/modules/api-info.js
    A ckan/public/base/javascript/modules/confirm-action.js
    R ckan/public/base/javascript/modules/confirm-delete.js
    A ckan/public/base/javascript/modules/related-item.js
    A ckan/public/base/javascript/plugins/jquery.truncator.js
    M ckan/public/base/javascript/pubsub.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/variables.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/module.spec.js
    A ckan/public/base/test/spec/modules/confirm-action.spec.js
    R ckan/public/base/test/spec/modules/confirm-delete.spec.js
    A ckan/public/base/test/spec/modules/related-item.spec.js
    A ckan/public/base/test/spec/pubsub.spec.js
    A ckan/templates/activity_streams/activity_stream_items.html
    R ckan/templates/activity_streams/deleted_related_item.html
    R ckan/templates/activity_streams/follow_dataset.html
    R ckan/templates/activity_streams/follow_user.html
    R ckan/templates/activity_streams/new_related_item.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/ajax_snippets/api_info.html
    A ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/development/snippets/form.html
    M ckan/templates/group/index.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/home/index.html
    A ckan/templates/macros/autoform.html
    M ckan/templates/macros/form.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    A ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/related/snippets/related_form.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/language_selector.html
    M ckan/templates/snippets/package_grid.html
    A ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/scripts.html
    M ckan/templates/snippets/sort_by.html
    A ckan/templates_legacy/activity_streams/activity_stream_items.html
    R ckan/templates_legacy/activity_streams/added_tag.html
    R ckan/templates_legacy/activity_streams/changed_group.html
    R ckan/templates_legacy/activity_streams/changed_package.html
    R ckan/templates_legacy/activity_streams/changed_package_extra.html
    R ckan/templates_legacy/activity_streams/changed_resource.html
    R ckan/templates_legacy/activity_streams/changed_user.html
    R ckan/templates_legacy/activity_streams/deleted_group.html
    R ckan/templates_legacy/activity_streams/deleted_package.html
    R ckan/templates_legacy/activity_streams/deleted_package_extra.html
    R ckan/templates_legacy/activity_streams/deleted_related_item.html
    R ckan/templates_legacy/activity_streams/deleted_resource.html
    R ckan/templates_legacy/activity_streams/follow_dataset.html
    R ckan/templates_legacy/activity_streams/follow_user.html
    R ckan/templates_legacy/activity_streams/new_group.html
    R ckan/templates_legacy/activity_streams/new_package.html
    R ckan/templates_legacy/activity_streams/new_package_extra.html
    R ckan/templates_legacy/activity_streams/new_related_item.html
    R ckan/templates_legacy/activity_streams/new_resource.html
    R ckan/templates_legacy/activity_streams/new_user.html
    R ckan/templates_legacy/activity_streams/removed_tag.html
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_dictization.py
    M doc/coding-standards.rst
    M doc/extension-templating.rst
    M doc/frontend-development.rst
    A doc/template-tutorial.rst
    M doc/templating.rst
    M setup.cfg

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' into 2618-nested-resources

Conflicts:
	ckan/controllers/home.py

trivial merge

	ckan/templates/snippets/scripts.html

extra module added

  Commit: 3daacbea6712b448f47fe4342a85e077ad74466f
      https://github.com/okfn/ckan/commit/3daacbea6712b448f47fe4342a85e077ad74466f
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] Prints to logging in html_resources

  Commit: 861c24a28d20ba36a5774a8a946452ceba70b86d
      https://github.com/okfn/ckan/commit/861c24a28d20ba36a5774a8a946452ceba70b86d
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] Add IE conditionals via config

  Commit: 405ab3fa3348d8291f18140a0a305c9344974050
      https://github.com/okfn/ckan/commit/405ab3fa3348d8291f18140a0a305c9344974050
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] dependencies for groups

  Commit: 1c62a1e591f821d9fb3c450a60d4f695ce6cc754
      https://github.com/okfn/ckan/commit/1c62a1e591f821d9fb3c450a60d4f695ce6cc754
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/html_resources/__init__.py
    M ckan/templates/package/resource_read.html
    M ckan/templates/snippets/scripts.html

  Log Message:
  -----------
  [#2618] Upgrade templates

  Commit: 36667990f3255ce9f8da73e43ea2abbfa817e0ee
      https://github.com/okfn/ckan/commit/36667990f3255ce9f8da73e43ea2abbfa817e0ee
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    A ckan/public/base/datapreview/resource.config
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/vendor/resource.config

  Log Message:
  -----------
  [#2618] Update/add config files for resources

  Commit: d43d88cd5060e126541fee48515b715a2e3406ae
      https://github.com/okfn/ckan/commit/d43d88cd5060e126541fee48515b715a2e3406ae
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    A ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.js
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.js

  Log Message:
  -----------
  [#2618] Add "unminified" js files

  Commit: a75cc9d35c710d9841e7c12cc054bd6f85d5629c
      https://github.com/okfn/ckan/commit/a75cc9d35c710d9841e7c12cc054bd6f85d5629c
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.js
    M ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    M ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    M ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.js

  Log Message:
  -----------
  [#2618] Ckan minify js files

  Commit: 15c0b86ac15a7011b8864447dbb51103efdd4b85
      https://github.com/okfn/ckan/commit/15c0b86ac15a7011b8864447dbb51103efdd4b85
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/templates/macros/autoform.html

  Log Message:
  -----------
  [#2375] Allow extra html in autoforms

  Commit: 3f54a4e6958143a652bff1d040fc37fd9ecea688
      https://github.com/okfn/ckan/commit/3f54a4e6958143a652bff1d040fc37fd9ecea688
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/controllers/related.py
    M ckan/templates/user/read.html

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' into 2618-nested-resources

  Commit: 3a425ef31d8da7fc108c52e9e29751fcc09325d2
      https://github.com/okfn/ckan/commit/3a425ef31d8da7fc108c52e9e29751fcc09325d2
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/vendor/resource.config

  Log Message:
  -----------
  [#2618] Update resource.configs

  Commit: 093c99f8e6f495d978e1d26c392b19f3504556cc
      https://github.com/okfn/ckan/commit/093c99f8e6f495d978e1d26c392b19f3504556cc
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    R ckan/public/base/vendor/select2/select2.min.js

  Log Message:
  -----------
  [#2618] Do not track .min.* files in base

  Commit: dd35762942f7090f457e672db6afe252dbece5cc
      https://github.com/okfn/ckan/commit/dd35762942f7090f457e672db6afe252dbece5cc
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    A ckan/public/base/.gitignore

  Log Message:
  -----------
  [#2618] Do not track .min.* files in base

  Commit: ac7962457cb1a03f17d1064a3b337cf5610b85f9
      https://github.com/okfn/ckan/commit/ac7962457cb1a03f17d1064a3b337cf5610b85f9
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] Make sure different renders are rendered separatley

  Commit: bb5f7d473ee68173555adc581492341818015213
      https://github.com/okfn/ckan/commit/bb5f7d473ee68173555adc581492341818015213
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/public/base/vendor/resource.config

  Log Message:
  -----------
  [#2618] Add html5shim.js to vendor

  Commit: 65df09672c73042b3d6741571ad796021e233281
      https://github.com/okfn/ckan/commit/65df09672c73042b3d6741571ad796021e233281
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

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

  Log Message:
  -----------
  [#2618] Auto serve dataviewer css

  Commit: fcc3897b68d5889aafec96d83f89c68d50b9a07d
      https://github.com/okfn/ckan/commit/fcc3897b68d5889aafec96d83f89c68d50b9a07d
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] Allow force_top resource config

  Commit: f47488db09d92636430bc63e89fd8d4e88a169f8
      https://github.com/okfn/ckan/commit/f47488db09d92636430bc63e89fd8d4e88a169f8
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] Allow custom renderer order

  Commit: 08ffbe25d6b1a2974eb80187770c627f9f74ceed
      https://github.com/okfn/ckan/commit/08ffbe25d6b1a2974eb80187770c627f9f74ceed
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/public/base/vendor/resource.config

  Log Message:
  -----------
  [#2618] Update config for html5.js

  Commit: 59b64c4b18beb29057ca08c39c27ebaecb851857
      https://github.com/okfn/ckan/commit/59b64c4b18beb29057ca08c39c27ebaecb851857
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] Clean IEConditionalRenderer

  Commit: bb45607655797caaaf8233a39632f1b304200833
      https://github.com/okfn/ckan/commit/bb45607655797caaaf8233a39632f1b304200833
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] Fanstatic inline scripts added

  Commit: b01b116b460a931883d9401effdf84afcee377b8
      https://github.com/okfn/ckan/commit/b01b116b460a931883d9401effdf84afcee377b8
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/public/base/vendor/resource.config

  Log Message:
  -----------
  [#2618] Update vendor resources.config

  Commit: 018913847fddafd1b3ad11866fc6c606e3fa3dbe
      https://github.com/okfn/ckan/commit/018913847fddafd1b3ad11866fc6c606e3fa3dbe
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/html_resources/__init__.py

  Log Message:
  -----------
  [#2618] Allow custom render order of zero

  Commit: da13d17489db865515776390357ceddd2a5d05ca
      https://github.com/okfn/ckan/commit/da13d17489db865515776390357ceddd2a5d05ca
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/templates/base.html

  Log Message:
  -----------
  [#2618] Goodbye html5shim block

  Commit: 6ab4ea04802a6d0240c3a1d9f388e0a306b7841d
      https://github.com/okfn/ckan/commit/6ab4ea04802a6d0240c3a1d9f388e0a306b7841d
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckanext/stats/templates/ckanext/stats/index.html

  Log Message:
  -----------
  [#2618] Goodbye html5shim block in stats extension

  Commit: a3b9e1351a0d08ec6c171232f40213a1279f66f5
      https://github.com/okfn/ckan/commit/a3b9e1351a0d08ec6c171232f40213a1279f66f5
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    R ckan/html_resources/.gitignore
    R ckan/html_resources/__init__.py
    A ckan/lib/fanstatic_extensions.py
    A ckan/lib/fanstatic_resources.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#2618] move html_resources into lib

  Commit: 4106f7e3ae5ad00cad129d664075211eb0c1393c
      https://github.com/okfn/ckan/commit/4106f7e3ae5ad00cad129d664075211eb0c1393c
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/lib/fanstatic_resources.py

  Log Message:
  -----------
  [#2618] make external libs dependent on base

  Commit: 8f7081729742f5fc8d0c99a781b5e816d6a6de19
      https://github.com/okfn/ckan/commit/8f7081729742f5fc8d0c99a781b5e816d6a6de19
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  [#2618] extensions can add resource libs

  Commit: fe53e85a90d0bfe5558af31f40b5e6e5da0b8fad
      https://github.com/okfn/ckan/commit/fe53e85a90d0bfe5558af31f40b5e6e5da0b8fad
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckanext/stats/plugin.py
    A ckanext/stats/public/ckanext/stats/resource.config
    M ckanext/stats/templates/ckanext/stats/index.html

  Log Message:
  -----------
  [#2618] Stats uses fanstatic

  Commit: a9920b66411e5e3d97ab287436d049da7904e6a6
      https://github.com/okfn/ckan/commit/a9920b66411e5e3d97ab287436d049da7904e6a6
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/public/base/vendor/resource.config

  Log Message:
  -----------
  [#2618] Vendor bugfix

  Commit: 0fd8d99c2077a1e440e7c2e51d137d21d5fa8c91
      https://github.com/okfn/ckan/commit/0fd8d99c2077a1e440e7c2e51d137d21d5fa8c91
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/lib/fanstatic_resources.py

  Log Message:
  -----------
  [#2618] Allow inline scripts in groups

  Commit: f8dab60fc4675a10d9b66f356aa9ff8402cfac6c
      https://github.com/okfn/ckan/commit/f8dab60fc4675a10d9b66f356aa9ff8402cfac6c
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/public/base/javascript/resource.config
    M ckan/templates/base.html

  Log Message:
  -----------
  [#2618] Inline js class helper

  Commit: 8f02c4b038fec5712df1c3116d0a06958d7ce491
      https://github.com/okfn/ckan/commit/8f02c4b038fec5712df1c3116d0a06958d7ce491
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  [#2618] Restore correct fanstatic setup

  Commit: a0cfce8a0e52ade919ea6962449dd7b0addb903a
      https://github.com/okfn/ckan/commit/a0cfce8a0e52ade919ea6962449dd7b0addb903a
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M ckan/public/base/vendor/resource.config

  Log Message:
  -----------
  [#2618] Fix vendor resource.config

  Commit: aa85428fe6f1c4ae3c45afd19bda1a8a10f57675
      https://github.com/okfn/ckan/commit/aa85428fe6f1c4ae3c45afd19bda1a8a10f57675
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M ckan/lib/fanstatic_resources.py

  Log Message:
  -----------
  [#2618] Clean up resource adding plus add css

  Commit: e3d8cc99b20893aa8d5fc2e59890d92b3f0e68a4
      https://github.com/okfn/ckan/commit/e3d8cc99b20893aa8d5fc2e59890d92b3f0e68a4
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M ckan/templates/base.html

  Log Message:
  -----------
  [#2618] Main css added via fanstatic

  Commit: c5274a42f51230898c6ee28f98fca11402be787b
      https://github.com/okfn/ckan/commit/c5274a42f51230898c6ee28f98fca11402be787b
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M ckan/public/base/less/main.less
    M ckan/public/base/less/variables.less
    M ckan/public/base/vendor/resource.config

  Log Message:
  -----------
  [#2618] Fix relative path issues and select2

  Commit: 650ca2164c5d20b1632618d909dd04d0d9c00090
      https://github.com/okfn/ckan/commit/650ca2164c5d20b1632618d909dd04d0d9c00090
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

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

  Log Message:
  -----------
  [#2618] Reduce fanstatic noise

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

  Changed paths:
    R ckan/templates/snippets/internal-tracking.html
    A ckan/templates/snippets/internal_tracking.html
    M ckan/templates/snippets/scripts.html
    M ckan/templates/user/read.html
    M doc/templating.rst

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' into 2618-nested-resources

Conflicts:
	ckan/templates/snippets/scripts.html

    both add new content

  Commit: 7ecf0d2de23ca7c76b44882e734c29232933a5c9
      https://github.com/okfn/ckan/commit/7ecf0d2de23ca7c76b44882e734c29232933a5c9
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckan/lib/fanstatic_resources.py

  Log Message:
  -----------
  [#2618] Auto sort ordering when dependencies on group

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

  Changed paths:
    M ckan/lib/fanstatic_resources.py

  Log Message:
  -----------
  [#2618] Improve comments in lib.fanstatic_resources

  Commit: 2e8f2243e9e83c219cd0e49b17fc9cc895c98451
      https://github.com/okfn/ckan/commit/2e8f2243e9e83c219cd0e49b17fc9cc895c98451
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckan/public/base/vendor/resource.config

  Log Message:
  -----------
  [#2618] Remove order from vendor/resources.config

  Commit: 054164f9315b259ddf4b99994c4818b403013aeb
      https://github.com/okfn/ckan/commit/054164f9315b259ddf4b99994c4818b403013aeb
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    A doc/resources.rst

  Log Message:
  -----------
  [#2618] Add resources.rst

  Commit: 549d38194c496174f1c000d0f2b3eb598130cb7e
      https://github.com/okfn/ckan/commit/549d38194c496174f1c000d0f2b3eb598130cb7e
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M doc/resources.rst

  Log Message:
  -----------
  [#2618] resources.rst changes

  Commit: 9b1c8b04d0016573ca308a199e8bfe98bbdb14be
      https://github.com/okfn/ckan/commit/9b1c8b04d0016573ca308a199e8bfe98bbdb14be
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M doc/resources.rst

  Log Message:
  -----------
  [#2618] resources.rst improvements

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

  Changed paths:
    M ckan/lib/fanstatic_resources.py

  Log Message:
  -----------
  [#2618] Fanstatic resources cleanup

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

  Changed paths:
    M ckan/lib/fanstatic_resources.py

  Log Message:
  -----------
  [#2618] Fanstatic refactoring

  Commit: 7acbc169fd3d77a954920effa3b9cfd10cfda010
      https://github.com/okfn/ckan/commit/7acbc169fd3d77a954920effa3b9cfd10cfda010
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckan/lib/fanstatic_extensions.py
    M ckan/lib/fanstatic_resources.py

  Log Message:
  -----------
  [#2618] Fanstatic flakes8

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

  Changed paths:
    M ckan/lib/fanstatic_resources.py

  Log Message:
  -----------
  [#2618] Remove outdated file docstring

  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: ec105c4139f20c1d75f6d81153ae616d4a88fd88
      https://github.com/okfn/ckan/commit/ec105c4139f20c1d75f6d81153ae616d4a88fd88
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/helpers.py
    M ckan/templates/admin/config.html
    A ckan/templates/admin/confirm_reset.html
    M ckan/templates/snippets/debug.html
    M ckan/templates/user/read.html
    M ckanext/organizations/forms.py
    R ckanext/organizations/templates/organization_apply.html
    R ckanext/organizations/templates/organization_apply_form.html
    R ckanext/organizations/templates/organization_form.html
    R ckanext/organizations/templates/organization_history.html
    R ckanext/organizations/templates/organization_index.html
    R ckanext/organizations/templates/organization_layout.html
    R ckanext/organizations/templates/organization_new.html
    R ckanext/organizations/templates/organization_package_form.html
    R ckanext/organizations/templates/organization_read.html
    R ckanext/organizations/templates/organization_users.html
    R ckanext/organizations/templates/organization_users_form.html
    A ckanext/organizations/templates_legacy/email/join_publisher_request.txt
    A ckanext/organizations/templates_legacy/organization_apply.html
    A ckanext/organizations/templates_legacy/organization_apply_form.html
    A ckanext/organizations/templates_legacy/organization_form.html
    A ckanext/organizations/templates_legacy/organization_history.html
    A ckanext/organizations/templates_legacy/organization_index.html
    A ckanext/organizations/templates_legacy/organization_layout.html
    A ckanext/organizations/templates_legacy/organization_new.html
    A ckanext/organizations/templates_legacy/organization_package_form.html
    A ckanext/organizations/templates_legacy/organization_read.html
    A ckanext/organizations/templates_legacy/organization_users.html
    A ckanext/organizations/templates_legacy/organization_users_form.html

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' into 2618-nested-resources

  Commit: 4b9cd18676747ec15ddaf946906494cc771c7977
      https://github.com/okfn/ckan/commit/4b9cd18676747ec15ddaf946906494cc771c7977
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M ckan/lib/fanstatic_extensions.py
    M ckan/lib/fanstatic_resources.py

  Log Message:
  -----------
  [#2618] Minimise the monkey patching of fanstatic

  Commit: 2cccb0b9c37f57d6ab76967b4e454d8daa0cbd10
      https://github.com/okfn/ckan/commit/2cccb0b9c37f57d6ab76967b4e454d8daa0cbd10
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M ckan/lib/fanstatic_extensions.py
    M ckan/lib/fanstatic_resources.py

  Log Message:
  -----------
  [#2618] Cut down to one custom renderer

  Commit: 92b23f99051feba3a3332fb92df304dc53887332
      https://github.com/okfn/ckan/commit/92b23f99051feba3a3332fb92df304dc53887332
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M ckan/lib/fanstatic_extensions.py

  Log Message:
  -----------
  [#2618] Add better comments to the monkey patches

  Commit: 81ce1e98a9fc71e645b72e8f29d17f5d003deeb1
      https://github.com/okfn/ckan/commit/81ce1e98a9fc71e645b72e8f29d17f5d003deeb1
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M ckan/lib/fanstatic_resources.py

  Log Message:
  -----------
  [#2618] Futher code reduction

  Commit: fe9758c2eb3a2f135c5d4a91bf2295720cd95bde
      https://github.com/okfn/ckan/commit/fe9758c2eb3a2f135c5d4a91bf2295720cd95bde
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M ckan/lib/fanstatic_extensions.py

  Log Message:
  -----------
  [#2618] Remove unused imports

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

  Changed paths:
    M .tx/config
    M CHANGELOG.txt
    M bin/less
    M ckan/__init__.py
    M ckan/authz.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    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/controllers/user.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/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    A ckan/i18n/ja/LC_MESSAGES/ckan.mo
    A ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/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/extract.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/mailer.py
    M ckan/lib/maintain.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/sql.py
    M ckan/logic/action/__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/delete.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/license.py
    M ckan/model/resource.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/datapreview/vendor/recline/recline.js
    A ckan/public/base/images/background-tag-ie7.png
    A ckan/public/base/images/breadcrumb-slash-ie7.png
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/module.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/select-switch.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    A ckan/public/base/less/iehacks.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/less/variables.less
    R ckan/public/images/icons/authorization_group.png
    R ckan/public/images/icons/authorization_group_add.png
    R ckan/public/images/icons/authorization_group_edit.png
    A ckan/public/images/icons/followers.png
    M ckan/public/scripts/application.js
    M ckan/templates/admin/authz.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/read.html
    R ckan/templates_legacy/_snippet/add-related.html
    M ckan/templates_legacy/_util.html
    M ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/authorization_group/__init__.py
    R ckan/templates_legacy/authorization_group/authz.html
    R ckan/templates_legacy/authorization_group/edit.html
    R ckan/templates_legacy/authorization_group/edit_form.html
    R ckan/templates_legacy/authorization_group/index.html
    R ckan/templates_legacy/authorization_group/layout.html
    R ckan/templates_legacy/authorization_group/new.html
    R ckan/templates_legacy/authorization_group/read.html
    M ckan/templates_legacy/group/authz.html
    M ckan/templates_legacy/package/authz.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/related_list.html
    M ckan/templates_legacy/user/layout.html
    M ckan/tests/__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_related.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/lib/test_simple_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/misc/test_auth_profiles.py
    M 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/controllers.py
    M ckanext/organizations/forms.py
    A ckanext/organizations/templates/organization_edit.html
    A ckanext/organizations/templates/organizations/form.html
    A ckanext/organizations/templates/organizations/index.html
    A ckanext/organizations/templates/organizations/new.html
    A ckanext/organizations/templates/organizations/read.html
    A ckanext/organizations/templates/organizations/users.html
    A ckanext/organizations/templates/organizations/users_form.html
    R ckanext/organizations/templates_legacy/email/join_publisher_request.txt
    R ckanext/organizations/templates_legacy/organization_apply.html
    R ckanext/organizations/templates_legacy/organization_apply_form.html
    R ckanext/organizations/templates_legacy/organization_form.html
    R ckanext/organizations/templates_legacy/organization_history.html
    R ckanext/organizations/templates_legacy/organization_index.html
    R ckanext/organizations/templates_legacy/organization_layout.html
    R ckanext/organizations/templates_legacy/organization_new.html
    R ckanext/organizations/templates_legacy/organization_package_form.html
    R ckanext/organizations/templates_legacy/organization_read.html
    R ckanext/organizations/templates_legacy/organization_users.html
    R ckanext/organizations/templates_legacy/organization_users_form.html
    A ckanext/organizations/templates_legacy/organizations/apply.html
    A ckanext/organizations/templates_legacy/organizations/apply_form.html
    A ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
    A ckanext/organizations/templates_legacy/organizations/form.html
    A ckanext/organizations/templates_legacy/organizations/history.html
    A ckanext/organizations/templates_legacy/organizations/index.html
    A ckanext/organizations/templates_legacy/organizations/layout.html
    A ckanext/organizations/templates_legacy/organizations/new.html
    A ckanext/organizations/templates_legacy/organizations/package_form.html
    A ckanext/organizations/templates_legacy/organizations/read.html
    A ckanext/organizations/templates_legacy/organizations/users.html
    A ckanext/organizations/templates_legacy/organizations/users_form.html
    M doc/conf.py
    M doc/configuration.rst
    M doc/datastore.rst
    M doc/filestore.rst
    M doc/frontend-development.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' into 2618-nested-resources

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

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  [#2375] Fix test when db not built

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

  Changed paths:
    M ckan/templates/page.html
    R ckan/templates/snippets/scripts.html

  Log Message:
  -----------
  [2618] remove scripts

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

  Changed paths:
    A ckanext/stats/public/.gitignore

  Log Message:
  -----------
  [#2375] Add .gitignore for minified stats files

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

  Changed paths:
    R ckan/public/base/javascript/config.ini

  Log Message:
  -----------
  [#2375] Remove unused file config.ini

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

  Changed paths:
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/tracking.js
    M ckan/templates/page.html
    R ckan/templates/snippets/internal_tracking.html

  Log Message:
  -----------
  [#2375] Tracking (internal) now uses fanstatic

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

  Changed paths:
    M ckan/templates/page.html

  Log Message:
  -----------
  [#2375] Add vendor scripts to page

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

  Changed paths:
    M ckan/lib/fanstatic_resources.py

  Log Message:
  -----------
  [#2375] Fanstatic inline script fixes

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

  Changed paths:
    M ckan/lib/fanstatic_resources.py

  Log Message:
  -----------
  [#2375] Stop minification errors if no permission

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

  Changed paths:
    M ckan/public/base/css/main.css

  Log Message:
  -----------
  [#2375] css fix

  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

  Commit: c3db69ff6019c1a25177e2e5f32e2c08b85db0c7
      https://github.com/okfn/ckan/commit/c3db69ff6019c1a25177e2e5f32e2c08b85db0c7
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-09-13 (Thu, 13 Sep 2012)

  Changed paths:
    M .gitignore
    M LICENSE.txt
    A bin/less
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    A ckan/controllers/util.py
    A ckan/include/README.txt
    A ckan/include/__init__.py
    A ckan/include/rcssmin.py
    A ckan/include/rjsmin.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    A ckan/lib/extract.py
    A ckan/lib/fanstatic_extensions.py
    A ckan/lib/fanstatic_resources.py
    A ckan/lib/formatters.py
    M ckan/lib/helpers.py
    A ckan/lib/jinja_extensions.py
    M ckan/lib/maintain.py
    A ckan/lib/render.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/logic/auth/update.py
    M ckan/logic/validators.py
    A ckan/migration/versions/060_add_system_info_table.py
    M ckan/model/__init__.py
    M ckan/model/resource.py
    A ckan/model/system_info.py
    M ckan/plugins/toolkit.py
    A ckan/public/base/.gitignore
    A ckan/public/base/css/.gitignore
    A ckan/public/base/css/fuchsia.css
    A ckan/public/base/css/green.css
    A ckan/public/base/css/main.css
    A ckan/public/base/css/maroon.css
    A ckan/public/base/css/red.css
    A ckan/public/base/datapreview/css/datapreview.css
    A ckan/public/base/datapreview/datapreview.js
    A ckan/public/base/datapreview/resource.config
    A ckan/public/base/datapreview/vendor/backbone/0.5.1/backbone.js
    A ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.js
    A ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.css
    A ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.js
    A ckan/public/base/datapreview/vendor/bootstrap/2.0.3/img/glyphicons-halflings-white.png
    A ckan/public/base/datapreview/vendor/bootstrap/2.0.3/img/glyphicons-halflings.png
    A ckan/public/base/datapreview/vendor/flot/0.7/excanvas.js
    A ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.js
    A ckan/public/base/datapreview/vendor/jquery.mustache/jquery.mustache.js
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/layers.png
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/marker-shadow.png
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/marker.png
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/popup-close.png
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/zoom-in.png
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/zoom-out.png
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.css
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.css
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.js
    A ckan/public/base/datapreview/vendor/moment/1.6.2/moment.js
    A ckan/public/base/datapreview/vendor/mustache/0.5.0-dev/mustache.js
    A ckan/public/base/datapreview/vendor/recline/css/recline.css
    A ckan/public/base/datapreview/vendor/recline/recline.js
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/README.txt
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/images/sort-asc.gif
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/images/sort-desc.gif
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.css
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.js
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.js
    A ckan/public/base/datapreview/vendor/underscore/1.1.6/underscore.js
    A ckan/public/base/i18n/bg.js
    A ckan/public/base/i18n/ca.js
    A ckan/public/base/i18n/cs_CZ.js
    A ckan/public/base/i18n/de.js
    A ckan/public/base/i18n/el.js
    A ckan/public/base/i18n/es.js
    A ckan/public/base/i18n/fi.js
    A ckan/public/base/i18n/fr.js
    A ckan/public/base/i18n/hu.js
    A ckan/public/base/i18n/it.js
    A ckan/public/base/i18n/lt.js
    A ckan/public/base/i18n/lv.js
    A ckan/public/base/i18n/nl.js
    A ckan/public/base/i18n/no.js
    A ckan/public/base/i18n/pl.js
    A ckan/public/base/i18n/pt_BR.js
    A ckan/public/base/i18n/ro.js
    A ckan/public/base/i18n/ru.js
    A ckan/public/base/i18n/sk.js
    A ckan/public/base/i18n/sl.js
    A ckan/public/base/i18n/sq.js
    A ckan/public/base/i18n/sr.js
    A ckan/public/base/i18n/sr_Latn.js
    A ckan/public/base/i18n/sv.js
    A ckan/public/base/i18n/zh_TW.js
    A ckan/public/base/images/background-tag-ie7.png
    A ckan/public/base/images/background-tag.png
    A ckan/public/base/images/background-tile.png
    A ckan/public/base/images/breadcrumb-slash-ie7.png
    A ckan/public/base/images/ckan-logo-footer.png
    A ckan/public/base/images/ckan-logo.png
    A ckan/public/base/images/ckan.ico
    A ckan/public/base/images/flags.png
    A ckan/public/base/images/icon-search-27x26.png
    A ckan/public/base/images/loading-spinner.gif
    A ckan/public/base/images/placeholder-application.png
    A ckan/public/base/images/placeholder-group.png
    A ckan/public/base/images/placeholder-image.png
    A ckan/public/base/images/sprite-ckan-icons.png
    A ckan/public/base/images/sprite-resource-icons.png
    A ckan/public/base/javascript/client.js
    A ckan/public/base/javascript/i18n.js
    A ckan/public/base/javascript/main.js
    A ckan/public/base/javascript/module.js
    A ckan/public/base/javascript/modules/api-info.js
    A ckan/public/base/javascript/modules/autocomplete.js
    A ckan/public/base/javascript/modules/basic-form.js
    A ckan/public/base/javascript/modules/confirm-action.js
    A ckan/public/base/javascript/modules/custom-fields.js
    A ckan/public/base/javascript/modules/related-item.js
    A ckan/public/base/javascript/modules/resource-form.js
    A ckan/public/base/javascript/modules/resource-upload-field.js
    A ckan/public/base/javascript/modules/select-switch.js
    A ckan/public/base/javascript/modules/slug-preview.js
    A ckan/public/base/javascript/notify.js
    A ckan/public/base/javascript/plugins/jquery.date-helpers.js
    A ckan/public/base/javascript/plugins/jquery.form-warning.js
    A ckan/public/base/javascript/plugins/jquery.inherit.js
    A ckan/public/base/javascript/plugins/jquery.proxy-all.js
    A ckan/public/base/javascript/plugins/jquery.slug-preview.js
    A ckan/public/base/javascript/plugins/jquery.slug.js
    A ckan/public/base/javascript/plugins/jquery.truncator.js
    A ckan/public/base/javascript/plugins/jquery.url-helpers.js
    A ckan/public/base/javascript/pubsub.js
    A ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/sandbox.js
    A ckan/public/base/javascript/tracking.js
    A ckan/public/base/less/ckan.less
    A ckan/public/base/less/dataset.less
    A ckan/public/base/less/disqus.less
    A ckan/public/base/less/footer.less
    A ckan/public/base/less/forms.less
    A ckan/public/base/less/group.less
    A ckan/public/base/less/icons.less
    A ckan/public/base/less/iehacks.less
    A ckan/public/base/less/layout.less
    A ckan/public/base/less/main.less
    A ckan/public/base/less/masthead.less
    A ckan/public/base/less/media.less
    A ckan/public/base/less/mixins.less
    A ckan/public/base/less/module.less
    A ckan/public/base/less/nav.less
    A ckan/public/base/less/profile.less
    A ckan/public/base/less/prose.less
    A ckan/public/base/less/toolbar.less
    A ckan/public/base/less/variables.less
    A ckan/public/base/test/index.html
    A ckan/public/base/test/primer/index.html
    A ckan/public/base/test/spec/ckan.spec.js
    A ckan/public/base/test/spec/client.spec.js
    A ckan/public/base/test/spec/module.spec.js
    A ckan/public/base/test/spec/modules/autocomplete.spec.js
    A ckan/public/base/test/spec/modules/basic-form.spec.js
    A ckan/public/base/test/spec/modules/confirm-action.spec.js
    A ckan/public/base/test/spec/modules/custom-fields.spec.js
    A ckan/public/base/test/spec/modules/related-item.spec.js
    A ckan/public/base/test/spec/modules/resource-form.spec.js
    A ckan/public/base/test/spec/modules/resource-upload-field.spec.js
    A ckan/public/base/test/spec/notify.spec.js
    A ckan/public/base/test/spec/plugins/jquery.date-helpers.spec.js
    A ckan/public/base/test/spec/plugins/jquery.form-warning.spec.js
    A ckan/public/base/test/spec/plugins/jquery.inherit.spec.js
    A ckan/public/base/test/spec/plugins/jquery.proxy-all.spec.js
    A ckan/public/base/test/spec/plugins/jquery.slug-preview.spec.js
    A ckan/public/base/test/spec/plugins/jquery.slug.spec.js
    A ckan/public/base/test/spec/plugins/jquery.url-helpers.spec.js
    A ckan/public/base/test/spec/pubsub.spec.js
    A ckan/public/base/test/spec/sandbox.spec.js
    A ckan/public/base/test/vendor/chai.js
    A ckan/public/base/test/vendor/less.js
    A ckan/public/base/test/vendor/mocha.css
    A ckan/public/base/test/vendor/mocha.js
    A ckan/public/base/test/vendor/sinon.js
    A ckan/public/base/vendor/bootstrap.js
    A ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings.png
    A ckan/public/base/vendor/bootstrap/js/bootstrap-alert.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-button.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-modal.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-tab.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-transition.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.js
    A ckan/public/base/vendor/bootstrap/less/accordion.less
    A ckan/public/base/vendor/bootstrap/less/alerts.less
    A ckan/public/base/vendor/bootstrap/less/bootstrap.less
    A ckan/public/base/vendor/bootstrap/less/breadcrumbs.less
    A ckan/public/base/vendor/bootstrap/less/button-groups.less
    A ckan/public/base/vendor/bootstrap/less/buttons.less
    A ckan/public/base/vendor/bootstrap/less/carousel.less
    A ckan/public/base/vendor/bootstrap/less/close.less
    A ckan/public/base/vendor/bootstrap/less/code.less
    A ckan/public/base/vendor/bootstrap/less/component-animations.less
    A ckan/public/base/vendor/bootstrap/less/dropdowns.less
    A ckan/public/base/vendor/bootstrap/less/forms.less
    A ckan/public/base/vendor/bootstrap/less/grid.less
    A ckan/public/base/vendor/bootstrap/less/hero-unit.less
    A ckan/public/base/vendor/bootstrap/less/labels-badges.less
    A ckan/public/base/vendor/bootstrap/less/layouts.less
    A ckan/public/base/vendor/bootstrap/less/mixins.less
    A ckan/public/base/vendor/bootstrap/less/modals.less
    A ckan/public/base/vendor/bootstrap/less/navbar.less
    A ckan/public/base/vendor/bootstrap/less/navs.less
    A ckan/public/base/vendor/bootstrap/less/pager.less
    A ckan/public/base/vendor/bootstrap/less/pagination.less
    A ckan/public/base/vendor/bootstrap/less/popovers.less
    A ckan/public/base/vendor/bootstrap/less/progress-bars.less
    A ckan/public/base/vendor/bootstrap/less/reset.less
    A ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
    A ckan/public/base/vendor/bootstrap/less/responsive-767px-max.less
    A ckan/public/base/vendor/bootstrap/less/responsive-768px-979px.less
    A ckan/public/base/vendor/bootstrap/less/responsive-navbar.less
    A ckan/public/base/vendor/bootstrap/less/responsive-utilities.less
    A ckan/public/base/vendor/bootstrap/less/responsive.less
    A ckan/public/base/vendor/bootstrap/less/scaffolding.less
    A ckan/public/base/vendor/bootstrap/less/sprites.less
    A ckan/public/base/vendor/bootstrap/less/tables.less
    A ckan/public/base/vendor/bootstrap/less/thumbnails.less
    A ckan/public/base/vendor/bootstrap/less/tooltip.less
    A ckan/public/base/vendor/bootstrap/less/type.less
    A ckan/public/base/vendor/bootstrap/less/utilities.less
    A ckan/public/base/vendor/bootstrap/less/variables.less
    A ckan/public/base/vendor/bootstrap/less/wells.less
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    A ckan/public/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public/base/vendor/html5.js
    A ckan/public/base/vendor/jed.js
    A ckan/public/base/vendor/jquery-fileupload/jquery.fileupload-ui.js
    A ckan/public/base/vendor/jquery-fileupload/jquery.fileupload.js
    A ckan/public/base/vendor/jquery-fileupload/jquery.iframe-transport.js
    A ckan/public/base/vendor/jquery.js
    A ckan/public/base/vendor/jquery.ui.widget.js
    A ckan/public/base/vendor/resource.config
    A ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2.css
    A ckan/public/base/vendor/select2/select2.js
    A ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/spinner.gif
    M ckan/public/scripts/application.js
    R ckan/public/scripts/vendor/recline/recline.js
    R ckan/templates/__init__.py
    R ckan/templates/_snippet/data-api-help.html
    R ckan/templates/_util.html
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/authz.html
    A ckan/templates/admin/config.html
    A ckan/templates/admin/confirm_reset.html
    M ckan/templates/admin/index.html
    R ckan/templates/admin/layout.html
    R ckan/templates/admin/trash.html
    A ckan/templates/ajax_snippets/api_info.html
    A ckan/templates/ajax_snippets/custom_fields.html
    A ckan/templates/ajax_snippets/related-item.html
    A ckan/templates/base.html
    A ckan/templates/development/markup.html
    A ckan/templates/development/primer.html
    A ckan/templates/development/snippets/breadcrumb.html
    A ckan/templates/development/snippets/facet.html
    A ckan/templates/development/snippets/form.html
    A ckan/templates/development/snippets/form_stages.html
    A ckan/templates/development/snippets/list.html
    A ckan/templates/development/snippets/markup.html
    A ckan/templates/development/snippets/media_grid.html
    A ckan/templates/development/snippets/module.html
    A ckan/templates/development/snippets/nav.html
    A ckan/templates/development/snippets/pagination.html
    A ckan/templates/development/snippets/simple-input.html
    A ckan/templates/development/snippets/toolbar.html
    M ckan/templates/error_document_template.html
    R ckan/templates/facets.html
    A ckan/templates/footer.html
    R ckan/templates/group/__init__.py
    R ckan/templates/group/authz.html
    A ckan/templates/group/base_form_page.html
    A ckan/templates/group/confirm_delete.html
    M ckan/templates/group/edit.html
    R ckan/templates/group/edit_form.html
    R ckan/templates/group/history.html
    M ckan/templates/group/index.html
    R ckan/templates/group/layout.html
    M ckan/templates/group/new.html
    M ckan/templates/group/new_group_form.html
    M ckan/templates/group/read.html
    A ckan/templates/group/snippets/feeds.html
    A ckan/templates/group/snippets/group_form.html
    A ckan/templates/group/snippets/group_item.html
    A ckan/templates/group/snippets/group_list.html
    A ckan/templates/header.html
    R ckan/templates/home/__init__.py
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    R ckan/templates/home/layout.html
    A ckan/templates/home/snippets/about_text.html
    R ckan/templates/importer/__init__.py
    R ckan/templates/importer/importer.html
    R ckan/templates/importer/preview.html
    R ckan/templates/importer/result.html
    R ckan/templates/js_strings.html
    R ckan/templates/layout.html
    R ckan/templates/layout_base.html
    A ckan/templates/macros/autoform.html
    A ckan/templates/macros/form.html
    R ckan/templates/package/__init__.py
    R ckan/templates/package/authz.html
    A ckan/templates/package/base_form_page.html
    R ckan/templates/package/comments.html
    A ckan/templates/package/confirm_delete.html
    A ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/edit.html
    R ckan/templates/package/edit_form.html
    R ckan/templates/package/editresources.html
    M ckan/templates/package/followers.html
    R ckan/templates/package/form.html
    R ckan/templates/package/form_extra_fields.html
    R ckan/templates/package/form_fields.html
    R ckan/templates/package/form_resources.html
    R ckan/templates/package/history.html
    R ckan/templates/package/layout.html
    M ckan/templates/package/new.html
    M ckan/templates/package/new_package_form.html
    A ckan/templates/package/new_package_metadata.html
    A ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    R ckan/templates/package/read.n3
    R ckan/templates/package/read.rdf
    R ckan/templates/package/read_core.html
    A ckan/templates/package/related_list.html
    A ckan/templates/package/resource_api_data.html
    A ckan/templates/package/resource_edit.html
    R ckan/templates/package/resource_embedded_dataviewer.html
    M ckan/templates/package/resource_read.html
    R ckan/templates/package/resources.html
    M ckan/templates/package/search.html
    R ckan/templates/package/search_form.html
    A ckan/templates/package/snippets/additional_info.html
    A ckan/templates/package/snippets/back_to_package_action.html
    A ckan/templates/package/snippets/data_api_button.html
    A ckan/templates/package/snippets/new_package_breadcrumb.html
    A ckan/templates/package/snippets/package_basic_fields.html
    A ckan/templates/package/snippets/package_form.html
    A ckan/templates/package/snippets/package_metadata_fields.html
    A ckan/templates/package/snippets/package_metadata_form.html
    A ckan/templates/package/snippets/resource_edit_form.html
    A ckan/templates/package/snippets/resource_form.html
    A ckan/templates/package/snippets/resource_item.html
    A ckan/templates/package/snippets/resources.html
    A ckan/templates/package/snippets/resources_list.html
    A ckan/templates/package/snippets/search_form.html
    A ckan/templates/package/snippets/stages.html
    A ckan/templates/package/snippets/tags.html
    A ckan/templates/page.html
    R ckan/templates/related/add-related.html
    A ckan/templates/related/base_form_page.html
    A ckan/templates/related/confirm_delete.html
    M ckan/templates/related/dashboard.html
    A ckan/templates/related/edit.html
    A ckan/templates/related/edit_form.html
    A ckan/templates/related/new.html
    R ckan/templates/related/related_list.html
    A ckan/templates/related/snippets/related_form.html
    A ckan/templates/related/snippets/related_item.html
    A ckan/templates/related/snippets/related_list.html
    R ckan/templates/rest/__init__.py
    R ckan/templates/revision/__init__.py
    R ckan/templates/revision/diff.html
    R ckan/templates/revision/layout.html
    R ckan/templates/revision/list.html
    R ckan/templates/revision/read.html
    A ckan/templates/snippets/custom_form_fields.html
    R ckan/templates/snippets/data-viewer-embed-branded-link.html
    R ckan/templates/snippets/data-viewer-embed-dialog.html
    A ckan/templates/snippets/datapreview_embed_dialog.html
    A ckan/templates/snippets/debug.html
    A ckan/templates/snippets/disqus_trackback.html
    A ckan/templates/snippets/facet_list.html
    A ckan/templates/snippets/group.html
    A ckan/templates/snippets/group_item.html
    A ckan/templates/snippets/home_breadcrumb_item.html
    R ckan/templates/snippets/internal-tracking.html
    A ckan/templates/snippets/language_selector.html
    A ckan/templates/snippets/license.html
    A ckan/templates/snippets/package_grid.html
    A ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/package_list.html
    A ckan/templates/snippets/popular.html
    A ckan/templates/snippets/related.html
    R ckan/templates/snippets/revision_list.html
    A ckan/templates/snippets/social.html
    A ckan/templates/snippets/sort_by.html
    A ckan/templates/snippets/subscribe.html
    A ckan/templates/snippets/tag_list.html
    R ckan/templates/storage/index.html
    R ckan/templates/storage/success.html
    R ckan/templates/tag/__init__.py
    R ckan/templates/tag/index.html
    R ckan/templates/tag/layout.html
    R ckan/templates/tag/read.html
    R ckan/templates/user/__init__.py
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/followers.html
    R ckan/templates/user/layout.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/new.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read.html
    M ckan/templates/user/request_reset.html
    A ckan/templates/user/snippets/back_to_user_action.html
    A ckan/templates/user/snippets/login_form.html
    A ckan/templates/user/snippets/things_to_do.html
    A ckan/templates/user/snippets/user_search.html
    A ckan/templates_legacy/__init__.py
    A ckan/templates_legacy/_snippet/data-api-help.html
    A ckan/templates_legacy/_util.html
    A ckan/templates_legacy/activity_streams/activity_stream_items.html
    A ckan/templates_legacy/admin/authz.html
    A ckan/templates_legacy/admin/index.html
    A ckan/templates_legacy/admin/layout.html
    A ckan/templates_legacy/admin/trash.html
    A ckan/templates_legacy/error_document_template.html
    A ckan/templates_legacy/facets.html
    A ckan/templates_legacy/group/__init__.py
    A ckan/templates_legacy/group/authz.html
    A ckan/templates_legacy/group/edit.html
    A ckan/templates_legacy/group/edit_form.html
    A ckan/templates_legacy/group/history.html
    A ckan/templates_legacy/group/index.html
    A ckan/templates_legacy/group/layout.html
    A ckan/templates_legacy/group/new.html
    A ckan/templates_legacy/group/new_group_form.html
    A ckan/templates_legacy/group/read.html
    A ckan/templates_legacy/home/__init__.py
    A ckan/templates_legacy/home/about.html
    A ckan/templates_legacy/home/index.html
    A ckan/templates_legacy/home/layout.html
    A ckan/templates_legacy/importer/__init__.py
    A ckan/templates_legacy/importer/importer.html
    A ckan/templates_legacy/importer/preview.html
    A ckan/templates_legacy/importer/result.html
    A ckan/templates_legacy/js_strings.html
    A ckan/templates_legacy/layout.html
    A ckan/templates_legacy/layout_base.html
    A ckan/templates_legacy/package/__init__.py
    A ckan/templates_legacy/package/authz.html
    A ckan/templates_legacy/package/comments.html
    A ckan/templates_legacy/package/edit.html
    A ckan/templates_legacy/package/edit_form.html
    A ckan/templates_legacy/package/editresources.html
    A ckan/templates_legacy/package/followers.html
    A ckan/templates_legacy/package/form.html
    A ckan/templates_legacy/package/form_extra_fields.html
    A ckan/templates_legacy/package/form_fields.html
    A ckan/templates_legacy/package/form_resources.html
    A ckan/templates_legacy/package/history.html
    A ckan/templates_legacy/package/layout.html
    A ckan/templates_legacy/package/new.html
    A ckan/templates_legacy/package/new_package_form.html
    A ckan/templates_legacy/package/read.html
    A ckan/templates_legacy/package/read.n3
    A ckan/templates_legacy/package/read.rdf
    A ckan/templates_legacy/package/read_core.html
    A ckan/templates_legacy/package/resource_embedded_dataviewer.html
    A ckan/templates_legacy/package/resource_read.html
    A ckan/templates_legacy/package/resources.html
    A ckan/templates_legacy/package/search.html
    A ckan/templates_legacy/package/search_form.html
    A ckan/templates_legacy/related/add-related.html
    A ckan/templates_legacy/related/dashboard.html
    A ckan/templates_legacy/related/related_list.html
    A ckan/templates_legacy/rest/__init__.py
    A ckan/templates_legacy/revision/__init__.py
    A ckan/templates_legacy/revision/diff.html
    A ckan/templates_legacy/revision/layout.html
    A ckan/templates_legacy/revision/list.html
    A ckan/templates_legacy/revision/read.html
    A ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    A ckan/templates_legacy/snippets/data-viewer-embed-dialog.html
    A ckan/templates_legacy/snippets/follow_button.html
    A ckan/templates_legacy/snippets/internal-tracking.html
    A ckan/templates_legacy/snippets/package_list.html
    A ckan/templates_legacy/snippets/recline-extra-footer.html
    A ckan/templates_legacy/snippets/recline-extra-header.html
    A ckan/templates_legacy/snippets/revision_list.html
    A ckan/templates_legacy/storage/index.html
    A ckan/templates_legacy/storage/success.html
    A ckan/templates_legacy/tag/__init__.py
    A ckan/templates_legacy/tag/index.html
    A ckan/templates_legacy/tag/layout.html
    A ckan/templates_legacy/tag/read.html
    A ckan/templates_legacy/user/__init__.py
    A ckan/templates_legacy/user/dashboard.html
    A ckan/templates_legacy/user/edit.html
    A ckan/templates_legacy/user/edit_user_form.html
    A ckan/templates_legacy/user/followers.html
    A ckan/templates_legacy/user/layout.html
    A ckan/templates_legacy/user/list.html
    A ckan/templates_legacy/user/login.html
    A ckan/templates_legacy/user/logout.html
    A ckan/templates_legacy/user/logout_first.html
    A ckan/templates_legacy/user/new.html
    A ckan/templates_legacy/user/new_user_form.html
    A ckan/templates_legacy/user/perform_reset.html
    A ckan/templates_legacy/user/read.html
    A ckan/templates_legacy/user/request_reset.html
    M ckan/tests/functional/test_related.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/misc/test_auth_profiles.py
    M ckan/tests/pylons_controller.py
    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 ckanext/organizations/controllers.py
    M ckanext/organizations/forms.py
    R ckanext/organizations/templates/organization_apply.html
    R ckanext/organizations/templates/organization_apply_form.html
    R ckanext/organizations/templates/organization_form.html
    R ckanext/organizations/templates/organization_history.html
    R ckanext/organizations/templates/organization_index.html
    R ckanext/organizations/templates/organization_layout.html
    R ckanext/organizations/templates/organization_new.html
    R ckanext/organizations/templates/organization_package_form.html
    R ckanext/organizations/templates/organization_read.html
    R ckanext/organizations/templates/organization_users.html
    R ckanext/organizations/templates/organization_users_form.html
    A ckanext/organizations/templates/organizations/form.html
    A ckanext/organizations/templates/organizations/index.html
    A ckanext/organizations/templates/organizations/new.html
    A ckanext/organizations/templates/organizations/read.html
    A ckanext/organizations/templates/organizations/users.html
    A ckanext/organizations/templates/organizations/users_form.html
    A ckanext/organizations/templates_legacy/organizations/apply.html
    A ckanext/organizations/templates_legacy/organizations/apply_form.html
    A ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
    A ckanext/organizations/templates_legacy/organizations/form.html
    A ckanext/organizations/templates_legacy/organizations/history.html
    A ckanext/organizations/templates_legacy/organizations/index.html
    A ckanext/organizations/templates_legacy/organizations/layout.html
    A ckanext/organizations/templates_legacy/organizations/new.html
    A ckanext/organizations/templates_legacy/organizations/package_form.html
    A ckanext/organizations/templates_legacy/organizations/read.html
    A ckanext/organizations/templates_legacy/organizations/users.html
    A ckanext/organizations/templates_legacy/organizations/users_form.html
    M ckanext/stats/controller.py
    M ckanext/stats/plugin.py
    A ckanext/stats/public/.gitignore
    A ckanext/stats/public/ckanext/stats/css/stats.css
    A ckanext/stats/public/ckanext/stats/javascript/modules/plot.js
    A ckanext/stats/public/ckanext/stats/javascript/modules/stats-nav.js
    A ckanext/stats/public/ckanext/stats/resource.config
    A ckanext/stats/public/ckanext/stats/test/fixtures/table.html
    A ckanext/stats/public/ckanext/stats/test/index.html
    A ckanext/stats/public/ckanext/stats/test/spec/modules/plot.spec.js
    A ckanext/stats/public/ckanext/stats/test/spec/modules/stats-nav.spec.js
    A ckanext/stats/public/ckanext/stats/vendor/excanvas.js
    A ckanext/stats/public/ckanext/stats/vendor/jquery.flot.js
    R ckanext/stats/templates/__init__.py
    R ckanext/stats/templates/ckanext/__init__.py
    R ckanext/stats/templates/ckanext/stats/__init__.py
    M ckanext/stats/templates/ckanext/stats/index.html
    R ckanext/stats/templates/ckanext/stats/leaderboard.html
    A ckanext/stats/templates_legacy/__init__.py
    A ckanext/stats/templates_legacy/ckanext/__init__.py
    A ckanext/stats/templates_legacy/ckanext/stats/__init__.py
    A ckanext/stats/templates_legacy/ckanext/stats/index.html
    A ckanext/stats/templates_legacy/ckanext/stats/leaderboard.html
    M doc/_themes/sphinx-theme-okfn
    M doc/coding-standards.rst
    M doc/datastore.rst
    A doc/extension-templating.rst
    A doc/frontend-development.rst
    M doc/install-from-source.rst
    A doc/javascript-module-tutorial.rst
    A doc/resources.rst
    A doc/template-blocks.rst
    A doc/template-tutorial.rst
    A doc/templating.rst
    M doc/using-data-api.rst
    A jshint.json
    M pip-requirements.txt
    M setup.cfg
    M setup.py
    M test-core.ini

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

  Commit: 3adc136007e3f4150041e5cf8f39a715aad547ed
      https://github.com/okfn/ckan/commit/3adc136007e3f4150041e5cf8f39a715aad547ed
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-09-14 (Fri, 14 Sep 2012)

  Changed paths:
    M ckan/config/middleware.py
    R ckan/html_resources/.gitignore
    R ckan/html_resources/__init__.py
    M ckan/lib/app_globals.py
    A ckan/lib/fanstatic_extensions.py
    A ckan/lib/fanstatic_resources.py
    M ckan/lib/helpers.py
    M ckan/plugins/toolkit.py
    A ckan/public/base/.gitignore
    M ckan/public/base/css/main.css
    A ckan/public/base/datapreview/resource.config
    A ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.js
    M ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.js
    M ckan/public/base/datapreview/vendor/recline/recline.js
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    M ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    M ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.js
    M ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckan/public/base/javascript/config.ini
    A ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/tracking.js
    M ckan/public/base/less/main.less
    M ckan/public/base/less/variables.less
    A ckan/public/base/vendor/resource.config
    R ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/scripts/application.js
    M ckan/templates/base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/page.html
    R ckan/templates/snippets/internal_tracking.html
    R ckan/templates/snippets/scripts.html
    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 ckanext/stats/plugin.py
    A ckanext/stats/public/.gitignore
    A ckanext/stats/public/ckanext/stats/resource.config
    M ckanext/stats/templates/ckanext/stats/index.html
    M doc/datastore.rst
    A doc/resources.rst
    M doc/using-data-api.rst
    M setup.py

  Log Message:
  -----------
  Fixing merge

Compare: https://github.com/okfn/ckan/compare/5fa94a265b0b...3adc136007e3