[ckan-changes] [okfn/ckan] b094a0: [#408] Remove organizations (publisher) code

GitHub noreply at github.com
Tue Mar 26 04:41:55 UTC 2013


  Branch: refs/heads/283-activity-stream-fixes
  Home:   https://github.com/okfn/ckan
  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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 991488fc38521abfe3b175bca6ef80913a929579
      https://github.com/okfn/ckan/commit/991488fc38521abfe3b175bca6ef80913a929579
  Author: Nigel Babu <nigelbabu at gmail.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/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/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/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/snippets/license.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/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' into 283-activity-stream-fixes


  Commit: f6ed9b6b28f60145b17f19e8307b2212d637ddcd
      https://github.com/okfn/ckan/commit/f6ed9b6b28f60145b17f19e8307b2212d637ddcd
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

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

  Log Message:
  -----------
  [#283] Check context has user in related_update

* Check that the context has user key.
* Check that a user object exists corresponding to
  value of 'user' in context.


  Commit: b0d671f11972e1fe6a0718990c47ca2d924bbd4e
      https://github.com/okfn/ckan/commit/b0d671f11972e1fe6a0718990c47ca2d924bbd4e
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

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

  Log Message:
  -----------
  [#283] Assert more values in activity_response_dict

* Check that user_id matches user used to create related_item.
* Check that the related item matches the dataset created/modified/deleted.
* Check that the dataset key is set to none when creating/updating.


Compare: https://github.com/okfn/ckan/compare/76f15609506a...b0d671f11972


More information about the ckan-changes mailing list