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

GitHub noreply at github.com
Tue Mar 26 10:11:10 UTC 2013


  Branch: refs/heads/368-new-history-page-2
  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: b094a0402680b677ed9c8c2f319129c9afe8f44a
      https://github.com/okfn/ckan/commit/b094a0402680b677ed9c8c2f319129c9afe8f44a
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-15 (Fri, 15 Feb 2013)

  Changed paths:
    R ckanext/organizations/__init__.py
    R ckanext/organizations/controllers.py
    R ckanext/organizations/forms.py
    R ckanext/organizations/templates/email/join_publisher_request.txt
    R ckanext/organizations/templates/organization_edit.html
    R ckanext/organizations/templates/organizations/form.html
    R ckanext/organizations/templates/organizations/index.html
    R ckanext/organizations/templates/organizations/new.html
    R ckanext/organizations/templates/organizations/read.html
    R ckanext/organizations/templates/organizations/users.html
    R ckanext/organizations/templates/organizations/users_form.html
    R ckanext/organizations/templates_legacy/organizations/apply.html
    R ckanext/organizations/templates_legacy/organizations/apply_form.html
    R ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
    R ckanext/organizations/templates_legacy/organizations/form.html
    R ckanext/organizations/templates_legacy/organizations/history.html
    R ckanext/organizations/templates_legacy/organizations/index.html
    R ckanext/organizations/templates_legacy/organizations/layout.html
    R ckanext/organizations/templates_legacy/organizations/new.html
    R ckanext/organizations/templates_legacy/organizations/package_form.html
    R ckanext/organizations/templates_legacy/organizations/read.html
    R ckanext/organizations/templates_legacy/organizations/users.html
    R ckanext/organizations/templates_legacy/organizations/users_form.html

  Log Message:
  -----------
  [#408] Remove organizations (publisher) code


  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: 4331816b09dc92cb7c0dfb6aa7b95d49ea89d3da
      https://github.com/okfn/ckan/commit/4331816b09dc92cb7c0dfb6aa7b95d49ea89d3da
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    A ckanext/example_idatasetform/__init__.py
    A ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/templates/package/new_package_metadata.html
    A ckanext/example_idatasetform/templates/package/read.html
    A ckanext/example_idatasetform/templates/package/snippets/package_form.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_form.html
    A ckanext/example_idatasetform/tests/test_example_idatasetform_plugin.py
    M setup.py

  Log Message:
  -----------
  [#2750] Add example_idatasetform example extension


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

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/plugins/interfaces.py
    M doc/conf.py

  Log Message:
  -----------
  [#2750] Improve IDatasetForm docstrings

- Rewrite the IDatasetForm docstrings to make them clearer,
  and conform to PEP257
- Reorder methods in IDatasetForm and DefaultDatasetForm
  so that they're 1. in a more logical order and 2. in the
  same order as eachother
- Tell autodoc to put the methods in source-code order,
  not alphabetical, in the sphinx docs
- Remove docstrings from DefaultDatasetForm that are
  exact repeats of corresponding docstrings in IDatasetForm
- Add edit_template() to IDatasetForm, it was missing

db_to_form_schema_options() and form_to_db_schema_options() and some
other schema methods in DefaultDatasetForm are still missing from
IDatasetForm but I'm leaving it that way for now, consider them
unofficial.


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

  Changed paths:
    R doc/forms.rst
    M doc/index.rst

  Log Message:
  -----------
  [#2750] Delete 'Customizing Forms' docs

They are out of date, and we have ckanext/example_idatasetform instead
now.


  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: 55dec0d327e17d935f9584a19e16d294b92569f2
      https://github.com/okfn/ckan/commit/55dec0d327e17d935f9584a19e16d294b92569f2
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#471] Deprecate lib.helper link functions


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

  Changed paths:
    M ckan/templates_legacy/layout_base.html

  Log Message:
  -----------
  [#471] Fix template for nav_named_link() removal


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

  Changed paths:
    M ckan/templates_legacy/group/layout.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/revision/layout.html
    M ckan/templates_legacy/user/layout.html

  Log Message:
  -----------
  [#471] Fix template for subnav_link() removal


  Commit: 026e135bc8333e98661529c9d500a9a2ac56ff28
      https://github.com/okfn/ckan/commit/026e135bc8333e98661529c9d500a9a2ac56ff28
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#471] Use suggested function not direct link for clarity


  Commit: 6bf23484539bc0f697bdb9906a4bca1b1419efde
      https://github.com/okfn/ckan/commit/6bf23484539bc0f697bdb9906a4bca1b1419efde
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates_legacy/layout_base.html

  Log Message:
  -----------
  [#471] Fix up nav_named_link() so now uses nav_link()


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

  Changed paths:
    M doc/tag-vocabularies.rst

  Log Message:
  -----------
  [#2750] Rewrite tag vocabularies docs

Change the tag vocabularies docs to refer to the working example in
ckanext/example_idatasetform instead of providing their own detailed
instructions.

Also add some more general explanation at the start about what tag
vocabularies are for/why you might want to use them/what you can do with
them, it was all a bit mysterious.

Remove some false claims from the Properties section, I don't think that
the restricted/free vocabulary types are implemented (they are either
always restricted or always free, can't remember), vocabularies do not
have descriptions.


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

  Changed paths:
    M ckanext/example_idatasetform/plugin.py

  Log Message:
  -----------
  [#2750] example_idatasetform use toolkit not logic

Use ckan.plugins.toolkit instead of ckan.logic in ckanext/example_idatasetform


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

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#471] Fix subnav_named_route() to use nav_link()


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

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#471] Fix nav_link() when controller supplied as positional arg


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

  Changed paths:
    M .travis.yml
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/template.py
    M ckan/lib/base.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/search/__init__.py
    M ckan/model/group.py
    M ckan/templates/package/search.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/models/test_group.py
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/resourceproxy/controller.py
    M pip-requirements.txt
    M test-core.ini

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


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

  Changed paths:
    M ckanext/example_idatasetform/plugin.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html

  Log Message:
  -----------
  [#2750] Add a convert_to_extras field to ExampleIDatasetFormPlugin

Add another custom field to ExampleIDatasetFormPlugin, one that uses
convert_to/from_extras instead of convert_to/from_tags.

I also had to make the plugin disable DefaultDatasetForm's
check_data_dict() because it breaks with the new three-stage dataset
creation when using convert_to_extras.


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

  Changed paths:
    M .travis.yml
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/templates/package/search.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 ckanext/resourceproxy/controller.py
    M pip-requirements-test.txt
    M pip-requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 471-helper-clean-link-functions


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

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#471] Fix typo


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

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  [#482] Add get_validator() and get_converter() functions to plugins.toolkit


  Commit: 6514f8f9c1d65eda9134a821c0ad1c296ff52f59
      https://github.com/okfn/ckan/commit/6514f8f9c1d65eda9134a821c0ad1c296ff52f59
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

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

  Log Message:
  -----------
  [#474] Removes 'a' from 'Edit a Organization'


  Commit: 18c21de62930d4b966102389f48863ac5767fd10
      https://github.com/okfn/ckan/commit/18c21de62930d4b966102389f48863ac5767fd10
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [#482] Add docstrings


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

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [#482] Refactor to reduce code duplication


  Commit: d89d5ef520c4fd33766b8e155635fb5fc445ad94
      https://github.com/okfn/ckan/commit/d89d5ef520c4fd33766b8e155635fb5fc445ad94
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/variables.less

  Log Message:
  -----------
  [#474] Tweaks to pills and tags


  Commit: 56cebfeb7bcaa91233843bdfbc6a6b564779354e
      https://github.com/okfn/ckan/commit/56cebfeb7bcaa91233843bdfbc6a6b564779354e
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/templates/package/snippets/info.html

  Log Message:
  -----------
  [#474] CSS tweaks to modules and navs


  Commit: 6539d1d9445e955d70ae12893a5efeee005be8d1
      https://github.com/okfn/ckan/commit/6539d1d9445e955d70ae12893a5efeee005be8d1
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M ckan/templates/home/index.html

  Log Message:
  -----------
  [#474] Homepage tag title tweak


  Commit: cc3e03d6a71ee4d42eec27ac9140c23acecad20f
      https://github.com/okfn/ckan/commit/cc3e03d6a71ee4d42eec27ac9140c23acecad20f
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

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

  Log Message:
  -----------
  [#474] Makes resource heading overflow properly


  Commit: 814b3973fd49d85eb22e31b2ddbda8547100325d
      https://github.com/okfn/ckan/commit/814b3973fd49d85eb22e31b2ddbda8547100325d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    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

  Log Message:
  -----------
  [#349] remove the publisher_form stuff


  Commit: 5f22028a60d16e8d0ec72aac339f6297af9d740a
      https://github.com/okfn/ckan/commit/5f22028a60d16e8d0ec72aac339f6297af9d740a
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    R ckan/tests/mock_publisher_auth.py

  Log Message:
  -----------
  [#349] remove mock_publisher_auth.py


  Commit: 61871d7a01e6992e38f96d40801b4f8faef0b6eb
      https://github.com/okfn/ckan/commit/61871d7a01e6992e38f96d40801b4f8faef0b6eb
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

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

  Log Message:
  -----------
  [#349] remove tests related to publisher


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

  Changed paths:
    R ckan/lib/authztool.py
    M setup.py

  Log Message:
  -----------
  [#349] Remove old auth paster commands


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

  Changed paths:
    M ckan/lib/create_test_data.py

  Log Message:
  -----------
  [#349] Remove create_roles() in create_test_data


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

  Changed paths:
    R ckanext/resourceproxy/tests/file_server.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M pip-requirements-test.txt

  Log Message:
  -----------
  [#543] Test resource proxy using httpretty


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

  Changed paths:
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  [#543] from .. import -> import ..


  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: 7e3de5fb9ac074acc892f029f211d0a31bea4df9
      https://github.com/okfn/ckan/commit/7e3de5fb9ac074acc892f029f211d0a31bea4df9
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-04 (Mon, 04 Mar 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/search/index.py

  Log Message:
  -----------
  [#515] Fix issue with orgs appearing in group facet


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

  Changed paths:
    M ckanext/example_idatasetform/tests/test_example_idatasetform_plugin.py

  Log Message:
  -----------
  [#2750] Fix tag editing test in example_idatasetform


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

  Changed paths:
    M ckanext/example_idatasetform/tests/test_example_idatasetform_plugin.py

  Log Message:
  -----------
  [#2750] Edit some other fields in example_idatasetform test

Test that normal dataset fields can still be edited when using
IDatasetForm.


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

  Changed paths:
    M ckanext/example_idatasetform/plugin.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform_plugin.py

  Log Message:
  -----------
  [#2750] Finish example_idatasetform tests

This just finishes up the example_idatasetform tests that count how many
times the per-dataset-type templates are called.


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

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#548] Fix broken password reset and add FIXMEs


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

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/admin/base.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/group/read_base.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/read_base.html
    R ckan/templates/snippets/page_header.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/read_base.html

  Log Message:
  -----------
  [#552] Adds page_header_tabs block for extensions to be able to add to tabs


  Commit: 0dd41f92cae76c8ff99f212e5959de560f69680a
      https://github.com/okfn/ckan/commit/0dd41f92cae76c8ff99f212e5959de560f69680a
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M .travis.yml
    A bin/travis-build

  Log Message:
  -----------
  [#544] Run tests with Postgres 8.4 and 9.1 on Travis


  Commit: 69d1104005c5d8f2716587e6aab9323c5aa6b108
      https://github.com/okfn/ckan/commit/69d1104005c5d8f2716587e6aab9323c5aa6b108
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    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

  Log Message:
  -----------
  Remove old vendor files that moved to ckanext


  Commit: 2f401f918addedbe2178ed88e24b7762eb72e5be
      https://github.com/okfn/ckan/commit/2f401f918addedbe2178ed88e24b7762eb72e5be
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

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

  Log Message:
  -----------
  Test whether the preview works for unicode filetype names


  Commit: 04a5b5741ba615a1bda0d6fbf535941c3df60883
      https://github.com/okfn/ckan/commit/04a5b5741ba615a1bda0d6fbf535941c3df60883
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Fix and improve no-preview code, Fixes issue with unicode filetype names, fewer log entries, better descriptions for what went wrong


  Commit: 197ca9ef24e8bbc4827b5ad4eaf57889ea13eb40
      https://github.com/okfn/ckan/commit/197ca9ef24e8bbc4827b5ad4eaf57889ea13eb40
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M ckan/templates/dataviewer/snippets/no_preview.html

  Log Message:
  -----------
  Active voice in error messages


  Commit: 2398f3e97633492e573de51e9b2f48afeddffb5c
      https://github.com/okfn/ckan/commit/2398f3e97633492e573de51e9b2f48afeddffb5c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/dataviewer/snippets/no_preview.html

  Log Message:
  -----------
  Make all reasons for no preview translatable


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

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/logic/test_action.py

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


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

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/lib/plugins.py
    A ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/snippets/organization.html

  Log Message:
  -----------
  Adds follower and activity stream support to orgs


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

  Changed paths:
    M ckan/templates/page.html

  Log Message:
  -----------
  When the secondary block is empty add .no-nav to .wrapper


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

  Changed paths:
    M ckan/templates/error_document_template.html
    M ckan/templates/home/about.html

  Log Message:
  -----------
  Fixes the 2 current templates with the correct new behaviour for .no-nav


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

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

  Log Message:
  -----------
  [#552] Adds inner block to user page header tabs


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

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/admin/base.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/group/read_base.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/read_base.html
    R ckan/templates/snippets/page_header.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/read_base.html

  Log Message:
  -----------
  Merge branch '552-page-header-tabs'

Conflicts:
	ckan/config/routing.py
	ckan/templates/organization/read_base.html

    activity stream rfelated conflicts


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

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

  Log Message:
  -----------
  Adds URL to the resource page just below the title


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

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

  Log Message:
  -----------
  Makes no results message work in all different contexts


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

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

  Log Message:
  -----------
  [#560] Skip datastore sql tests in legacy mode


  Commit: 4d04d93c674155ada099c92cc1e24e914ab30d7b
      https://github.com/okfn/ckan/commit/4d04d93c674155ada099c92cc1e24e914ab30d7b
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#560] Pep8


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

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#560] Do not ensure separate read and write urls in legacy mode


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

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#560] Refactor _is_read_only_database


  Commit: 3828adc68b5e820b1a9e41ae41adc4aa73efa9f4
      https://github.com/okfn/ckan/commit/3828adc68b5e820b1a9e41ae41adc4aa73efa9f4
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    A ckanext/datastore/tests/test_configure.py

  Log Message:
  -----------
  [#560] Test datastore configuration


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

  Changed paths:
    M ckan/templates/package/snippets/search_form.html

  Log Message:
  -----------
  [#472] Fix dataset messages on general searches groups/orgs etc


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

  Changed paths:
    M ckan/lib/jinja_extensions.py

  Log Message:
  -----------
  [#568] Fix to allow translations to be extracted


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

  Changed paths:
    M ckan/templates/package/snippets/search_form.html

  Log Message:
  -----------
  Merge pull request #472 from okfn/472-group-search-fix

No results / no entires message


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

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#560] Create indexes with names if on PG prior to 9.0 because automatic naming is not supported there


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

  Changed paths:
    A ckan/public/base/images/table-seperator.png
    A ckan/public/base/javascript/modules/table-toggle-more.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/tables.less
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  Adds new JS module for hiding and showing extra meta information


  Commit: 9dd37f064bcc0f2b0a8290fc0dca7a14a5b58bc8
      https://github.com/okfn/ckan/commit/9dd37f064bcc0f2b0a8290fc0dca7a14a5b58bc8
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#560] Return True, instead of printing it


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

  Changed paths:
    M ckan/templates/package/snippets/search_form.html

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


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

  Changed paths:
    M ckan/public/base/javascript/modules/table-toggle-more.js

  Log Message:
  -----------
  [#499] Whitespace fix


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

  Changed paths:
    M ckan/lib/app_globals.py
    M ckan/templates/footer.html

  Log Message:
  -----------
  Show latest api docs when not release version


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

  Changed paths:
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/package/search.html

  Log Message:
  -----------
  Adds g.ckan_doc_version into more templates


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

  Changed paths:
    M ckan/templates/package/snippets/info.html

  Log Message:
  -----------
  [#474] Capitalization tweaks


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

  Changed paths:
    M ckan/public/base/css/main.css
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.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/variables.less
    M ckan/templates/home/index.html
    M ckan/templates/organization/edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/info.html

  Log Message:
  -----------
  Recompile css for master


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

  Changed paths:
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/search_form.html
    A ckan/templates/snippets/search_result_text.html

  Log Message:
  -----------
  [#472] Unify the dataset searches to give consistent results text

Conflicts:
	ckan/templates/package/snippets/search_form.html

    trivial


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

  Changed paths:
    M ckan/templates/group/index.html

  Log Message:
  -----------
  [#575] Removes uneeded <hr>


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

  Changed paths:
    M ckan/templates/user/snippets/followee_dropdown.html

  Log Message:
  -----------
  Adds autocomplete="off" to dashboard dropdown filter


  Commit: 690655b4089f3d9f2db4d73a77c0a265a1cfb10c
      https://github.com/okfn/ckan/commit/690655b4089f3d9f2db4d73a77c0a265a1cfb10c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#560] Correct version comparison


  Commit: 8ac24a17a27373c1cc2d10e91411125c391758b1
      https://github.com/okfn/ckan/commit/8ac24a17a27373c1cc2d10e91411125c391758b1
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/plugins/interfaces.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
    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
    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-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/dataset.less
    M ckan/public/base/less/homepage.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/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/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/home/about.html
    M ckan/templates/home/index.html
    A ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/read.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/search.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/page.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/organization.html
    R ckan/templates/snippets/page_header.html
    A ckan/templates/snippets/search_result_text.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/plugin.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/reclinepreview/theme/public/css/recline.min.css

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 349-old-auth-cleanups


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

  Changed paths:
    R ckan/lib/authztool.py
    M ckan/lib/create_test_data.py
    M ckan/tests/functional/test_group.py
    R ckan/tests/mock_publisher_auth.py
    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
    M setup.py

  Log Message:
  -----------
  Merge branch '349-old-auth-cleanups'


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

  Changed paths:
    M ckan/lib/jinja_extensions.py

  Log Message:
  -----------
  Merge branch '568-fix-trans-extract'


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

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

  Log Message:
  -----------
  [#560] Compare with bool with is instead of ==


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

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

  Log Message:
  -----------
  [#560] Test pg version comparison


  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: 721205adee1ac58f9fe8f1654fbd1b9226b69738
      https://github.com/okfn/ckan/commit/721205adee1ac58f9fe8f1654fbd1b9226b69738
  Author: amercader <amercadero at gmail.com>
  Date:   2013-03-07 (Thu, 07 Mar 2013)

  Changed paths:
    M ckan/templates/admin/index.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/home/snippets/about_text.html
    M ckan/templates/package/base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/search_form.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/home_breadcrumb_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/popular.html
    M ckan/templates/snippets/related.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    M ckan/templates/user/logout_first.html

  Log Message:
  -----------
  Template translation review

Known issue: h.time_ago_in_words_from_str


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

  Changed paths:
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/related/snippets/related_form.html

  Log Message:
  -----------
  Fixes after review


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

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

  Log Message:
  -----------
  Fix translation issue with package search


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

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Fix crash in stage 3 when ValidationErrors occur

Basically when raising a ValidationError on stage 3 of the dataset
creation, the new_metadata method didn't set context before
_setup_template_variables was called, raising an exception.

Note that this prevents the exception, but the message is still not
shown (see #586).


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

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/group/index.html
    M ckan/templates/organization/index.html
    M ckan/templates/snippets/search_result_text.html

  Log Message:
  -----------
  Improvements to the search text including number formatting, groups, orgs


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

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/organization/edit_base.html

  Log Message:
  -----------
  [#585] Makes org edit page header correct


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

  Changed paths:
    M .travis.yml
    A bin/travis-build

  Log Message:
  -----------
  Merge pull request #562 from vitorbaptista/544

[#544] Run tests with Postgres 8.4 and 9.1 on Travis


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

  Changed paths:
    M ckan/templates/footer.html

  Log Message:
  -----------
  [#307] Fix About translation in footer


  Commit: c8c36d3131463eceb6b3ef231420a5e4f1359387
      https://github.com/okfn/ckan/commit/c8c36d3131463eceb6b3ef231420a5e4f1359387
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-03-07 (Thu, 07 Mar 2013)

  Changed paths:
    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

  Log Message:
  -----------
  Merge pull request #560 from okfn/560-datastore-tests

Datastore tests aren't respecting the legacy_mode flag, index creation does not work on PG 8.4


  Commit: c1073c73462772cb0b80f230880891affb0d162f
      https://github.com/okfn/ckan/commit/c1073c73462772cb0b80f230880891affb0d162f
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-03-07 (Thu, 07 Mar 2013)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  [#589] Fixes DeprecationWarning on ckan.lib.app_globals

Instead of calling config.debug, we need to call config['debug'].

Fixes #589.


  Commit: f0925f64c7435cea00e8b5928d446494f59839f6
      https://github.com/okfn/ckan/commit/f0925f64c7435cea00e8b5928d446494f59839f6
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-03-07 (Thu, 07 Mar 2013)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  [#589] Test that config['debug'] is True, not that it exists

If it doesn't exist, consider it as False.


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

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

  Log Message:
  -----------
  [#590] Renames edit to admin


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

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

  Log Message:
  -----------
  [#592] Removes page header on create org page


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

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

  Log Message:
  -----------
  [#590] Changes breadcrumb to admin


  Commit: 786b763cc670dedf34a48d12921bacd588d2c1c3
      https://github.com/okfn/ckan/commit/786b763cc670dedf34a48d12921bacd588d2c1c3
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-08 (Fri, 08 Mar 2013)

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

  Log Message:
  -----------
  [#592] Grammarification


  Commit: 33f90c749c7a24ba7bf43b1a6dd8cbb90cb23750
      https://github.com/okfn/ckan/commit/33f90c749c7a24ba7bf43b1a6dd8cbb90cb23750
  Author: amercader <amercadero at gmail.com>
  Date:   2013-03-08 (Fri, 08 Mar 2013)

  Changed paths:
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/read_base.html

  Log Message:
  -----------
  Merge branch '590-edit-admin-button'


  Commit: 18559e27fec5833a935311d00c8cc699ccd1f9ef
      https://github.com/okfn/ckan/commit/18559e27fec5833a935311d00c8cc699ccd1f9ef
  Author: amercader <amercadero at gmail.com>
  Date:   2013-03-08 (Fri, 08 Mar 2013)

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

  Log Message:
  -----------
  Merge branch '592-org-create-header'


  Commit: 0b0816610b2f16f11a83c8cb0c8bc151ee29d04d
      https://github.com/okfn/ckan/commit/0b0816610b2f16f11a83c8cb0c8bc151ee29d04d
  Author: amercader <amercadero at gmail.com>
  Date:   2013-03-11 (Mon, 11 Mar 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Merge branch '548-password-reset-fix'


  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: 6580bcd27629d9a5b0498ede302b0a3687dd09b0
      https://github.com/okfn/ckan/commit/6580bcd27629d9a5b0498ede302b0a3687dd09b0
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-11 (Mon, 11 Mar 2013)

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

  Log Message:
  -----------
  Fix logout template


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

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  Merge branch '482-plugin-validator-converter-access'


  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: 9a56e8e6f5b53b2e2b0e8a7fe2842e2716700319
      https://github.com/okfn/ckan/commit/9a56e8e6f5b53b2e2b0e8a7fe2842e2716700319
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-03-11 (Mon, 11 Mar 2013)

  Changed paths:
    A ckanext/example_idatasetform/__init__.py
    A ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/templates/package/new_package_metadata.html
    A ckanext/example_idatasetform/templates/package/read.html
    A ckanext/example_idatasetform/templates/package/snippets/package_form.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_form.html
    M setup.py

  Log Message:
  -----------
  [#2750] Add ckanext/example_idatasetform


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

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/plugins/interfaces.py
    M doc/conf.py

  Log Message:
  -----------
  [#2750] Improve IDatasetForm docstrings

- Rewrite the IDatasetForm docstrings to make them clearer,
  and conform to PEP257
- Reorder methods in IDatasetForm and DefaultDatasetForm
  so that they're 1. in a more logical order and 2. in the
  same order as eachother
- Tell autodoc to put the methods in source-code order,
  not alphabetical, in the sphinx docs
- Remove docstrings from DefaultDatasetForm that are
  exact repeats of corresponding docstrings in IDatasetForm
- Add edit_template() to IDatasetForm, it was missing

db_to_form_schema_options() and form_to_db_schema_options() and some
other schema methods in DefaultDatasetForm are still missing from
IDatasetForm but I'm leaving it that way for now, consider them
unofficial.


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

  Changed paths:
    R doc/forms.rst
    M doc/index.rst

  Log Message:
  -----------
  [#2750] Delete 'Customizing Forms' docs

They are out of date, and we have ckanext/example_idatasetform instead
now.


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

  Changed paths:
    M doc/tag-vocabularies.rst

  Log Message:
  -----------
  [#2750] Rewrite tag vocabularies docs

Change the tag vocabularies docs to refer to the working example in
ckanext/example_idatasetform instead of providing their own detailed
instructions.

Also add some more general explanation at the start about what tag
vocabularies are for/why you might want to use them/what you can do with
them, it was all a bit mysterious.

Remove some false claims from the Properties section, I don't think that
the restricted/free vocabulary types are implemented (they are either
always restricted or always free, can't remember), vocabularies do not
have descriptions.


  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: 379add8393be7b3bb62d6c8eba0f7be0fcfc4632
      https://github.com/okfn/ckan/commit/379add8393be7b3bb62d6c8eba0f7be0fcfc4632
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-12 (Tue, 12 Mar 2013)

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

  Log Message:
  -----------
  [#485] Remove colour padlock from license snippet


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

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

  Log Message:
  -----------
  [#485] Put back endif


  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: bb94e628458741d85b782880ff9383c9b30e2743
      https://github.com/okfn/ckan/commit/bb94e628458741d85b782880ff9383c9b30e2743
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

  Changed paths:
    A ckan/templates/tag/index.html

  Log Message:
  -----------
  [#421] Adds tag index page


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

  Changed paths:
    M ckan/controllers/tag.py

  Log Message:
  -----------
  [#421] Redirects old tag redirect page to new package search with tag


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

  Changed paths:
    M .travis.yml
    A bin/travis-build
    A ckan/common.py
    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/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dumper.py
    M ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/jsonp.py
    M ckan/lib/mailer.py
    M ckan/lib/plugins.py
    M ckan/lib/repoze_patch.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.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/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
    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
    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-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/dataset.less
    M ckan/public/base/less/homepage.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/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/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/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
    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
    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/read_base.html
    M ckan/templates/user/snippets/followee_dropdown.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_group.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/misc/test_sync.py
    R ckan/tests/mock_publisher_auth.py
    M ckan/tests/test_dumper.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
    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
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 515-org-group-search-issue


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

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

  Log Message:
  -----------
  [#515] Add a check to stop errors


  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: 7d775cba0bf8fd3df03c3dfc535fc19a527fc41c
      https://github.com/okfn/ckan/commit/7d775cba0bf8fd3df03c3dfc535fc19a527fc41c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-14 (Thu, 14 Mar 2013)

  Changed paths:
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  [#543] Resolve speed issues in resource proxy test with httpretty.
The problem was that httpretty slows down requests and this slowed down set_resource_url.


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

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

  Log Message:
  -----------
  [#630] Members table now has header and behaves like the other tables within admin


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

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

  Log Message:
  -----------
  [#630] Moves 'Add member' button into the correct position


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

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

  Log Message:
  -----------
  [#630] Adds 'Add Dataset' button into bulk_process page


  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: 54c932abc8a83b45ea468adb9563b5401612eb14
      https://github.com/okfn/ckan/commit/54c932abc8a83b45ea468adb9563b5401612eb14
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-14 (Thu, 14 Mar 2013)

  Changed paths:
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  [#543] Fix test_resource_proxy_non_existent


  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: 37a9320e1800ac0af4333ba33c609044a9eaf58e
      https://github.com/okfn/ckan/commit/37a9320e1800ac0af4333ba33c609044a9eaf58e
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-14 (Thu, 14 Mar 2013)

  Changed paths:
    M ckan/controllers/tag.py

  Log Message:
  -----------
  [#421] Fix for checking if we're in legacy templates mode for tests


  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: c790b48762adba05094132781d52517e04bcc85c
      https://github.com/okfn/ckan/commit/c790b48762adba05094132781d52517e04bcc85c
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  [#288] Fix for unicode/latin1 .ini values


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

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

  Log Message:
  -----------
  [#638] Clean up some imports and remove OrderedDict redefine


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

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#638] Use correct function


  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


  Commit: 1b117786f206bb1623cfbdd69c860c0fc46df487
      https://github.com/okfn/ckan/commit/1b117786f206bb1623cfbdd69c860c0fc46df487
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

  Changed paths:
    M ckan/new_authz.py

  Log Message:
  -----------
  [#636] Fix deleted members having rights


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

  Changed paths:
    M ckan/plugins/toolkit.py
    M ckanext/example_idatasetform/plugin.py

  Log Message:
  -----------
  [#2750] Add DefaultDatasetForm to plugins toolkit

At DefaultDatasetForm to the plugins toolkit. This means that
IDatasetForm plugins based on DefaultDatasetForm no longer need to
import ckan.lib.plugins.

Also change ExampleIDatasetForm to no longer import ckan.lib.plugins.


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

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

  Log Message:
  -----------
  [#639] Clean logic.auth.update


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

  Changed paths:
    M ckanext/example_idatasetform/plugin.py
    R ckanext/example_idatasetform/templates/package/new_package_metadata.html
    R ckanext/example_idatasetform/templates/package/snippets/package_form.html
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    R ckanext/example_idatasetform/templates/package/snippets/package_metadata_form.html

  Log Message:
  -----------
  [#2750] Use ITemplateHelpers not setup_template_variables()

In ExampleIDatasetForm use ITemplateHelpers not
setup_template_variables() to pass the list of available country codes
to the template. This greatly reduces the number of templates that need
to be overridden!


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

  Changed paths:
    M ckanext/example_idatasetform/plugin.py

  Log Message:
  -----------
  [#2750] Move create_country_codes() to a better place

Move example_idatasetform's create_country_codes() to a better place.


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

  Changed paths:
    M ckanext/example_idatasetform/plugin.py

  Log Message:
  -----------
  [#2750] Add setup_template_variables() back

Add setup_template_variables() back into ExampleIDatasetFormPlugin, just
counts how many times it gets called, for testing purposes.


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

  Changed paths:
    M ckanext/example_idatasetform/plugin.py

  Log Message:
  -----------
  [#2750] Use super()

Seems like the right thing to do


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

  Changed paths:
    M ckanext/example_idatasetform/templates/package/read.html

  Log Message:
  -----------
  [#2750] Change an HTML comment into a Jinja comment


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

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

  Log Message:
  -----------
  [#636] Check we set state to active


  Commit: 2e2e9572b70c6a8d6485269c4b740c5742cfd636
      https://github.com/okfn/ckan/commit/2e2e9572b70c6a8d6485269c4b740c5742cfd636
  Author: John Glover <j at johnglover.net>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

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

  Log Message:
  -----------
  [#639] PEP8


  Commit: abf2729128cc330750ad8847bc91c9314492dbf6
      https://github.com/okfn/ckan/commit/abf2729128cc330750ad8847bc91c9314492dbf6
  Author: John Glover <glover.john at gmail.com>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

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

  Log Message:
  -----------
  Merge pull request #639 from okfn/639-clean-logic-auth-update

logic.auth.update is a mess


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

  Changed paths:
    M ckan/logic/schema.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/schema/test_schema.py
    M ckanext/test_tag_vocab_plugin.py

  Log Message:
  -----------
  [#649] Rename default_package_schema() -> _base_package_schema()

Also add a docstring.

This schema seems to be a base schema for other package schemas to be
based on, and a private helper function of schema.py. It's not used
outside of schema.py apart from by some tests that probably should not
be using it. The new name hopefully makes it clearer what the purpose of
this function is.


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

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#649] Deprecate package_form_schema() properly

I think package_form_schema() was probably deprecated using a code
comment before we had the Right Way of deprecating things (using the
deprecated decorator).


  Commit: 34911b9921756469a40ceb5320ba9451ecd75fe7
      https://github.com/okfn/ckan/commit/34911b9921756469a40ceb5320ba9451ecd75fe7
  Author: kindly <kindly at gmail.com>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

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

  Log Message:
  -----------
  #515 make it so organization titles are in facet listing


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

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#649] Don't validate package dicts in package controller

The package_*() action functions handle fetching package schemas and
using them to validate package dicts, no need to also do it in the
package controller!


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

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

  Log Message:
  -----------
  [#649] Delete package_create_validate()

Delete package_create_validate() action function.

This function has no docstring and no tests, and duplicates package dict
validation code in package_create().


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

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

  Log Message:
  -----------
  [#649] Delete package_update_validate()

Delete package_update_validate() action function.

This function has no docstring and no tests, and duplicates package dict
validation code in package_update().


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

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

  Log Message:
  -----------
  [#430] Add test for packages in vocab list.

>From seanh commit 4c917f58e544d42c101964077a684db27caf293a


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

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

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


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

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

  Log Message:
  -----------
  [#629] Adds .clearfix to .module-heading to make the 'Clear all' a little nicer


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

  Changed paths:
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html

  Log Message:
  -----------
  [#2750] Tweaks base package_metadata_fields.html and then {% ckan_extends %} from it.


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

  Changed paths:
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html

  Log Message:
  -----------
  [#2750] Simplify the template yet more


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

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/schema/test_schema.py
    M ckanext/test_tag_vocab_plugin.py

  Log Message:
  -----------
  [#649] Refactor form_to_db_schema()

Replace form_to_db_schema(), form_to_db_schema_options(),
form_to_db_schema_api_create(), form_to_db_schema_api_update(),
form_to_db_package_schema() with just two schemas: create and update.
Then get the tests passing.

schema.py:

- Delete _base_package_schema()
- Delete already deprecated package_form_schema()
- Delete form_to_db_package_schema()
- Tweak default_create_package_schema() and
  default_update_package_schema() to get tests passing

DefaultDatasetForm:

- Delete form_to_db_schema_options()
- Delete form_to_db_schema()
- Delete form_to_db_schema_api_create()
- Delete form_to_db_schema_api_update()
- Add create_package_schema(), returns None
- Add update_package_schema(), returns None

Note that by deleting form_to_db_schema() and
form_to_db_schema_options(), _api_create() and _api_update(), we're
breaking backwards compatibility with any plugins that were using these.

package_create():
- Don't call form_to_db_schema_options() or form_to_db_schema().
- Instead call the package plugin's create_package_schema(), if that
  doesn't exist or if it returns None then call
  default_create_package_schema() instead

package_update():
- Don't call form_to_db_schema_options() or form_to_db_schema().
- Instead call the package plugin's update_package_schema(), if that
  doesn't exist or if it returns None then call
  default_update_package_schema() instead

Note that by no longer calling the form_to_db_schema_options() or
form_to_db_schema() methods of IDatasetForm plugins, we're breaking
backward compatibility with those plugins.

Note this makes IDatasetForm less flexible - plugins can return
different schemas for creating, updating or showing packages, but they
can no longer return different schemas depending on whether we're using
the API or web UI, or on other parameters from the Pylons context.

test_tag_vocab.py:

- Update MockVocabTagsPlugin to work with the new interface

Also update some other tests.


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

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/logic/schema.py
    M ckanext/test_tag_vocab_plugin.py

  Log Message:
  -----------
  [#649] Rename db_to_form_package_schema() -> default_show_package_schema()

This makes the name consistent with default_create_package_schema() and
default_update_package_schema().


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

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/logic/action/get.py
    M ckanext/test_tag_vocab_plugin.py

  Log Message:
  -----------
  [#649] Get rid of form_to_db_schema_options()

package_show(): Don't call an IDatasetForm plugin's
db_to_form_schema_options() or db_to_form_schema() anymore, instead call
package_show_schema(), if the plugin doesn't have that method or if it
returns None then fall back on
ckan.logic.schema.default_package_show_schema(). (Same pattern as for
package_create() and package_update()).

Delete DefaultDatasetForm's db_to_form_schema_options() and
db_to_form_schema(), add show_package_schema() that just returns None,
same as create_package_schema() and update_package_schema().


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

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  Merge branch '288-unicode-title-support'


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

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

  Log Message:
  -----------
  Merge branch '629-clear-all-facet'


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

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Remove unused _check_data_dict() from package controller

This method is never called


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

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#649] Remove schema-related hacks from package controller

These hacks are no longer needed


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

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

  Log Message:
  -----------
  Merge branch '630-org-template-tidy-up'


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  Merge branch '515-org-group-search-issue'

Conflicts:
	ckan/lib/search/index.py


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

  Changed paths:
    M ckan/lib/dictization/model_dictize.py

  Log Message:
  -----------
  [#430] Fix for packages not appearing in vocabulary_show


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py
    M ckan/public/base/less/module.less
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/members.html

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 430-packages-missing-vocabulary-show


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

  Changed paths:
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html

  Log Message:
  -----------
  [#2750] Add custom_text_field back into example idatasetform templates

This field accidentally got removed from the templates in a previous
commit


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

  Changed paths:
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html

  Log Message:
  -----------
  [#2750] Remove 'free extras' from package form in example idatasetform

This is necessary to make convert_to/from_extras() work


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/public/base/less/module.less
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/members.html

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


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

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/plugins/interfaces.py
    A ckanext/example_idatasetform/__init__.py
    A ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/templates/package/new_package_metadata.html
    A ckanext/example_idatasetform/templates/package/read.html
    A ckanext/example_idatasetform/templates/package/snippets/package_form.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_form.html
    A ckanext/example_idatasetform/tests/test_example_idatasetform_plugin.py
    M doc/conf.py
    R doc/forms.rst
    M doc/index.rst
    M doc/tag-vocabularies.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'example_idatasetform_without_tests'

Conflicts:
	doc/tag-vocabularies.rst

    removed
    This needs to be done via the action API (:doc:`api`). Please check
    the examples section to see which calls are needed.


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

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

  Log Message:
  -----------
  [#654] Allow activity streams to be disabled via config


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

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/plugins/interfaces.py
    A ckanext/example_idatasetform/__init__.py
    A ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/templates/package/new_package_metadata.html
    A ckanext/example_idatasetform/templates/package/read.html
    A ckanext/example_idatasetform/templates/package/snippets/package_form.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_form.html
    A ckanext/example_idatasetform/tests/test_example_idatasetform_plugin.py
    M doc/conf.py
    R doc/forms.rst
    M doc/index.rst
    M doc/tag-vocabularies.rst
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 654-disable-activity-streams-via-config


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

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#638] PEP8


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/less/module.less
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/members.html
    A ckanext/example_idatasetform/__init__.py
    A ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/templates/package/new_package_metadata.html
    A ckanext/example_idatasetform/templates/package/read.html
    A ckanext/example_idatasetform/templates/package/snippets/package_form.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_form.html
    A ckanext/example_idatasetform/tests/test_example_idatasetform_plugin.py
    M doc/conf.py
    R doc/forms.rst
    M doc/index.rst
    M doc/tag-vocabularies.rst
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 638-code-clean


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

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

  Log Message:
  -----------
  Merge pull request #638 from okfn/638-code-clean

Minor code clean OrderedDict


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

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/plugins/interfaces.py
    R ckanext/example_idatasetform/__init__.py
    R ckanext/example_idatasetform/plugin.py
    R ckanext/example_idatasetform/templates/package/new_package_metadata.html
    R ckanext/example_idatasetform/templates/package/read.html
    R ckanext/example_idatasetform/templates/package/snippets/package_form.html
    R ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    R ckanext/example_idatasetform/templates/package/snippets/package_metadata_form.html
    R ckanext/example_idatasetform/tests/test_example_idatasetform_plugin.py
    M doc/conf.py
    A doc/forms.rst
    M doc/index.rst
    M doc/tag-vocabularies.rst
    M setup.py

  Log Message:
  -----------
  Revert "Merge branch 'example_idatasetform_without_tests'"

This reverts commit 0ce63eee311a371bfcda603a01da5657f9f6892e, reversing
changes made to 579ee38be17426d023d698bff8025c4f5849b824.


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

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

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


  Commit: 3efeda6fb0cd5a381d288d728e03a8a5ea988868
      https://github.com/okfn/ckan/commit/3efeda6fb0cd5a381d288d728e03a8a5ea988868
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-19 (Tue, 19 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/plugins/toolkit.py
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/tests/functional/test_package.py
    A ckanext/example_idatasetform/__init__.py
    A ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/templates/package/read.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    M doc/conf.py
    R doc/forms.rst
    M doc/index.rst
    M doc/tag-vocabularies.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'example_idatasetform_without_tests_second_try'


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/less/module.less
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/members.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/tests/functional/test_package.py
    A ckanext/example_idatasetform/__init__.py
    A ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/templates/package/read.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    M doc/conf.py
    R doc/forms.rst
    M doc/index.rst
    M doc/tag-vocabularies.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into idatasetform-package-schemas-simplification

Conflicts:
	ckan/controllers/package.py
	ckan/lib/plugins.py

At this point ckanext/example_idatasetform/ is broken by the recent #649
commits, will fix it in following commits...


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

  Changed paths:
    M ckanext/example_idatasetform/plugin.py

  Log Message:
  -----------
  [#649] Update example_idatasetform to new IDatasetForm interface

This imports ckan.logic.schema which is bad.


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

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckanext/example_idatasetform/plugin.py

  Log Message:
  -----------
  [#649] Make DefaultDatasetForm return default schemas

Make DefaultDatasetForm's create_package_schema(),
update_package_schema() and show_package_schema() methods return
default_create_package_schema(), default_update_package_schema() and
default_show_package_schema() from schema.py.

This makes it easier for plugins as they can just inherit from
DefaultDatasetForm and call super() to get the default schemas, they
don't need to import ckan.logic.schema to get them (or we don't need to
add the default schemas to the plugins toolkit).

This removes the logic, which was repeated in package_create(),
package_update() and package_show(), of getting the schema from the
plugin but if the plugin provided no schema then falling back on the default
one from schema.py. The action functions now simply get the schema from
plugin and always expect the plugin to provide the schema. The default
fallback behaviour is provided by plugins inheriting from
DefaultDatasetForm instead.


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

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#649] Update IDatasetForm docs


  Commit: bf95feeb1dfb708f1f008abbae3b7cb8b86782c5
      https://github.com/okfn/ckan/commit/bf95feeb1dfb708f1f008abbae3b7cb8b86782c5
  Author: kindly <kindly at gmail.com>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

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

  Log Message:
  -----------
  #658 make action post


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

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

  Log Message:
  -----------
  [#594] Make group/org search non case sensitive


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

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

  Log Message:
  -----------
  Merge pull request #658 from okfn/658-bulk-action-post

Make bulk action a post request


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

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

  Log Message:
  -----------
  Merge pull request #594 from okfn/594-case-insensitive-group-org-search

org / group search is case sensitive


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

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

  Log Message:
  -----------
  [#636] Fix group auth tests.

A partial update was removing members
from a group so at the next call to group_update
authorization was denied. The whole group dict
is now fetched using group_show before being
updated.

Also some PEP8 fixes.


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/less/module.less
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/members.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/schema/test_schema.py
    A ckanext/example_idatasetform/__init__.py
    A ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/templates/package/read.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    M ckanext/test_tag_vocab_plugin.py
    M doc/conf.py
    R doc/forms.rst
    M doc/index.rst
    M doc/tag-vocabularies.rst
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 636-auth-bug


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

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/new_authz.py
    M ckan/tests/logic/test_auth.py

  Log Message:
  -----------
  Merge pull request #636 from okfn/636-auth-bug

Access is not restricted when user is removed from Group


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

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/lib/search/index.py
    M ckan/templates/package/search.html

  Log Message:
  -----------
  [#666] Fix group/org facet titles


  Commit: 5751655f5b12ae425d556987c11866c2d3c219c5
      https://github.com/okfn/ckan/commit/5751655f5b12ae425d556987c11866c2d3c219c5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M ckan/templates/home/about.html

  Log Message:
  -----------
  [#671] Use render_markdown() for custom about page text

Use render_markdown() not markdown_extract() for custom about page text,
so that the full text gets shown not just an extract. Fixes #671.


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

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

  Log Message:
  -----------
  [#654] Import asbool from paste.deploy.converters instead of ckan.lib.helpers


  Commit: 4efd5bb21502b1578217044dc370dbc1110a5770
      https://github.com/okfn/ckan/commit/4efd5bb21502b1578217044dc370dbc1110a5770
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    R doc/administrative-dashboard.rst

  Log Message:
  -----------
  [#532] remove doc/administrative-datshboard.rst


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

  Changed paths:
    M ckan/public/base/less/forms.less
    M ckan/templates/package/new_package_metadata.html

  Log Message:
  -----------
  [#586] Adds error_summary to add stage 3 and tidies up errors after bootstrap upgrade


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

  Changed paths:
    R ckanext/resourceproxy/tests/file_server.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M pip-requirements-test.txt

  Log Message:
  -----------
  Merge branch '543-httpretty-for-proxy-tests'


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

  Changed paths:
    M ckan/templates/tag/index.html

  Log Message:
  -----------
  [#421] Update strings for CKAN 2.0 readyness


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

  Changed paths:
    M ckan/controllers/tag.py
    A ckan/templates/tag/index.html

  Log Message:
  -----------
  Merge branch '421-tag-pages'


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

  Changed paths:
    M ckan/templates/tag/index.html

  Log Message:
  -----------
  Revert "[#421] Update strings for CKAN 2.0 readyness"

This reverts commit e048f480c82695b5ffdd73dda671d02f5f484787.

This commit is for 2.0 only


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

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates_legacy/group/layout.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/revision/layout.html
    M ckan/templates_legacy/user/layout.html

  Log Message:
  -----------
  Merge branch '471-helper-clean-link-functions'


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

  Changed paths:
    M ckan/public/base/less/footer.less
    M ckan/templates/footer.html

  Log Message:
  -----------
  [#486] Put's footer links into better columns


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

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

  Log Message:
  -----------
  [#678] Moves the position of the modal into the correct position in center of screen


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

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

  Log Message:
  -----------
  Merge branch '678-modal-position'


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

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#654] Document activity streams config option


  Commit: 78314a4ef08b3938d57bc8fcf6e096d33839e8b9
      https://github.com/okfn/ckan/commit/78314a4ef08b3938d57bc8fcf6e096d33839e8b9
  Author: amercader <amercadero at gmail.com>
  Date:   2013-03-21 (Thu, 21 Mar 2013)

  Changed paths:
    M ckan/lib/activity_streams_session_extension.py
    M ckan/logic/action/create.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_activity.py
    M doc/configuration.rst

  Log Message:
  -----------
  Merge branch '654-disable-activity-streams-via-config'


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

  Changed paths:
    M .travis.yml
    A bin/travis-build
    A ckan/common.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    R ckan/controllers/datastore.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.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/activity_streams_session_extension.py
    M ckan/lib/app_globals.py
    R ckan/lib/authztool.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/dumper.py
    M ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/jsonp.py
    M ckan/lib/mailer.py
    M ckan/lib/maintain.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/repoze_patch.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/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/027_adjust_harvester.py
    M ckan/migration/versions/029_version_groups.py
    M ckan/migration/versions/045_user_name_unique.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/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/bg.png
    M ckan/public/base/images/ckan-logo-footer.png
    M ckan/public/base/images/ckan-logo.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
    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
    M ckan/public/base/javascript/main.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
    M ckan/public/base/javascript/modules/dashboard.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
    M ckan/public/base/javascript/modules/popover-context.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
    M ckan/public/base/javascript/plugins/jquery.slug-preview.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/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
    A ckan/public/base/less/font-awesome.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/main.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
    A ckan/public/base/less/tables.less
    M ckan/public/base/less/toolbar.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
    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
    R ckan/templates/admin/authz.html
    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/ajax_snippets/api_info.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/page_header.html
    M ckan/templates/development/snippets/toolbar.html
    M ckan/templates/error_document_template.html
    M ckan/templates/footer.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/group/snippets/group_item.html
    M ckan/templates/header.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/home/snippets/about_text.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.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/member_new.html
    M ckan/templates/organization/members.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
    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_package_metadata.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
    R ckan/templates/package/resource_api_data.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/data_api_button.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    A ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resources_list.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/activity_item.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/datapreview_embed_dialog.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/group_item.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
    A ckan/templates/tag/index.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    A ckan/templates/user/edit_base.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/list.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/back_to_user_action.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/followers.html
    M ckan/templates_legacy/group/layout.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/package/search.html
    M ckan/templates_legacy/revision/layout.html
    M ckan/templates_legacy/user/layout.html
    M ckan/tests/__init__.py
    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/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/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_api.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_email_notifications.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/api/test_util.py
    M ckan/tests/functional/test_activity.py
    R ckan/tests/functional/test_datastore.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_storage.py
    M ckan/tests/functional/test_upload.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_datapreview.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/lib/test_solr_search_index.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/misc/test_sync.py
    R ckan/tests/mock_publisher_auth.py
    M ckan/tests/models/test_group.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_dumper.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/bin/datastore_setup.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_configure.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_idatasetform/__init__.py
    A ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/templates/package/read.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    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
    R ckanext/jsonpreview/theme/public/css/json.min.css
    R ckanext/jsonpreview/theme/public/preview_json.min.js
    M ckanext/multilingual/plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    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
    M ckanext/reclinepreview/tests/test_preview.py
    R ckanext/reclinepreview/theme/public/css/recline.min.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M ckanext/resourceproxy/controller.py
    R 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 ckanext/test_tag_vocab_plugin.py
    R doc/administrative-dashboard.rst
    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/configuration.rst
    M doc/datastore-api.rst
    A doc/filestore-api.rst
    M doc/filestore.rst
    R doc/forms.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
    M doc/writing-extensions.rst
    M pip-requirements-test.txt
    M pip-requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 408-remove-legacy-org-code


  Commit: 902dbb8d122f5d5a5d8303b6e6e1c1226e2cb6d8
      https://github.com/okfn/ckan/commit/902dbb8d122f5d5a5d8303b6e6e1c1226e2cb6d8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-03-21 (Thu, 21 Mar 2013)

  Changed paths:
    R ckanext/organizations/__init__.py
    R ckanext/organizations/controllers.py
    R ckanext/organizations/forms.py
    R ckanext/organizations/templates/email/join_publisher_request.txt
    R ckanext/organizations/templates/organization_edit.html
    R ckanext/organizations/templates/organizations/form.html
    R ckanext/organizations/templates/organizations/index.html
    R ckanext/organizations/templates/organizations/new.html
    R ckanext/organizations/templates/organizations/read.html
    R ckanext/organizations/templates/organizations/users.html
    R ckanext/organizations/templates/organizations/users_form.html
    R ckanext/organizations/templates_legacy/organizations/apply.html
    R ckanext/organizations/templates_legacy/organizations/apply_form.html
    R ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
    R ckanext/organizations/templates_legacy/organizations/form.html
    R ckanext/organizations/templates_legacy/organizations/history.html
    R ckanext/organizations/templates_legacy/organizations/index.html
    R ckanext/organizations/templates_legacy/organizations/layout.html
    R ckanext/organizations/templates_legacy/organizations/new.html
    R ckanext/organizations/templates_legacy/organizations/package_form.html
    R ckanext/organizations/templates_legacy/organizations/read.html
    R ckanext/organizations/templates_legacy/organizations/users.html
    R ckanext/organizations/templates_legacy/organizations/users_form.html

  Log Message:
  -----------
  Merge branch '408-remove-legacy-org-code'


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

  Changed paths:
    M ckan/public/base/less/footer.less
    M ckan/templates/footer.html

  Log Message:
  -----------
  Merge branch '486-footer-template'


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

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

  Log Message:
  -----------
  Recompile css


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/tag.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/layout.less
    M ckan/templates/footer.html
    M ckan/templates/home/about.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    A ckan/templates/tag/index.html
    M ckan/templates_legacy/group/layout.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/revision/layout.html
    M ckan/templates_legacy/user/layout.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/schema/test_schema.py
    A ckanext/example_idatasetform/__init__.py
    A ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/templates/package/read.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    R ckanext/organizations/__init__.py
    R ckanext/organizations/controllers.py
    R ckanext/organizations/forms.py
    R ckanext/organizations/templates/email/join_publisher_request.txt
    R ckanext/organizations/templates/organization_edit.html
    R ckanext/organizations/templates/organizations/form.html
    R ckanext/organizations/templates/organizations/index.html
    R ckanext/organizations/templates/organizations/new.html
    R ckanext/organizations/templates/organizations/read.html
    R ckanext/organizations/templates/organizations/users.html
    R ckanext/organizations/templates/organizations/users_form.html
    R ckanext/organizations/templates_legacy/organizations/apply.html
    R ckanext/organizations/templates_legacy/organizations/apply_form.html
    R ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
    R ckanext/organizations/templates_legacy/organizations/form.html
    R ckanext/organizations/templates_legacy/organizations/history.html
    R ckanext/organizations/templates_legacy/organizations/index.html
    R ckanext/organizations/templates_legacy/organizations/layout.html
    R ckanext/organizations/templates_legacy/organizations/new.html
    R ckanext/organizations/templates_legacy/organizations/package_form.html
    R ckanext/organizations/templates_legacy/organizations/read.html
    R ckanext/organizations/templates_legacy/organizations/users.html
    R ckanext/organizations/templates_legacy/organizations/users_form.html
    R ckanext/resourceproxy/tests/file_server.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/test_tag_vocab_plugin.py
    R doc/administrative-dashboard.rst
    M doc/conf.py
    M doc/configuration.rst
    R doc/forms.rst
    M doc/index.rst
    M doc/tag-vocabularies.rst
    M pip-requirements-test.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 430-packages-missing-vocabulary-show


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

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/tests/functional/api/model/test_vocabulary.py

  Log Message:
  -----------
  Merge branch '430-packages-missing-vocabulary-show'


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/tag.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/footer.html
    M ckan/templates/home/about.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/members.html
    M ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/snippets/simple_search.html
    A ckan/templates/tag/index.html
    M ckan/templates_legacy/group/layout.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/revision/layout.html
    M ckan/templates_legacy/user/layout.html
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_package.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/logic/test_auth.py
    M ckan/tests/schema/test_schema.py
    A ckanext/example_idatasetform/__init__.py
    A ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/templates/package/read.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    R ckanext/organizations/__init__.py
    R ckanext/organizations/controllers.py
    R ckanext/organizations/forms.py
    R ckanext/organizations/templates/email/join_publisher_request.txt
    R ckanext/organizations/templates/organization_edit.html
    R ckanext/organizations/templates/organizations/form.html
    R ckanext/organizations/templates/organizations/index.html
    R ckanext/organizations/templates/organizations/new.html
    R ckanext/organizations/templates/organizations/read.html
    R ckanext/organizations/templates/organizations/users.html
    R ckanext/organizations/templates/organizations/users_form.html
    R ckanext/organizations/templates_legacy/organizations/apply.html
    R ckanext/organizations/templates_legacy/organizations/apply_form.html
    R ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
    R ckanext/organizations/templates_legacy/organizations/form.html
    R ckanext/organizations/templates_legacy/organizations/history.html
    R ckanext/organizations/templates_legacy/organizations/index.html
    R ckanext/organizations/templates_legacy/organizations/layout.html
    R ckanext/organizations/templates_legacy/organizations/new.html
    R ckanext/organizations/templates_legacy/organizations/package_form.html
    R ckanext/organizations/templates_legacy/organizations/read.html
    R ckanext/organizations/templates_legacy/organizations/users.html
    R ckanext/organizations/templates_legacy/organizations/users_form.html
    R ckanext/resourceproxy/tests/file_server.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/test_tag_vocab_plugin.py
    R doc/administrative-dashboard.rst
    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/configuration.rst
    M doc/datastore-api.rst
    A doc/filestore-api.rst
    M doc/filestore.rst
    R doc/forms.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
    M pip-requirements-test.txt
    M pip-requirements.txt
    M setup.py

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


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

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

  Log Message:
  -----------
  Merge branch '485-monochrome-icons'


  Commit: 3ec952bd3b512e6f8ce8872643116e97f6a789b7
      https://github.com/okfn/ckan/commit/3ec952bd3b512e6f8ce8872643116e97f6a789b7
  Author: kindly <kindly at gmail.com>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/lib/search/index.py
    M ckan/templates/package/search.html

  Log Message:
  -----------
  Merge pull request #666 from okfn/666-satanic-org-facets

Org faceting shows org name not title [2.0]


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

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

  Log Message:
  -----------
  [#683] Remove author for resource page


  Commit: 7791070ee53c1f04d45eb9cf13631e5b4a87daef
      https://github.com/okfn/ckan/commit/7791070ee53c1f04d45eb9cf13631e5b4a87daef
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M .travis.yml
    A bin/travis-build
    A ckan/common.py
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/app_globals.py
    R ckan/lib/authztool.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dumper.py
    M ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/jsonp.py
    M ckan/lib/mailer.py
    M ckan/lib/plugins.py
    M ckan/lib/repoze_patch.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/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/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.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
    A ckan/public/base/images/table-seperator.png
    A ckan/public/base/javascript/modules/table-toggle-more.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.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
    M ckan/public/base/less/tables.less
    M ckan/public/base/less/variables.less
    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_base.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/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/members.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/base.html
    M ckan/templates/package/new_package_metadata.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/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
    M ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    A ckan/templates/tag/index.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates_legacy/group/layout.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/revision/layout.html
    M ckan/templates_legacy/user/layout.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_activity.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_preview_interface.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/logic/test_auth.py
    M ckan/tests/misc/test_sync.py
    R ckan/tests/mock_publisher_auth.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_dumper.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
    A ckanext/example_idatasetform/__init__.py
    A ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/templates/package/read.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    R ckanext/organizations/__init__.py
    R ckanext/organizations/controllers.py
    R ckanext/organizations/forms.py
    R ckanext/organizations/templates/email/join_publisher_request.txt
    R ckanext/organizations/templates/organization_edit.html
    R ckanext/organizations/templates/organizations/form.html
    R ckanext/organizations/templates/organizations/index.html
    R ckanext/organizations/templates/organizations/new.html
    R ckanext/organizations/templates/organizations/read.html
    R ckanext/organizations/templates/organizations/users.html
    R ckanext/organizations/templates/organizations/users_form.html
    R ckanext/organizations/templates_legacy/organizations/apply.html
    R ckanext/organizations/templates_legacy/organizations/apply_form.html
    R ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
    R ckanext/organizations/templates_legacy/organizations/form.html
    R ckanext/organizations/templates_legacy/organizations/history.html
    R ckanext/organizations/templates_legacy/organizations/index.html
    R ckanext/organizations/templates_legacy/organizations/layout.html
    R ckanext/organizations/templates_legacy/organizations/new.html
    R ckanext/organizations/templates_legacy/organizations/package_form.html
    R ckanext/organizations/templates_legacy/organizations/read.html
    R ckanext/organizations/templates_legacy/organizations/users.html
    R ckanext/organizations/templates_legacy/organizations/users_form.html
    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/resourceproxy/tests/file_server.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/test_tag_vocab_plugin.py
    R doc/administrative-dashboard.rst
    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/configuration.rst
    M doc/datastore-api.rst
    A doc/filestore-api.rst
    M doc/filestore.rst
    R doc/forms.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
    M pip-requirements-test.txt
    M pip-requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 368-new-history-page-2

Conflicts:
	ckan/templates/package/read_base.html


Compare: https://github.com/okfn/ckan/compare/adfc4bf2f9a8...7791070ee53c


More information about the ckan-changes mailing list