[ckan-changes] [okfn/ckan] 6d0bf3: [#2345] Beginning of autodoc API reference

GitHub noreply at github.com
Tue Jun 26 10:43:27 UTC 2012


  Branch: refs/heads/feature-2347-related-dashboard
  Home:   https://github.com/okfn/ckan
  Commit: 6d0bf37f6bb1bd6688e2f8cac386b563f34b3a29
      https://github.com/okfn/ckan/commit/6d0bf37f6bb1bd6688e2f8cac386b563f34b3a29
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M ckan/logic/action/get.py
    A doc/api-ref.rst

  Log Message:
  -----------
  [#2345] Beginning of autodoc API reference


  Commit: c1c9198a9445f0835d200c812f13318312c1b5e9
      https://github.com/okfn/ckan/commit/c1c9198a9445f0835d200c812f13318312c1b5e9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M ckan/logic/action/get.py
    M doc/api-ref.rst

  Log Message:
  -----------
  [#2345] Little more work on autodoc action API ref


  Commit: c59937fbd93ceee70280fdaa8bdac56361926a31
      https://github.com/okfn/ckan/commit/c59937fbd93ceee70280fdaa8bdac56361926a31
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

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

  Log Message:
  -----------
  [doc] Tweak some docstrings in logic/action/get.py

Make first lines shorter


  Commit: 02a0a5be18d2b4c1d9804c48670e4f6eb5bd9702
      https://github.com/okfn/ckan/commit/02a0a5be18d2b4c1d9804c48670e4f6eb5bd9702
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M doc/api-ref.rst

  Log Message:
  -----------
  [#2345] Add autodocs to a couple of functions in action/create.py


  Commit: 63a8010ac1dd03f96499abf1f404ade96d0b1825
      https://github.com/okfn/ckan/commit/63a8010ac1dd03f96499abf1f404ade96d0b1825
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M doc/api-ref.rst

  Log Message:
  -----------
  [#2345] Add update and delete modules to action api autodoc ref


  Commit: e8bd3b416d75fbf7d311d4fa4177597c8c6a25a6
      https://github.com/okfn/ckan/commit/e8bd3b416d75fbf7d311d4fa4177597c8c6a25a6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#2345] Correct a comment in schema.py


  Commit: 6f98af1829d46cbad125bc18bf8a0ea5979b54a0
      https://github.com/okfn/ckan/commit/6f98af1829d46cbad125bc18bf8a0ea5979b54a0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

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

  Log Message:
  -----------
  [#2345] Finish up a few more action/get.py docstrings

these were the low-hanging fruit


  Commit: 898f31d872db3bcbe1af8f602699d3ba8b82f06d
      https://github.com/okfn/ckan/commit/898f31d872db3bcbe1af8f602699d3ba8b82f06d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

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

  Log Message:
  -----------
  Fix a bug with the limit argument to current_package_list_with_resources


  Commit: 69f2783c55914669e3cfc2456cf37410204bc3bd
      https://github.com/okfn/ckan/commit/69f2783c55914669e3cfc2456cf37410204bc3bd
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/tests/logic/test_member.py

  Log Message:
  -----------
  [bug] Fix to extraneous fields in context for member api


  Commit: 09e5889f705645ada04a7f5c87ceee48b93e1d70
      https://github.com/okfn/ckan/commit/09e5889f705645ada04a7f5c87ceee48b93e1d70
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

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

  Log Message:
  -----------
  [#2345] More work on action/get.py docstrings


  Commit: 5e8acd9e1989529b86b666bd534dd5c0816a00ba
      https://github.com/okfn/ckan/commit/5e8acd9e1989529b86b666bd534dd5c0816a00ba
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-04 (Fri, 04 May 2012)

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

  Log Message:
  -----------
  [#2345] Sphinxify action/get.py:member_list() docstring


  Commit: e8b4e146f6e6f2af88c72f3c2e86ff9e67d28bae
      https://github.com/okfn/ckan/commit/e8b4e146f6e6f2af88c72f3c2e86ff9e67d28bae
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-07 (Mon, 07 May 2012)

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

  Log Message:
  -----------
  [#2345] More work on action/get.py docstrings


  Commit: 968690e5fd3d7bfeff6fa09a7cff09e2ecd98a61
      https://github.com/okfn/ckan/commit/968690e5fd3d7bfeff6fa09a7cff09e2ecd98a61
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_tag.py

  Log Message:
  -----------
  Don't dictize each tags packages on tag index page

This makes the tag index page load much faster when there are a large
number of tags.

tag_list() logic action function calls tag_list_dicitize() instead of
tag_dictize(), the difference is that tag_list_dicitize() doesn't
dictize all of the tag's packages as well. Extended tag_list_dicitize()
to have some of tag_dictize()'s features that it was missing.


  Commit: 112e405d0116bdcf196062520e3474e231337996
      https://github.com/okfn/ckan/commit/112e405d0116bdcf196062520e3474e231337996
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M ckan/lib/cli.py
    M profile_tests.py
    M setup.py

  Log Message:
  -----------
  [#2401]: Add CLI for time/speed profiling of requests.


  Commit: fcb5858f98358cb2954723c58efa8f61cb86c872
      https://github.com/okfn/ckan/commit/fcb5858f98358cb2954723c58efa8f61cb86c872
  Author: kindly <kindly at gmail.com>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M ckan/lib/navl/dictization_functions.py

  Log Message:
  -----------
  [xs] take out set_trace!


  Commit: 522adf60dd059d253d6920402bca28cb61984eb6
      https://github.com/okfn/ckan/commit/522adf60dd059d253d6920402bca28cb61984eb6
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M ckan/lib/navl/dictization_functions.py

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


  Commit: ac8f0c9fe03f14d2cd7f2b336415d8f22377b438
      https://github.com/okfn/ckan/commit/ac8f0c9fe03f14d2cd7f2b336415d8f22377b438
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-17 (Thu, 17 May 2012)

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

  Log Message:
  -----------
  [xs]: Fix Genshi test failure seen on newer machines - kindly and I had it.


  Commit: 12da5e9effeeb1aca0df321c355d8438647ef426
      https://github.com/okfn/ckan/commit/12da5e9effeeb1aca0df321c355d8438647ef426
  Author: kindly <kindly at gmail.com>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [2402] search result speedup


  Commit: 20fda6937204c134de815c9b4745784655cefaf7
      https://github.com/okfn/ckan/commit/20fda6937204c134de815c9b4745784655cefaf7
  Author: kindly <kindly at gmail.com>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/tests/functional/test_user.py
    M profile_tests.py
    M setup.py

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


  Commit: 05144f8621ee719c345373934e70719f46e87cf6
      https://github.com/okfn/ckan/commit/05144f8621ee719c345373934e70719f46e87cf6
  Author: kindly <kindly at gmail.com>
  Date:   2012-05-17 (Thu, 17 May 2012)

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

  Log Message:
  -----------
  [2403] home page speed improvments


  Commit: a6d555fd0d67cf0450a71b66173a050212fe7d1f
      https://github.com/okfn/ckan/commit/a6d555fd0d67cf0450a71b66173a050212fe7d1f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-18 (Fri, 18 May 2012)

  Changed paths:
    M .gitattributes
    M .tx/config
    M CHANGELOG.txt
    M ckan/authz.py
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/authztool.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__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/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/058_add_follower_tables.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/authorization_group.py
    M ckan/model/authz.py
    M ckan/model/core.py
    M ckan/model/domain_object.py
    M ckan/model/extension.py
    A ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/group_extra.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/misc.py
    M ckan/model/modification.py
    M ckan/model/package.py
    M ckan/model/package_extra.py
    R ckan/model/package_mapping.py
    M ckan/model/package_relationship.py
    M ckan/model/rating.py
    M ckan/model/related.py
    M ckan/model/resource.py
    M ckan/model/tag.py
    M ckan/model/task_status.py
    M ckan/model/term_translation.py
    M ckan/model/test_user.py
    M ckan/model/tracking.py
    M ckan/model/types.py
    M ckan/model/user.py
    M ckan/model/vocabulary.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/css/style.css
    M ckan/public/scripts/application.js
    M ckan/templates/_util.html
    M ckan/templates/admin/authz.html
    M ckan/templates/authorization_group/authz.html
    M ckan/templates/authorization_group/edit.html
    M ckan/templates/authorization_group/index.html
    M ckan/templates/authorization_group/new.html
    M ckan/templates/authorization_group/read.html
    M ckan/templates/group/authz.html
    M ckan/templates/group/edit.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/layout_base.html
    M ckan/templates/package/authz.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/editresources.html
    A ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/layout.html
    M ckan/templates/package/new.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read.n3
    M ckan/templates/package/read.rdf
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/search_form.html
    M ckan/templates/revision/diff.html
    M ckan/templates/revision/list.html
    A ckan/templates/user/followers.html
    M ckan/templates/user/layout.html
    M ckan/templates/user/login.html
    M ckan/templates/user/read.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/test_api.py
    A ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/api/test_util.py
    A ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_authztool.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_group.py
    M ckan/tests/pylons_controller.py
    M ckan_deb/usr/bin/ckan-setup-solr
    M ckanext/multilingual/plugin.py
    M ckanext/organizations/templates/email/join_publisher_request.txt
    M ckanext/stats/controller.py
    M ckanext/stats/plugin.py
    M ckanext/stats/stats.py
    M doc/api-v2.rst
    M doc/api.rst
    M doc/apiv3.rst
    M doc/background-tasks.rst
    M doc/commenting.rst
    A doc/data-viewer.rst
    M doc/deployment.rst
    M doc/filestore.rst
    M doc/forms.rst
    M doc/index.rst
    M doc/linked-data-and-rdf.rst
    M doc/publisher-profile.rst
    A doc/tag-vocabularies.rst
    A doc/user-stories-list.rst
    A doc/user-stories.rst
    M doc/using-data-api.rst
    M doc/writing-extensions.rst
    M profile_tests.py
    M requires/lucid_missing.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-2345-action-api-autodocs

Conflicts:
	ckan/logic/action/create.py
	ckan/logic/action/delete.py
	ckan/logic/action/get.py


  Commit: f401ac92f3f8d3fff63ca67e0787abf91fffcd54
      https://github.com/okfn/ckan/commit/f401ac92f3f8d3fff63ca67e0787abf91fffcd54
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-18 (Fri, 18 May 2012)

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

  Log Message:
  -----------
  [#2345] Update some tests


  Commit: b0a1e53c12312864b4348df6dd3a177a9e2c5254
      https://github.com/okfn/ckan/commit/b0a1e53c12312864b4348df6dd3a177a9e2c5254
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-18 (Fri, 18 May 2012)

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

  Log Message:
  -----------
  [#2345] More work on logic/action/get.py docstrings


  Commit: 8971a99d99f57b31b9a37a289bd64a483c58516a
      https://github.com/okfn/ckan/commit/8971a99d99f57b31b9a37a289bd64a483c58516a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-19 (Sat, 19 May 2012)

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

  Log Message:
  -----------
  [#2345] Docstring for package_create


  Commit: cdbba6e46cb4de46224faa9eae72531760b6fc99
      https://github.com/okfn/ckan/commit/cdbba6e46cb4de46224faa9eae72531760b6fc99
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-20 (Sun, 20 May 2012)

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

  Log Message:
  -----------
  [#2345] More logic/action/create.py docstrings


  Commit: 3637049383aa478063534ce1509263b6606f2b6e
      https://github.com/okfn/ckan/commit/3637049383aa478063534ce1509263b6606f2b6e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-20 (Sun, 20 May 2012)

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

  Log Message:
  -----------
  [#2345] Finish logic/action/create.py docstrings


  Commit: ab390da3eac498f82c526d992ab42473ba24d9b6
      https://github.com/okfn/ckan/commit/ab390da3eac498f82c526d992ab42473ba24d9b6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-20 (Sun, 20 May 2012)

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

  Log Message:
  -----------
  [#2345] Fix some tests that were failing

due to changes in logic api docstrings


  Commit: dc83654332d27f86bf3c078b60d0a7e1711f3873
      https://github.com/okfn/ckan/commit/dc83654332d27f86bf3c078b60d0a7e1711f3873
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/update.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#2345] Add docstrings to ckan/logic/update.py and delete.py


  Commit: bd76c0f27d3bfc6f29ef2146419e3bddebaf695f
      https://github.com/okfn/ckan/commit/bd76c0f27d3bfc6f29ef2146419e3bddebaf695f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
    R doc/api-ref.rst
    M doc/apiv3.rst

  Log Message:
  -----------
  [#2345] Replace action API ref with new autodoc one


  Commit: 131c0f4fe30902bdfd0547dc2e8cf33038b997bf
      https://github.com/okfn/ckan/commit/131c0f4fe30902bdfd0547dc2e8cf33038b997bf
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
    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/delete.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M doc/apiv3.rst

  Log Message:
  -----------
  Merge branch 'feature-2345-action-api-autodocs'


  Commit: 2053a2077bf6777fbb3102d2345f42526cca3b34
      https://github.com/okfn/ckan/commit/2053a2077bf6777fbb3102d2345f42526cca3b34
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
    A Coding_Standards.rst

  Log Message:
  -----------
  Add Coding_Standards.rst file

Only contains CKAN Docstring Standards so far.


  Commit: 0e28352e90f81fe326a0dfd94eaca903874b5460
      https://github.com/okfn/ckan/commit/0e28352e90f81fe326a0dfd94eaca903874b5460
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-20 (Sun, 20 May 2012)

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

  Log Message:
  -----------
  Remove some unwanted docstrings


  Commit: de98840e0e4d94955ec099ee079b49078e62ba9a
      https://github.com/okfn/ckan/commit/de98840e0e4d94955ec099ee079b49078e62ba9a
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-21 (Mon, 21 May 2012)

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

  Log Message:
  -----------
  [#2345] Docstring for package_search action.


  Commit: c07fc16fab72dbedfe8139b9c4fcc61b6c3655fa
      https://github.com/okfn/ckan/commit/c07fc16fab72dbedfe8139b9c4fcc61b6c3655fa
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
    M .gitattributes
    M .tx/config
    M CHANGELOG.txt
    M ckan/authz.py
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/authztool.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__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/delete.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/058_add_follower_tables.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/authorization_group.py
    M ckan/model/authz.py
    M ckan/model/core.py
    M ckan/model/domain_object.py
    M ckan/model/extension.py
    A ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/group_extra.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/misc.py
    M ckan/model/modification.py
    M ckan/model/package.py
    M ckan/model/package_extra.py
    R ckan/model/package_mapping.py
    M ckan/model/package_relationship.py
    M ckan/model/rating.py
    M ckan/model/related.py
    M ckan/model/resource.py
    M ckan/model/tag.py
    M ckan/model/task_status.py
    M ckan/model/term_translation.py
    M ckan/model/test_user.py
    M ckan/model/tracking.py
    M ckan/model/types.py
    M ckan/model/user.py
    M ckan/model/vocabulary.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/css/style.css
    M ckan/public/scripts/application.js
    M ckan/templates/_util.html
    M ckan/templates/admin/authz.html
    M ckan/templates/authorization_group/authz.html
    M ckan/templates/authorization_group/edit.html
    M ckan/templates/authorization_group/index.html
    M ckan/templates/authorization_group/new.html
    M ckan/templates/authorization_group/read.html
    M ckan/templates/group/authz.html
    M ckan/templates/group/edit.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/layout_base.html
    M ckan/templates/package/authz.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/editresources.html
    A ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/layout.html
    M ckan/templates/package/new.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read.n3
    M ckan/templates/package/read.rdf
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/search_form.html
    M ckan/templates/revision/diff.html
    M ckan/templates/revision/list.html
    A ckan/templates/user/followers.html
    M ckan/templates/user/layout.html
    M ckan/templates/user/login.html
    M ckan/templates/user/read.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/test_api.py
    A ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/api/test_util.py
    A ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_authztool.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_group.py
    M ckan/tests/pylons_controller.py
    M ckan_deb/usr/bin/ckan-setup-solr
    M ckanext/multilingual/plugin.py
    M ckanext/organizations/templates/email/join_publisher_request.txt
    M ckanext/stats/controller.py
    M ckanext/stats/plugin.py
    M ckanext/stats/stats.py
    R doc/api-ref.rst
    M doc/api-v2.rst
    M doc/api.rst
    M doc/apiv3.rst
    M doc/background-tasks.rst
    M doc/commenting.rst
    A doc/data-viewer.rst
    M doc/deployment.rst
    M doc/filestore.rst
    M doc/forms.rst
    M doc/index.rst
    M doc/linked-data-and-rdf.rst
    M doc/publisher-profile.rst
    A doc/tag-vocabularies.rst
    A doc/user-stories-list.rst
    A doc/user-stories.rst
    M doc/using-data-api.rst
    M doc/writing-extensions.rst
    M profile_tests.py
    M requires/lucid_missing.txt
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/feature-2345-action-api-autodocs' into feature-2345-action-api-autodocs

Conflicts:
	ckan/logic/action/get.py


  Commit: 9248ce2b508597c034a4fab831af15b66700100b
      https://github.com/okfn/ckan/commit/9248ce2b508597c034a4fab831af15b66700100b
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-21 (Mon, 21 May 2012)

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

  Log Message:
  -----------
  Tidying package_search docstring


  Commit: e5a1ccff8a28bb9979d11525466ae58b94ef7d1c
      https://github.com/okfn/ckan/commit/e5a1ccff8a28bb9979d11525466ae58b94ef7d1c
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
    M doc/apiv3.rst

  Log Message:
  -----------
  Moved section about GETable actions


  Commit: 952c90cf4c825602355c1b9cd16b9ae680b67377
      https://github.com/okfn/ckan/commit/952c90cf4c825602355c1b9cd16b9ae680b67377
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
    M ckan/logic/action/get.py
    M doc/apiv3.rst

  Log Message:
  -----------
  Merge branch 'feature-2345-action-api-autodocs'


  Commit: c81347d0cb4abeb2732be864ddfd8aefd7213e11
      https://github.com/okfn/ckan/commit/c81347d0cb4abeb2732be864ddfd8aefd7213e11
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-23 (Wed, 23 May 2012)

  Changed paths:
    A Coding_Standards.rst
    M ckan/controllers/api.py
    M ckan/controllers/home.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/search/index.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/delete.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M doc/apiv3.rst
    M profile_tests.py
    M setup.py

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


  Commit: f2ed9a03581c3229cf01209baa9a02a71642e0b6
      https://github.com/okfn/ckan/commit/f2ed9a03581c3229cf01209baa9a02a71642e0b6
  Author: Augusto Herrmann <herrmann at mp-120332.(none)>
  Date:   2012-05-23 (Wed, 23 May 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  wrap up bottom scripts in layout_base.html so that this section can be replaced or appended to in other templates


  Commit: e245727f980b55406fe560e610a4c709c2f752cd
      https://github.com/okfn/ckan/commit/e245727f980b55406fe560e610a4c709c2f752cd
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-24 (Thu, 24 May 2012)

  Changed paths:
    M ckan/controllers/package.py
    R ckan/tests/functional/test_autoneg.py
    M requires/lucid_missing.txt

  Log Message:
  -----------
  2413 Removes autoneg from dependencies and traces of it from code.


  Commit: b7e235a8a9eb87c5e3cb8af26ae23c925695d2a6
      https://github.com/okfn/ckan/commit/b7e235a8a9eb87c5e3cb8af26ae23c925695d2a6
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-24 (Thu, 24 May 2012)

  Changed paths:
    M ckan/controllers/package.py
    A ckan/lib/accept.py
    A ckan/tests/lib/test_accept.py

  Log Message:
  -----------
  Fixed merge conflict


  Commit: 25ab9f4f27d57feab54b5cd0cf714e8276a529bd
      https://github.com/okfn/ckan/commit/25ab9f4f27d57feab54b5cd0cf714e8276a529bd
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-24 (Thu, 24 May 2012)

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

  Log Message:
  -----------
  2322 Added some simple convenience urls

Added changes to routes for cosmetically improved urls with a
redirect for the API call, a new package controller function for
redirecting to the actual resource url if it exists.

The /dataset/id/resource/id/viewer url uses the existing embed url
with an improved default that more closely matches the screen size
although doesn't change the embed code to use % instead of px.


  Commit: 6776e47e2b45137f634170b10905afc8e90314a1
      https://github.com/okfn/ckan/commit/6776e47e2b45137f634170b10905afc8e90314a1
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-24 (Thu, 24 May 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  2322 - Removed unnecessary whitespace


  Commit: d6c9e48f8df5e926abd3fb1a1607f4f5a30075b4
      https://github.com/okfn/ckan/commit/d6c9e48f8df5e926abd3fb1a1607f4f5a30075b4
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-24 (Thu, 24 May 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  [2383] Properly convert microseconds in date_str_to_datetime helper.

Stop this helper function from incorrectly parsing a UTC offset "+0100" as
100 microseconds.

Now, if passed UTC offset as "+0100", this function will not parse the
timestamp.  The same behaviour as when it's passed "+01:00" as a UTC
offset.


  Commit: 9fc5f5c320630314826cb08908896d386fa97ddf
      https://github.com/okfn/ckan/commit/9fc5f5c320630314826cb08908896d386fa97ddf
  Author: kindly <kindly at gmail.com>
  Date:   2012-05-24 (Thu, 24 May 2012)

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

  Log Message:
  -----------
  Merge pull request #11 from okfn/enhancement-2322-convenience-urls

[2322] Merge added some simple convenience urls


  Commit: 82e1bd27ad45e5f4096cab63fbfcdc29a8a2ca66
      https://github.com/okfn/ckan/commit/82e1bd27ad45e5f4096cab63fbfcdc29a8a2ca66
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-25 (Fri, 25 May 2012)

  Changed paths:
    A ckan/lib/maintain.py

  Log Message:
  -----------
  2420 add @deprecated decorator


  Commit: 0f3f6c94f7501bf82c6e213eb234dc26533e4f20
      https://github.com/okfn/ckan/commit/0f3f6c94f7501bf82c6e213eb234dc26533e4f20
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-25 (Fri, 25 May 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  2420 mark some helper functions as deprecated


  Commit: 576082bd6205da8bbf6d40e4eb3f6b6f0e60fcc0
      https://github.com/okfn/ckan/commit/576082bd6205da8bbf6d40e4eb3f6b6f0e60fcc0
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-25 (Fri, 25 May 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/lib/search/__init__.py
    M doc/install-from-source.rst
    M requires/lucid_present.txt

  Log Message:
  -----------
  2414 Remove LXML as a dependency from core

Removes LXML from the requirements by replacing the html stripping
when generating a markdown extract of the description.

Also removes LXML from the initialisation code that checks the
solr schema version


  Commit: bb0806e30cbd6810609bed15e0b4c32abcfdcc4e
      https://github.com/okfn/ckan/commit/bb0806e30cbd6810609bed15e0b4c32abcfdcc4e
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-25 (Fri, 25 May 2012)

  Changed paths:
    M ckan/lib/helpers.py
    A ckan/lib/maintain.py

  Log Message:
  -----------
  Merge pull request #13 from okfn/feature-2420-deprecated

Merge pull request #13 from okfn/feature-2420-deprecated


  Commit: e5e4b95e4c90cf6a0b00358fff9a4025cace3558
      https://github.com/okfn/ckan/commit/e5e4b95e4c90cf6a0b00358fff9a4025cace3558
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-25 (Fri, 25 May 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    A ckan/lib/maintain.py

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


  Commit: 70e58d4fab0c16b2f783d752352b1c3c6fb347cc
      https://github.com/okfn/ckan/commit/70e58d4fab0c16b2f783d752352b1c3c6fb347cc
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-28 (Mon, 28 May 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  [2383] Adding descriptive message to ValueError

And added test that explicitely tests the second form of UTC offset.


  Commit: cb8c2ecf0d63f31fe2bcd878fb23aae1fe981102
      https://github.com/okfn/ckan/commit/cb8c2ecf0d63f31fe2bcd878fb23aae1fe981102
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-28 (Mon, 28 May 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  Merge branch 'bug-2383-date-on-add-edit-resource-breaks-if-offset-is-specified'


  Commit: e7a559045c93d0d2afb3dbdc7243644f893d1d78
      https://github.com/okfn/ckan/commit/e7a559045c93d0d2afb3dbdc7243644f893d1d78
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-28 (Mon, 28 May 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/lib/test_helpers.py

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


  Commit: 2c959a3e2b91c02afec5b50ffa2f85a34149842e
      https://github.com/okfn/ckan/commit/2c959a3e2b91c02afec5b50ffa2f85a34149842e
  Author: kindly <kindly at gmail.com>
  Date:   2012-05-28 (Mon, 28 May 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/lib/search/__init__.py
    M doc/install-from-source.rst
    M requires/lucid_present.txt

  Log Message:
  -----------
  Merge pull request #14 from okfn/enhancement-2414-kill-lxml

#2414 Remove LXML as a dependency from core


  Commit: 3b96c332ce62dc41fd1fa6777e5e2ed0318b3aff
      https://github.com/okfn/ckan/commit/3b96c332ce62dc41fd1fa6777e5e2ed0318b3aff
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-28 (Mon, 28 May 2012)

  Changed paths:
    M ckan/templates/layout_base.html

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


  Commit: 773d4e11281485a48c3784cd513de1cfef8f1ca6
      https://github.com/okfn/ckan/commit/773d4e11281485a48c3784cd513de1cfef8f1ca6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-28 (Mon, 28 May 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/lib/search/__init__.py
    M doc/install-from-source.rst
    M requires/lucid_present.txt

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


  Commit: f1d68c3d2d4d25a0c0f8a89a68940643fc19b156
      https://github.com/okfn/ckan/commit/f1d68c3d2d4d25a0c0f8a89a68940643fc19b156
  Author: John Glover <j at johnglover.net>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    M ckanext/multilingual/plugin.py

  Log Message:
  -----------
  Fix bug in translating lists in multilingual plugin.

Get translations of individual items in a list
instead of looking for a translation of the entire
list object.

Also use 'in' to check for dict keys instead of
the deprecated '.has_key()'.


  Commit: 97c377140a560129c79a344659c5668b7810866a
      https://github.com/okfn/ckan/commit/97c377140a560129c79a344659c5668b7810866a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    M pip-requirements-docs.txt

  Log Message:
  -----------
  [#2434] Add PasteDeploy to pip-requirements-docs

Hoping this might get rid of a traceback we're getting on readthedocs


  Commit: 7816dfff6913dc47da676e67709a4a776e0f013f
      https://github.com/okfn/ckan/commit/7816dfff6913dc47da676e67709a4a776e0f013f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    M ckanext/multilingual/plugin.py

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


  Commit: bd37658061bd1fac548bd210430cd9548169a562
      https://github.com/okfn/ckan/commit/bd37658061bd1fac548bd210430cd9548169a562
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

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

  Log Message:
  -----------
  fix 500 error on dataset related page plus followers count


  Commit: f46ee123e1aeb1acbb2fe6fd5b6ee0d90d88ae16
      https://github.com/okfn/ckan/commit/f46ee123e1aeb1acbb2fe6fd5b6ee0d90d88ae16
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/controllers/related.py

  Log Message:
  -----------
  2482 use follower_count logic call


  Commit: 33d44faea38b1514fade9214852762eae69d4d8c
      https://github.com/okfn/ckan/commit/33d44faea38b1514fade9214852762eae69d4d8c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

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

  Log Message:
  -----------
  Merge branch '2482-related-items-500-error-followers'


  Commit: 026d332edaa61d4b6a71be865e49652f4c494f4a
      https://github.com/okfn/ckan/commit/026d332edaa61d4b6a71be865e49652f4c494f4a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/model/tag.py

  Log Message:
  -----------
  Fix up docstrings in ckan/model/tag.py

Make them conform to our new docstring standards, so I can use them as
an example.


  Commit: ea7379a36d8af7b74e03f416de66f74bc4f0bc84
      https://github.com/okfn/ckan/commit/ea7379a36d8af7b74e03f416de66f74bc4f0bc84
  Author: kindly <kindly at gmail.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M requires/lucid_missing.txt

  Log Message:
  -----------
  [#2451] remove-flup


  Commit: 16848e3166ebff8d8596ab074d7149f37342d6a8
      https://github.com/okfn/ckan/commit/16848e3166ebff8d8596ab074d7149f37342d6a8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    R Coding_Standards.rst
    A doc/coding-standards.rst
    M doc/index.rst

  Log Message:
  -----------
  [#2481] Move Coding_Standards.rst into Sphinx docs


  Commit: 2b708ac3d610d771c2d7737db24d8bb599f49b09
      https://github.com/okfn/ckan/commit/2b708ac3d610d771c2d7737db24d8bb599f49b09
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M doc/coding-standards.rst

  Log Message:
  -----------
  [#2437] Add commit message guidelines to coding standards


  Commit: 7a032998ed052c6f8c3795bc1cb10f7b904f650d
      https://github.com/okfn/ckan/commit/7a032998ed052c6f8c3795bc1cb10f7b904f650d
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-01 (Fri, 01 Jun 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/public/scripts/application.js
    M ckan/templates/js_strings.html
    M ckan/templates/package/layout.html
    A ckan/templates/snippets/follow_button.html
    M ckan/templates/user/layout.html

  Log Message:
  -----------
  [#2484] move follower functionality into helpers

This stops the need for repeating code in the controllers
and helps de-couple the follower functionality

It also fixes the translation of the updated buttons


  Commit: ba4d37cfc8532a24e9f5bbf35735e5fdecc74e56
      https://github.com/okfn/ckan/commit/ba4d37cfc8532a24e9f5bbf35735e5fdecc74e56
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-04 (Mon, 04 Jun 2012)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Fix context dicts in user controller


  Commit: f573a3a8d70f269c659f44282f798c6db08d9ece
      https://github.com/okfn/ckan/commit/f573a3a8d70f269c659f44282f798c6db08d9ece
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-05 (Tue, 05 Jun 2012)

  Changed paths:
    M ckanext/multilingual/tests/test_multilingual_plugin.py

  Log Message:
  -----------
  Make output of multilingual tests less verbose


  Commit: c0726d693725d86de0dd77f20a91ee187a3fd728
      https://github.com/okfn/ckan/commit/c0726d693725d86de0dd77f20a91ee187a3fd728
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    R Coding_Standards.rst
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/lib/search/__init__.py
    M ckan/model/tag.py
    M ckan/templates/layout_base.html
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    A doc/coding-standards.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M pip-requirements-docs.txt
    M requires/lucid_present.txt

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


  Commit: 118da5343e405a56519f790e3c86f26bb71d8fe8
      https://github.com/okfn/ckan/commit/118da5343e405a56519f790e3c86f26bb71d8fe8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    M doc/test.rst

  Log Message:
  -----------
  Make the testing docs clearer


  Commit: 1e8a35a7a3017667587e3bef267d207ef62e0681
      https://github.com/okfn/ckan/commit/1e8a35a7a3017667587e3bef267d207ef62e0681
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#2497] when we have a 401 and not logged in keep locale


  Commit: d1238706f31d2e11eb3a462f5219c5378d09f143
      https://github.com/okfn/ckan/commit/d1238706f31d2e11eb3a462f5219c5378d09f143
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  Revert "[#2497] when we have a 401 and not logged in keep locale"

not the correct place

This reverts commit 1e8a35a7a3017667587e3bef267d207ef62e0681.


  Commit: cfaf2458c25eaa04b650c9d42961ce8cc07c8935
      https://github.com/okfn/ckan/commit/cfaf2458c25eaa04b650c9d42961ce8cc07c8935
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  [#2497] use url_for to get correct login url


  Commit: 05fc10cc3d0f0df5741b9c1e83344f706ce9a9be
      https://github.com/okfn/ckan/commit/05fc10cc3d0f0df5741b9c1e83344f706ce9a9be
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  [#2497] remove unused imports


  Commit: 288c2fdd980299cdc1f0952154c34c885be08a58
      https://github.com/okfn/ckan/commit/288c2fdd980299cdc1f0952154c34c885be08a58
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  [#2497] clean whitespace


  Commit: 1f2b6e5f950c8b6fd0e1a2eb814cedce72aac9a0
      https://github.com/okfn/ckan/commit/1f2b6e5f950c8b6fd0e1a2eb814cedce72aac9a0
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  [#2497] making logging clearer code


  Commit: 04d6a0707edbd9bdc22bb126aaf6e552c654f4f3
      https://github.com/okfn/ckan/commit/04d6a0707edbd9bdc22bb126aaf6e552c654f4f3
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  [#2497] more making logging clearer code


  Commit: 2a8a70879e512d7a1b34d39ce08ace6c145a94d6
      https://github.com/okfn/ckan/commit/2a8a70879e512d7a1b34d39ce08ace6c145a94d6
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  [#2497] improve copde readability


  Commit: 403aaf9d90be07dde89a0d9e64c7bb39009b79c9
      https://github.com/okfn/ckan/commit/403aaf9d90be07dde89a0d9e64c7bb39009b79c9
  Author: amercader <amercadero at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  Merge branch '2497-lose-language-on-abort'


  Commit: 8f658b4f59bae684833e5463b9e9b5d988126bb3
      https://github.com/okfn/ckan/commit/8f658b4f59bae684833e5463b9e9b5d988126bb3
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  fix logout issue


  Commit: f115bc1423f0f8634ba06d7413175f8068c69074
      https://github.com/okfn/ckan/commit/f115bc1423f0f8634ba06d7413175f8068c69074
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py
    M doc/test.rst

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


  Commit: d1f6b733c335e37d668f4a8fc633f7074dd1c222
      https://github.com/okfn/ckan/commit/d1f6b733c335e37d668f4a8fc633f7074dd1c222
  Author: amercader <amercadero at gmail.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    M doc/geospatial.rst
    A doc/harvesting.rst
    M doc/index.rst

  Log Message:
  -----------
  [#2505] Intro docs for harvesting and geospatial


  Commit: e221a16c3706ab4c57f0bf45cad5dbabb91a6942
      https://github.com/okfn/ckan/commit/e221a16c3706ab4c57f0bf45cad5dbabb91a6942
  Author: John Glover <j at johnglover.net>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    M ckanext/organizations/templates/organization_read.html

  Log Message:
  -----------
  [2509] copy changes from group read page to organization read


  Commit: 1271faf4711f9f6d5c7718dce55c2506463a926d
      https://github.com/okfn/ckan/commit/1271faf4711f9f6d5c7718dce55c2506463a926d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    A ckan/i18n/check_po_files.py

  Log Message:
  -----------
  Add a script for checking for errors in po files


  Commit: fd7cfb8e0084a9da2e6ef03ce0115cfa8ea06718
      https://github.com/okfn/ckan/commit/fd7cfb8e0084a9da2e6ef03ce0115cfa8ea06718
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

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


  Commit: 41c5bf360245502fa950f287f46f56ffbd7e49c3
      https://github.com/okfn/ckan/commit/41c5bf360245502fa950f287f46f56ffbd7e49c3
  Author: amercader <amercadero at gmail.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    M doc/index.rst
    A doc/install-from-package-amazon.rst
    A doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst

  Log Message:
  -----------
  [#2505] Update package install instructions

Moved VirtualBox and Amamzon EC2 to separate pages, updated introduction
and Upgrading instructions, depending on if upgrading from a major or a
minor release.


  Commit: 438e7ebc3cba9646a313284cc2e924dc9aa32776
      https://github.com/okfn/ckan/commit/438e7ebc3cba9646a313284cc2e924dc9aa32776
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    M ckan/i18n/check_po_files.py
    M setup.py

  Log Message:
  -----------
  Make check-po-files script into paster command


  Commit: 5725ea0f4a84886961727237664150f8f53e08b8
      https://github.com/okfn/ckan/commit/5725ea0f4a84886961727237664150f8f53e08b8
  Author: amercader <amercadero at gmail.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/post-installation.rst
    M doc/solr-setup.rst

  Log Message:
  -----------
  [#2505] Update source install instructions

Following feedbak from markw (see #2406).


  Commit: 2a5714bdc33bf6be89265afc7642363266363cc3
      https://github.com/okfn/ckan/commit/2a5714bdc33bf6be89265afc7642363266363cc3
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

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

  Log Message:
  -----------
  [2507] Resize the search input to fill horizontal width

This solution uses JavaScript to resize the form input to fill the
horizontal width regardless of the size of the submit button. The
input is set to a smaller width by default so that the input and button
will fit on one line by default.


  Commit: 667e665f9928922cd27de6eda872267d96172709
      https://github.com/okfn/ckan/commit/667e665f9928922cd27de6eda872267d96172709
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

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

  Log Message:
  -----------
  Merge branch 'feature-2507-fix-search-input'


  Commit: 40c6e138c398525730cf0694facf57378f9f2b3f
      https://github.com/okfn/ckan/commit/40c6e138c398525730cf0694facf57378f9f2b3f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

  Changed paths:
    M doc/geospatial.rst

  Log Message:
  -----------
  [#2505] Minor edits to geospatial docs


  Commit: 041a3d44a67cf984ca0569b53c7ff81215aa8275
      https://github.com/okfn/ckan/commit/041a3d44a67cf984ca0569b53c7ff81215aa8275
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

  Changed paths:
    M doc/harvesting.rst

  Log Message:
  -----------
  [#2505] Minor edits to harvesting docs


  Commit: 466e898456155737041a46cf3e43987c5370d3ce
      https://github.com/okfn/ckan/commit/466e898456155737041a46cf3e43987c5370d3ce
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

  Changed paths:
    M doc/geospatial.rst
    A doc/harvesting.rst
    M doc/index.rst
    A doc/install-from-package-amazon.rst
    A doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/post-installation.rst
    M doc/solr-setup.rst

  Log Message:
  -----------
  Merge branch '2505-docs-improvements-for-1.7.1'


  Commit: 3f4a125af2a8f83e72e441f39615bbf1ee3ed57c
      https://github.com/okfn/ckan/commit/3f4a125af2a8f83e72e441f39615bbf1ee3ed57c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

  Changed paths:
    M doc/coding-standards.rst

  Log Message:
  -----------
  Change CKAN commit guidelines

Since it doesn't look like we're going to use davglas' github-trac
plugin, revert to our old [#123] style ticket numbers in commit messages


  Commit: 82561f64eae325857be9a6fd796acb0c6439be8a
      https://github.com/okfn/ckan/commit/82561f64eae325857be9a6fd796acb0c6439be8a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

  Changed paths:
    M pip-requirements-docs.txt

  Log Message:
  -----------
  Revert "[#2434] Add PasteDeploy to pip-requirements-docs"

This reverts commit 97c377140a560129c79a344659c5668b7810866a.

Didn't work


  Commit: d32b117261d9beb92a889751352b008cc13be3e4
      https://github.com/okfn/ckan/commit/d32b117261d9beb92a889751352b008cc13be3e4
  Author: amercader <amercadero at gmail.com>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

  Changed paths:
    M ckanext/organizations/templates/organization_read.html

  Log Message:
  -----------
  Merge branch 'defect-2509-organization-read'


  Commit: d8c707f52a1b1df5872de0248d9ceb51154c171a
      https://github.com/okfn/ckan/commit/d8c707f52a1b1df5872de0248d9ceb51154c171a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-13 (Wed, 13 Jun 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#2521] Add synchronous_search plugin to deployment.ini template

Replace build_search_index_synchronously option


  Commit: fb1a5b0c16d947c075d8cb4924eb9e52325fa8ea
      https://github.com/okfn/ckan/commit/fb1a5b0c16d947c075d8cb4924eb9e52325fa8ea
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-13 (Wed, 13 Jun 2012)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#2521] Remove build_search_index_synchronously from docs


  Commit: 659123fcec0081272a88629e8f80b38e34b4ecdd
      https://github.com/okfn/ckan/commit/659123fcec0081272a88629e8f80b38e34b4ecdd
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-13 (Wed, 13 Jun 2012)

  Changed paths:
    M test-core.ini

  Log Message:
  -----------
  [#2521] Remove build_search_index_synchronously from test-core.ini


  Commit: 39943a739ffd7e0eedea4bce5cedb5e79bfa722c
      https://github.com/okfn/ckan/commit/39943a739ffd7e0eedea4bce5cedb5e79bfa722c
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-13 (Wed, 13 Jun 2012)

  Changed paths:
    M requires/lucid_missing.txt

  Log Message:
  -----------
  Merge branch 'feature-2451-remove-flup'


  Commit: c20698a0cb480e6d1545a3b93cbb67bc94c7553d
      https://github.com/okfn/ckan/commit/c20698a0cb480e6d1545a3b93cbb67bc94c7553d
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-14 (Thu, 14 Jun 2012)

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

  Log Message:
  -----------
  Failing test for 2293

Uses the WUI to edit and add a package to a group, then it renames the
group before checking how many datasets it has.  The call via sqlalchemy
shows it has the correct number of datasets, but the index page shows the
wrong number as we've changed the name without re-indexing the datasets


  Commit: dbe25d8b8d7fabfc40c5d794a920b91cec349335
      https://github.com/okfn/ckan/commit/dbe25d8b8d7fabfc40c5d794a920b91cec349335
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-14 (Thu, 14 Jun 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Updated edit in controller to reindex packages when name changed


  Commit: 14a8a59646f18335447f2171e49b2ef35cabfb1f
      https://github.com/okfn/ckan/commit/14a8a59646f18335447f2171e49b2ef35cabfb1f
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-15 (Fri, 15 Jun 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    A ckan/i18n/check_po_files.py
    M ckan/public/css/style.css
    M ckan/public/scripts/application.js
    M ckanext/organizations/templates/organization_read.html
    M doc/coding-standards.rst
    M doc/configuration.rst
    M doc/geospatial.rst
    A doc/harvesting.rst
    M doc/index.rst
    A doc/install-from-package-amazon.rst
    A doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/post-installation.rst
    M doc/solr-setup.rst
    M pip-requirements-docs.txt
    M requires/lucid_missing.txt
    M setup.py
    M test-core.ini

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


  Commit: 0d814c52ba3806e82dde6c2b7ad14d7c5a259cb1
      https://github.com/okfn/ckan/commit/0d814c52ba3806e82dde6c2b7ad14d7c5a259cb1
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-15 (Fri, 15 Jun 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    A ckan/i18n/check_po_files.py
    M ckan/public/css/style.css
    M ckan/public/scripts/application.js
    M ckanext/organizations/templates/organization_read.html
    M doc/coding-standards.rst
    M doc/configuration.rst
    M doc/geospatial.rst
    A doc/harvesting.rst
    M doc/index.rst
    A doc/install-from-package-amazon.rst
    A doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/post-installation.rst
    M doc/solr-setup.rst
    M pip-requirements-docs.txt
    M requires/lucid_missing.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into defect-2293-group-rename-problem


  Commit: 4a7f4806bd22c897d29235f31880caa8809c8633
      https://github.com/okfn/ckan/commit/4a7f4806bd22c897d29235f31880caa8809c8633
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-15 (Fri, 15 Jun 2012)

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

  Log Message:
  -----------
  Fix for resetting the test before continuing


  Commit: f050a8498d5f50e2c51f7a0bf92b5d3e8c1570e4
      https://github.com/okfn/ckan/commit/f050a8498d5f50e2c51f7a0bf92b5d3e8c1570e4
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-15 (Fri, 15 Jun 2012)

  Changed paths:
    M doc/coding-standards.rst

  Log Message:
  -----------
  Relax the CKAN commit guidelines

No need to repeat a lot of stuff from the Pro Git Book about whitespace
and line lengths. Also make it clear that not every commit has to
reference a trac ticket.


  Commit: ea92af3321647dd1ee56c3751db41964a8e8476f
      https://github.com/okfn/ckan/commit/ea92af3321647dd1ee56c3751db41964a8e8476f
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

  Changed paths:
    M ckan/controllers/group.py

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


  Commit: e6a82ed0a7e2f411ea72ad90384b1e153fc96838
      https://github.com/okfn/ckan/commit/e6a82ed0a7e2f411ea72ad90384b1e153fc96838
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

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

  Log Message:
  -----------
  PEP8 cleanup and removing "


  Commit: ef3200e4898cfca322cdea34b387b354078455ba
      https://github.com/okfn/ckan/commit/ef3200e4898cfca322cdea34b387b354078455ba
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Removing "


  Commit: cdd5f2acd0969e74e1343599edac1e843f2bada4
      https://github.com/okfn/ckan/commit/cdd5f2acd0969e74e1343599edac1e843f2bada4
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Changed direct access to logic func to a call to get_action


  Commit: 4522f63da3db10035462b75829dd02b27722953e
      https://github.com/okfn/ckan/commit/4522f63da3db10035462b75829dd02b27722953e
  Author: amercader <amercadero at gmail.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

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

  Log Message:
  -----------
  [#2505] Fixes to the package install upgrade process


  Commit: 4e580e9cb98e2aa3e6f6906e03ee295b7a4b5917
      https://github.com/okfn/ckan/commit/4e580e9cb98e2aa3e6f6906e03ee295b7a4b5917
  Author: amercader <amercadero at gmail.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

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

  Log Message:
  -----------
  Merge branch '2505-docs-improvements-for-1.7.1'


  Commit: fb6a10d01c997d086485ce31b62f753ed302cfa6
      https://github.com/okfn/ckan/commit/fb6a10d01c997d086485ce31b62f753ed302cfa6
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

  Changed paths:
    M doc/coding-standards.rst
    M doc/install-from-package.rst

  Log Message:
  -----------
  Merge branch 'master' into defect-2293-group-rename-problem


  Commit: d5a71cb6aa75b460d969ba3f0bb69334ade8534e
      https://github.com/okfn/ckan/commit/d5a71cb6aa75b460d969ba3f0bb69334ade8534e
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  genshi hack to allow properties in templates


  Commit: c0aa45fea018c32837686f4886471da3b6bd5755
      https://github.com/okfn/ckan/commit/c0aa45fea018c32837686f4886471da3b6bd5755
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    M ckan/controllers/home.py

  Log Message:
  -----------
  example usage of a property


  Commit: a9defd03757a36a15a06c45042fb8f78046e10ea
      https://github.com/okfn/ckan/commit/a9defd03757a36a15a06c45042fb8f78046e10ea
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    M ckan/controllers/home.py

  Log Message:
  -----------
  Revert "example usage of a property"

This reverts commit 9d38187aed90e10218fc086e6a72461234e23958.


  Commit: 2542cb3e9db16e595266e806dd85b30ca59c0126
      https://github.com/okfn/ckan/commit/2542cb3e9db16e595266e806dd85b30ca59c0126
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  add copyright notice for genshi code hack


  Commit: d37619608be4898b6aadd37120ce8f7913b76780
      https://github.com/okfn/ckan/commit/d37619608be4898b6aadd37120ce8f7913b76780
  Author: kindly <kindly at gmail.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [2571] append only resource create


  Commit: 876ea6535878eba79d3203beda9eac25d8c5fa60
      https://github.com/okfn/ckan/commit/876ea6535878eba79d3203beda9eac25d8c5fa60
  Author: kindly <kindly at gmail.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

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

  Log Message:
  -----------
  [2571] add basic user auth checks to resource create


  Commit: 4d812a1592bb3f526b56cb7c7ca7b3fd0b687204
      https://github.com/okfn/ckan/commit/4d812a1592bb3f526b56cb7c7ca7b3fd0b687204
  Author: amercader <amercadero at gmail.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M CHANGELOG.txt

  Log Message:
  -----------
  [xs] Update CHANGELOG for 1.7.1 release


  Commit: 94c648a83d1328b4050ad9e0b8e6e16f9dabc2fa
      https://github.com/okfn/ckan/commit/94c648a83d1328b4050ad9e0b8e6e16f9dabc2fa
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M CHANGELOG.txt

  Log Message:
  -----------
  Merge branch 'master' into feature-2571-add-resource-create


  Commit: 2bf1d3d0f2fd2851433049c6d270468140f1f416
      https://github.com/okfn/ckan/commit/2bf1d3d0f2fd2851433049c6d270468140f1f416
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch 'feature-2571-add-resource-create'

merge bracnch 2571 resource_create action implemented


  Commit: fb86d64cb1484291eb4b1c0634b8ea8c27abac32
      https://github.com/okfn/ckan/commit/fb86d64cb1484291eb4b1c0634b8ea8c27abac32
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M CHANGELOG.txt
    M ckan/config/environment.py
    M ckan/controllers/group.py
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/logic/test_action.py
    M doc/coding-standards.rst
    M doc/install-from-package.rst

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


  Commit: 6d3b56b42c67f6837b346df41bc405ad2728c5f8
      https://github.com/okfn/ckan/commit/6d3b56b42c67f6837b346df41bc405ad2728c5f8
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M doc/solr-setup.rst

  Log Message:
  -----------
  Helpful SOLR hint.


  Commit: ebd836504ff2e323eb93de4dd89a3c579e724c1a
      https://github.com/okfn/ckan/commit/ebd836504ff2e323eb93de4dd89a3c579e724c1a
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M ckan/lib/create_test_data.py

  Log Message:
  -----------
  Fix minor bug that caused create_users to not commit changes.


  Commit: 0ed19599772213631c627614383fe6d1d9dea2fa
      https://github.com/okfn/ckan/commit/0ed19599772213631c627614383fe6d1d9dea2fa
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/search/__init__.py

  Log Message:
  -----------
  Improve logging in useful places.


  Commit: 84d674dac775f93f50b35436c38b6d0c5d0dc2fd
      https://github.com/okfn/ckan/commit/84d674dac775f93f50b35436c38b6d0c5d0dc2fd
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M ckan/lib/create_test_data.py

  Log Message:
  -----------
  Comment required, else Toby would just delete the method out of hand.


  Commit: 496ee0504907ed1f60d45cbcdfec927303adbdb7
      https://github.com/okfn/ckan/commit/496ee0504907ed1f60d45cbcdfec927303adbdb7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#2484] Improve docstrings of follow helper functions


  Commit: b9d5051e0f074a23fae3531397e6ec7c3bd9b0ed
      https://github.com/okfn/ckan/commit/b9d5051e0f074a23fae3531397e6ec7c3bd9b0ed
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M CHANGELOG.txt
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    A ckan/i18n/check_po_files.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/repoze_patch.py
    M ckan/lib/search/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/public/css/style.css
    M ckan/public/scripts/application.js
    M ckan/tests/functional/test_group.py
    M ckan/tests/logic/test_action.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/organizations/templates/organization_read.html
    M doc/coding-standards.rst
    M doc/configuration.rst
    M doc/geospatial.rst
    A doc/harvesting.rst
    M doc/index.rst
    A doc/install-from-package-amazon.rst
    A doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/post-installation.rst
    M doc/solr-setup.rst
    M doc/test.rst
    M pip-requirements-docs.txt
    M requires/lucid_missing.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-2484-followers-as-helper


  Commit: 1d4f02a3aa886c012937e681fb48e66ca5e8e854
      https://github.com/okfn/ckan/commit/1d4f02a3aa886c012937e681fb48e66ca5e8e854
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/public/scripts/application.js
    M ckan/templates/js_strings.html
    M ckan/templates/package/layout.html
    A ckan/templates/snippets/follow_button.html
    M ckan/templates/user/layout.html

  Log Message:
  -----------
  Merge branch 'feature-2484-followers-as-helper'


  Commit: c7cd7a1e0740ed8983d868804989779b29a740a4
      https://github.com/okfn/ckan/commit/c7cd7a1e0740ed8983d868804989779b29a740a4
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/logic/__init__.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [2500] get_action now raises an exception on missing action

Previously get_action returned None for missing actions, but this led
to opaque errors in templates whereas now it raises an exception which is
clear in describing the problem.

Also lots of PEP8 cleanup of the non-test code.


  Commit: 62e4d53230a1069a1fd5c988d23998dcdeb434ec
      https://github.com/okfn/ckan/commit/62e4d53230a1069a1fd5c988d23998dcdeb434ec
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/logic/__init__.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch 'defect-2500-get-action-missing'


  Commit: 7c38889103c0b88a7a5bc4b3fb23131cc4f5ed00
      https://github.com/okfn/ckan/commit/7c38889103c0b88a7a5bc4b3fb23131cc4f5ed00
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/controllers/authorization_group.py
    M ckan/controllers/datastore.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py

  Log Message:
  -----------
  PEP8ification of controllers module


  Commit: c00f61024e07f2a9af639431f755cd93f31e9da7
      https://github.com/okfn/ckan/commit/c00f61024e07f2a9af639431f755cd93f31e9da7
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-22 (Fri, 22 Jun 2012)

  Changed paths:
    M ckan/lib/accept.py

  Log Message:
  -----------
  PEP8ified


  Commit: d434cc35dd4544ae72e147ca683e23eab003570e
      https://github.com/okfn/ckan/commit/d434cc35dd4544ae72e147ca683e23eab003570e
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-22 (Fri, 22 Jun 2012)

  Changed paths:
    M ckan/lib/celery_app.py

  Log Message:
  -----------
  PEP8ified


  Commit: df89f946a1d50b4bf8af0ccb1ac2c68bece529cb
      https://github.com/okfn/ckan/commit/df89f946a1d50b4bf8af0ccb1ac2c68bece529cb
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-22 (Fri, 22 Jun 2012)

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

  Log Message:
  -----------
  PEP8ified


  Commit: 69ddf00a6bb57d4752dff06335ea30ce58003777
      https://github.com/okfn/ckan/commit/69ddf00a6bb57d4752dff06335ea30ce58003777
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-22 (Fri, 22 Jun 2012)

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

  Log Message:
  -----------
  PEP8ified


  Commit: e759ef98adf6de7f25ebcd925d16d4ab4359e192
      https://github.com/okfn/ckan/commit/e759ef98adf6de7f25ebcd925d16d4ab4359e192
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-22 (Fri, 22 Jun 2012)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/helpers.py
    M ckan/lib/search/__init__.py
    M ckan/logic/__init__.py
    M ckan/public/scripts/application.js
    M ckan/templates/js_strings.html
    M ckan/templates/package/layout.html
    A ckan/templates/snippets/follow_button.html
    M ckan/templates/user/layout.html
    M ckan/tests/logic/test_action.py
    M doc/solr-setup.rst

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


  Commit: 3b7ff6c2e9eaa2bb21567525fd9df0fcde330816
      https://github.com/okfn/ckan/commit/3b7ff6c2e9eaa2bb21567525fd9df0fcde330816
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-22 (Fri, 22 Jun 2012)

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

  Log Message:
  -----------
  Fix a test that was broken with sqlite

If you do CreateTestData.create() and then do setup_test_search_index()
in a setup_class() method then setup_test_search_index() causes the
entire test class to be skipped when tests are run with sqlite, and the
teardown_class() method is not run, so you have created test data but
not deleted it, and the next test classes will crash when they try to
create the test data. Instead call setup_test_search_index() before you
create test data.


  Commit: a68431aa331c361e55905ec461cbc1028279ec36
      https://github.com/okfn/ckan/commit/a68431aa331c361e55905ec461cbc1028279ec36
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-22 (Fri, 22 Jun 2012)

  Changed paths:
    M ckan/tests/test_versions.py

  Log Message:
  -----------
  Workaround for broken Pylons version test

test_pylons() was failing when the right version of Pylons is installed
into a virtualenv with pip rather than installed system-wide. Looks like
a bug in the Pylons code when it reports its version number.  Changed
the test to get the version from pip freeze instead.


  Commit: 1864c7f2fad71e81a6c69e84f808149b2850f6f6
      https://github.com/okfn/ckan/commit/1864c7f2fad71e81a6c69e84f808149b2850f6f6
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-25 (Mon, 25 Jun 2012)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [#2591] fix postgresql 9.1.4 unicode issue

sqlalchemy gets confused over unicode encoding in postgresql v9.1.4
we get utf-8 data but we can think that we are getting SQL_ASCII
this patch forces sqlalchemy to use utf-8 which will make things easier
as all ckan data should be treated as utf-8


  Commit: 2d73bafa3aaa2bfa3c11662a8287ca12dd62185f
      https://github.com/okfn/ckan/commit/2d73bafa3aaa2bfa3c11662a8287ca12dd62185f
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-25 (Mon, 25 Jun 2012)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [#2591] only enforce unicode for postgresql

sqlite databases do not want to be affected


  Commit: 3d239c55a980c33b8404c8e762d86e1e9b53ab8b
      https://github.com/okfn/ckan/commit/3d239c55a980c33b8404c8e762d86e1e9b53ab8b
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/helpers.py
    M ckan/lib/search/__init__.py
    M ckan/logic/__init__.py
    M ckan/public/scripts/application.js
    M ckan/templates/js_strings.html
    M ckan/templates/package/layout.html
    M ckan/templates/user/layout.html
    M ckan/tests/functional/test_group.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_versions.py
    M doc/solr-setup.rst

  Log Message:
  -----------
  merge with master branch


  Commit: a78c8275413bba31891cf74bce610053e51847ca
      https://github.com/okfn/ckan/commit/a78c8275413bba31891cf74bce610053e51847ca
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/controllers/authorization_group.py
    M ckan/controllers/datastore.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/lib/accept.py
    M ckan/lib/celery_app.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/common.py

  Log Message:
  -----------
  Merge branch 'enhancement-pep8-controllers'

Conflicts:
	ckan/controllers/package.py
	ckan/controllers/related.py
	ckan/lib/search/__init__.py
minor merge conflicts


  Commit: 75283f65d644d928e2b5c636d16d3fe06bbf600f
      https://github.com/okfn/ckan/commit/75283f65d644d928e2b5c636d16d3fe06bbf600f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  Merge branch 'defect-2591-postgresql-unicode'


  Commit: fa9dc06e1e560946a7840fe6507017524dd1bbe9
      https://github.com/okfn/ckan/commit/fa9dc06e1e560946a7840fe6507017524dd1bbe9
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M ckan/config/environment.py

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


  Commit: 2bf11bb1b18ce0190c007d1604f485d8c50a9073
      https://github.com/okfn/ckan/commit/2bf11bb1b18ce0190c007d1604f485d8c50a9073
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/controllers/admin.py
    M ckan/controllers/authorization_group.py
    M ckan/controllers/datastore.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/lib/accept.py
    M ckan/lib/celery_app.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/common.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/test_versions.py

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


  Commit: 2843e91437ff77151c6fb84e049c74231588e8b2
      https://github.com/okfn/ckan/commit/2843e91437ff77151c6fb84e049c74231588e8b2
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M CHANGELOG.txt
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/authorization_group.py
    M ckan/controllers/datastore.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    A ckan/i18n/check_po_files.py
    A ckan/lib/accept.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    A ckan/lib/maintain.py
    M ckan/lib/repoze_patch.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/common.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/model/tag.py
    M ckan/public/css/style.css
    M ckan/public/scripts/application.js
    M ckan/templates/js_strings.html
    M ckan/templates/layout_base.html
    M ckan/templates/package/layout.html
    A ckan/templates/snippets/follow_button.html
    M ckan/templates/user/layout.html
    R ckan/tests/functional/test_autoneg.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_accept.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/test_versions.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/organizations/templates/organization_read.html
    M doc/apiv3.rst
    A doc/coding-standards.rst
    M doc/configuration.rst
    M doc/geospatial.rst
    A doc/harvesting.rst
    M doc/index.rst
    A doc/install-from-package-amazon.rst
    A doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/post-installation.rst
    M doc/solr-setup.rst
    M doc/test.rst
    M profile_tests.py
    M requires/lucid_missing.txt
    M requires/lucid_present.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge from master


Compare: https://github.com/okfn/ckan/compare/c44d4f98d3a6...2843e91437ff


More information about the ckan-changes mailing list