[ckan-changes] [okfn/ckan] df8f8d: [#262] Fix helper import in controller home

GitHub noreply at github.com
Fri Mar 15 12:24:58 UTC 2013


  Branch: refs/heads/example_idatasetform_without_tests_second_try
  Home:   https://github.com/okfn/ckan
  Commit: df8f8d01428bc29562a96428837658dd01d4df48
      https://github.com/okfn/ckan/commit/df8f8d01428bc29562a96428837658dd01d4df48
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M ckan/controllers/home.py

  Log Message:
  -----------
  [#262] Fix helper import in controller home


  Commit: b80cddf7389bdc8b342aad72f0ad71caf8dac7f8
      https://github.com/okfn/ckan/commit/b80cddf7389bdc8b342aad72f0ad71caf8dac7f8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#262] Fix helper import in controller package


  Commit: 35f05c17dfff8c01ec5f1e2edc482e2a17a1dbc7
      https://github.com/okfn/ckan/commit/35f05c17dfff8c01ec5f1e2edc482e2a17a1dbc7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M ckan/controllers/tag.py

  Log Message:
  -----------
  [#262] Fix helper import in controller tag


  Commit: c86c61a6c82bf6854724be89cc28c1f95ef83fb5
      https://github.com/okfn/ckan/commit/c86c61a6c82bf6854724be89cc28c1f95ef83fb5
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#262] Fix helper import in controller group


  Commit: e8a2afb99c0a251504e6acb7102db1cee9ae6c6b
      https://github.com/okfn/ckan/commit/e8a2afb99c0a251504e6acb7102db1cee9ae6c6b
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M ckan/controllers/feed.py

  Log Message:
  -----------
  [#262] Fix helper import in controller feed


  Commit: 195fcdd24226ace301f285fe402640318920a450
      https://github.com/okfn/ckan/commit/195fcdd24226ace301f285fe402640318920a450
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M ckan/controllers/revision.py

  Log Message:
  -----------
  [#262] Fix helper import in controller revision


  Commit: 4fddebb30acdc5e84c5fa2d20957ded71115fd9e
      https://github.com/okfn/ckan/commit/4fddebb30acdc5e84c5fa2d20957ded71115fd9e
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#262] Fix helper import in lib.base


  Commit: 7b75158e6d35c08c601e6f43be045da710bb0683
      https://github.com/okfn/ckan/commit/7b75158e6d35c08c601e6f43be045da710bb0683
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M ckan/lib/field_types.py

  Log Message:
  -----------
  [#262] Fix helper import in lib.field_types


  Commit: 25f286e8b5ae6aa26d4cb60373dec93b43880db8
      https://github.com/okfn/ckan/commit/25f286e8b5ae6aa26d4cb60373dec93b43880db8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M ckan/lib/mailer.py

  Log Message:
  -----------
  [#262] Fix helper import in lib.mailer


  Commit: b7c62848a1b40b1f354e75fb1982d5968ef8ecbf
      https://github.com/okfn/ckan/commit/b7c62848a1b40b1f354e75fb1982d5968ef8ecbf
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M ckan/lib/jsonp.py

  Log Message:
  -----------
  [#262] Fix helper import in lib.jsonp


  Commit: d21b20c2a3a551740961ec68fcaacf1c97e384a8
      https://github.com/okfn/ckan/commit/d21b20c2a3a551740961ec68fcaacf1c97e384a8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M ckan/lib/search/query.py

  Log Message:
  -----------
  [#262] Fix helper import in lib.search.query


  Commit: 6b4cf909fe796f762157f5fdf6ae8865e52a8f4a
      https://github.com/okfn/ckan/commit/6b4cf909fe796f762157f5fdf6ae8865e52a8f4a
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#262] Fix helper import in logic.validators


  Commit: 82366b8b27d18356b8e1f94832b7316905a80272
      https://github.com/okfn/ckan/commit/82366b8b27d18356b8e1f94832b7316905a80272
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M ckan/migration/versions/022_add_group_extras.py

  Log Message:
  -----------
  [#262] Fix helper import in version 022


  Commit: 91ad379c0d0b8cacdc337e50db4cb4ef6aaf7757
      https://github.com/okfn/ckan/commit/91ad379c0d0b8cacdc337e50db4cb4ef6aaf7757
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-09 (Wed, 09 Jan 2013)

  Changed paths:
    M ckan/migration/versions/029_version_groups.py

  Log Message:
  -----------
  [#262] Fix helper import in version 029


  Commit: 0a707dfd06ff19d8c3c5894d8e51eac1fafe7f5d
      https://github.com/okfn/ckan/commit/0a707dfd06ff19d8c3c5894d8e51eac1fafe7f5d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-10 (Thu, 10 Jan 2013)

  Changed paths:
    M ckan/tests/__init__.py

  Log Message:
  -----------
  [#262] Fix helper import in tests


  Commit: 691e670f730bbcd3e9271be7e68703fe80c6a1af
      https://github.com/okfn/ckan/commit/691e670f730bbcd3e9271be7e68703fe80c6a1af
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-10 (Thu, 10 Jan 2013)

  Changed paths:
    A ckan/common.py
    M ckan/lib/base.py
    M ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/jsonp.py
    M ckan/lib/search/query.py
    M ckan/migration/versions/022_add_group_extras.py
    M ckan/migration/versions/029_version_groups.py

  Log Message:
  -----------
  [#262] Move externals from lib helpers to ckan.common


  Commit: c46317d98d45c1baa5a0198a5f19063bc7af207c
      https://github.com/okfn/ckan/commit/c46317d98d45c1baa5a0198a5f19063bc7af207c
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-10 (Thu, 10 Jan 2013)

  Changed paths:
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_datastore.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/misc/test_sync.py
    M ckan/tests/test_dumper.py

  Log Message:
  -----------
  [#262] Convert tests that used from lib.helpers import ...


  Commit: 125ed1bf017c620a8cfc63bd1dba19c7d4099af1
      https://github.com/okfn/ckan/commit/125ed1bf017c620a8cfc63bd1dba19c7d4099af1
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-11 (Fri, 11 Jan 2013)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  [#262] Fix import of lib helpers in lib.repoze_patch


  Commit: 55cc4f72ecc6f2ac6a2d852756511cfa4dab3796
      https://github.com/okfn/ckan/commit/55cc4f72ecc6f2ac6a2d852756511cfa4dab3796
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    A doc/api-search.rst
    M doc/api-util.rst
    R doc/api-v2.rst
    M doc/api.rst
    R doc/apiv3.rst
    M doc/architecture.rst
    M doc/index.rst
    A doc/legacy-api.rst
    M doc/tag-vocabularies.rst

  Log Message:
  -----------
  [#255] First part of API docs update for CKAN 2.0

The action API is now the default API.

Moved apiv3.rst -> api.rst.

Edited and rearranged apiv3.rst.

Removed the API quickstart tutorial as superfluous.

Removed the Tools for Accessing the API section as these tools
(particularly ckanclient) are out of date and unmaintained.

Moved what was in api.rst and api-v2.rst into legacy-api.rst.

Moved the Search API docs (which were mixed into apiv3.rst with the
Action API docs) into api-search.rst. The old version of the search API
is still documented in legacy-api.rst.


  Commit: 35282c33b059105523b6d30b9acdf96cbb0bd701
      https://github.com/okfn/ckan/commit/35282c33b059105523b6d30b9acdf96cbb0bd701
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/base.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 255-update-api-docs


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

  Changed paths:
    R doc/api-search.rst
    M doc/index.rst

  Log Message:
  -----------
  [#255] Move the Search API docs into Legacy API chapter

There was actuallt already a copy of the Search API docs in the
legacy-api.rst file, so just delete the api-search.rst file and remove
it from the index.


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

  Changed paths:
    R doc/api-util.rst
    M doc/index.rst
    M doc/legacy-api.rst

  Log Message:
  -----------
  [#255] Move Util API docs into Legacy API chapter


  Commit: 98d9296584fedb362ffaff1224e2b3043bb8b487
      https://github.com/okfn/ckan/commit/98d9296584fedb362ffaff1224e2b3043bb8b487
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

  Changed paths:
    M doc/legacy-api.rst

  Log Message:
  -----------
  [#255] Legacy API docs tweaks

Just tweak a couple of section headings and the introductory text


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

  Changed paths:
    M doc/api.rst

  Log Message:
  -----------
  [#255] Rename API v3 -> Action API in docs

This is the correct name, because other named APIs (Datastore API, etc.)
may also have a v3, and the Action API may one day have a v4.


  Commit: 6f15064ec0acfab223f46f2933670e35d5b7ccbe
      https://github.com/okfn/ckan/commit/6f15064ec0acfab223f46f2933670e35d5b7ccbe
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

  Changed paths:
    M doc/api.rst

  Log Message:
  -----------
  [#255] Tweak Action API docs intro

Mention RPC-style, and add lots of links to demo.ckan.org as examples.


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

  Changed paths:
    M doc/datastore-api.rst

  Log Message:
  -----------
  [#255] Rename DataStore Data API -> DataStore API in docs


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

  Changed paths:
    A doc/filestore-api.rst
    M doc/filestore.rst
    M doc/index.rst

  Log Message:
  -----------
  [#255] Edit FileStore API docs

Move the FileStore API docs into its own file (filestore-api.rst) same
as the Action API and DataStore API, and move it to the CKAN API section
in the table of contents.

Also renamed it Storage API -> FileStore API (since the feature is
called the FileStore), and added a link to the ckanclient code that
shows how to use it (since the documentation is hopeless).

On the FileStore page, where the FileStore API docs used to be put a
link to the new FileStore API page.

Edited the FileStore feature docs: rename Storage Web Interface ->
FileStore Web Interface (the feature seems to change names, from
FileStore to just Storage, half-way down the page).


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

  Changed paths:
    M doc/index.rst

  Log Message:
  -----------
  [#255] Simplify API documentation table of contents

Only list the top-level sections, not subsesctions.


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

  Changed paths:
    M doc/api.rst
    A doc/ckan.logic.action.create.rst
    A doc/ckan.logic.action.delete.rst
    A doc/ckan.logic.action.get.rst
    A doc/ckan.logic.action.rst
    A doc/ckan.logic.action.update.rst

  Log Message:
  -----------
  [#255] Break Action API reference into multiple pages


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

  Changed paths:
    M doc/conf.py

  Log Message:
  -----------
  [#255] Autodoc API functions in source order

Put autodoc function listings in source order (was previously
alphabetical order) in docs.


  Commit: 19346cbe462efc03b14f13c0507e99931423892c
      https://github.com/okfn/ckan/commit/19346cbe462efc03b14f13c0507e99931423892c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-08 (Fri, 08 Feb 2013)

  Changed paths:
    M doc/loading-data.rst

  Log Message:
  -----------
  [#255] Replace ckanclient Loading Data example

Replace the example of loading data using ckanclient in the docs with
one using the action api.

The rest of the Load Datasets page of the docs still looks pretty out of date.


  Commit: 013640c5c058e93206a10ef59db005b9949b7090
      https://github.com/okfn/ckan/commit/013640c5c058e93206a10ef59db005b9949b7090
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-08 (Fri, 08 Feb 2013)

  Changed paths:
    M doc/api.rst

  Log Message:
  -----------
  [#255] Add an assert to an api example in the docs


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

  Changed paths:
    R doc/api-tutorial.rst

  Log Message:
  -----------
  [#255] Remove API Quickstart Tutorial file

It had already been removed from the table of contents


  Commit: 849db01412ac998023bc3e41c2c3e26c63b8545c
      https://github.com/okfn/ckan/commit/849db01412ac998023bc3e41c2c3e26c63b8545c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-08 (Fri, 08 Feb 2013)

  Changed paths:
    M doc/datastore-api.rst

  Log Message:
  -----------
  [#255] Edit DataStore API docs intro

Remove some unnecessary explanation, just refer to the Action API docs
instead.


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

  Changed paths:
    M doc/datastore-api.rst

  Log Message:
  -----------
  [#255] Tweak some DataStore API example URLs

You don't actually have to put the version number in the URL, since it
defaults to 3 and 3 is the only possible version number.


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

  Changed paths:
    M doc/datastore-api.rst

  Log Message:
  -----------
  [#255] Update an example API URL

Use action api not rest api


  Commit: 3939de636349abcb3c61f016d3ca3c178120ad25
      https://github.com/okfn/ckan/commit/3939de636349abcb3c61f016d3ca3c178120ad25
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-08 (Fri, 08 Feb 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/model/meta.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/forms.less
    M ckan/templates/admin/authz.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/group/read_base.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/related.html
    M ckan/templates/user/read.html
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 255-update-api-docs


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

  Changed paths:
    M doc/api.rst

  Log Message:
  -----------
  [#255] Fix a broken link in the API docs


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

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M doc/api.rst
    M doc/architecture.rst
    R doc/ckan.logic.action.rst
    M doc/datastore-api.rst
    M doc/install-from-source.rst
    M doc/python-coding-standards.rst

  Log Message:
  -----------
  [#255] Fix lots of sphinx warnings when building the docs


  Commit: 85b5b110371f0a276c1aec503c8d84f0b693a183
      https://github.com/okfn/ckan/commit/85b5b110371f0a276c1aec503c8d84f0b693a183
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  Changed paths:
    M doc/datastore-api.rst

  Log Message:
  -----------
  [#255] Remove "Using the Data API" from Datastore docs, add section about internal database structure


  Commit: 584f764fad2bcf22b9f8e0c4820fdf1f2f0e4153
      https://github.com/okfn/ckan/commit/584f764fad2bcf22b9f8e0c4820fdf1f2f0e4153
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  Changed paths:
    M doc/api.rst

  Log Message:
  -----------
  [#255] Link to datastore docs in api docs


  Commit: cb47bcaedfe4c834d99309db2f6797e96456977e
      https://github.com/okfn/ckan/commit/cb47bcaedfe4c834d99309db2f6797e96456977e
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  Changed paths:
    M doc/datastore-api.rst

  Log Message:
  -----------
  [#255] Removed Quickstart section from datastore docs


  Commit: 737baf4260f209d06807621e50b55b26f18e2db2
      https://github.com/okfn/ckan/commit/737baf4260f209d06807621e50b55b26f18e2db2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  Changed paths:
    M doc/install-from-source.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 255-update-api-docs


  Commit: d8717b395a8801db6f329382d7e62da450f260c8
      https://github.com/okfn/ckan/commit/d8717b395a8801db6f329382d7e62da450f260c8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  Changed paths:
    M doc/datastore-api.rst

  Log Message:
  -----------
  [#255] Remove a little repetition from datastore api docs


  Commit: e051bfd8be56223b38d41c92e411053e900b3c0f
      https://github.com/okfn/ckan/commit/e051bfd8be56223b38d41c92e411053e900b3c0f
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  Changed paths:
    M doc/datastore-api.rst

  Log Message:
  -----------
  [#255] Fixed syntax error in docs


  Commit: 936c6dacfc76bf14fd882954461c74ba2d9028dc
      https://github.com/okfn/ckan/commit/936c6dacfc76bf14fd882954461c74ba2d9028dc
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  Changed paths:
    M doc/datastore-api.rst
    M doc/install-from-source.rst

  Log Message:
  -----------
  Merge branch '255-update-api-docs' of github.com:okfn/ckan into 255-update-api-docs


  Commit: 755b91faa61c6a275db97971ba3d3d7692165e43
      https://github.com/okfn/ckan/commit/755b91faa61c6a275db97971ba3d3d7692165e43
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-12 (Tue, 12 Feb 2013)

  Changed paths:
    M doc/datastore-api.rst

  Log Message:
  -----------
  [#255] Remove unnecessary rows from datastore docs


  Commit: 2600f57f403c2aa279366d017542e0a78dbed4fb
      https://github.com/okfn/ckan/commit/2600f57f403c2aa279366d017542e0a78dbed4fb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/logic/schema.py
    M ckan/model/activity.py
    M ckan/plugins/core.py
    M ckan/public/base/css/main.css
    A ckan/public/base/images/dashboard-followee-related.png
    A ckan/public/base/images/full-width-nav-right.png
    M ckan/public/base/javascript/modules/dashboard.js
    M ckan/public/base/javascript/modules/data-viewer.js
    M ckan/public/base/javascript/modules/popover-context.js
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/masthead.less
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/ajax_snippets/popover_context_group.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/home/index.html
    A ckan/templates/snippets/popover_context.html
    M ckan/templates/user/dashboard.html
    A ckan/templates/user/snippets/followee_dropdown.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/resource.config
    A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.js
    R ckanext/reclinepreview/theme/public/vendor/backbone/backbone.js
    R ckanext/reclinepreview/theme/public/vendor/backbone/backbone.min.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings-white.png
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings.png
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.min.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.min.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings.png
    A ckanext/reclinepreview/theme/public/vendor/flot/excanvas.js
    A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.min.js
    M ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
    R ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.js
    R ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.min.js
    A ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.js
    A ckanext/reclinepreview/theme/public/vendor/json/json2.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster-src.js
    M ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/layers.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-icon.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-shadow.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-in.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-out.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.js
    A ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.js
    R ckanext/reclinepreview/theme/public/vendor/moment/moment.js
    R ckanext/reclinepreview/theme/public/vendor/moment/moment.min.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/mustache.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/mustache.min.js
    R ckanext/reclinepreview/theme/public/vendor/recline/css/recline.css
    R ckanext/reclinepreview/theme/public/vendor/recline/css/recline.min.css
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    A ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/README.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/MIT-LICENSE.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/README.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-asc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-desc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.js
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.css
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.png
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.js
    A ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/underscore.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/underscore.min.js
    M ckanext/reclinepreview/theme/templates/recline.html
    M doc/writing-extensions.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 255-update-api-docs


  Commit: 434b736e0405341f5064542f70728b8dc23d2198
      https://github.com/okfn/ckan/commit/434b736e0405341f5064542f70728b8dc23d2198
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

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

  Log Message:
  -----------
  [#255] Add API Versions to Action API docs

Add a section explaining api versions to the action api docs, and also
add version 3 to all example api urls.


  Commit: cd6c89299609092f89f11c56fe37149c8f7f4b1f
      https://github.com/okfn/ckan/commit/cd6c89299609092f89f11c56fe37149c8f7f4b1f
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/lib/dumper.py

  Log Message:
  -----------
  [#262] Improve lib.dumper imports


  Commit: 4b86bb297ae4d0a1facd06c36ca243306b10d742
      https://github.com/okfn/ckan/commit/4b86bb297ae4d0a1facd06c36ca243306b10d742
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M .gitignore
    A .travis.yml
    A CONTRIBUTING.rst
    M README.rst
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/group.py
    M ckan/model/meta.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/images/ckan-logo-footer.png
    M ckan/public/base/images/ckan-logo.png
    A ckan/public/base/images/dashboard-followee-related.png
    A ckan/public/base/images/full-width-nav-right.png
    M ckan/public/base/javascript/modules/dashboard.js
    M ckan/public/base/javascript/modules/data-viewer.js
    M ckan/public/base/javascript/modules/popover-context.js
    R ckan/public/base/javascript/modules/popover-context.min.js
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/dataset.less
    A ckan/public/base/less/dropdown.less
    A ckan/public/base/less/font-awesome.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/main.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/module.less
    R ckan/public/base/less/popover-context.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/less/variables.less
    R ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings-white.png
    R ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    A ckan/public/base/vendor/bootstrap/js/.jshintrc
    R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-button.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-button.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    M ckan/public/base/vendor/bootstrap/less/accordion.less
    M ckan/public/base/vendor/bootstrap/less/alerts.less
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/breadcrumbs.less
    M ckan/public/base/vendor/bootstrap/less/button-groups.less
    M ckan/public/base/vendor/bootstrap/less/buttons.less
    M ckan/public/base/vendor/bootstrap/less/carousel.less
    M ckan/public/base/vendor/bootstrap/less/close.less
    M ckan/public/base/vendor/bootstrap/less/code.less
    M ckan/public/base/vendor/bootstrap/less/component-animations.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/forms.less
    M ckan/public/base/vendor/bootstrap/less/grid.less
    M ckan/public/base/vendor/bootstrap/less/hero-unit.less
    M ckan/public/base/vendor/bootstrap/less/labels-badges.less
    M ckan/public/base/vendor/bootstrap/less/layouts.less
    A ckan/public/base/vendor/bootstrap/less/media.less
    M ckan/public/base/vendor/bootstrap/less/mixins.less
    M ckan/public/base/vendor/bootstrap/less/modals.less
    M ckan/public/base/vendor/bootstrap/less/navbar.less
    M ckan/public/base/vendor/bootstrap/less/navs.less
    M ckan/public/base/vendor/bootstrap/less/pager.less
    M ckan/public/base/vendor/bootstrap/less/pagination.less
    M ckan/public/base/vendor/bootstrap/less/popovers.less
    M ckan/public/base/vendor/bootstrap/less/progress-bars.less
    M ckan/public/base/vendor/bootstrap/less/reset.less
    M ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
    M ckan/public/base/vendor/bootstrap/less/responsive-767px-max.less
    M ckan/public/base/vendor/bootstrap/less/responsive-768px-979px.less
    M ckan/public/base/vendor/bootstrap/less/responsive-navbar.less
    M ckan/public/base/vendor/bootstrap/less/responsive-utilities.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/bootstrap/less/scaffolding.less
    M ckan/public/base/vendor/bootstrap/less/sprites.less
    M ckan/public/base/vendor/bootstrap/less/tables.less
    A ckan/public/base/vendor/bootstrap/less/tests/buttons.html
    A ckan/public/base/vendor/bootstrap/less/tests/css-tests.css
    A ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
    A ckan/public/base/vendor/bootstrap/less/tests/forms-responsive.html
    A ckan/public/base/vendor/bootstrap/less/tests/forms.html
    A ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    A ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
    A ckan/public/base/vendor/bootstrap/less/tests/navbar.html
    M ckan/public/base/vendor/bootstrap/less/thumbnails.less
    M ckan/public/base/vendor/bootstrap/less/tooltip.less
    M ckan/public/base/vendor/bootstrap/less/type.less
    M ckan/public/base/vendor/bootstrap/less/utilities.less
    M ckan/public/base/vendor/bootstrap/less/variables.less
    M ckan/public/base/vendor/bootstrap/less/wells.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    M ckan/public/base/vendor/resource.config
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/authz.html
    M ckan/templates/ajax_snippets/api_info.html
    R ckan/templates/ajax_snippets/popover_context_dataset.html
    R ckan/templates/ajax_snippets/popover_context_group.html
    R ckan/templates/ajax_snippets/popover_context_user.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/snippets/list.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/toolbar.html
    M ckan/templates/footer.html
    M ckan/templates/group/index.html
    M ckan/templates/group/read_base.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/snippets/activity_item.html
    A ckan/templates/snippets/context.html
    A ckan/templates/snippets/context/dataset.html
    A ckan/templates/snippets/context/group.html
    A ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/related.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/read.html
    M ckan/templates/user/read_base.html
    A ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/followers.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_tag.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_group.py
    M ckanext/datastore/bin/datastore_setup.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    R ckanext/reclinepreview/theme/public/preview_recline.min.js
    M ckanext/reclinepreview/theme/public/resource.config
    A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.js
    A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.min.js
    R ckanext/reclinepreview/theme/public/vendor/backbone/backbone.js
    R ckanext/reclinepreview/theme/public/vendor/backbone/backbone.min.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.min.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.min.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.min.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings-white.png
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings.png
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.min.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.min.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings.png
    A ckanext/reclinepreview/theme/public/vendor/flot/excanvas.js
    A ckanext/reclinepreview/theme/public/vendor/flot/excanvas.min.js
    A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.js
    A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.min.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.min.js
    M ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.js
    M ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
    R ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.js
    R ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.min.js
    A ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.js
    A ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.min.js
    A ckanext/reclinepreview/theme/public/vendor/json/json2.js
    A ckanext/reclinepreview/theme/public/vendor/json/json2.min.js
    M ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/layers.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-icon.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-shadow.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-in.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-out.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.js
    A ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.js
    A ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.min.js
    R ckanext/reclinepreview/theme/public/vendor/moment/moment.js
    R ckanext/reclinepreview/theme/public/vendor/moment/moment.min.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/mustache.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/mustache.min.js
    R ckanext/reclinepreview/theme/public/vendor/recline/css/recline.css
    R ckanext/reclinepreview/theme/public/vendor/recline/css/recline.min.css
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    A ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.js
    A ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/README.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.css
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/MIT-LICENSE.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/README.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-asc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-desc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.js
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.css
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.png
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.js
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    A ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.js
    A ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.min.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/underscore.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/underscore.min.js
    M ckanext/reclinepreview/theme/templates/recline.html
    R doc/contributing-docs.rst
    R doc/contributing.rst
    M doc/datastore-api.rst
    M doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/solr-setup.rst
    M doc/test.rst
    M doc/writing-extensions.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 262-improve-helper-imports


  Commit: d39c6c3bf20839877058bb888585d51b5219e72a
      https://github.com/okfn/ckan/commit/d39c6c3bf20839877058bb888585d51b5219e72a
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/tests/__init__.py

  Log Message:
  -----------
  [#262]  Fix json for tests


  Commit: b4f0ebcbee0aa2fa8ac1ed5bf2dfb5caab78b0a1
      https://github.com/okfn/ckan/commit/b4f0ebcbee0aa2fa8ac1ed5bf2dfb5caab78b0a1
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

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

  Log Message:
  -----------
  [#262] api tests need json


  Commit: 93a3c3a40186b130843bec3e9405d842dbd18cba
      https://github.com/okfn/ckan/commit/93a3c3a40186b130843bec3e9405d842dbd18cba
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/common.py

  Log Message:
  -----------
  [#262] Fix test


  Commit: 3ae0ad1dc59066a36551ef75dc63979772cf5d2e
      https://github.com/okfn/ckan/commit/3ae0ad1dc59066a36551ef75dc63979772cf5d2e
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

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

  Log Message:
  -----------
  [#262] Fix test due to json lib change


  Commit: 2cce94ae6885675719909bebf0caebc89b73d31b
      https://github.com/okfn/ckan/commit/2cce94ae6885675719909bebf0caebc89b73d31b
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    R ckan/controllers/datastore.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/logic/action/get.py
    M ckan/new_authz.py
    R ckan/templates/admin/authz.html
    M ckan/templates/admin/snippets/header.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    R ckan/templates/package/resource_api_data.html
    M ckan/templates/package/snippets/data_api_button.html
    R ckan/tests/functional/test_datastore.py

  Log Message:
  -----------
  Merge branch 'master' into 262-improve-helper-imports

Conflicts:
	ckan/tests/functional/test_datastore.py

    no longer exists so deleted


  Commit: 7f98f7e3910c801f225068e1eb1e7056d739e26b
      https://github.com/okfn/ckan/commit/7f98f7e3910c801f225068e1eb1e7056d739e26b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  Use db_to_form_package_schema() by default

Make DefaultDatasetForm's db_to_form_schema() method return
db_to_form_package_schema() rather than None, so that validation against
db_to_form_package_schema() is done by default, even when there's no
IDatasetForm plugin active.

The reason for this is that bugs in db_to_form_package_schema() can
cause pages to crash, features to stop working, etc., but the tests
currently do not catch these bugs because db_to_form_package_schema() is
only used when an IDatasetForm plugin that returns a schema based on
db_to_form_package_schema() is active, and no such plugin is active when
the tests run.


  Commit: 128a40030aaa1283698c50ebb74651c523edd8b3
      https://github.com/okfn/ckan/commit/128a40030aaa1283698c50ebb74651c523edd8b3
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  Show vocab tags as normal tags by default

Commit 77663865a changed the default behaviour of vocab tags so that
they are _not_ shown as normal tags (e.g. on the dataset read and search
pages). I thought this was a good idea because it's weird when you use
tag vocabulary to add a custom field, to see that tag also appear in the
normal tags. However, changing this behaviour breaks some tests, so I'm
changing it back!

If an extension is using a tag vocabulary to add a custom field, and it
doesn't want tags from that vocabulary to appear alongside normal tags,
then the extension can add the freet_tags_only converter to the schema
itself.


  Commit: eaff7b9021d5bf95e1563b0b6a499945cc89af69
      https://github.com/okfn/ckan/commit/eaff7b9021d5bf95e1563b0b6a499945cc89af69
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    M .travis.yml
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/migration/versions/064_add_email_last_sent_column.py
    A ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/model/group.py
    M ckan/model/group_extra.py
    M ckan/model/package_extra.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    A ckan/public/base/images/bg.png
    M ckan/public/base/images/dashboard-followee-related.png
    A ckan/public/base/images/nav-active.png
    A ckan/public/base/images/nav.png
    M ckan/public/base/images/placeholder-application.png
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-image.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/dashboard.js
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/dataset.less
    R ckan/public/base/less/follower-list.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    A ckan/public/base/less/homepage.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/less/variables.less
    A ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/confirm_reset.html
    M ckan/templates/admin/index.html
    R ckan/templates/admin/snippets/header.html
    M ckan/templates/error_document_template.html
    M ckan/templates/group/about.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/index.html
    M ckan/templates/group/members.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/header.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    A ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    R ckan/templates/package/snippets/back_to_package_action.html
    M ckan/templates/package/snippets/info.html
    A ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/snippets/context.html
    M ckan/templates/snippets/context/dataset.html
    M ckan/templates/snippets/context/group.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/social.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    A ckan/templates/user/edit_base.html
    M ckan/templates/user/list.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/back_to_user_action.html
    M ckan/templates/user/snippets/followers.html
    M ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    M ckan/tests/ckantestplugin/setup.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_email_notifications.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_storage.py
    M ckan/tests/functional/test_upload.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/models/test_group.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/bin/datastore_setup.py
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    A ckanext/example_itemplatehelpers/__init__.py
    A ckanext/example_itemplatehelpers/plugin.py
    A ckanext/example_itemplatehelpers/templates/home/index.html
    M ckanext/jsonpreview/tests/test_preview.py
    M ckanext/multilingual/plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M ckanext/resourceproxy/tests/file_server.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/tests/__init__.py
    M ckanext/stats/tests/test_stats_lib.py
    M doc/writing-extensions.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 262-improve-helper-imports

Conflicts:
	ckan/controllers/home.py
	ckan/controllers/revision.py
	ckan/controllers/tag.py

    - minor import fixes (trivial)


  Commit: 0d67c12e1e2d95c14aa9d98c153027b846d0657d
      https://github.com/okfn/ckan/commit/0d67c12e1e2d95c14aa9d98c153027b846d0657d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-04 (Mon, 04 Mar 2013)

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

  Log Message:
  -----------
  [#369] updating packages to deleted state had permission issues

This causes the v1/2 REST package update API to fail with access denied
because after successfully updating the package, the user no longer has
permission to read it to generate the dict-like response.

Just allow us to read the updated packeage


  Commit: b7e06e160ec6fad7f5c5c1bddef5f927a06c99fb
      https://github.com/okfn/ckan/commit/b7e06e160ec6fad7f5c5c1bddef5f927a06c99fb
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-07 (Thu, 07 Mar 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#582] Fix h.markdown_extract()

ih.markdown_extract() sometimes returns a literal and sometimes not.

This causes problems of over escaping for example in the dataset
listings with short descriptions. This patch makes this return a literal
consistantly.


  Commit: ce6df11d2dc50f46ffa867604afff03149f44479
      https://github.com/okfn/ckan/commit/ce6df11d2dc50f46ffa867604afff03149f44479
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-07 (Thu, 07 Mar 2013)

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#255] Fix unclear sentence in IResourcePreview docstring


  Commit: 517114924b058e9af92b780d37269c5e323d2a3e
      https://github.com/okfn/ckan/commit/517114924b058e9af92b780d37269c5e323d2a3e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-03-11 (Mon, 11 Mar 2013)

  Changed paths:
    M doc/api.rst

  Log Message:
  -----------
  [#255] Remove docs about having to put empty json dicts in api requests

It seems that you no longer need to provide an empty json dict or param
list when making an api request that has no params.


  Commit: 4d32986a28dffad08fd5a62c8a8b1968c63c0205
      https://github.com/okfn/ckan/commit/4d32986a28dffad08fd5a62c8a8b1968c63c0205
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-03-11 (Mon, 11 Mar 2013)

  Changed paths:
    M doc/api.rst

  Log Message:
  -----------
  [#255] Fix unversioned API URL mistake

This one is _supposed_ to be an example of an unversioned API URL, so
make it unversioned


  Commit: 9cc1aee00977b75ef8478766740db799031ed0dc
      https://github.com/okfn/ckan/commit/9cc1aee00977b75ef8478766740db799031ed0dc
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-11 (Mon, 11 Mar 2013)

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

  Log Message:
  -----------
  [#267] Fixes issue where incorrectly formated dates broke the indexing


  Commit: 4a9d9ed8d41fa811d82eeb2269cdf5d5e99d70e6
      https://github.com/okfn/ckan/commit/4a9d9ed8d41fa811d82eeb2269cdf5d5e99d70e6
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-11 (Mon, 11 Mar 2013)

  Changed paths:
    M pip-requirements.txt

  Log Message:
  -----------
  [#267] Add dateutils requirement


  Commit: 39b059da512512800aacdfd0d47975ae55aa3792
      https://github.com/okfn/ckan/commit/39b059da512512800aacdfd0d47975ae55aa3792
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-11 (Mon, 11 Mar 2013)

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

  Log Message:
  -----------
  [#267] Stop new error related to organisation


  Commit: 2e9366224e22d7bad52348eb043cbe70ffd3a040
      https://github.com/okfn/ckan/commit/2e9366224e22d7bad52348eb043cbe70ffd3a040
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-03-11 (Mon, 11 Mar 2013)

  Changed paths:
    M doc/legacy-api.rst

  Log Message:
  -----------
  [#255] Add warning to top of legacy API docs page


  Commit: 2ee72daee08e7cccbe7743936c50c491d4d4eacd
      https://github.com/okfn/ckan/commit/2ee72daee08e7cccbe7743936c50c491d4d4eacd
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-12 (Tue, 12 Mar 2013)

  Changed paths:
    M .travis.yml
    A bin/travis-build
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    R ckan/lib/authztool.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/027_adjust_harvester.py
    M ckan/migration/versions/045_user_name_unique.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    R ckan/public/base/css/fuchsia.min.css
    R ckan/public/base/css/green.min.css
    M ckan/public/base/css/main.css
    R ckan/public/base/css/main.min.css
    R ckan/public/base/css/maroon.min.css
    R ckan/public/base/css/red.min.css
    R ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
    R ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckan/public/base/i18n/bg.min.js
    R ckan/public/base/i18n/ca.min.js
    R ckan/public/base/i18n/cs_CZ.min.js
    R ckan/public/base/i18n/de.min.js
    R ckan/public/base/i18n/el.min.js
    R ckan/public/base/i18n/es.min.js
    R ckan/public/base/i18n/fi.min.js
    R ckan/public/base/i18n/fr.min.js
    R ckan/public/base/i18n/hu.min.js
    R ckan/public/base/i18n/it.min.js
    R ckan/public/base/i18n/lt.min.js
    R ckan/public/base/i18n/lv.min.js
    R ckan/public/base/i18n/nl.min.js
    R ckan/public/base/i18n/no.min.js
    R ckan/public/base/i18n/pl.min.js
    R ckan/public/base/i18n/pt_BR.min.js
    R ckan/public/base/i18n/ro.min.js
    R ckan/public/base/i18n/ru.min.js
    R ckan/public/base/i18n/sk.min.js
    R ckan/public/base/i18n/sl.min.js
    R ckan/public/base/i18n/sq.min.js
    R ckan/public/base/i18n/sr.min.js
    R ckan/public/base/i18n/sr_Latn.min.js
    R ckan/public/base/i18n/sv.min.js
    R ckan/public/base/i18n/zh_TW.min.js
    A ckan/public/base/images/table-seperator.png
    M ckan/public/base/javascript/client.js
    R ckan/public/base/javascript/client.min.js
    R ckan/public/base/javascript/i18n.min.js
    R ckan/public/base/javascript/main.min.js
    R ckan/public/base/javascript/module.min.js
    R ckan/public/base/javascript/modules/api-info.min.js
    M ckan/public/base/javascript/modules/autocomplete.js
    R ckan/public/base/javascript/modules/autocomplete.min.js
    R ckan/public/base/javascript/modules/basic-form.min.js
    R ckan/public/base/javascript/modules/confirm-action.min.js
    R ckan/public/base/javascript/modules/custom-fields.min.js
    R ckan/public/base/javascript/modules/dashboard.min.js
    R ckan/public/base/javascript/modules/data-viewer.min.js
    R ckan/public/base/javascript/modules/follow.min.js
    R ckan/public/base/javascript/modules/related-item.min.js
    R ckan/public/base/javascript/modules/resource-form.min.js
    R ckan/public/base/javascript/modules/resource-upload-field.min.js
    R ckan/public/base/javascript/modules/select-switch.min.js
    R ckan/public/base/javascript/modules/slug-preview.min.js
    A ckan/public/base/javascript/modules/table-selectable-rows.js
    A ckan/public/base/javascript/modules/table-toggle-more.js
    R ckan/public/base/javascript/notify.min.js
    R ckan/public/base/javascript/plugins/jquery.date-helpers.min.js
    R ckan/public/base/javascript/plugins/jquery.form-warning.min.js
    R ckan/public/base/javascript/plugins/jquery.inherit.min.js
    R ckan/public/base/javascript/plugins/jquery.proxy-all.min.js
    R ckan/public/base/javascript/plugins/jquery.slug-preview.min.js
    R ckan/public/base/javascript/plugins/jquery.slug.min.js
    R ckan/public/base/javascript/plugins/jquery.truncator.min.js
    R ckan/public/base/javascript/plugins/jquery.url-helpers.min.js
    R ckan/public/base/javascript/pubsub.min.js
    M ckan/public/base/javascript/resource.config
    R ckan/public/base/javascript/sandbox.min.js
    R ckan/public/base/javascript/tracking.min.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    A ckan/public/base/less/tables.less
    M ckan/public/base/less/variables.less
    R ckan/public/base/test/spec/ckan.spec.min.js
    R ckan/public/base/test/spec/client.spec.min.js
    R ckan/public/base/test/spec/module.spec.min.js
    R ckan/public/base/test/spec/modules/autocomplete.spec.min.js
    R ckan/public/base/test/spec/modules/basic-form.spec.min.js
    R ckan/public/base/test/spec/modules/confirm-action.spec.min.js
    R ckan/public/base/test/spec/modules/custom-fields.spec.min.js
    R ckan/public/base/test/spec/modules/related-item.spec.min.js
    R ckan/public/base/test/spec/modules/resource-form.spec.min.js
    R ckan/public/base/test/spec/modules/resource-upload-field.spec.min.js
    R ckan/public/base/test/spec/notify.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.date-helpers.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.form-warning.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.inherit.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.proxy-all.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.slug-preview.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.slug.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.url-helpers.spec.min.js
    R ckan/public/base/test/spec/pubsub.spec.min.js
    R ckan/public/base/test/spec/sandbox.spec.min.js
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/error_document_template.html
    M ckan/templates/footer.html
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/home/snippets/about_text.html
    A ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/base_form_page.html
    A ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    A ckan/templates/organization/snippets/help.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/snippets/related_form.html
    M ckan/templates/snippets/datapreview_embed_dialog.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    R ckan/templates/snippets/page_header.html
    M ckan/templates/snippets/popular.html
    M ckan/templates/snippets/related.html
    A ckan/templates/snippets/search_result_text.html
    A ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates_legacy/package/search.html
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_group.py
    M ckan/tests/functional/api/model/test_licenses.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_ratings.py
    M ckan/tests/functional/api/model/test_relationships.py
    M ckan/tests/functional/api/model/test_revisions.py
    M ckan/tests/functional/api/model/test_tag.py
    M ckan/tests/functional/api/test_api.py
    M ckan/tests/functional/api/test_misc.py
    M ckan/tests/functional/api/test_package_search.py
    M ckan/tests/functional/api/test_resource_search.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/logic/test_action.py
    R ckan/tests/mock_publisher_auth.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    R ckanext/jsonpreview/theme/public/css/json.min.css
    R ckanext/jsonpreview/theme/public/preview_json.min.js
    R ckanext/pdfpreview/theme/public/css/pdf.min.css
    R ckanext/pdfpreview/theme/public/css/recline.min.css
    R ckanext/pdfpreview/theme/public/preview_pdf.min.js
    R ckanext/publisher_form/__init__.py
    R ckanext/publisher_form/forms.py
    R ckanext/publisher_form/templates/dataset_form.html
    R ckanext/publisher_form/templates/publisher_form.html
    R ckanext/publisher_form/templates/publisher_index.html
    R ckanext/publisher_form/templates/publisher_layout.html
    R ckanext/publisher_form/templates/publisher_new.html
    R ckanext/publisher_form/templates/publisher_read.html
    R ckanext/reclinepreview/theme/public/css/recline.min.css
    M ckanext/resourceproxy/controller.py
    M pip-requirements-test.txt
    M pip-requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 262-improve-helper-imports

Conflicts:
	ckan/lib/search/query.py

    import fixes


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

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

  Log Message:
  -----------
  [#262] Fix test due to json lib change


  Commit: 33bbfbad7b7fe244277532d033f4df316881462a
      https://github.com/okfn/ckan/commit/33bbfbad7b7fe244277532d033f4df316881462a
  Author: John Glover <glover.john at gmail.com>
  Date:   2013-03-12 (Tue, 12 Mar 2013)

  Changed paths:
    A ckan/common.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/base.py
    M ckan/lib/dumper.py
    M ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/jsonp.py
    M ckan/lib/mailer.py
    M ckan/lib/repoze_patch.py
    M ckan/lib/search/query.py
    M ckan/logic/validators.py
    M ckan/migration/versions/022_add_group_extras.py
    M ckan/migration/versions/029_version_groups.py
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/misc/test_sync.py
    M ckan/tests/test_dumper.py

  Log Message:
  -----------
  Merge pull request #262 from okfn/262-improve-helper-imports

Improve imports from lib.helpers


  Commit: ea27c016c21896b87a6a8083fc907ef9abbc801a
      https://github.com/okfn/ckan/commit/ea27c016c21896b87a6a8083fc907ef9abbc801a
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-12 (Tue, 12 Mar 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge pull request #582 from okfn/582-fix-markdown_extract

h. markdown_extract() & < > issue [2.0]


  Commit: b928adcb22ff808afff4eb8cf7e340858edb8a7a
      https://github.com/okfn/ckan/commit/b928adcb22ff808afff4eb8cf7e340858edb8a7a
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-12 (Tue, 12 Mar 2013)

  Changed paths:
    M pip-requirements.txt

  Log Message:
  -----------
  [#267] change dependency


  Commit: 466182159d0b7c9c2cdf73ca33845239c01cf1af
      https://github.com/okfn/ckan/commit/466182159d0b7c9c2cdf73ca33845239c01cf1af
  Author: amercader <amercadero at gmail.com>
  Date:   2013-03-12 (Tue, 12 Mar 2013)

  Changed paths:
    M doc/api.rst
    M doc/architecture.rst
    M doc/multilingual.rst

  Log Message:
  -----------
  [#255] Minor tweaks on API related docs


  Commit: 290f9e0fbee869be37c0ced735afa9c802240c2c
      https://github.com/okfn/ckan/commit/290f9e0fbee869be37c0ced735afa9c802240c2c
  Author: amercader <amercadero at gmail.com>
  Date:   2013-03-12 (Tue, 12 Mar 2013)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/plugins/interfaces.py
    R doc/api-tutorial.rst
    R doc/api-util.rst
    R doc/api-v2.rst
    M doc/api.rst
    R doc/apiv3.rst
    M doc/architecture.rst
    A doc/ckan.logic.action.create.rst
    A doc/ckan.logic.action.delete.rst
    A doc/ckan.logic.action.get.rst
    A doc/ckan.logic.action.update.rst
    M doc/conf.py
    M doc/datastore-api.rst
    A doc/filestore-api.rst
    M doc/filestore.rst
    M doc/index.rst
    M doc/install-from-source.rst
    A doc/legacy-api.rst
    M doc/loading-data.rst
    M doc/multilingual.rst
    M doc/python-coding-standards.rst
    M doc/tag-vocabularies.rst

  Log Message:
  -----------
  Merge branch '255-update-api-docs'


  Commit: 9b178b072dc8ee6813af00f31c174a3eff389c2e
      https://github.com/okfn/ckan/commit/9b178b072dc8ee6813af00f31c174a3eff389c2e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-03-12 (Tue, 12 Mar 2013)

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

  Log Message:
  -----------
  [#619] Fix broken dumps link on dataset page

An if statement in a template was wrong, so if dumps_url was _not_ set
then ckan would try to show the dumps link and would render an empty
string. Reversing the if statements fixes it.


  Commit: f962b6f54f0ac034b3814efec3110a8fd9184b00
      https://github.com/okfn/ckan/commit/f962b6f54f0ac034b3814efec3110a8fd9184b00
  Author: amercader <amercadero at gmail.com>
  Date:   2013-03-12 (Tue, 12 Mar 2013)

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

  Log Message:
  -----------
  [#267] Add small test


  Commit: 45f540a2a058d9de644adc4c6158dfd4f9311821
      https://github.com/okfn/ckan/commit/45f540a2a058d9de644adc4c6158dfd4f9311821
  Author: John Glover <glover.john at gmail.com>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

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

  Log Message:
  -----------
  Merge pull request #620 from okfn/619-bug-broken-dump-link-at-bottom-of-dataset-page

[#619] Fix broken dumps link on dataset page


  Commit: ea5a10be8f4ef5845fa2ceeb4e3abd1c99ad1c00
      https://github.com/okfn/ckan/commit/ea5a10be8f4ef5845fa2ceeb4e3abd1c99ad1c00
  Author: amercader <amercadero at gmail.com>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

  Changed paths:
    M ckan/lib/search/index.py
    M ckan/tests/lib/test_solr_search_index.py
    M pip-requirements.txt

  Log Message:
  -----------
  Merge branch '267-date-indexing-fix'


  Commit: 63a07f22057f51391906b53ddbdf16efd46a81c1
      https://github.com/okfn/ckan/commit/63a07f22057f51391906b53ddbdf16efd46a81c1
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#595] Allow sorted_extras to exclude fields on request


  Commit: 0f9fd611dfb64268baa8dce72e627d325c0c159e
      https://github.com/okfn/ckan/commit/0f9fd611dfb64268baa8dce72e627d325c0c159e
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

  Changed paths:
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/snippets/simple_search.html

  Log Message:
  -----------
  [#613] Bulk process add new sort and update simple search template


  Commit: aeece329cd3ddfa3fceae7e1c3391563e4eb1564
      https://github.com/okfn/ckan/commit/aeece329cd3ddfa3fceae7e1c3391563e4eb1564
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

  Changed paths:
    M ckan/templates/organization/bulk_process.html

  Log Message:
  -----------
  [#604] Add facets to bulk process


  Commit: 7afd5808f00a3759ba088379a9fb37448be89b60
      https://github.com/okfn/ckan/commit/7afd5808f00a3759ba088379a9fb37448be89b60
  Author: kindly <kindly at gmail.com>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

  Changed paths:
    M ckan/templates/organization/bulk_process.html

  Log Message:
  -----------
  Merge branch '604-bulk-facets'


  Commit: 76d1468269ccea9e4c654ba61e63b19dab12a84b
      https://github.com/okfn/ckan/commit/76d1468269ccea9e4c654ba61e63b19dab12a84b
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

  Changed paths:
    M ckan/public/base/less/dataset.less
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/snippets/simple_search.html

  Log Message:
  -----------
  [#613] Small tweaks to templates to make search in tertiary column a little nicer


  Commit: 53c20964c722903ac8eb3f2e014bb8e79082ca34
      https://github.com/okfn/ckan/commit/53c20964c722903ac8eb3f2e014bb8e79082ca34
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

  Changed paths:
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/snippets/simple_search.html

  Log Message:
  -----------
  [#613]  is better than


  Commit: 7c7a2f50bed7b0403942a03cc91d90e9567b670c
      https://github.com/okfn/ckan/commit/7c7a2f50bed7b0403942a03cc91d90e9567b670c
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

  Changed paths:
    M ckan/lib/search/index.py
    M ckan/templates/organization/bulk_process.html
    M ckan/tests/lib/test_solr_search_index.py
    M pip-requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 613-bulk-update-sorting

Conflicts:
	ckan/templates/organization/bulk_process.html

    - facet fixes


  Commit: ab9396eeed6342d71ac30006562ceac4429b0cb0
      https://github.com/okfn/ckan/commit/ab9396eeed6342d71ac30006562ceac4429b0cb0
  Author: amercader <amercadero at gmail.com>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

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

  Log Message:
  -----------
  [#627] Allow to create private datasets

The private field was not present on the default package schema, used by
default_create_package_schema, so if you defined private in your package
dict it was ignored. This commit adds it to the default package schema
(ignoring it if not present).


  Commit: c9825cec1b617c9af40a3bede7ef9810f43cf1ec
      https://github.com/okfn/ckan/commit/c9825cec1b617c9af40a3bede7ef9810f43cf1ec
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

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

  Log Message:
  -----------
  [#3012] Some controller fixes


  Commit: 91dc7d243565b7cb9ca93d83170d04b35b2c5151
      https://github.com/okfn/ckan/commit/91dc7d243565b7cb9ca93d83170d04b35b2c5151
  Author: John Glover <j at johnglover.net>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

  Changed paths:
    M ckan/tests/lib/test_dictization_schema.py

  Log Message:
  -----------
  [#627] Fix test broken due to default schema change


  Commit: b5546f79edc7a37f22ca11ca0981a3241b17f3a7
      https://github.com/okfn/ckan/commit/b5546f79edc7a37f22ca11ca0981a3241b17f3a7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

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

  Log Message:
  -----------
  Revert "[#3012] Some controller fixes"

This reverts commit c9825cec1b617c9af40a3bede7ef9810f43cf1ec.

wrong branch


  Commit: 154eb255a24623f70583b1fb7b40ef6c7384cc87
      https://github.com/okfn/ckan/commit/154eb255a24623f70583b1fb7b40ef6c7384cc87
  Author: John Glover <j at johnglover.net>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

  Changed paths:
    M ckan/tests/lib/test_dictization_schema.py

  Log Message:
  -----------
  PEP8


  Commit: 6a5d5c4bff16d66ef3656b5ca4d21b577c63e475
      https://github.com/okfn/ckan/commit/6a5d5c4bff16d66ef3656b5ca4d21b577c63e475
  Author: John Glover <glover.john at gmail.com>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

  Changed paths:
    M ckan/logic/schema.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge pull request #627 from okfn/627-create-private-datasets

You can not create a dataset private by default


  Commit: bea4276fc7254ec89cea3791b56edc815c8a30b7
      https://github.com/okfn/ckan/commit/bea4276fc7254ec89cea3791b56edc815c8a30b7
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-14 (Thu, 14 Mar 2013)

  Changed paths:
    M ckan/public/base/less/dataset.less
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/snippets/simple_search.html

  Log Message:
  -----------
  Merge pull request #613 from okfn/613-bulk-update-sorting

Bulk processing - add sort lastmodified


  Commit: f63b00b1380edefaa40247db4fbaa4035d529e2a
      https://github.com/okfn/ckan/commit/f63b00b1380edefaa40247db4fbaa4035d529e2a
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-14 (Thu, 14 Mar 2013)

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

  Log Message:
  -----------
  [#613] Rebuilt main.css


  Commit: 01818700748df490b597d6263283cb21a2281492
      https://github.com/okfn/ckan/commit/01818700748df490b597d6263283cb21a2281492
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-14 (Thu, 14 Mar 2013)

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

  Log Message:
  -----------
  Adds title to return of organization_list_for_user


  Commit: f63cc92b9f5024392f3f989a7486cbcf9dccb730
      https://github.com/okfn/ckan/commit/f63cc92b9f5024392f3f989a7486cbcf9dccb730
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-14 (Thu, 14 Mar 2013)

  Changed paths:
    M ckan/templates/ajax_snippets/api_info.html

  Log Message:
  -----------
  Fix api_info template


  Commit: c5bdae7dd1505e66d5dc7e5f37b81aff7d110012
      https://github.com/okfn/ckan/commit/c5bdae7dd1505e66d5dc7e5f37b81aff7d110012
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-14 (Thu, 14 Mar 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge pull request #595 from okfn/595-exclude-fields-in-extras

h.sorted_extras needs a exclude param


  Commit: 80d36dee6e765cafffbc03945da8ee4b0bbbd3b5
      https://github.com/okfn/ckan/commit/80d36dee6e765cafffbc03945da8ee4b0bbbd3b5
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-14 (Thu, 14 Mar 2013)

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

  Log Message:
  -----------
  Merge pull request #545 from okfn/369-update-package-read-issue

[#369] updating packages to deleted state had permission issues [for 2.0]


  Commit: 05291cd4ba8d24ebe1e8a06329beb4dff9b54703
      https://github.com/okfn/ckan/commit/05291cd4ba8d24ebe1e8a06329beb4dff9b54703
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-14 (Thu, 14 Mar 2013)

  Changed paths:
    M ckan/public/base/less/forms.less

  Log Message:
  -----------
  Re-aligns labels for normal and large inputs site wide


  Commit: 1ff49ccc72ce17641b110a35e3c1b4724beb4a7f
      https://github.com/okfn/ckan/commit/1ff49ccc72ce17641b110a35e3c1b4724beb4a7f
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-14 (Thu, 14 Mar 2013)

  Changed paths:
    M ckan/public/base/less/forms.less

  Log Message:
  -----------
  Fixes large input height in Firefox because of it's odd input line-height rule


  Commit: 3aa15b247b0f80a5e525d4da71b11a17a39357b7
      https://github.com/okfn/ckan/commit/3aa15b247b0f80a5e525d4da71b11a17a39357b7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-14 (Thu, 14 Mar 2013)

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

  Log Message:
  -----------
  Recompile main.css


  Commit: 00c2898c804399608e38f970e12f53db5767e77c
      https://github.com/okfn/ckan/commit/00c2898c804399608e38f970e12f53db5767e77c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/plugins/interfaces.py
    M ckan/tests/functional/test_package.py
    M ckanext/example_idatasetform/plugin.py

  Log Message:
  -----------
  [#602] Deprecate IDatasetForm's check_data_dict

With the new three-stage dataset creation form in CKAN 2.0
check_data_dict() no longer works as intended. For example,
DefaultDatasetForm's check_data_dict() breaks any IDatasetForm plugins
that are trying to use convert_to_extras() (if they inherit from
DefaultDatasetForm).

Remove the method from IDatasetForm and DefaultDatasetForm, but still
call the method in all the places it would previously have been called
_if_ the active IDatasetForm plugin has the method.

Also remove three tests that seem to be testing check_data_dict()'s
behaviours.

Note that in the existing code, check_data_dict() seems to be called
twice when creating a package, once by the package controller and once
by package_create(), and the two are inconsistent in the number of
params they expect check_data_dict() to take! On updating a package it's
called just once, by package_update(). I have preserved these "legacy"
behaviours.

Also note that IGroupForm and IOrganizationForm still have
check_data_dict() methods, we probably want to get rid of them in the
future as well.


  Commit: 119800723cbdd865674ecaf38e31a9c1dc24bd70
      https://github.com/okfn/ckan/commit/119800723cbdd865674ecaf38e31a9c1dc24bd70
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

  Changed paths:
    A ckan/common.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/base.py
    M ckan/lib/dumper.py
    M ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/jsonp.py
    M ckan/lib/mailer.py
    M ckan/lib/repoze_patch.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/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/022_add_group_extras.py
    M ckan/migration/versions/029_version_groups.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/forms.less
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/package/search.html
    M ckan/templates/snippets/simple_search.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_solr_search_index.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/misc/test_sync.py
    M ckan/tests/test_dumper.py
    R doc/api-tutorial.rst
    R doc/api-util.rst
    R doc/api-v2.rst
    M doc/api.rst
    R doc/apiv3.rst
    M doc/architecture.rst
    A doc/ckan.logic.action.create.rst
    A doc/ckan.logic.action.delete.rst
    A doc/ckan.logic.action.get.rst
    A doc/ckan.logic.action.update.rst
    M doc/conf.py
    M doc/datastore-api.rst
    A doc/filestore-api.rst
    M doc/filestore.rst
    M doc/index.rst
    M doc/install-from-source.rst
    A doc/legacy-api.rst
    M doc/loading-data.rst
    M doc/multilingual.rst
    M doc/python-coding-standards.rst
    M pip-requirements.txt

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

Conflicts:
	doc/tag-vocabularies.rst


Compare: https://github.com/okfn/ckan/compare/bd44895179ef...119800723cbd


More information about the ckan-changes mailing list