[ckan-changes] [okfn/ckan] 43eed1: Merge branch 'master' of https://github.com/okfn/c...

GitHub noreply at github.com
Mon Mar 26 19:59:34 UTC 2012


  Branch: refs/heads/feature-1821-multilingual-extension
  Home:   https://github.com/okfn/ckan
  Commit: 43eed1b2e8c6a851ff271108276f952000443611
      https://github.com/okfn/ckan/commit/43eed1b2e8c6a851ff271108276f952000443611
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M README.rst
  M ckan/lib/create_test_data.py
  M ckan/templates/package/resource_read.html
  M doc/apiv3.rst
  M doc/install-from-source.rst
  R pip-requirements-prerelease.txt
  M requires/lucid_present.txt

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


  Commit: 8cc806a0119b54da7f0eeb0220bf154c88721004
      https://github.com/okfn/ckan/commit/8cc806a0119b54da7f0eeb0220bf154c88721004
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M ckan/templates/_util.html
  A ckan/templates/_util_activity_div.html
  M ckan/templates/activity_streams/added_tag.html
  M ckan/templates/activity_streams/changed_group.html
  M ckan/templates/activity_streams/changed_package.html
  M ckan/templates/activity_streams/changed_package_extra.html
  M ckan/templates/activity_streams/changed_resource.html
  M ckan/templates/activity_streams/changed_user.html
  M ckan/templates/activity_streams/deleted_group.html
  M ckan/templates/activity_streams/deleted_package.html
  M ckan/templates/activity_streams/deleted_package_extra.html
  M ckan/templates/activity_streams/deleted_resource.html
  M ckan/templates/activity_streams/new_group.html
  M ckan/templates/activity_streams/new_package.html
  M ckan/templates/activity_streams/new_package_extra.html
  M ckan/templates/activity_streams/new_resource.html
  M ckan/templates/activity_streams/new_user.html
  M ckan/templates/activity_streams/removed_tag.html

  Log Message:
  -----------
  move _activity_div function into own include to increase render speed


  Commit: 73026cfe269e991636d6cc42aa7619feeddf20e3
      https://github.com/okfn/ckan/commit/73026cfe269e991636d6cc42aa7619feeddf20e3
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M README.rst
  M ckan/lib/create_test_data.py
  M ckan/lib/plugins.py
  M ckan/templates/group/layout.html
  M ckan/templates/package/resource_read.html
  M ckan/tests/functional/test_group.py
  M ckanext/publisher_form/forms.py
  M doc/apiv3.rst
  M doc/install-from-source.rst
  R pip-requirements-prerelease.txt
  M requires/lucid_present.txt
  M setup.py

  Log Message:
  -----------
  Merge branch 'master' into enhancement-2227-tests-sucky


  Commit: 8825f00794878ef0a7172423335440c9e7b5d2fc
      https://github.com/okfn/ckan/commit/8825f00794878ef0a7172423335440c9e7b5d2fc
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [xs] Disable some useless Sqlalchemy warnings


  Commit: 039ae5544d623e682d55438edee1db695b3f4f9b
      https://github.com/okfn/ckan/commit/039ae5544d623e682d55438edee1db695b3f4f9b
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  remove unwanted print


  Commit: 6d303c15b018e1207d92a1409ebba6db7d5ded37
      https://github.com/okfn/ckan/commit/6d303c15b018e1207d92a1409ebba6db7d5ded37
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/package.py
  A ckan/templates/package/read.n3
  A ckan/templates/package/read.rdf

  Log Message:
  -----------
  [2209] Changed package read to allow for different representations (rdf/n3)


  Commit: 949121093bc0cee0d06c0121997609892e8c7327
      https://github.com/okfn/ckan/commit/949121093bc0cee0d06c0121997609892e8c7327
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M ckan/controllers/group.py
  M ckan/controllers/package.py

  Log Message:
  -----------
  [bug] For new/search/index determine the group/package type from the url


  Commit: 3dcce306fb46885079b0b6cdda1c1479b60fec65
      https://github.com/okfn/ckan/commit/3dcce306fb46885079b0b6cdda1c1479b60fec65
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M ckan/templates/package/read.n3
  M ckan/templates/package/read.rdf

  Log Message:
  -----------
  [2209] Initial draft of the initial schema in RDF, validates


  Commit: 75d25a57779c40fd37b0d9d9f578833a2002ea87
      https://github.com/okfn/ckan/commit/75d25a57779c40fd37b0d9d9f578833a2002ea87
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    R ckan/templates/package/read.n3

  Log Message:
  -----------
  [2209] Remove the N3 serialisation


  Commit: 524408dc19ae31bc554fdab8577eab019bb9fc72
      https://github.com/okfn/ckan/commit/524408dc19ae31bc554fdab8577eab019bb9fc72
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/package.py

  Log Message:
  -----------
  [2209] Fix the read method in package controller to allow .format requests as well as revisions with . in the name. Could, however be prettier


  Commit: ef4e9597137a9775845264b57c2ec6d53c0cddf1
      https://github.com/okfn/ckan/commit/ef4e9597137a9775845264b57c2ec6d53c0cddf1
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M doc/index.rst

  Log Message:
  -----------
  [#2226,docs][s]: split up table of contents listing on home pages into sections with headings.


  Commit: a4a0c8c29829c31255c26b31ff03d5c4185bdf98
      https://github.com/okfn/ckan/commit/a4a0c8c29829c31255c26b31ff03d5c4185bdf98
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    R doc/buildbot.rst
  R doc/datastore.rst
  A doc/dev/buildbot.rst
  R doc/file-upload.rst
  M doc/index.rst
  A doc/storage/datastore.rst
  A doc/storage/filestore.rst

  Log Message:
  -----------
  [#2226,doc][s]: start refactor of layout of doc files.


  Commit: 2b5a148ee26983c058bdf39695634db2ce0a9498
      https://github.com/okfn/ckan/commit/2b5a148ee26983c058bdf39695634db2ce0a9498
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

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

  Log Message:
  -----------
  [2209] Testing the rdf generation for test data


  Commit: 8404bca1ed7fe203b5b3edfeaee6e4b10f7cd481
      https://github.com/okfn/ckan/commit/8404bca1ed7fe203b5b3edfeaee6e4b10f7cd481
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    R doc/ckan-features.png
  R doc/ckan-vision.png

  Log Message:
  -----------
  [#2226,doc][xs]: remove unused images in docs.


  Commit: 929eb092248c2e904673ca93ba4457f9999dedee
      https://github.com/okfn/ckan/commit/929eb092248c2e904673ca93ba4457f9999dedee
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M ckan/config/middleware.py
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  cleanup


  Commit: 17c075acdd21111a26ce27c7ef6cbf05d6a1ac38
      https://github.com/okfn/ckan/commit/17c075acdd21111a26ce27c7ef6cbf05d6a1ac38
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M ckan/controllers/package.py
  A ckan/templates/package/read.rdf
  M ckan/tests/functional/test_package.py

  Log Message:
  -----------
  Merge branch 'feature-2209-rdf-export'


  Commit: 7d4e1d5a9c3c60fd19a794f2d4a9edf000e58805
      https://github.com/okfn/ckan/commit/7d4e1d5a9c3c60fd19a794f2d4a9edf000e58805
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    R doc/buildbot.rst
  R doc/datastore.rst
  A doc/dev/buildbot.rst
  R doc/file-upload.rst
  M doc/index.rst
  A doc/storage/datastore.rst
  A doc/storage/filestore.rst

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


  Commit: 3e1907907c413fb10275bbaee466575f1a7f44a1
      https://github.com/okfn/ckan/commit/3e1907907c413fb10275bbaee466575f1a7f44a1
  Author: kindly <kindly at gmail.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M ckan/__init__.py
  R ckan/config/plugins.py
  M ckan/controllers/group.py
  M ckan/controllers/package.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/plugins/core.py
  M ckan/plugins/interfaces.py
  M ckan/tests/logic/test_action.py
  M ckan/tests/logic/test_member.py
  M ckanext/publisher_form/forms.py
  A ckanext/publisher_form/templates/publisher_index.html
  A ckanext/publisher_form/templates/publisher_layout.html
  A ckanext/publisher_form/templates/publisher_new.html
  A ckanext/publisher_form/templates/publisher_read.html
  M ckanext/test_tag_vocab_plugin.py
  M doc/install-from-source.rst
  M pip-requirements.txt

  Log Message:
  -----------
  merge 1.6.1 changes


  Commit: 20e63d05c50969a4d9f3a8a64e87a03e8626342d
      https://github.com/okfn/ckan/commit/20e63d05c50969a4d9f3a8a64e87a03e8626342d
  Author: kindly <kindly at gmail.com>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

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

  Log Message:
  -----------
  merge 1.6.1 changes


  Commit: 8685c6000d1cb211928b4dbc63990fb72d884f8c
      https://github.com/okfn/ckan/commit/8685c6000d1cb211928b4dbc63990fb72d884f8c
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [release-1.6.1][solr] Expose sorting of solr results in the package controller.

Although the search module already supported sorting of results by a number
of fields, it wasn't exposed in the url parameters of the package controller's
search action.

 - action now accepts a "sort" url parameter, which can be used to specify
   the fields to sort on (using the standard solr syntax). eg:
   "&sort=metadata_modified%20desc,%20url%20desc"

 - provided a helper function for generating the correct urls from templates.

Note - solr only accepts sorting upon fields that are not multi-valued; are
   indexed; and uses a singleTerm analyzer (or none at all).  This means
   we're not currently able to sort by fields with type "text" (as
   defined in our solr schema.xml). eg - the "title" field.


  Commit: 226ac1456b0533cd3fd9d22fcece2b354dde9a77
      https://github.com/okfn/ckan/commit/226ac1456b0533cd3fd9d22fcece2b354dde9a77
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M ckan/config/solr/schema-1.3.xml

  Log Message:
  -----------
  [release-1.6.1][solr] Added a new field, titleString, to the solr schema.

Since the 'title' field is of type 'text', it means we can't sort on it.  So I've added a new
solr field that has a copy of the 'title' field, but of type 'string', meaning it can be
sorted on.

There are other 'text' fields, but I think the 'title' is likely the only one we'd want to
sort on.

This change is backwards compatible, hence not creating a new version of the schema


  Commit: 1cfaa3a69240c537d71efd97d1cb73f85a8a1444
      https://github.com/okfn/ckan/commit/1cfaa3a69240c537d71efd97d1cb73f85a8a1444
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M ckan/config/solr/schema-1.3.xml
  M ckan/controllers/package.py

  Log Message:
  -----------
  Merge branch 'release-v1.6.1'


  Commit: f2b5a5d4f68746d162b0dac30db2ea436eb79edb
      https://github.com/okfn/ckan/commit/f2b5a5d4f68746d162b0dac30db2ea436eb79edb
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M ckan/templates/_snippet/data-api-help.html
  M doc/storage/datastore.rst
  M doc/storage/filestore.rst

  Log Message:
  -----------
  [#2226,doc][s]: correct link in templates to data api help to new doc location and tidy up storage docs.


  Commit: 061b4d1339f5a3fd821e227a0b1b102822a317cc
      https://github.com/okfn/ckan/commit/061b4d1339f5a3fd821e227a0b1b102822a317cc
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M ckan/__init__.py
  R ckan/config/plugins.py
  M ckan/config/solr/schema-1.3.xml
  M ckan/controllers/group.py
  M ckan/controllers/package.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/plugins/core.py
  M ckan/plugins/interfaces.py
  A ckan/templates/package/read.rdf
  M ckan/tests/functional/test_package.py
  M ckan/tests/logic/test_action.py
  M ckan/tests/logic/test_member.py
  M ckanext/publisher_form/forms.py
  A ckanext/publisher_form/templates/publisher_index.html
  A ckanext/publisher_form/templates/publisher_layout.html
  A ckanext/publisher_form/templates/publisher_new.html
  A ckanext/publisher_form/templates/publisher_read.html
  M ckanext/test_tag_vocab_plugin.py
  M doc/install-from-source.rst
  M pip-requirements.txt

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


  Commit: 416bf66ab7824341d129944665398f12f1b1eec0
      https://github.com/okfn/ckan/commit/416bf66ab7824341d129944665398f12f1b1eec0
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    M ckan/__init__.py
  R ckan/config/plugins.py
  M ckan/config/solr/schema-1.3.xml
  M ckan/controllers/group.py
  M ckan/controllers/package.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/plugins/core.py
  M ckan/plugins/interfaces.py
  M ckan/templates/_snippet/data-api-help.html
  M ckan/tests/functional/test_package.py
  M ckan/tests/logic/test_action.py
  M ckan/tests/logic/test_member.py
  M ckanext/publisher_form/forms.py
  A ckanext/publisher_form/templates/publisher_index.html
  A ckanext/publisher_form/templates/publisher_layout.html
  A ckanext/publisher_form/templates/publisher_new.html
  A ckanext/publisher_form/templates/publisher_read.html
  M ckanext/test_tag_vocab_plugin.py
  R doc/ckan-features.png
  R doc/ckan-vision.png
  M doc/install-from-source.rst
  M doc/storage/datastore.rst
  M doc/storage/filestore.rst
  M pip-requirements.txt

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


  Commit: dda53dfe069de983509972e7c61a7bedf4f41e66
      https://github.com/okfn/ckan/commit/dda53dfe069de983509972e7c61a7bedf4f41e66
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    A doc/database-dumps.rst
  R doc/database_dumps.rst
  R doc/editing_the_database_ownership.rst
  A doc/howto-editing-database-ownership.rst
  M doc/index.rst
  A doc/loading-data.rst
  R doc/loading_data.rst
  M doc/paster.rst

  Log Message:
  -----------
  [#2226,doc][xs]: standardize naming of files and correct some formatting.


  Commit: 86d2bc53a74455dbccade0a07fc815d8f40ada72
      https://github.com/okfn/ckan/commit/86d2bc53a74455dbccade0a07fc815d8f40ada72
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    A doc/buildbot.rst
  A doc/datastore.rst
  R doc/dev/buildbot.rst
  A doc/filestore.rst
  M doc/index.rst
  R doc/storage/datastore.rst
  R doc/storage/filestore.rst

  Log Message:
  -----------
  [#2226,doc][xs]: put all files back at base level (no point putting things in directories and much simpler).


  Commit: 5681ea873fa1a9284da9a3381b7bc9a63c791dae
      https://github.com/okfn/ckan/commit/5681ea873fa1a9284da9a3381b7bc9a63c791dae
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    M ckan/config/environment.py
  M ckan/config/routing.py
  M ckan/controllers/package.py
  M ckan/migration/versions/027_adjust_harvester.py
  M ckan/tests/functional/test_package.py

  Log Message:
  -----------
  [bug,xs] Fixed RDF test and warnings for non-unicode default value


  Commit: e1143457aa3e338bf70f3595a584d9f019c80394
      https://github.com/okfn/ckan/commit/e1143457aa3e338bf70f3595a584d9f019c80394
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    M ckan/config/environment.py
  M ckan/config/routing.py
  M ckan/controllers/package.py
  M ckan/migration/versions/027_adjust_harvester.py
  M ckan/tests/functional/test_package.py

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


  Commit: faa85027ab0a1508fef1308ab62b2509abeda476
      https://github.com/okfn/ckan/commit/faa85027ab0a1508fef1308ab62b2509abeda476
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    M ckan/__init__.py
  M ckan/config/environment.py
  R ckan/config/plugins.py
  M ckan/config/routing.py
  M ckan/config/solr/schema-1.3.xml
  M ckan/controllers/group.py
  M ckan/controllers/package.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/migration/versions/027_adjust_harvester.py
  M ckan/plugins/core.py
  M ckan/plugins/interfaces.py
  M ckan/templates/_snippet/data-api-help.html
  A ckan/templates/package/read.rdf
  M ckan/tests/functional/test_package.py
  M ckan/tests/logic/test_action.py
  M ckan/tests/logic/test_member.py
  M ckanext/publisher_form/forms.py
  A ckanext/publisher_form/templates/publisher_index.html
  A ckanext/publisher_form/templates/publisher_layout.html
  A ckanext/publisher_form/templates/publisher_new.html
  A ckanext/publisher_form/templates/publisher_read.html
  M ckanext/test_tag_vocab_plugin.py
  R doc/ckan-features.png
  R doc/ckan-vision.png
  A doc/database-dumps.rst
  R doc/database_dumps.rst
  M doc/datastore.rst
  R doc/editing_the_database_ownership.rst
  R doc/file-upload.rst
  A doc/filestore.rst
  A doc/howto-editing-database-ownership.rst
  M doc/index.rst
  M doc/install-from-source.rst
  A doc/loading-data.rst
  R doc/loading_data.rst
  M doc/paster.rst
  M pip-requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into enhancement-2227-tests-sucky


  Commit: 4fb31df0659a83e7fffc59d7dc5159b959996a8c
      https://github.com/okfn/ckan/commit/4fb31df0659a83e7fffc59d7dc5159b959996a8c
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [2209,xs] Missing package type when locating new_template


  Commit: e975a06b8c613e4de15edb310b1b538d4bbbf488
      https://github.com/okfn/ckan/commit/e975a06b8c613e4de15edb310b1b538d4bbbf488
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    M ckan/ckan_nose_plugin.py
  M ckan/controllers/user.py
  M ckan/i18n/bg/LC_MESSAGES/ckan.mo
  M ckan/i18n/ca/LC_MESSAGES/ckan.mo
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
  M ckan/i18n/de/LC_MESSAGES/ckan.mo
  M ckan/i18n/el/LC_MESSAGES/ckan.mo
  M ckan/i18n/es/LC_MESSAGES/ckan.mo
  M ckan/i18n/fi/LC_MESSAGES/ckan.mo
  M ckan/i18n/fr/LC_MESSAGES/ckan.mo
  M ckan/i18n/hu/LC_MESSAGES/ckan.mo
  M ckan/i18n/it/LC_MESSAGES/ckan.mo
  M ckan/i18n/lt/LC_MESSAGES/ckan.mo
  M ckan/i18n/nl/LC_MESSAGES/ckan.mo
  M ckan/i18n/no/LC_MESSAGES/ckan.mo
  M ckan/i18n/pl/LC_MESSAGES/ckan.mo
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
  M ckan/i18n/ro/LC_MESSAGES/ckan.mo
  M ckan/i18n/ru/LC_MESSAGES/ckan.mo
  M ckan/i18n/sl/LC_MESSAGES/ckan.mo
  M ckan/i18n/sq/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
  M ckan/i18n/sv/LC_MESSAGES/ckan.mo
  M ckan/templates/_util.html
  A ckan/templates/_util_activity_div.html
  M ckan/templates/activity_streams/added_tag.html
  M ckan/templates/activity_streams/changed_group.html
  M ckan/templates/activity_streams/changed_package.html
  M ckan/templates/activity_streams/changed_package_extra.html
  M ckan/templates/activity_streams/changed_resource.html
  M ckan/templates/activity_streams/changed_user.html
  M ckan/templates/activity_streams/deleted_group.html
  M ckan/templates/activity_streams/deleted_package.html
  M ckan/templates/activity_streams/deleted_package_extra.html
  M ckan/templates/activity_streams/deleted_resource.html
  M ckan/templates/activity_streams/new_group.html
  M ckan/templates/activity_streams/new_package.html
  M ckan/templates/activity_streams/new_package_extra.html
  M ckan/templates/activity_streams/new_resource.html
  M ckan/templates/activity_streams/new_user.html
  M ckan/templates/activity_streams/removed_tag.html
  M ckan/templates/home/about.html
  A doc/buildbot.rst
  A doc/database-dumps.rst
  R doc/database_dumps.rst
  A doc/datastore.rst
  R doc/dev/buildbot.rst
  R doc/editing_the_database_ownership.rst
  A doc/filestore.rst
  A doc/howto-editing-database-ownership.rst
  M doc/index.rst
  A doc/loading-data.rst
  R doc/loading_data.rst
  M doc/paster.rst
  R doc/storage/datastore.rst
  R doc/storage/filestore.rst
  A profile_tests.py

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


  Commit: 0d970d3a0e523a1695830e8c8c28c0ba10a8d8b9
      https://github.com/okfn/ckan/commit/0d970d3a0e523a1695830e8c8c28c0ba10a8d8b9
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    A ckan/public/img/glyphicons-halflings-white.png
  A ckan/public/img/glyphicons-halflings.png
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#2236,data-viewer][s]: integrate latest version of Recline (v0.3b).


  Commit: bf17fd8194db566d9ce4f6cc3dd08b90e79a9643
      https://github.com/okfn/ckan/commit/bf17fd8194db566d9ce4f6cc3dd08b90e79a9643
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    M ckan/templates/user/read.html

  Log Message:
  -----------
  [#2221,master][xs]: remove row class on user page on top grouping to avoid catching bootstrap css and thus looking wrong.


  Commit: 03823251dbb0739fd796e03a0fed8ac8cbe6cb29
      https://github.com/okfn/ckan/commit/03823251dbb0739fd796e03a0fed8ac8cbe6cb29
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    A doc/administrative-dashboard.rst
  M doc/index.rst

  Log Message:
  -----------
  [#2226,doc/new][s]: move Administrator Dashboard doc into docs from wiki.


  Commit: 741dff6453024d1a3e81f6ea9f2d34123c9c1651
      https://github.com/okfn/ckan/commit/741dff6453024d1a3e81f6ea9f2d34123c9c1651
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    A doc/domain-model-dataset.rst
  A doc/domain-model-resource.rst
  A doc/domain-model-task-status.rst
  A doc/domain-model.rst
  M doc/index.rst

  Log Message:
  -----------
  [#2226,doc/new][m]: move domain model into docs from wiki (dataset, resources task status and an overview page).


  Commit: ebab39c707e53c5f4ab0655066e9c84d1c16196b
      https://github.com/okfn/ckan/commit/ebab39c707e53c5f4ab0655066e9c84d1c16196b
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    M ckan/controllers/admin.py
  M ckan/lib/base.py
  M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  fixes for tests


  Commit: d867a2386514fbc81572187cd6cb7feae41db8b5
      https://github.com/okfn/ckan/commit/d867a2386514fbc81572187cd6cb7feae41db8b5
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    M README.rst
  M ckan/__init__.py
  M ckan/ckan_nose_plugin.py
  M ckan/config/deployment.ini_tmpl
  M ckan/config/environment.py
  R ckan/config/plugins.py
  M ckan/config/routing.py
  M ckan/config/solr/schema-1.3.xml
  M ckan/controllers/api.py
  M ckan/controllers/datastore.py
  M ckan/controllers/group.py
  M ckan/controllers/package.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/cs_CZ/LC_MESSAGES/ckan.mo
  M ckan/i18n/de/LC_MESSAGES/ckan.mo
  M ckan/i18n/el/LC_MESSAGES/ckan.mo
  M ckan/i18n/es/LC_MESSAGES/ckan.mo
  M ckan/i18n/fi/LC_MESSAGES/ckan.mo
  M ckan/i18n/fr/LC_MESSAGES/ckan.mo
  M ckan/i18n/hu/LC_MESSAGES/ckan.mo
  M ckan/i18n/it/LC_MESSAGES/ckan.mo
  M ckan/i18n/lt/LC_MESSAGES/ckan.mo
  M ckan/i18n/nl/LC_MESSAGES/ckan.mo
  M ckan/i18n/no/LC_MESSAGES/ckan.mo
  M ckan/i18n/pl/LC_MESSAGES/ckan.mo
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
  M ckan/i18n/ro/LC_MESSAGES/ckan.mo
  M ckan/i18n/ru/LC_MESSAGES/ckan.mo
  M ckan/i18n/sl/LC_MESSAGES/ckan.mo
  M ckan/i18n/sq/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
  M ckan/i18n/sv/LC_MESSAGES/ckan.mo
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/authenticator.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/__init__.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/lib/plugins.py
  M ckan/lib/search/index.py
  M ckan/logic/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/get.py
  M ckan/logic/auth/create.py
  M ckan/logic/auth/publisher/create.py
  M ckan/logic/auth/publisher/get.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/migration/versions/027_adjust_harvester.py
  M ckan/model/group.py
  M ckan/model/user.py
  M ckan/new_authz.py
  M ckan/plugins/core.py
  M ckan/plugins/interfaces.py
  M ckan/public/css/bootstrap.css
  M ckan/public/css/forms.css
  M ckan/public/css/style.css
  A ckan/public/images/chevron-down.png
  A ckan/public/images/chevron-up.png
  A ckan/public/images/icons/package_add.png
  A ckan/public/images/icons/page_white.png
  A ckan/public/images/icons/page_white_add.png
  A ckan/public/images/icons/page_white_code.png
  A ckan/public/images/icons/page_white_compressed.png
  A ckan/public/images/icons/page_white_cup.png
  A ckan/public/images/icons/page_white_database.png
  A ckan/public/images/icons/page_white_error.png
  A ckan/public/images/icons/page_white_excel.png
  A ckan/public/images/icons/page_white_gear.png
  A ckan/public/images/icons/page_white_link.png
  A ckan/public/images/icons/page_white_text.png
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  A ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
  R ckan/public/scripts/vendor/jquery/1.6.2/jquery.js
  A ckan/public/scripts/vendor/jquery/1.7.1/jquery.js
  A ckan/templates/_snippet/data-api-help.html
  M ckan/templates/_util.html
  A ckan/templates/_util_activity_div.html
  M ckan/templates/activity_streams/added_tag.html
  M ckan/templates/activity_streams/changed_group.html
  M ckan/templates/activity_streams/changed_package.html
  M ckan/templates/activity_streams/changed_package_extra.html
  M ckan/templates/activity_streams/changed_resource.html
  M ckan/templates/activity_streams/changed_user.html
  M ckan/templates/activity_streams/deleted_group.html
  M ckan/templates/activity_streams/deleted_package.html
  M ckan/templates/activity_streams/deleted_package_extra.html
  M ckan/templates/activity_streams/deleted_resource.html
  M ckan/templates/activity_streams/new_group.html
  M ckan/templates/activity_streams/new_package.html
  M ckan/templates/activity_streams/new_package_extra.html
  M ckan/templates/activity_streams/new_resource.html
  M ckan/templates/activity_streams/new_user.html
  M ckan/templates/activity_streams/removed_tag.html
  M ckan/templates/facets.html
  M ckan/templates/group/layout.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/home/about.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  A ckan/templates/package/editresources.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new.html
  M ckan/templates/package/new_package_form.html
  A ckan/templates/package/read.rdf
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/user/list.html
  M ckan/tests/__init__.py
  M ckan/tests/functional/api/model/test_group.py
  M ckan/tests/functional/api/test_resource.py
  M ckan/tests/functional/api/test_util.py
  M ckan/tests/functional/test_authz.py
  M ckan/tests/functional/test_datastore.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_storage.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/logic/test_action.py
  A ckan/tests/logic/test_member.py
  M ckanext/publisher_form/forms.py
  M ckanext/publisher_form/templates/dataset_form.html
  M ckanext/publisher_form/templates/publisher_form.html
  A ckanext/publisher_form/templates/publisher_index.html
  A ckanext/publisher_form/templates/publisher_layout.html
  A ckanext/publisher_form/templates/publisher_new.html
  A ckanext/publisher_form/templates/publisher_read.html
  M ckanext/test_tag_vocab_plugin.py
  M doc/apiv3.rst
  M doc/authorization.rst
  R doc/ckan-features.png
  R doc/ckan-vision.png
  M doc/configuration.rst
  A doc/database-dumps.rst
  R doc/database_dumps.rst
  M doc/datastore.rst
  R doc/editing_the_database_ownership.rst
  R doc/file-upload.rst
  A doc/filestore.rst
  A doc/howto-editing-database-ownership.rst
  M doc/index.rst
  M doc/install-from-source.rst
  A doc/loading-data.rst
  R doc/loading_data.rst
  M doc/paster.rst
  A doc/publisher_auth_profile.rst
  R pip-requirements-prerelease.txt
  M pip-requirements.txt
  A profile_tests.py
  M requires/lucid_present.txt
  M setup.py
  M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into enhancement-2220-cache-friendly

Conflicts:
	ckan/controllers/api.py
	ckan/controllers/package.py
	ckan/controllers/user.py
	ckan/lib/dictization/model_dictize.py
	ckan/lib/dictization/model_save.py


  Commit: cf38d1384f4039feb5e2d203037505c48b6235c8
      https://github.com/okfn/ckan/commit/cf38d1384f4039feb5e2d203037505c48b6235c8
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    M ckan/ckan_nose_plugin.py

  Log Message:
  -----------
  stop test timing


  Commit: 8c8cb8a6ddc9a71bba39e5168045c48e872d99a0
      https://github.com/okfn/ckan/commit/8c8cb8a6ddc9a71bba39e5168045c48e872d99a0
  Author: kindly <kindly at gmail.com>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/group.py
  M ckan/controllers/package.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/tests/functional/test_tag_vocab.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckanext/test_tag_vocab_plugin.py

  Log Message:
  -----------
  [#2233] package show uses db_to_form schema


  Commit: c4fb0c78c5ee2234ea7f627cbd1e167f33e60eac
      https://github.com/okfn/ckan/commit/c4fb0c78c5ee2234ea7f627cbd1e167f33e60eac
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    A doc/api-util.rst
  A doc/api-v2.rst
  M doc/api.rst
  M doc/apiv3.rst
  M doc/index.rst

  Log Message:
  -----------
  [#2226,doc/api][m]: refactor API pages layout quite heavily and refactor content (mildly).

* Split out v2 docs to api-v2.rst and Util API docs to api-util.rst (Util API is common to v2 and v3 so could centralize)
* Pull common content (Authentication and API Keys, JSONP) into main api.rst
* Reword and improve api.rst content and make some minor tweaks to v2 and v3


  Commit: f02bbb52ef3579af02a13384d3f647581d8eee7d
      https://github.com/okfn/ckan/commit/f02bbb52ef3579af02a13384d3f647581d8eee7d
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    M ckan/ckan_nose_plugin.py
  M ckan/controllers/package.py
  A ckan/public/img/glyphicons-halflings-white.png
  A ckan/public/img/glyphicons-halflings.png
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  Merge branch 'master' into enhancement-2220-cache-friendly


  Commit: 9e3e4ce672e4985b6e2c1a47a96c5319cb3498ab
      https://github.com/okfn/ckan/commit/9e3e4ce672e4985b6e2c1a47a96c5319cb3498ab
  Author: kindly <kindly at gmail.com>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    M ckan/ckan_nose_plugin.py
  M ckan/config/environment.py
  M ckan/tests/functional/test_datastore.py
  M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [2237] add environment variables and add way to segment tests


  Commit: efb02f7e317a0eed201f3f9504131b8c809c63f5
      https://github.com/okfn/ckan/commit/efb02f7e317a0eed201f3f9504131b8c809c63f5
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-17 (Sat, 17 Mar 2012)

  Changed paths:
    M doc/administrative-dashboard.rst

  Log Message:
  -----------
  [doc/administrative-dashboard][xs]: minor tweaks to text.


  Commit: 1b2653c133fb0421b3d92bb18d8e87c8cda4febc
      https://github.com/okfn/ckan/commit/1b2653c133fb0421b3d92bb18d8e87c8cda4febc
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-17 (Sat, 17 Mar 2012)

  Changed paths:
    M doc/_themes/sphinx-theme-okfn

  Log Message:
  -----------
  [doc/themes][xs]: update to latest sphinx theme which gives nicer tables and admonitions.


  Commit: 8276c62e85ee10ee924ac8fb610125b067dc928e
      https://github.com/okfn/ckan/commit/8276c62e85ee10ee924ac8fb610125b067dc928e
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-17 (Sat, 17 Mar 2012)

  Changed paths:
    M doc/api.rst

  Log Message:
  -----------
  [#2226,doc/api][s]: move details of tools for accessing API including API clients into api.rst from wiki.


  Commit: 1d8d2d204a80510dfd766cc273067a3417ba828a
      https://github.com/okfn/ckan/commit/1d8d2d204a80510dfd766cc273067a3417ba828a
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-17 (Sat, 17 Mar 2012)

  Changed paths:
    A doc/api-tutorial.rst
  M doc/api.rst

  Log Message:
  -----------
  [#2226,doc/api-tutorial][s]: create API quickstart tutorial based on http://wiki.ckan.org/Using_the_API.


  Commit: 463347f965ace31ba32899545a17df160bc41f60
      https://github.com/okfn/ckan/commit/463347f965ace31ba32899545a17df160bc41f60
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-17 (Sat, 17 Mar 2012)

  Changed paths:
    M ckan/ckan_nose_plugin.py
  M ckan/config/environment.py
  M ckan/config/routing.py
  M ckan/controllers/group.py
  M ckan/controllers/package.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/tests/functional/test_datastore.py
  M ckan/tests/functional/test_tag_vocab.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/logic/test_action.py
  M ckanext/test_tag_vocab_plugin.py

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


  Commit: 9e86aa9bf9bd7643dc54596e2c417a63b8caf27d
      https://github.com/okfn/ckan/commit/9e86aa9bf9bd7643dc54596e2c417a63b8caf27d
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-18 (Sun, 18 Mar 2012)

  Changed paths:
    M doc/api.rst

  Log Message:
  -----------
  [#2226,doc/api][xs]: add Google Refine extension to list of clients.


  Commit: 6289f98d909350ac20b2078d2c5dfcfc5c2ec5d7
      https://github.com/okfn/ckan/commit/6289f98d909350ac20b2078d2c5dfcfc5c2ec5d7
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-18 (Sun, 18 Mar 2012)

  Changed paths:
    M doc/conf.py
  M doc/index.rst
  A doc/linked-data-and-rdf.rst

  Log Message:
  -----------
  [#2226,doc/linked-data-and-rdf][s]: add new linked data section (needs more work - @rossjones).


  Commit: 014552675e9948571e31e0339a40ce9e4fdbff4d
      https://github.com/okfn/ckan/commit/014552675e9948571e31e0339a40ce9e4fdbff4d
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-18 (Sun, 18 Mar 2012)

  Changed paths:
    M doc/configuration.rst
  M doc/domain-model.rst
  M doc/install-from-source.rst
  M doc/paster.rst

  Log Message:
  -----------
  [#2226,doc][xs]: fix minor formatting issues causing sphinx warnings.


  Commit: 21397ef3c8e92f2f3d5df31e33690be0dbefc44d
      https://github.com/okfn/ckan/commit/21397ef3c8e92f2f3d5df31e33690be0dbefc44d
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-18 (Sun, 18 Mar 2012)

  Changed paths:
    M doc/_templates/footer.html
  M doc/conf.py

  Log Message:
  -----------
  [#2226,doc][xs]: add license to footer of page along with open button.


  Commit: e812e2141fbf54857209e9e515afa9316885d0f2
      https://github.com/okfn/ckan/commit/e812e2141fbf54857209e9e515afa9316885d0f2
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-18 (Sun, 18 Mar 2012)

  Changed paths:
    M doc/index.rst
  A doc/publisher-profile.rst
  R doc/publisher_auth_profile.rst

  Log Message:
  -----------
  [#2226,doc/publisher-profile][s]: heavily refactor publisher profile docs (and rename from publisher_auth_profile).

* Also add into main toc tree


  Commit: 4e1453f8bfe5b4d5f0509b81ff2edaccea723189
      https://github.com/okfn/ckan/commit/4e1453f8bfe5b4d5f0509b81ff2edaccea723189
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/ckan_nose_plugin.py
  M ckan/config/environment.py
  M ckan/config/routing.py
  M ckan/controllers/group.py
  M ckan/controllers/package.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
  A ckan/public/img/glyphicons-halflings-white.png
  A ckan/public/img/glyphicons-halflings.png
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/package/resource_read.html
  M ckan/templates/user/read.html
  M ckan/tests/functional/test_datastore.py
  M ckan/tests/functional/test_tag_vocab.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/logic/test_action.py
  M ckanext/test_tag_vocab_plugin.py
  M doc/_templates/footer.html
  M doc/_themes/sphinx-theme-okfn
  A doc/administrative-dashboard.rst
  A doc/api-tutorial.rst
  A doc/api-util.rst
  A doc/api-v2.rst
  M doc/api.rst
  M doc/apiv3.rst
  M doc/conf.py
  M doc/configuration.rst
  A doc/domain-model-dataset.rst
  A doc/domain-model-resource.rst
  A doc/domain-model-task-status.rst
  A doc/domain-model.rst
  M doc/index.rst
  M doc/install-from-source.rst
  A doc/linked-data-and-rdf.rst
  M doc/paster.rst
  A doc/publisher-profile.rst
  R doc/publisher_auth_profile.rst

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


  Commit: 670a3e3318bffbe5bde43acefa445914d95cfa9d
      https://github.com/okfn/ckan/commit/670a3e3318bffbe5bde43acefa445914d95cfa9d
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [xs,bug] Recent changes to package_show killed Package controller, fixed


  Commit: 34ebdcc06105b50065d666afabf41e4096c20873
      https://github.com/okfn/ckan/commit/34ebdcc06105b50065d666afabf41e4096c20873
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/controllers/package.py
  M ckan/controllers/storage.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_storage.py

  Log Message:
  -----------
  [xs,bug] Fix for storage tests and removing package_show from Package controller _get_package_type;


  Commit: 3c0eebcaf0c24d601ab20f43a6600ba5ee91bba7
      https://github.com/okfn/ckan/commit/3c0eebcaf0c24d601ab20f43a6600ba5ee91bba7
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [xs] fix bootstrap css for firefox


  Commit: 65e10adb1b15e2acaea29968f97ad36d81d071ba
      https://github.com/okfn/ckan/commit/65e10adb1b15e2acaea29968f97ad36d81d071ba
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/controllers/package.py
  A ckan/templates/package/read.n3
  M doc/linked-data-and-rdf.rst

  Log Message:
  -----------
  [2209] Allow selection of RDF format by accept header


  Commit: 5afdbc80be0a093588c5ef74e630e2e840c356e5
      https://github.com/okfn/ckan/commit/5afdbc80be0a093588c5ef74e630e2e840c356e5
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/templates/layout_base.html

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


  Commit: 38bc166e7313142cf86f204bf4696d5042a068f4
      https://github.com/okfn/ckan/commit/38bc166e7313142cf86f204bf4696d5042a068f4
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/controllers/package.py
  M ckan/lib/base.py
  M ckan/templates/package/read.n3

  Log Message:
  -----------
  Fixed rendering for text templates and first draft of n3


  Commit: 33a754401e44863e235e78af37f7f87d093b83e7
      https://github.com/okfn/ckan/commit/33a754401e44863e235e78af37f7f87d093b83e7
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  page cache uses redis


  Commit: 0a0b595a9a099de11a56b2e96604a9856b944e1a
      https://github.com/okfn/ckan/commit/0a0b595a9a099de11a56b2e96604a9856b944e1a
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  lib.base.render() cleanups and remove template caching


  Commit: 43ca08a5f4ff3442c4831bf029c688e1ec7f9e98
      https://github.com/okfn/ckan/commit/43ca08a5f4ff3442c4831bf029c688e1ec7f9e98
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/lib/base.py
  M ckan/tests/functional/test_autoneg.py

  Log Message:
  -----------
  [xs] Fix for autonegotiation tests


  Commit: 2e449400c422b0c5885d7f21fa54a508c9f6c304
      https://github.com/okfn/ckan/commit/2e449400c422b0c5885d7f21fa54a508c9f6c304
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/public/scripts/application.js
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  remove welcome bar


  Commit: 7882f1dc57ef08fe56a3802a4a25425757cc1253
      https://github.com/okfn/ckan/commit/7882f1dc57ef08fe56a3802a4a25425757cc1253
  Author: John Glover <j at johnglover.net>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

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

  Log Message:
  -----------
  [xs][logic/get] fix typo in validation error string


  Commit: b603b8f9b685d24160642079bbfaed6c8ba910aa
      https://github.com/okfn/ckan/commit/b603b8f9b685d24160642079bbfaed6c8ba910aa
  Author: John Glover <j at johnglover.net>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/controllers/package.py
  M ckan/controllers/storage.py
  M ckan/lib/base.py
  M ckan/templates/layout_base.html
  A ckan/templates/package/read.n3
  M ckan/tests/functional/test_autoneg.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_storage.py
  M doc/linked-data-and-rdf.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: a09fb748ce05c16e06308c9a538c0a76860cccf5
      https://github.com/okfn/ckan/commit/a09fb748ce05c16e06308c9a538c0a76860cccf5
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/templates/package/read.rdf
  M doc/linked-data-and-rdf.rst

  Log Message:
  -----------
  Improved RDF documentation


  Commit: 79cea2a58725429ac2c4420a2c83782aa5f904c4
      https://github.com/okfn/ckan/commit/79cea2a58725429ac2c4420a2c83782aa5f904c4
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

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

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


  Commit: e056cb8bad1e9691a4c596512c03f885cc2b20a5
      https://github.com/okfn/ckan/commit/e056cb8bad1e9691a4c596512c03f885cc2b20a5
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/model/meta.py

  Log Message:
  -----------
  add cache clearing on database changes


  Commit: ecd7a23835bda933af71311dcbe64a3b720b1294
      https://github.com/okfn/ckan/commit/ecd7a23835bda933af71311dcbe64a3b720b1294
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/ckan_nose_plugin.py
  M ckan/config/environment.py
  M ckan/config/routing.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/controllers/storage.py
  M ckan/lib/base.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/templates/layout_base.html
  A ckan/templates/package/read.n3
  M ckan/templates/user/read.html
  M ckan/tests/functional/test_autoneg.py
  M ckan/tests/functional/test_datastore.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_storage.py
  M ckan/tests/functional/test_tag_vocab.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/logic/test_action.py
  M ckanext/test_tag_vocab_plugin.py
  M doc/_templates/footer.html
  M doc/_themes/sphinx-theme-okfn
  A doc/administrative-dashboard.rst
  A doc/api-tutorial.rst
  A doc/api-util.rst
  A doc/api-v2.rst
  M doc/api.rst
  M doc/apiv3.rst
  M doc/conf.py
  M doc/configuration.rst
  A doc/domain-model-dataset.rst
  A doc/domain-model-resource.rst
  A doc/domain-model-task-status.rst
  A doc/domain-model.rst
  M doc/index.rst
  M doc/install-from-source.rst
  A doc/linked-data-and-rdf.rst
  M doc/paster.rst
  A doc/publisher-profile.rst
  R doc/publisher_auth_profile.rst

  Log Message:
  -----------
  Merge branch 'master' into enhancement-2220-cache-friendly

Conflicts:
	ckan/lib/base.py


  Commit: 88400b7a0fceb0e37d7f8481489373889d8e7449
      https://github.com/okfn/ckan/commit/88400b7a0fceb0e37d7f8481489373889d8e7449
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  clean up whitespace in template rendering


  Commit: 2675b2a2df94aaacdcc8ef2d624b05609910e1ca
      https://github.com/okfn/ckan/commit/2675b2a2df94aaacdcc8ef2d624b05609910e1ca
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/config/middleware.py
  M ckan/config/routing.py
  M ckan/controllers/admin.py
  M ckan/controllers/api.py
  M ckan/controllers/home.py
  M ckan/controllers/package.py
  M ckan/controllers/user.py
  M ckan/exceptions.py
  M ckan/lib/base.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/lib/i18n.py
  M ckan/lib/search/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/model/meta.py
  M ckan/public/scripts/application.js
  M ckan/templates/layout_base.html
  M ckan/templates/user/edit_user_form.html
  M ckan/templates/user/layout.html
  M ckan/templates/user/list.html
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/test_user.py
  M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  Merge branch 'enhancement-2220-cache-friendly'


  Commit: dbb572d62d681939bb9fb54a9a37fa811582192a
      https://github.com/okfn/ckan/commit/dbb572d62d681939bb9fb54a9a37fa811582192a
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    R ckan/public/css/blueprint/ie.css
  R ckan/public/css/blueprint/print.css
  R ckan/public/css/blueprint/screen.css
  M ckan/public/css/style.css
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  [#2223]: Removing all blueprint references and classes. Done layout_base. Remaining: home/index, user/read, package/resource/read


  Commit: c21020907dfbff4b5fce6e65f2a3aa5e41ee2026
      https://github.com/okfn/ckan/commit/c21020907dfbff4b5fce6e65f2a3aa5e41ee2026
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M doc/authorization.rst
  M doc/configuration.rst
  M doc/domain-model.rst

  Log Message:
  -----------
  [#2226,doc][xs]: correct some links etc that were causing warnings.


  Commit: 4bf547e95a914452e12b8eff1e5b96adc9ed1653
      https://github.com/okfn/ckan/commit/4bf547e95a914452e12b8eff1e5b96adc9ed1653
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    A doc/background-tasks.rst
  M doc/extensions.rst
  M doc/index.rst

  Log Message:
  -----------
  [#2226,doc/background-tasks][m]: add in documentation on background tasks.

* Incorporates http://wiki.ckan.org/Writing_asynchronous_tasks (for dev section)
* Moves over admin/setup section from extensions.rst


  Commit: f75c5b72a33a217d922b0ea76e3b1585177f88ef
      https://github.com/okfn/ckan/commit/f75c5b72a33a217d922b0ea76e3b1585177f88ef
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    A doc/deployment.rst

  Log Message:
  -----------
  [#2226,doc/deployment][s]: incorporate http://wiki.ckan.org/Deployment.


  Commit: 0d83cd877a1db85d05f5683d185ca374b7ae5c1d
      https://github.com/okfn/ckan/commit/0d83cd877a1db85d05f5683d185ca374b7ae5c1d
  Author: kindly <kindly at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
  M ckan/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/test_admin.py
  M ckan/tests/functional/test_home.py
  M ckan/tests/functional/test_user.py
  M ckan/tests/lib/test_mailer.py
  M ckan/tests/misc/test_mock_mail_server.py
  M ckan/tests/mock_mail_server.py
  M ckan/tests/models/test_package.py
  M test-core.ini

  Log Message:
  -----------
  [2237] speed up tests and clean broken ones due to oredering


  Commit: c594ef2a3f791e24bb5a6976ddf0f6458410f3b0
      https://github.com/okfn/ckan/commit/c594ef2a3f791e24bb5a6976ddf0f6458410f3b0
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M doc/index.rst
  M doc/post-installation.rst

  Log Message:
  -----------
  [#2226,doc][xs]: items missing from prenultimate commit f75c5b72a33a217d922b0ea76e3b1585177f88ef.


  Commit: 858e23008855e900cfc0c96269880a8a4931b06b
      https://github.com/okfn/ckan/commit/858e23008855e900cfc0c96269880a8a4931b06b
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M ckan/controllers/template.py

  Log Message:
  -----------
  [master,controller/template][xs]: support urls which do not have .html in them (but template does) and only abort 404 on template not found as otherwise we can hide errors.


  Commit: 9965818e20f7532b37eb97a3b76c078263eb0dd1
      https://github.com/okfn/ckan/commit/9965818e20f7532b37eb97a3b76c078263eb0dd1
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M ckan/templates/admin/index.html
  M ckan/templates/package/read.html
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#1559,master][xs]: add comment hooks into dataset and resource templates and recent comments hook into ckan-admin index page to utilize new ckanext-disqus setup (fixes #1559).


  Commit: 7fcd8349f364c95a1b6c1b11efd38b60ecdbf105
      https://github.com/okfn/ckan/commit/7fcd8349f364c95a1b6c1b11efd38b60ecdbf105
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  fix for connection loss on redis.flush


  Commit: 7835604b1afb96cefa7d68cc7d9eec337519ca58
      https://github.com/okfn/ckan/commit/7835604b1afb96cefa7d68cc7d9eec337519ca58
  Author: John Glover <j at johnglover.net>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M doc/writing-extensions.rst

  Log Message:
  -----------
  [2245][docs] updating 'writing extensions' doc, removing out-of-date text


  Commit: 4dae5b4250246a722357cf48a5c8d642560f9c4a
      https://github.com/okfn/ckan/commit/4dae5b4250246a722357cf48a5c8d642560f9c4a
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    A doc/commenting.rst
  M doc/index.rst

  Log Message:
  -----------
  [#2226,doc/commenting][s]: add documentation re comments and commenting functionality in CKAN.


  Commit: 05efec67598339d35844ebd56adc9d85e983163e
      https://github.com/okfn/ckan/commit/05efec67598339d35844ebd56adc9d85e983163e
  Author: John Glover <j at johnglover.net>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M ckan/config/middleware.py
  M ckan/config/routing.py
  M ckan/controllers/admin.py
  M ckan/controllers/api.py
  M ckan/controllers/home.py
  M ckan/controllers/package.py
  M ckan/controllers/template.py
  M ckan/controllers/user.py
  M ckan/exceptions.py
  M ckan/lib/base.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/lib/i18n.py
  M ckan/lib/search/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/model/meta.py
  M ckan/public/scripts/application.js
  M ckan/templates/admin/index.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/read.html
  M ckan/templates/package/read.rdf
  M ckan/templates/package/resource_read.html
  M ckan/templates/user/edit_user_form.html
  M ckan/templates/user/layout.html
  M ckan/templates/user/list.html
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/test_admin.py
  M ckan/tests/functional/test_home.py
  M ckan/tests/functional/test_user.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_mailer.py
  M ckan/tests/misc/test_mock_mail_server.py
  M ckan/tests/mock_mail_server.py
  M ckan/tests/models/test_package.py
  M doc/authorization.rst
  A doc/background-tasks.rst
  M doc/configuration.rst
  A doc/deployment.rst
  M doc/domain-model.rst
  M doc/extensions.rst
  M doc/index.rst
  M doc/linked-data-and-rdf.rst
  M doc/post-installation.rst
  M test-core.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: cced74c49a2dbe8c3ffd69b6c7dfaa4ed5f2814e
      https://github.com/okfn/ckan/commit/cced74c49a2dbe8c3ffd69b6c7dfaa4ed5f2814e
  Author: John Glover <j at johnglover.net>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    A doc/commenting.rst
  M doc/index.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 99375082e03a2457b20484701e66402ebe29c165
      https://github.com/okfn/ckan/commit/99375082e03a2457b20484701e66402ebe29c165
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py
  R ckan/public/css/bootstrap.css
  A ckan/public/css/bootstrap.min.css
  M ckan/public/css/style.css
  M ckan/templates/home/index.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/user/read.html

  Log Message:
  -----------
  [#2223]: Converted structural markup (span-12 etc) from blueprint to bootstrap format.


  Commit: 220559f898251ebaa19ca4f1bf1b692d307e9f67
      https://github.com/okfn/ckan/commit/220559f898251ebaa19ca4f1bf1b692d307e9f67
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/public/scripts/templates.js
  M ckan/templates/_util.html
  M ckan/templates/admin/authz.html
  M ckan/templates/admin/trash.html
  M ckan/templates/group/authz.html
  M ckan/templates/group/history.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/authz.html
  M ckan/templates/package/history.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/search_form.html
  M ckan/templates/revision/read.html
  M ckan/templates/user/edit_user_form.html
  M ckan/templates/user/list.html
  M ckan/templates/user/login.html
  M ckan/templates/user/new_user_form.html
  M ckan/templates/user/perform_reset.html
  M ckan/templates/user/request_reset.html
  M ckanext/publisher_form/templates/dataset_form.html
  M ckanext/publisher_form/templates/publisher_form.html
  M ckanext/publisher_form/templates/publisher_read.html

  Log Message:
  -----------
  [#2223]: Change all uses of pretty-button to btn


  Commit: f9bf0c6cd2d042a8297f6d5e00d47e4a6554f34a
      https://github.com/okfn/ckan/commit/f9bf0c6cd2d042a8297f6d5e00d47e4a6554f34a
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/public/css/style.css
  M ckan/public/scripts/templates.js
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  [#2223]: Switched to Bootstrap flash messages; spaced out the page.


  Commit: 41a665710653e96107b905c335a1ecfdcd95b092
      https://github.com/okfn/ckan/commit/41a665710653e96107b905c335a1ecfdcd95b092
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  only worry about ckan/auth_tkt cookies


  Commit: 7535aefb6285ad9147cdc1f791cb691fa2dcbcf5
      https://github.com/okfn/ckan/commit/7535aefb6285ad9147cdc1f791cb691fa2dcbcf5
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  remove auth_tkt if possible plus added comments to cookie removal code


  Commit: a9385dfa4ec8670801cc604eae72883335b6247b
      https://github.com/okfn/ckan/commit/a9385dfa4ec8670801cc604eae72883335b6247b
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M ckan/controllers/template.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/templates/admin/index.html
  M ckan/templates/package/read.html
  M ckan/templates/package/resource_read.html
  M ckan/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/test_admin.py
  M ckan/tests/functional/test_home.py
  M ckan/tests/functional/test_user.py
  M ckan/tests/lib/test_mailer.py
  M ckan/tests/misc/test_mock_mail_server.py
  M ckan/tests/mock_mail_server.py
  M ckan/tests/models/test_package.py
  M doc/authorization.rst
  A doc/background-tasks.rst
  A doc/commenting.rst
  M doc/configuration.rst
  A doc/deployment.rst
  M doc/domain-model.rst
  M doc/extensions.rst
  M doc/index.rst
  M doc/post-installation.rst
  M doc/writing-extensions.rst
  M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into enhancement-2244-clean-up-auth


  Commit: 10cfd16841366fc7f6f4fc38d2b027868f0cb1ef
      https://github.com/okfn/ckan/commit/10cfd16841366fc7f6f4fc38d2b027868f0cb1ef
  Author: amercader <amercadero at gmail.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M ckan/lib/cli.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/index.py
  M ckan/lib/search/query.py
  M ckan/tests/lib/test_cli.py
  M doc/paster.rst

  Log Message:
  -----------
  [#1616][search] Improvements on the search index CLI

Several fixes and new options for the `search-index` paster command:

* Add -o option to only reindex datasets not already indexed
* Add -i option to ignore exceptions when rebuilding
* Add -r option to just refresh the index (not clearing it first)
* Fix show command to show the index stored for a dataset
* Add support for clearing the index of just one dataset


  Commit: 3b1fff9ff90c61cfdca2368c5e71d735e6a42ed2
      https://github.com/okfn/ckan/commit/3b1fff9ff90c61cfdca2368c5e71d735e6a42ed2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    A ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore

  Log Message:
  -----------
  Fix paster create -t ckanext ...

This command was crashing, complaining that it couldn't find an egg-info
dir. It looks like there needs to be an empty directory at:

    ckan/pastertemplates/template/ckanext_+project+.egg-info/

Since git doesn't track empty directories, I think this might have been
lost in the move from hg to git?


  Commit: 163ea7bb8024c5706ddf1858c81185b0eb2e1c0e
      https://github.com/okfn/ckan/commit/163ea7bb8024c5706ddf1858c81185b0eb2e1c0e
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  [master,bugfix,routing][xs]: correct bug introduced in f82f3b9acd8a4dc82813a163511e87cf706681ac whereby conditions for datastore write were GET/POST/DELETE rather than PUT/POST/DELETE.


  Commit: 590962dbb3f8bcb038da49b3501e9af72ba5e1f2
      https://github.com/okfn/ckan/commit/590962dbb3f8bcb038da49b3501e9af72ba5e1f2
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M ckan/config/middleware.py
  M ckan/lib/base.py
  A ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore
  M doc/writing-extensions.rst

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


  Commit: 257bf052a9a701109e5486430561b8a0666671b6
      https://github.com/okfn/ckan/commit/257bf052a9a701109e5486430561b8a0666671b6
  Author: kindly <kindly at gmail.com>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M ckan/lib/dictization/__init__.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/model/package.py

  Log Message:
  -----------
  [2237] speed up tests by makeing metadata modified faster


  Commit: 962bd9d27767044d56c219ff905bdefbd9297118
      https://github.com/okfn/ckan/commit/962bd9d27767044d56c219ff905bdefbd9297118
  Author: amercader <amercadero at gmail.com>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/lib/dictization/__init__.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/model/package.py
  A ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore

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


  Commit: 33950c53d039fcf606c2ca96f4871966372a0c7e
      https://github.com/okfn/ckan/commit/33950c53d039fcf606c2ca96f4871966372a0c7e
  Author: John Glover <j at johnglover.net>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M doc/forms.rst

  Log Message:
  -----------
  [2248][docs] update 'customizing forms' docs to describe implementing IDatasetForm instead of subclassing controllers


  Commit: abf582f1a98efce418e178881de9214bbae8db92
      https://github.com/okfn/ckan/commit/abf582f1a98efce418e178881de9214bbae8db92
  Author: John Glover <j at johnglover.net>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M ckan/config/middleware.py
  M ckan/config/routing.py
  M ckan/lib/base.py
  M ckan/lib/cli.py
  M ckan/lib/dictization/__init__.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/index.py
  M ckan/lib/search/query.py
  M ckan/model/package.py
  A ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore
  M ckan/tests/lib/test_cli.py
  M doc/paster.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 6b4c6c992c696c86baa63cc15ca3a9874a656cf8
      https://github.com/okfn/ckan/commit/6b4c6c992c696c86baa63cc15ca3a9874a656cf8
  Author: amercader <amercadero at gmail.com>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M ckan/lib/search/index.py
  M ckan/tests/lib/test_solr_search_index.py

  Log Message:
  -----------
  [#2232][search] Escape illegal XML characters before indexing

Otherwise SOLR will return an exception


  Commit: 057ed479e83a67c7e399054a50d0b38b3e64fcd3
      https://github.com/okfn/ckan/commit/057ed479e83a67c7e399054a50d0b38b3e64fcd3
  Author: John Glover <j at johnglover.net>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M doc/forms.rst

  Log Message:
  -----------
  [2213][docs] add geospatial tag example to 'customizing forms' documentation


  Commit: 000b7b9a23af0537c7088023d0ffa262c81601a5
      https://github.com/okfn/ckan/commit/000b7b9a23af0537c7088023d0ffa262c81601a5
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [#2223]: Remove Modernizr. HTML5shiv is enough.


  Commit: d1d8094a879cc4794fd34191943de4263957a5a6
      https://github.com/okfn/ckan/commit/d1d8094a879cc4794fd34191943de4263957a5a6
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

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

  Log Message:
  -----------
  [#2223]: Ran JSLint across app.js to get things working in IE7.


  Commit: 6b5466c18dc3fe1d74a1c4b18380388b4af5cc0a
      https://github.com/okfn/ckan/commit/6b5466c18dc3fe1d74a1c4b18380388b4af5cc0a
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M ckan/config/middleware.py
  M ckan/config/routing.py
  M ckan/controllers/admin.py
  M ckan/controllers/api.py
  M ckan/controllers/home.py
  M ckan/controllers/package.py
  M ckan/controllers/template.py
  M ckan/controllers/user.py
  M ckan/exceptions.py
  M ckan/lib/base.py
  M ckan/lib/cli.py
  M ckan/lib/dictization/__init__.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/lib/i18n.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/index.py
  M ckan/lib/search/query.py
  M ckan/logic/action/create.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/model/meta.py
  M ckan/model/package.py
  A ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore
  M ckan/public/scripts/application.js
  M ckan/templates/admin/index.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/read.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/user/edit_user_form.html
  M ckan/templates/user/layout.html
  M ckan/templates/user/list.html
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/test_admin.py
  M ckan/tests/functional/test_home.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_mailer.py
  M ckan/tests/lib/test_solr_search_index.py
  M ckan/tests/misc/test_mock_mail_server.py
  M ckan/tests/mock_mail_server.py
  M ckan/tests/models/test_package.py
  M doc/authorization.rst
  A doc/background-tasks.rst
  A doc/commenting.rst
  M doc/configuration.rst
  A doc/deployment.rst
  M doc/domain-model.rst
  M doc/extensions.rst
  M doc/forms.rst
  M doc/index.rst
  M doc/paster.rst
  M doc/post-installation.rst
  M doc/writing-extensions.rst
  M test-core.ini

  Log Message:
  -----------
  [#2223]: Merging in master


  Commit: 90772051f663640e64ed9970c9fad1f937740890
      https://github.com/okfn/ckan/commit/90772051f663640e64ed9970c9fad1f937740890
  Author: amercader <amercadero at gmail.com>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M ckan/lib/plugins.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py

  Log Message:
  -----------
  [#2231][logic] Allow schema to be passed as part of the context

This allows extensions which are not implementing the dataset
form interface to use custom schemas.


  Commit: 66b59b6808a20c347ca74607c28fed7c7b21e2b3
      https://github.com/okfn/ckan/commit/66b59b6808a20c347ca74607c28fed7c7b21e2b3
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    A ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  [#2223]: Upgraded to bootstrap 2.0.2 minified JS.


  Commit: 9034afaa6e45f0b8425a1978bfe45db9ac15bd43
      https://github.com/okfn/ckan/commit/9034afaa6e45f0b8425a1978bfe45db9ac15bd43
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  R ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
  M ckan/templates/package/new_package_form.html

  Log Message:
  -----------
  [#2223]: Tidying JS template code to match bootstrap form markup.


  Commit: e3484cbb2a26c3eb95d1806bc0ce42b7a865c4c9
      https://github.com/okfn/ckan/commit/e3484cbb2a26c3eb95d1806bc0ce42b7a865c4c9
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/templates/package/edit.html
  M ckan/templates/package/new_package_form.html

  Log Message:
  -----------
  [#2223]: Bootstrap-ising the add package, package settings, and edit resources pages.


  Commit: 5c26bdfa74edf316556561b03ae7fab0102d0f6b
      https://github.com/okfn/ckan/commit/5c26bdfa74edf316556561b03ae7fab0102d0f6b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M ckan/tests/functional/api/test_activity.py

  Log Message:
  -----------
  Make test_activity.py faster

Only run create_test_data() once in
tests/functional/api/test_activity.py, not before each test case. Fix
the test cases to work under these conditions.


  Commit: 0b8beb73e3ea6189c39e8663c128c3ab78317dec
      https://github.com/okfn/ckan/commit/0b8beb73e3ea6189c39e8663c128c3ab78317dec
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M ckan/tests/functional/api/test_activity.py

  Log Message:
  -----------
  Reorder methods in test_activity.py

Put them in a more logical order


  Commit: e2d59d87c735cd91c0b2fe602fa8e76a8f76bb7a
      https://github.com/okfn/ckan/commit/e2d59d87c735cd91c0b2fe602fa8e76a8f76bb7a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M ckan/lib/plugins.py
  M ckan/lib/search/index.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py
  M ckan/tests/lib/test_solr_search_index.py
  M doc/forms.rst

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


  Commit: a69308e8a44b4521954080cc54b5d3cf231e44b2
      https://github.com/okfn/ckan/commit/a69308e8a44b4521954080cc54b5d3cf231e44b2
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M ckan/public/css/style.css

  Log Message:
  -----------
  [#2223]: Bootstrap fade effect on a bordered box in dataset/edit.


  Commit: 046b53a535404a26cf3337c1d0e6677649dc5ea2
      https://github.com/okfn/ckan/commit/046b53a535404a26cf3337c1d0e6677649dc5ea2
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/templates/package/new_package_form.html

  Log Message:
  -----------
  [#2223]: edit/extras looks great.


  Commit: 54b579b48c15484937cd0bcc6792062ffc52f5db
      https://github.com/okfn/ckan/commit/54b579b48c15484937cd0bcc6792062ffc52f5db
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/templates/_util.html
  M ckan/templates/package/authz.html
  M ckan/templates/package/history.html
  M ckan/templates/package/read_core.html
  M ckan/templates/revision/diff.html
  M ckan/templates/revision/list.html
  M ckan/templates/revision/read.html

  Log Message:
  -----------
  [#2223]: Packages and revision templates improved.


  Commit: 67a49f2686e7df4d1800a6dec163a8ad79a132aa
      https://github.com/okfn/ckan/commit/67a49f2686e7df4d1800a6dec163a8ad79a132aa
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/public/scripts/application.js

  Log Message:
  -----------
  [#2223]: Javascript fixes.


  Commit: e2cd4defa5ef5d90f939ed6875cfa66e68b69aa9
      https://github.com/okfn/ckan/commit/e2cd4defa5ef5d90f939ed6875cfa66e68b69aa9
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/templates/package/editresources.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#2223]: Tidied resource editor and view pages.


  Commit: 9537400d96e3954cd807af0ec05dbc1498fbaef2
      https://github.com/okfn/ckan/commit/9537400d96e3954cd807af0ec05dbc1498fbaef2
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/templates/admin/authz.html
  M ckan/templates/admin/trash.html
  M ckan/templates/authorization_group/edit_form.html
  M ckan/templates/group/authz.html
  M ckan/templates/group/edit.html
  M ckan/templates/group/history.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/package/new_package_form.html

  Log Message:
  -----------
  [#2223]: Groups. Authorization pages. Admin pages. Lots of bug fixes.


  Commit: 18ff0cbec76fb4a17921f75b447706f6eb27c083
      https://github.com/okfn/ckan/commit/18ff0cbec76fb4a17921f75b447706f6eb27c083
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  [#2223]: edit user form


  Commit: 9cb60b023c718cc8fccf4845d6210e5ff6e27b05
      https://github.com/okfn/ckan/commit/9cb60b023c718cc8fccf4845d6210e5ff6e27b05
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M ckan/templates/user/new_user_form.html

  Log Message:
  -----------
  [#2223]: Create user form


  Commit: 3b478fc0de32dea54066927ff017ad3e08dbd795
      https://github.com/okfn/ckan/commit/3b478fc0de32dea54066927ff017ad3e08dbd795
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  [#2223]: Tidying up the edges.


  Commit: 36fbe55135056f1518d376561c1c6ad679dd783e
      https://github.com/okfn/ckan/commit/36fbe55135056f1518d376561c1c6ad679dd783e
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M ckan/lib/plugins.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py
  M ckan/tests/functional/api/test_activity.py

  Log Message:
  -----------
  Merge branch 'master' into feature-2223-bootstrap


  Commit: ca79dbcce6df8d6e1b69a4e3ad3f5cac40f5f472
      https://github.com/okfn/ckan/commit/ca79dbcce6df8d6e1b69a4e3ad3f5cac40f5f472
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    A pip-requirements-docs.txt

  Log Message:
  -----------
  [master,docs][xs]: add pip-requirements-docs.txt in attempt to fix read the docs build issues.


  Commit: 4e21144c10bd32b1ba381f22a0a8fb9b989dac59
      https://github.com/okfn/ckan/commit/4e21144c10bd32b1ba381f22a0a8fb9b989dac59
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

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

  Log Message:
  -----------
  [#1828,vendor/recline][xs]: upgrade to HEAD of recline v0.3 (minor improvements).

* Fix hash navigation bugs, horizontal bar charts and get rid of costco stuff that was interacting badly with disqus.


  Commit: 803cb057afd8202134627b242937aa52a18654ed
      https://github.com/okfn/ckan/commit/803cb057afd8202134627b242937aa52a18654ed
  Author: kindly <kindly at gmail.com>
  Date:   2012-03-23 (Fri, 23 Mar 2012)

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

  Log Message:
  -----------
  [2223] fix some test only auth ones left


  Commit: 18ef4e9e01b8c35549ddedbb39030fd296f1a7b5
      https://github.com/okfn/ckan/commit/18ef4e9e01b8c35549ddedbb39030fd296f1a7b5
  Author: kindly <kindly at gmail.com>
  Date:   2012-03-23 (Fri, 23 Mar 2012)

  Changed paths:
    M ckan/public/scripts/vendor/recline/recline.js
  A pip-requirements-docs.txt

  Log Message:
  -----------
  Merge branch 'master' into feature-2223-bootstrap


  Commit: e7fc0ba775a07acafc46435dff161b5e3fd81966
      https://github.com/okfn/ckan/commit/e7fc0ba775a07acafc46435dff161b5e3fd81966
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-23 (Fri, 23 Mar 2012)

  Changed paths:
    M ckan/templates/facets.html

  Log Message:
  -----------
  [hotfix][xxs]: Moving an HTML comment to fix an IE7 bug.


  Commit: e28afd5a9d86bbce28a05366496191e87a896caa
      https://github.com/okfn/ckan/commit/e28afd5a9d86bbce28a05366496191e87a896caa
  Author: kindly <kindly at gmail.com>
  Date:   2012-03-23 (Fri, 23 Mar 2012)

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

  Log Message:
  -----------
  [2223] fix so that delete/change state not in form for unorthorized users


  Commit: d3857e030ac0fbb282969dd9e78cd2a6cb4c71f6
      https://github.com/okfn/ckan/commit/d3857e030ac0fbb282969dd9e78cd2a6cb4c71f6
  Author: kindly <kindly at gmail.com>
  Date:   2012-03-23 (Fri, 23 Mar 2012)

  Changed paths:
    M ckan/templates/facets.html

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


  Commit: 0bf4b33955df3806785f9b42a55acaeb45596e25
      https://github.com/okfn/ckan/commit/0bf4b33955df3806785f9b42a55acaeb45596e25
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-23 (Fri, 23 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py
  R ckan/public/css/blueprint/ie.css
  R ckan/public/css/blueprint/print.css
  R ckan/public/css/blueprint/screen.css
  R ckan/public/css/bootstrap.css
  A ckan/public/css/bootstrap.min.css
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  R ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
  A ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js
  M ckan/templates/_util.html
  M ckan/templates/admin/authz.html
  M ckan/templates/admin/trash.html
  M ckan/templates/authorization_group/edit_form.html
  M ckan/templates/facets.html
  M ckan/templates/group/authz.html
  M ckan/templates/group/edit.html
  M ckan/templates/group/history.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/home/index.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/authz.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/editresources.html
  M ckan/templates/package/history.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/search_form.html
  M ckan/templates/revision/diff.html
  M ckan/templates/revision/list.html
  M ckan/templates/revision/read.html
  M ckan/templates/user/edit_user_form.html
  M ckan/templates/user/list.html
  M ckan/templates/user/login.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
  M ckan/tests/functional/test_authz.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckanext/publisher_form/templates/dataset_form.html
  M ckanext/publisher_form/templates/publisher_form.html
  M ckanext/publisher_form/templates/publisher_read.html

  Log Message:
  -----------
  Merge branch 'feature-2223-bootstrap'


  Commit: 8d09b92e2c0789b667d77020951b737ea59f3353
      https://github.com/okfn/ckan/commit/8d09b92e2c0789b667d77020951b737ea59f3353
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-23 (Fri, 23 Mar 2012)

  Changed paths:
    R doc/ckan_form_guidance.doc

  Log Message:
  -----------
  [master,#2226,doc][xs]: remove long obsolete .doc file.


  Commit: fc3708010cab6a831ede6cea73b66184a4988f04
      https://github.com/okfn/ckan/commit/fc3708010cab6a831ede6cea73b66184a4988f04
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-24 (Sat, 24 Mar 2012)

  Changed paths:
    M doc/datastore.rst

  Log Message:
  -----------
  [master,doc/datastore][xs]: micro tweak to first paragraph.


  Commit: 53991fcd65da1a23cec8062c4c1d99d4ad9632cc
      https://github.com/okfn/ckan/commit/53991fcd65da1a23cec8062c4c1d99d4ad9632cc
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-24 (Sat, 24 Mar 2012)

  Changed paths:
    M ckan/public/scripts/application.js
  M ckan/templates/_snippet/data-api-help.html
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#1828,#1797,resource/view][xs]: very minor tweaks to css for data explorer and data api modal info to make corretions post-bootstrapification.


  Commit: c9946d3db06c7eec0a4127ecc7fa5edc3cf4ae78
      https://github.com/okfn/ckan/commit/c9946d3db06c7eec0a4127ecc7fa5edc3cf4ae78
  Author: John Glover <j at johnglover.net>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [xs][controller/package] bug fix: use _get_package_type in history function instead of trying to access the 'type' key on the package dict (may not exist).


  Commit: 98292eb8493e094160e3c8aad761ce5b65761b29
      https://github.com/okfn/ckan/commit/98292eb8493e094160e3c8aad761ce5b65761b29
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M README.rst
  M ckan/__init__.py
  M ckan/ckan_nose_plugin.py
  M ckan/config/environment.py
  M ckan/config/middleware.py
  R ckan/config/plugins.py
  M ckan/config/routing.py
  M ckan/config/solr/schema-1.3.xml
  M ckan/controllers/admin.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/controllers/home.py
  M ckan/controllers/package.py
  M ckan/controllers/storage.py
  M ckan/controllers/template.py
  M ckan/controllers/user.py
  M ckan/exceptions.py
  M ckan/i18n/bg/LC_MESSAGES/ckan.mo
  M ckan/i18n/ca/LC_MESSAGES/ckan.mo
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
  M ckan/i18n/de/LC_MESSAGES/ckan.mo
  M ckan/i18n/el/LC_MESSAGES/ckan.mo
  M ckan/i18n/es/LC_MESSAGES/ckan.mo
  M ckan/i18n/fi/LC_MESSAGES/ckan.mo
  M ckan/i18n/fr/LC_MESSAGES/ckan.mo
  M ckan/i18n/hu/LC_MESSAGES/ckan.mo
  M ckan/i18n/it/LC_MESSAGES/ckan.mo
  M ckan/i18n/lt/LC_MESSAGES/ckan.mo
  M ckan/i18n/nl/LC_MESSAGES/ckan.mo
  M ckan/i18n/no/LC_MESSAGES/ckan.mo
  M ckan/i18n/pl/LC_MESSAGES/ckan.mo
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
  M ckan/i18n/ro/LC_MESSAGES/ckan.mo
  M ckan/i18n/ru/LC_MESSAGES/ckan.mo
  M ckan/i18n/sl/LC_MESSAGES/ckan.mo
  M ckan/i18n/sq/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
  M ckan/i18n/sv/LC_MESSAGES/ckan.mo
  M ckan/lib/base.py
  M ckan/lib/cli.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/__init__.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/lib/i18n.py
  M ckan/lib/plugins.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/index.py
  M ckan/lib/search/query.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/migration/versions/027_adjust_harvester.py
  M ckan/model/meta.py
  M ckan/model/package.py
  A ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore
  M ckan/plugins/core.py
  M ckan/plugins/interfaces.py
  R ckan/public/css/blueprint/ie.css
  R ckan/public/css/blueprint/print.css
  R ckan/public/css/blueprint/screen.css
  R ckan/public/css/bootstrap.css
  A ckan/public/css/bootstrap.min.css
  M ckan/public/css/style.css
  A ckan/public/img/glyphicons-halflings-white.png
  A ckan/public/img/glyphicons-halflings.png
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  R ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
  A ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/_snippet/data-api-help.html
  M ckan/templates/_util.html
  A ckan/templates/_util_activity_div.html
  M ckan/templates/activity_streams/added_tag.html
  M ckan/templates/activity_streams/changed_group.html
  M ckan/templates/activity_streams/changed_package.html
  M ckan/templates/activity_streams/changed_package_extra.html
  M ckan/templates/activity_streams/changed_resource.html
  M ckan/templates/activity_streams/changed_user.html
  M ckan/templates/activity_streams/deleted_group.html
  M ckan/templates/activity_streams/deleted_package.html
  M ckan/templates/activity_streams/deleted_package_extra.html
  M ckan/templates/activity_streams/deleted_resource.html
  M ckan/templates/activity_streams/new_group.html
  M ckan/templates/activity_streams/new_package.html
  M ckan/templates/activity_streams/new_package_extra.html
  M ckan/templates/activity_streams/new_resource.html
  M ckan/templates/activity_streams/new_user.html
  M ckan/templates/activity_streams/removed_tag.html
  M ckan/templates/admin/authz.html
  M ckan/templates/admin/index.html
  M ckan/templates/admin/trash.html
  M ckan/templates/authorization_group/edit_form.html
  M ckan/templates/facets.html
  M ckan/templates/group/authz.html
  M ckan/templates/group/edit.html
  M ckan/templates/group/history.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/home/about.html
  M ckan/templates/home/index.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/authz.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/editresources.html
  M ckan/templates/package/history.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read.html
  A ckan/templates/package/read.n3
  A ckan/templates/package/read.rdf
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/search_form.html
  M ckan/templates/revision/diff.html
  M ckan/templates/revision/list.html
  M ckan/templates/revision/read.html
  M ckan/templates/user/edit_user_form.html
  M ckan/templates/user/layout.html
  M ckan/templates/user/list.html
  M ckan/templates/user/login.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
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/api/test_activity.py
  M ckan/tests/functional/test_admin.py
  M ckan/tests/functional/test_authz.py
  M ckan/tests/functional/test_autoneg.py
  M ckan/tests/functional/test_datastore.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_home.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_storage.py
  M ckan/tests/functional/test_tag_vocab.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_mailer.py
  M ckan/tests/lib/test_solr_search_index.py
  M ckan/tests/logic/test_action.py
  M ckan/tests/logic/test_member.py
  M ckan/tests/misc/test_mock_mail_server.py
  M ckan/tests/mock_mail_server.py
  M ckan/tests/models/test_package.py
  M ckanext/publisher_form/forms.py
  M ckanext/publisher_form/templates/dataset_form.html
  M ckanext/publisher_form/templates/publisher_form.html
  A ckanext/publisher_form/templates/publisher_index.html
  A ckanext/publisher_form/templates/publisher_layout.html
  A ckanext/publisher_form/templates/publisher_new.html
  A ckanext/publisher_form/templates/publisher_read.html
  M ckanext/test_tag_vocab_plugin.py
  M doc/_templates/footer.html
  M doc/_themes/sphinx-theme-okfn
  A doc/administrative-dashboard.rst
  A doc/api-tutorial.rst
  A doc/api-util.rst
  A doc/api-v2.rst
  M doc/api.rst
  M doc/apiv3.rst
  M doc/authorization.rst
  A doc/background-tasks.rst
  R doc/ckan-features.png
  R doc/ckan-vision.png
  R doc/ckan_form_guidance.doc
  A doc/commenting.rst
  M doc/conf.py
  M doc/configuration.rst
  A doc/database-dumps.rst
  R doc/database_dumps.rst
  M doc/datastore.rst
  A doc/deployment.rst
  A doc/domain-model-dataset.rst
  A doc/domain-model-resource.rst
  A doc/domain-model-task-status.rst
  A doc/domain-model.rst
  R doc/editing_the_database_ownership.rst
  M doc/extensions.rst
  R doc/file-upload.rst
  A doc/filestore.rst
  M doc/forms.rst
  A doc/howto-editing-database-ownership.rst
  M doc/index.rst
  M doc/install-from-source.rst
  A doc/linked-data-and-rdf.rst
  A doc/loading-data.rst
  R doc/loading_data.rst
  M doc/paster.rst
  M doc/post-installation.rst
  A doc/publisher-profile.rst
  R doc/publisher_auth_profile.rst
  M doc/writing-extensions.rst
  A pip-requirements-docs.txt
  R pip-requirements-prerelease.txt
  M pip-requirements.txt
  A profile_tests.py
  M requires/lucid_present.txt
  M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-1821-multilingual-extension

Conflicts:
	ckan/lib/create_test_data.py
	ckan/lib/dictization/model_dictize.py
	ckan/logic/action/get.py
	ckan/templates/facets.html


Compare: https://github.com/okfn/ckan/compare/7d326ba...98292eb


More information about the ckan-changes mailing list