[ckan-changes] [okfn/ckan] ffdde5: [#617] Install from source doc updates

GitHub noreply at github.com
Mon Apr 22 14:29:10 UTC 2013


  Branch: refs/heads/531-data-viewer-docs
  Home:   https://github.com/okfn/ckan
  Commit: ffdde52fffd663fd800c84e25b1f323da9a59ee8
      https://github.com/okfn/ckan/commit/ffdde52fffd663fd800c84e25b1f323da9a59ee8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-19 (Tue, 19 Mar 2013)

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

  Log Message:
  -----------
  [#617] Install from source doc updates


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

  Changed paths:
    A doc/CONTRIBUTING.rst

  Log Message:
  -----------
  [#618] create symlink from docs/CONTRIBUTING.rst to CONTRIBUTING.txt


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/new_authz.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
    M ckanext/example_idatasetform/plugin.py
    R ckanext/example_idatasetform/templates/package/new_package_metadata.html
    M ckanext/example_idatasetform/templates/package/read.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
    R ckanext/example_idatasetform/tests/test_example_idatasetform_plugin.py

  Log Message:
  -----------
  Merge branch 'master' into 617-source-install-doc


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

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

  Log Message:
  -----------
  [#617] Build solr index with -r


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

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  [#606] Fix no resource error to not me flash message


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

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

  Log Message:
  -----------
  Pass current user


  Commit: 995d1df4b06324ce115d2a9d0247fb2bb84f8801
      https://github.com/okfn/ckan/commit/995d1df4b06324ce115d2a9d0247fb2bb84f8801
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-03-22 (Fri, 22 Mar 2013)

  Changed paths:
    M ckan/lib/cli.py
    M doc/paster.rst

  Log Message:
  -----------
  [#533] Change paster commands docs to follow paster's conventions

In paster's documentation, a required field is shown in UPPER_CASE, and
underscores are used as word separator.


  Commit: 466500018e030585d41acc77123f59945f1844b5
      https://github.com/okfn/ckan/commit/466500018e030585d41acc77123f59945f1844b5
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-03-23 (Sat, 23 Mar 2013)

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

  Log Message:
  -----------
  Add a test


  Commit: 97138fe0d69719b40d3a55832dddc8cdb4b61b19
      https://github.com/okfn/ckan/commit/97138fe0d69719b40d3a55832dddc8cdb4b61b19
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    M ckan/lib/cli.py
    M ckanext/datastore/commands.py
    M doc/database-dumps.rst
    M doc/paster.rst

  Log Message:
  -----------
  [#533] Update paster's documentation and rename its title


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

  Changed paths:
    M doc/paster.rst

  Log Message:
  -----------
  [#533] Remove documentation of paster rights and roles.

They don't exist anymore.


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

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

  Log Message:
  -----------
  [#509] Fix bug in add/remove groups


  Commit: c76c351555f7daa44aa2be1f671363a76857d2b7
      https://github.com/okfn/ckan/commit/c76c351555f7daa44aa2be1f671363a76857d2b7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-01 (Mon, 01 Apr 2013)

  Changed paths:
    M ckan/logic/schema.py
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#621] Move extras_validation into __before

This fixes an issue where creating a new resource would crash in
validation if there was a custom field (using convert_to/from_extras)
with a name that sorted after extras validation alphabetically. Fixes #621.


  Commit: 172677d2ad334fb6faca5d3b6c2f0bfc6e7f63fb
      https://github.com/okfn/ckan/commit/172677d2ad334fb6faca5d3b6c2f0bfc6e7f63fb
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#708] Fix render_markdown() helper function


  Commit: 6924bbd41a7ccc77a5e11d8a6012e5ed75c1f510
      https://github.com/okfn/ckan/commit/6924bbd41a7ccc77a5e11d8a6012e5ed75c1f510
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/package_saver.py
    R ckan/misc.py
    M ckan/model/package.py
    M ckan/templates_legacy/package/read_core.html

  Log Message:
  -----------
  [#708] Switch over to use markdown_extract() not misc.py


  Commit: 2c8977e0bedce4ebc11a066f2ad11aa82e124726
      https://github.com/okfn/ckan/commit/2c8977e0bedce4ebc11a066f2ad11aa82e124726
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M ckan/lib/create_test_data.py
    M ckan/tests/functional/test_package.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/misc/test_format_text.py
    M ckan/tests/models/test_package.py

  Log Message:
  -----------
  [#708] Fix tests


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

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#708] Get markdown_extract() to use RE_MD_HTML_TAGS


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

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#708] Minor refactor


  Commit: 494420ffaa7eeb7e4b676f6ffcc0a44836f4b407
      https://github.com/okfn/ckan/commit/494420ffaa7eeb7e4b676f6ffcc0a44836f4b407
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M ckan/config/environment.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/base.py
    M ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.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/converters.py
    M ckan/logic/validators.py
    M ckan/model/license.py
    M ckan/model/package_relationship.py
    M ckan/plugins/toolkit.py
    M ckan/tests/functional/test_home.py

  Log Message:
  -----------
  [#727] Clean up imports in core


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

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  [#728] Add ckan.tracking_enabled to app_globals

The ckan.tracking_enabled ini file setting was being ignored, so page
view tracking wasn't working. Adding ckan.tracking_enabled to
app_globals makes the setting work again.

Fixes #728


  Commit: 55129dbf959b060b27c68afce87486e5925e0b74
      https://github.com/okfn/ckan/commit/55129dbf959b060b27c68afce87486e5925e0b74
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#729] Handle languages in URLs when updating page view tracking summary

Page view tracking was failing when a language was selected:

1. Put `ckan.tracking_enabled = true` in your ini file
2. Run CKAN, visit a page with a language e.g. `/en/dataset/annakarenina`
3. Run `paster tracking update`. If you look in your db, in the
   `tracking_summary` table there'll be a row with `package_id`
   `~~not~found~~`.
4. Run `paster tracking export tracking.csv`, the exported CSV file will
   say 0 views.

If you visit the page without the language in the URL e.g.
`/dataset/annakarenina` then run the export command again, the view does
get counted.

This commit fixes the SQL used by the `paster tracking update/export`
command to handle URLs with or without languages at the start.

Fixes #729


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

  Changed paths:
    M ckan/lib/dictization/model_save.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [#509] Test fixups


  Commit: 3eeeef257a9c9a7c574f9a9662289ebc7cd40d24
      https://github.com/okfn/ckan/commit/3eeeef257a9c9a7c574f9a9662289ebc7cd40d24
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

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

  Log Message:
  -----------
  [#541] Add docs for page view tracking feature

Add documentation for the page view tracking feature. There are still
some details to document, including how to show number of page views on
the pages themselves (eg. dataset views next to datasets) and how to
show "popular" labels next to popular datasets. It's also possible to
get a list of the N most popular datasets, for example for the front
page, perhaps this should be documented too.


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

  Changed paths:
    A doc/images/sort-datasets-by-popularity.png

  Log Message:
  -----------
  [#541] Add popularity-sorting screenshot

Should have been added in commit 3eeeef2 but I forgot.


  Commit: b6ce1c88abf922236a5b209f177fa65e2a6d0c07
      https://github.com/okfn/ckan/commit/b6ce1c88abf922236a5b209f177fa65e2a6d0c07
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/templates/activity_streams/activity_stream_items.html

  Log Message:
  -----------
  [#256] Remove id from dashboard activity list.

* Remove id from the dashboard activity list functions
* If offset is less than 30, show less should link to offset 0.


  Commit: c9919b4928a2165777f6dbfd64b46d0e65dc98e4
      https://github.com/okfn/ckan/commit/c9919b4928a2165777f6dbfd64b46d0e65dc98e4
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py
    M ckan/logic/validators.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/misc.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/footer.less
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/header.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/organization/confirm_delete_member.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/read.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.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/related/confirm_delete.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/snippets/license.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout.html
    M ckan/templates/user/new.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read.html
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/logic/test_member.py
    M ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    A ckanext/example_idatasetform/templates/package/snippets/package_basic_fields.html
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    R doc/about.rst
    M doc/index.rst
    M doc/legacy-api.rst
    R doc/user-stories-list.rst
    R doc/user-stories.rst

  Log Message:
  -----------
  Merge branch 'master' into 256-dashboard_activity_list_error


  Commit: 52005cb098848ffe55117fb46c06be1a96e59c5d
      https://github.com/okfn/ckan/commit/52005cb098848ffe55117fb46c06be1a96e59c5d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

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

  Log Message:
  -----------
  [#730] Only show 'Popular' sort option if tracking enabled

Sorting datasets by popularity only works if page view tracking is
enabled, so don't show the 'Popular' option in the 'Order by:' dropdown
if tracking isn't enabled.


  Commit: 8f12aea64093320837bb928862904c958a3d6ee2
      https://github.com/okfn/ckan/commit/8f12aea64093320837bb928862904c958a3d6ee2
  Author: John Glover <j at johnglover.net>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js

  Log Message:
  -----------
  [#702] Update Recline to latest master version.

Adds filter support for datastore backend and a
couple of other bug fixes.


  Commit: ca04063ce061fb80375e73d5aad865ebd6e0ae6d
      https://github.com/okfn/ckan/commit/ca04063ce061fb80375e73d5aad865ebd6e0ae6d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/search/query.py
    M ckan/logic/action/get.py
    M ckan/templates/snippets/sort_by.html

  Log Message:
  -----------
  [#714] Fix default sort ordering

Change the default sort order of package_search() to 'relevance asc,
metadata_modified desc'. We want to sort by relevance by default, but
when there's no search query relevance is meaningless, in that case fall
back on showing the most recently modified datasets first. Also changes
the sort ordering of the "Relevance" option in the "Order by:" dropdown
to 'relevance asc, metadata_modified desc' instead of just 'relevance
asc'.

The previous default ordering was 'score desc, name asc'. I'm not even
sure if that works, it seems to disagree with the sort strings that the
dropdown gives you, when you chose relevance from the dropdown you got
'relevance asc' not 'score desc' (and the datasets appeared in a
different order then the default), and when you chose name you get
'title_string' not name.

Previously we've fallen back on showing datasets alphabetically but
that's boring as it simply means that all the datasets beginning with 'a'
are always shown. Last modified seems more interesting and changes over
time. Popularity is not an option because that only works if the page
view tracking feature is enabled.

Move the logic that selects the default sort order for package_search()
out of lib and into package_search().

The package_search() action function now returns the sort order it used
in the 'sort' key of the returned dict, and the package controller sends
this to the templates to decide which sort ordering to show selected in
the "Order by:" dropdown. Previously the package controller and action
function each had their own logic and the dropdown was out of sync with
the actual sort order.

Fixes #714.


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

  Changed paths:
    A doc/images/popular-dataset.png
    A doc/images/popular-resource.png
    M doc/tracking.rst

  Log Message:
  -----------
  [#541] Add docs for highlighting popular datasets and resources

Also mention that tracking summary data is also available for resources
via the API, not just packages.


  Commit: 4822caa0565f10681864db4a364eafd91a50c58b
      https://github.com/okfn/ckan/commit/4822caa0565f10681864db4a364eafd91a50c58b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M doc/tracking.rst

  Log Message:
  -----------
  [#541] Document how to show dataset and resource view counts in templates


  Commit: a38ce6b025442c5198a32196aa2098e7496705d5
      https://github.com/okfn/ckan/commit/a38ce6b025442c5198a32196aa2098e7496705d5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M doc/tracking.rst

  Log Message:
  -----------
  [#541] Document showing most popular datasets on front page


  Commit: b0ce83c1ed6b42da83f2ccc2ebf0d4cac2ffbb33
      https://github.com/okfn/ckan/commit/b0ce83c1ed6b42da83f2ccc2ebf0d4cac2ffbb33
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M doc/tracking.rst

  Log Message:
  -----------
  [#541] Reference Google Analytics extension in Tracking docs


  Commit: 1023289df5bf44be11e81c026cb1e34c3b60e9bf
      https://github.com/okfn/ckan/commit/1023289df5bf44be11e81c026cb1e34c3b60e9bf
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Revert the helper function signature


  Commit: 7ba8be234b49d70938ac21f4863345dd36fd4c93
      https://github.com/okfn/ckan/commit/7ba8be234b49d70938ac21f4863345dd36fd4c93
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

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

  Log Message:
  -----------
  Merge branch 'master' into 256-dashboard_activity_list_error


  Commit: 2b46a450ce4ce118599a86ecefd3d4b8baba8d32
      https://github.com/okfn/ckan/commit/2b46a450ce4ce118599a86ecefd3d4b8baba8d32
  Author: John Martin <me at johnmart.in>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

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

  Log Message:
  -----------
  [#726] Fix page zoom out bug up to zoom:0.6


  Commit: 7013645ee7600c68bab23e52155d6b62a62c91f2
      https://github.com/okfn/ckan/commit/7013645ee7600c68bab23e52155d6b62a62c91f2
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

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

  Log Message:
  -----------
  [#256] Fix the duplicate dataset test failure


  Commit: 43516bff31528ff275c2c7e75daa95ed8ee282b5
      https://github.com/okfn/ckan/commit/43516bff31528ff275c2c7e75daa95ed8ee282b5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-06 (Sat, 06 Apr 2013)

  Changed paths:
    M ckan/model/__init__.py
    M ckan/model/tracking.py

  Log Message:
  -----------
  [#730] Add tracking_raw_table to model

The tracking_raw table was being created by a migration script, but was
not actually defined anywhere in ckan's model. This means that in tests,
ckan.model.rebuild_db() would not clear the tracking_raw table, and the
old data would then leak it into tracking_summary as well. Adding
tracking_raw to the model makes rebuild_db() behave as expected again.


  Commit: c0484f86b55550d378d0f9906d016543bb2c2974
      https://github.com/okfn/ckan/commit/c0484f86b55550d378d0f9906d016543bb2c2974
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-07 (Sun, 07 Apr 2013)

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

  Log Message:
  -----------
  [#730] Make sure 'sort' is always in package_search's data_dict

If data_dict contained no 'sort', the default value was not being added
if the data_dict did contain 'abort_search': True. The code nonetheless
tries to access data_dict['sort'] later on and crashes. (Isn't this what
schemas and validation are supposed to be for?) This was causing a test
to fail. Adding the default 'sort' value to data_dict even if
'abort_search': True is there fixes it.


  Commit: 2879cf964e7c214e2046a4644606a7417bc19e4b
      https://github.com/okfn/ckan/commit/2879cf964e7c214e2046a4644606a7417bc19e4b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-07 (Sun, 07 Apr 2013)

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

  Log Message:
  -----------
  [#714] Fix some solr package search tests

CKAN used to convert 'sort': 'rank' into 'sort': 'score desc, namae asc'
but since commit ca04063ce061fb80375e73d5aad865ebd6e0ae6d ([#714] Fix
default sort ordering) it no longer does this, which breaks these tests.
Update the tests to pass 'score desc, name asc' directly instead.


  Commit: bc496ffd758cf3053dc24e6e24e02f495553f71f
      https://github.com/okfn/ckan/commit/bc496ffd758cf3053dc24e6e24e02f495553f71f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/templates/snippets/sort_by.html

  Log Message:
  -----------
  [#714] Use score not relevance in default sort order

'relevance' is not actually in the solr schema so it doesn't do
anything, score is the one we want.


  Commit: 85b30cacf3d0f249544ace9fd73705f03933d1f9
      https://github.com/okfn/ckan/commit/85b30cacf3d0f249544ace9fd73705f03933d1f9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

  Changed paths:
    M ckan/lib/create_test_data.py
    M ckan/tests/functional/test_pagination.py

  Log Message:
  -----------
  [#714] Fix pagination tests

Change create_arbitrary() to always create datasets in the same order,
instead of a different order each time. Update pagination tests to
expect datasets in the new default sort order.


  Commit: 495d1521ebacad5281d06c02ab21963bd6f4e13d
      https://github.com/okfn/ckan/commit/495d1521ebacad5281d06c02ab21963bd6f4e13d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

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

  Log Message:
  -----------
  [#714] Fix an intermittently failing test

This test depends on the order of the two datasets. The default sort
order has changed now to most-recently-modified-first when there's no
search query, and since the test creates the two datasets in a random
order the search returns the datasets in a different order each time the
test is run, giving a 50/50 chance that the test will fail.

Change the test to not depend on the fixed order of the datasets.


  Commit: 5bd3efac1e0b19056b5305fd626eedafc40f510b
      https://github.com/okfn/ckan/commit/5bd3efac1e0b19056b5305fd626eedafc40f510b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

  Changed paths:
    M doc/tracking.rst

  Log Message:
  -----------
  [#541] Tweak page view tracking docs

Just clarify the docs a bit, and also mention that "recent" means last
14 days and that paster export is for datasets only.


  Commit: 48da70a71de2a0c2d3ed7da152dd289f2f166a51
      https://github.com/okfn/ckan/commit/48da70a71de2a0c2d3ed7da152dd289f2f166a51
  Author: John Martin <me at johnmart.in>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

  Changed paths:
    M ckan/public/base/less/prose.less
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#740] Adds ellipsis wrapper to resource_read


  Commit: 7c7f3320de025aad5a1abbe426925b0184b2c309
      https://github.com/okfn/ckan/commit/7c7f3320de025aad5a1abbe426925b0184b2c309
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

  Changed paths:
    M doc/tracking.rst

  Log Message:
  -----------
  [#541] Small tweak to page view tracking docs


  Commit: 938a346af96fbe1f91c0f19c7acd16fd89b87ab2
      https://github.com/okfn/ckan/commit/938a346af96fbe1f91c0f19c7acd16fd89b87ab2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#621] Fix crash on duplicate extras key error

Fix a crash when generating a 'duplicate extras key' error. To trigger
the crash, post a dataset dict to package_create() containing two extras
dicts with the same key. There is no test for this yet.


  Commit: f0aeecefe2a742b5923a04cced5e16d1524d70fc
      https://github.com/okfn/ckan/commit/f0aeecefe2a742b5923a04cced5e16d1524d70fc
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

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

  Log Message:
  -----------
  [#621] Add tests for duplicate extras key error

This code path was not covered by the tests.


  Commit: ed0b8527d106583714a223ff841ecd618b08c8e4
      https://github.com/okfn/ckan/commit/ed0b8527d106583714a223ff841ecd618b08c8e4
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M bin/osx-postgres-mem.sh
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/lib/search/query.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/model/tag.py
    A ckan/templates/group/history.html
    A ckan/templates/group/snippets/history_revisions.html
    A ckan/templates/group/snippets/revisions_table.html
    A ckan/templates/package/history.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/search.html
    A ckan/templates/package/snippets/history_revisions.html
    A ckan/templates/package/snippets/revisions_table.html
    A ckan/templates/revision/__init__.py
    A ckan/templates/revision/diff.html
    A ckan/templates/revision/list.html
    A ckan/templates/revision/read.html
    A ckan/templates/revision/read_base.html
    A ckan/templates/revision/snippets/revisions_list.html
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    R doc/contrib.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/legacy-api.rst
    M doc/test.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 621-bug-move-extras_validation_into___before


  Commit: 04d8df80da19579bd551e469a879f12c8dedb15c
      https://github.com/okfn/ckan/commit/04d8df80da19579bd551e469a879f12c8dedb15c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    R doc/CONTRIBUTING.rst
    A doc/contributing.rst

  Log Message:
  -----------
  [#618] Rename contributing -> CONTRIBUTING in docs

The source file in the root of this git repo is still called CONTRIBUTING.rst,
but the symlink to it in docs/ is now lower-case contributing.rst. This
means the docs.ckan.org URL is /contributing.html not
/CONTRIBUTING.html.


  Commit: 25852a2032f11d3c3117a3cfa29c81643c545c2f
      https://github.com/okfn/ckan/commit/25852a2032f11d3c3117a3cfa29c81643c545c2f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M doc/index.rst

  Log Message:
  -----------
  [#618] Add contributing docs to docs index


  Commit: 3428f8a5c1f873bfa36dfb08fa62eb226bf9092c
      https://github.com/okfn/ckan/commit/3428f8a5c1f873bfa36dfb08fa62eb226bf9092c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  [#618] Fix a broken link in CONTRIBUTING.rst


  Commit: 2ab6084a5e7e8ecd109a65d6b5dd2dc53f5f368c
      https://github.com/okfn/ckan/commit/2ab6084a5e7e8ecd109a65d6b5dd2dc53f5f368c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  [#618] Move Coding Standards link to top of CONTRIBUTING.rst

Make it more prominent.


  Commit: 254222ffbd43f736eb5baf7c188578ecbd5a2a55
      https://github.com/okfn/ckan/commit/254222ffbd43f736eb5baf7c188578ecbd5a2a55
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst
    A doc/contributing.rst
    M doc/index.rst

  Log Message:
  -----------
  Merge branch '618-source-contributing-file-from-docs'


  Commit: 09220c47854666bd126a8bc8125621abbc6b399f
      https://github.com/okfn/ckan/commit/09220c47854666bd126a8bc8125621abbc6b399f
  Author: John Martin <me at johnmart.in>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

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

  Log Message:
  -----------
  [#748] Changes page title on /organization index


  Commit: 6760976d0e1868a03196d90949dd619cff7f89d9
      https://github.com/okfn/ckan/commit/6760976d0e1868a03196d90949dd619cff7f89d9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  Fix broken link in CONTRIBUTING.rst

There seems to be a bug in GitHub's restructured text rendering, an
internal link to a section with a ' in its  title will be broken (but it
works fine in Sphinx). Rename the section to workaround this.


  Commit: f3bb02d9fe3f749055ef838379ed4cf11ca3db00
      https://github.com/okfn/ckan/commit/f3bb02d9fe3f749055ef838379ed4cf11ca3db00
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  Remove changelog update from contributing guidelines

We agreed not to update the changelog as features are added, someone
will update it all at once before a release instead.


  Commit: bcff15ac0c6262b81d3ff2ed5454f7899e3f8a3c
      https://github.com/okfn/ckan/commit/bcff15ac0c6262b81d3ff2ed5454f7899e3f8a3c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

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

  Log Message:
  -----------
  [#621] Return duplicate extras key error in a list

This makes it consistent with other errors that CKAN returns.


  Commit: 5fff2bc88d6f84566178d76660fc37f6876131d5
      https://github.com/okfn/ckan/commit/5fff2bc88d6f84566178d76660fc37f6876131d5
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

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

  Log Message:
  -----------
  [#509] minor indentation cleanup


  Commit: a5c5b667b1325475c26c1e12564ca4fa11c4e042
      https://github.com/okfn/ckan/commit/a5c5b667b1325475c26c1e12564ca4fa11c4e042
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ckan/lib/dictization/model_save.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  Merge branch '509-group-add-remove'


  Commit: ac3714c6e86b83eeda136c962e0ada5e364d2de8
      https://github.com/okfn/ckan/commit/ac3714c6e86b83eeda136c962e0ada5e364d2de8
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

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

  Log Message:
  -----------
  Merge pull request #735 from okfn/726-zoom-bug

#726 Fix page zoom out render issue


  Commit: cd8f25f6556ef5ed9d381d71e343d62e71cdaf32
      https://github.com/okfn/ckan/commit/cd8f25f6556ef5ed9d381d71e343d62e71cdaf32
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

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

  Log Message:
  -----------
  [#726] Recompile CSS files.


  Commit: 6f637791340bf04b61e6f6169fddabbb06b77251
      https://github.com/okfn/ckan/commit/6f637791340bf04b61e6f6169fddabbb06b77251
  Author: jbspeakr <jbspeakr at funkblocka.de>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  reformat /ckan/ckan/config/routing.py


  Commit: 87e0df4ea027f883c8f208f5b95ffee544f481a6
      https://github.com/okfn/ckan/commit/87e0df4ea027f883c8f208f5b95ffee544f481a6
  Author: jbspeakr <jbspeakr at funkblocka.de>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ckan/controllers/error.py

  Log Message:
  -----------
  reformat /ckan/ckan/controllers/error.py


  Commit: a591c7d33a88b65de9e0a3903acd82028f4225ad
      https://github.com/okfn/ckan/commit/a591c7d33a88b65de9e0a3903acd82028f4225ad
  Author: jbspeakr <jbspeakr at funkblocka.de>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ckan/controllers/feed.py

  Log Message:
  -----------
  reformat /ckan/ckan/controllers/feed.py


  Commit: 1f2cbbaa15de2ce305cfadaed580e140b19fb47a
      https://github.com/okfn/ckan/commit/1f2cbbaa15de2ce305cfadaed580e140b19fb47a
  Author: jbspeakr <jbspeakr at funkblocka.de>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ckan/controllers/home.py

  Log Message:
  -----------
  reformat /ckan/ckan/controllers/home.py


  Commit: 6ebc7d9010a29fb7d19a03513a5f02cf43aea812
      https://github.com/okfn/ckan/commit/6ebc7d9010a29fb7d19a03513a5f02cf43aea812
  Author: jbspeakr <jbspeakr at funkblocka.de>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

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

  Log Message:
  -----------
  reformat /ckan/ckan/controllers/organization.py


  Commit: 468210b5303371bec33c8d9e60b1f992c228bb04
      https://github.com/okfn/ckan/commit/468210b5303371bec33c8d9e60b1f992c228bb04
  Author: jbspeakr <jbspeakr at funkblocka.de>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ckan/controllers/related.py

  Log Message:
  -----------
  reformat /ckan/ckan/controllers/related.py


  Commit: f0088871d8f09c6243901c98ab542e53cf7aa011
      https://github.com/okfn/ckan/commit/f0088871d8f09c6243901c98ab542e53cf7aa011
  Author: jbspeakr <jbspeakr at funkblocka.de>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  reformat /ckan/ckan/controllers/storage.py


  Commit: 39b49dfd22e6b678fbdaa6ec2ad612e9afef9a91
      https://github.com/okfn/ckan/commit/39b49dfd22e6b678fbdaa6ec2ad612e9afef9a91
  Author: jbspeakr <jbspeakr at funkblocka.de>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ckan/controllers/tag.py

  Log Message:
  -----------
  reformat /ckan/ckan/controllers/tag.py


  Commit: bbb15f9ca6dd256ce178c950f33f6264c1dcd5e6
      https://github.com/okfn/ckan/commit/bbb15f9ca6dd256ce178c950f33f6264c1dcd5e6
  Author: jbspeakr <jbspeakr at funkblocka.de>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  reformat /ckan/ckan/controllers/user.py


  Commit: 40edf3abf91037db32bea141a16a8074ec29b7ef
      https://github.com/okfn/ckan/commit/40edf3abf91037db32bea141a16a8074ec29b7ef
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-12 (Fri, 12 Apr 2013)

  Changed paths:
    M ckan/public/base/less/prose.less
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  Merge branch '740-resource-url'


  Commit: 4361de6044a366da3c72a7c32542f2a62835f35c
      https://github.com/okfn/ckan/commit/4361de6044a366da3c72a7c32542f2a62835f35c
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-12 (Fri, 12 Apr 2013)

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

  Log Message:
  -----------
  [#740] Rebuild css


  Commit: bfc96b789eb088a4cc73f48b5d438c81ca59a1d8
      https://github.com/okfn/ckan/commit/bfc96b789eb088a4cc73f48b5d438c81ca59a1d8
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-12 (Fri, 12 Apr 2013)

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

  Log Message:
  -----------
  Merge branch '749-org-index-title'


  Commit: 60fb73f5e45f790bee9b01c5c8c3ec7734610f93
      https://github.com/okfn/ckan/commit/60fb73f5e45f790bee9b01c5c8c3ec7734610f93
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-12 (Fri, 12 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M bin/osx-postgres-mem.sh
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/error.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/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.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/validators.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/misc.py
    M ckan/model/tag.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/prose.less
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    A ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    A ckan/templates/group/snippets/history_revisions.html
    A ckan/templates/group/snippets/revisions_table.html
    M ckan/templates/header.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/organization/confirm_delete_member.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/followers.html
    A ckan/templates/package/history.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    A ckan/templates/package/snippets/history_revisions.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.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
    A ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/dashboard.html
    A ckan/templates/revision/__init__.py
    A ckan/templates/revision/diff.html
    A ckan/templates/revision/list.html
    A ckan/templates/revision/read.html
    A ckan/templates/revision/read_base.html
    A ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/license.html
    A ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout.html
    M ckan/templates/user/new.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read.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/lib/test_dictization.py
    M ckan/tests/logic/test_member.py
    M ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    A ckanext/example_idatasetform/templates/package/snippets/package_basic_fields.html
    M 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 doc/about.rst
    M doc/configuration.rst
    R doc/contrib.rst
    A doc/contributing.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/legacy-api.rst
    M doc/test.rst
    R doc/user-stories-list.rst
    R doc/user-stories.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 606-nice-error-on-no-resource


  Commit: 5354769c480f4ad115bf53ca7450d3f49c837edb
      https://github.com/okfn/ckan/commit/5354769c480f4ad115bf53ca7450d3f49c837edb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-12 (Fri, 12 Apr 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  Merge branch '606-nice-error-on-no-resource'


  Commit: dcf6307619c5820e28cbe59003264eea32322ef5
      https://github.com/okfn/ckan/commit/dcf6307619c5820e28cbe59003264eea32322ef5
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-12 (Fri, 12 Apr 2013)

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

  Log Message:
  -----------
  [#739] Add support for boost parameter in queries


  Commit: a831e431c07c05dcf2bf68216ad10ffcdb38cc6a
      https://github.com/okfn/ckan/commit/a831e431c07c05dcf2bf68216ad10ffcdb38cc6a
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-12 (Fri, 12 Apr 2013)

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

  Log Message:
  -----------
  [#739] Document new search parameters


  Commit: 7d12663890da127c2426abf94a44da5cd8514846
      https://github.com/okfn/ckan/commit/7d12663890da127c2426abf94a44da5cd8514846
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-12 (Fri, 12 Apr 2013)

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

  Log Message:
  -----------
  [#739] Pop extras from query parameters before sending them to Solr

Also move them from the root search params dict to 'extras', so they can
be also be used on GET requests, eg:

http://ckan/api/action/package_search?q=dogs&ext_bbox=1.36,41.13,1.38,41.15

gets transformed to:

{
    'q': 'dogs',
    'extras': {
  'ext_bbox': '1.36,41.13,1.38,41.15'
    }
}


  Commit: 502336d29c4a09cb5fdcd1dd4789ab55d075e754
      https://github.com/okfn/ckan/commit/502336d29c4a09cb5fdcd1dd4789ab55d075e754
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-12 (Fri, 12 Apr 2013)

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

  Log Message:
  -----------
  [#739] Partially revert 7d1266 as extensions needs 'extras' on after_search


  Commit: deef56f1b324569526d86b3bfd24a669d389f213
      https://github.com/okfn/ckan/commit/deef56f1b324569526d86b3bfd24a669d389f213
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M ckan/lib/cli.py
    M ckanext/datastore/commands.py
    M doc/database-dumps.rst
    M doc/paster.rst

  Log Message:
  -----------
  Merge branch '533' of git://github.com/vitorbaptista/ckan into vitorbaptista-533


  Commit: 061fdc4b716536f71a7cd7e127b8c05df3e31b3b
      https://github.com/okfn/ckan/commit/061fdc4b716536f71a7cd7e127b8c05df3e31b3b
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M ckan/lib/cli.py
    M ckanext/datastore/commands.py
    M doc/database-dumps.rst
    M doc/paster.rst

  Log Message:
  -----------
  Merge branch 'vitorbaptista-533'


  Commit: cf1c548b4d1fcbe5ee1015fa9f253225089805c4
      https://github.com/okfn/ckan/commit/cf1c548b4d1fcbe5ee1015fa9f253225089805c4
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M bin/osx-postgres-mem.sh
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/error.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/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/search/query.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/model/tag.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/prose.less
    A ckan/templates/group/history.html
    A ckan/templates/group/snippets/history_revisions.html
    A ckan/templates/group/snippets/revisions_table.html
    M ckan/templates/organization/index.html
    A ckan/templates/package/history.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    A ckan/templates/package/snippets/history_revisions.html
    A ckan/templates/package/snippets/revisions_table.html
    A ckan/templates/revision/__init__.py
    A ckan/templates/revision/diff.html
    A ckan/templates/revision/list.html
    A ckan/templates/revision/read.html
    A ckan/templates/revision/read_base.html
    A ckan/templates/revision/snippets/revisions_list.html
    M ckan/tests/lib/test_dictization.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    R doc/contrib.rst
    A doc/contributing.rst
    M doc/database-dumps.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/legacy-api.rst
    M doc/paster.rst
    M doc/test.rst
    M test-core.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'okfn/master' into 727-import-cleans

Conflicts:
	ckan/controllers/feed.py


  Commit: 98e98f0089edaf3b7e44aab50ab74dae679ef595
      https://github.com/okfn/ckan/commit/98e98f0089edaf3b7e44aab50ab74dae679ef595
  Author: kindly <kindly at gmail.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M ckan/config/routing.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_save.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/prose.less
    M ckan/templates/organization/index.html
    M ckan/templates/package/resource_read.html
    M ckan/tests/lib/test_dictization.py
    M ckanext/datastore/commands.py
    A doc/contributing.rst
    M doc/database-dumps.rst
    M doc/index.rst
    M doc/paster.rst

  Log Message:
  -----------
  Merge branch 'master' into 621-bug-move-extras_validation_into___before


  Commit: f75d21b288e5e2b1dbb7c2c416a498a28d6a5ad1
      https://github.com/okfn/ckan/commit/f75d21b288e5e2b1dbb7c2c416a498a28d6a5ad1
  Author: kindly <kindly at gmail.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

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

  Log Message:
  -----------
  Merge branch '621-bug-move-extras_validation_into___before'


  Commit: ad87251ec5755754b6161c490ed82ebb21fc869c
      https://github.com/okfn/ckan/commit/ad87251ec5755754b6161c490ed82ebb21fc869c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M ckan/config/environment.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/base.py
    M ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.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/converters.py
    M ckan/logic/validators.py
    M ckan/model/license.py
    M ckan/model/package_relationship.py
    M ckan/plugins/toolkit.py
    M ckan/tests/functional/test_home.py

  Log Message:
  -----------
  Merge pull request #727 from okfn/727-import-cleans

import cleanups for 2.1


  Commit: 954fa1381e796891e1a098982675c9b7a04dad05
      https://github.com/okfn/ckan/commit/954fa1381e796891e1a098982675c9b7a04dad05
  Author: John Martin <me at johnmart.in>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M doc/conf.py

  Log Message:
  -----------
  [#767] Changes doc title


  Commit: 3ffa1873e425d05bf383e51d83395030206f29c3
      https://github.com/okfn/ckan/commit/3ffa1873e425d05bf383e51d83395030206f29c3
  Author: Stefan Wehrmeyer <mail at stefanwehrmeyer.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M doc/post-installation.rst

  Log Message:
  -----------
  Add email to paster user add command in docs

Also replace config ini with standard development.ini


  Commit: cafdb7988cf48a9a4f44ef9d5903f7ae07a0e19b
      https://github.com/okfn/ckan/commit/cafdb7988cf48a9a4f44ef9d5903f7ae07a0e19b
  Author: John Glover <j at johnglover.net>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js

  Log Message:
  -----------
  [#702] Lint and whitespace cleanup.


  Commit: 40a136a2b7936a29d53fbbcb071a96f5542cd069
      https://github.com/okfn/ckan/commit/40a136a2b7936a29d53fbbcb071a96f5542cd069
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M ckan/controllers/home.py
    M doc/configuration.rst

  Log Message:
  -----------
  Change demo.featured_groups name and add docs (Fixes #584)


  Commit: ed41362ce62f57b5cfb32ef296b718f2d14f118d
      https://github.com/okfn/ckan/commit/ed41362ce62f57b5cfb32ef296b718f2d14f118d
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  Specify that group names or ids are alllowed


  Commit: d2613b2977b1d2927e697f161e9f6ec12951f91f
      https://github.com/okfn/ckan/commit/d2613b2977b1d2927e697f161e9f6ec12951f91f
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  Tweak documention per Tobby's suggestion


  Commit: 08da6c7206e01a2dc7cfe3a87c0ec241ce9576e5
      https://github.com/okfn/ckan/commit/08da6c7206e01a2dc7cfe3a87c0ec241ce9576e5
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/search/query.py
    M ckan/logic/action/get.py
    M ckan/model/__init__.py
    M ckan/model/tracking.py
    M ckan/templates/snippets/sort_by.html
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_action.py
    A doc/images/popular-dataset.png
    A doc/images/popular-resource.png
    A doc/images/sort-datasets-by-popularity.png
    M doc/index.rst
    A doc/tracking.rst

  Log Message:
  -----------
  Merge branch 'tracking-fixes'

Conflicts:
	ckan/lib/app_globals.py

    new config options added in different branches no conflicts


  Commit: 2c425029337f77266b60b4da044e8fbd2d1e49cc
      https://github.com/okfn/ckan/commit/2c425029337f77266b60b4da044e8fbd2d1e49cc
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js

  Log Message:
  -----------
  Merge pull request #702 from okfn/702-recline-filters

Recline datastore backend implementation incomplete (Fixes: #702)


  Commit: 8b88f596ac55bf32b834df76f2d00feac4b94ae1
      https://github.com/okfn/ckan/commit/8b88f596ac55bf32b834df76f2d00feac4b94ae1
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M doc/post-installation.rst

  Log Message:
  -----------
  Merge branch 'docs-add-user'


  Commit: 174b06547c6132119b4625e65f779ee7e56ff515
      https://github.com/okfn/ckan/commit/174b06547c6132119b4625e65f779ee7e56ff515
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M doc/conf.py

  Log Message:
  -----------
  Merge branch '767-doc-title'


  Commit: 0c1caab94088101792efce2e47defb011e1dc688
      https://github.com/okfn/ckan/commit/0c1caab94088101792efce2e47defb011e1dc688
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M doc/_templates/footer.html

  Log Message:
  -----------
  Update Issues link in docs footer (trac->github)


  Commit: 0955b0c09d5345a3f9745dbe07aa8099916eca9d
      https://github.com/okfn/ckan/commit/0955b0c09d5345a3f9745dbe07aa8099916eca9d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M doc/index.rst

  Log Message:
  -----------
  Change title on docs index page


  Commit: 36c6143b601c6b2cdec74ac17ca9d895ce6664a8
      https://github.com/okfn/ckan/commit/36c6143b601c6b2cdec74ac17ca9d895ce6664a8
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#708] Clean up code, fix comment, remove obvious comment


  Commit: ab31c4e0cdf84bc03d19787b2a727850f0ba9aea
      https://github.com/okfn/ckan/commit/ab31c4e0cdf84bc03d19787b2a727850f0ba9aea
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M ckan/tests/misc/test_format_text.py

  Log Message:
  -----------
  [#708] Add more tests to link detection tests


  Commit: 85a3d3e2fdf6ebbf8d51122f0092bdc8f694a635
      https://github.com/okfn/ckan/commit/85a3d3e2fdf6ebbf8d51122f0092bdc8f694a635
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M bin/osx-postgres-mem.sh
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/error.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/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.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/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/model/__init__.py
    M ckan/model/license.py
    M ckan/model/package_relationship.py
    M ckan/model/tag.py
    M ckan/model/tracking.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/prose.less
    A ckan/templates/group/history.html
    A ckan/templates/group/snippets/history_revisions.html
    A ckan/templates/group/snippets/revisions_table.html
    M ckan/templates/organization/index.html
    A ckan/templates/package/history.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    A ckan/templates/package/snippets/history_revisions.html
    M ckan/templates/package/snippets/package_basic_fields.html
    A ckan/templates/package/snippets/revisions_table.html
    A ckan/templates/revision/__init__.py
    A ckan/templates/revision/diff.html
    A ckan/templates/revision/list.html
    A ckan/templates/revision/read.html
    A ckan/templates/revision/read_base.html
    A ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/sort_by.html
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    A ckanext/example_idatasetform/templates/package/snippets/package_basic_fields.html
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M doc/_templates/footer.html
    M doc/conf.py
    M doc/configuration.rst
    R doc/contrib.rst
    A doc/contributing.rst
    M doc/database-dumps.rst
    A doc/images/popular-dataset.png
    A doc/images/popular-resource.png
    A doc/images/sort-datasets-by-popularity.png
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/legacy-api.rst
    M doc/paster.rst
    M doc/post-installation.rst
    M doc/test.rst
    A doc/tracking.rst
    R doc/user-stories-list.rst
    R doc/user-stories.rst
    M test-core.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'okfn/master' into 708-markdown-fixes

Conflicts:
	ckan/controllers/user.py


  Commit: 02605e3b3f64c36457fd56bc3db461fcb7445be1
      https://github.com/okfn/ckan/commit/02605e3b3f64c36457fd56bc3db461fcb7445be1
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

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

  Log Message:
  -----------
  [#256] Rename dashboard activity list test

* Rename dashboard activity list test for clarity.
* Remove extraneous print statement.


  Commit: ffcc901293e74d11903411eeec4a5285685a30fe
      https://github.com/okfn/ckan/commit/ffcc901293e74d11903411eeec4a5285685a30fe
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-17 (Wed, 17 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M bin/osx-postgres-mem.sh
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/error.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/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.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/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/__init__.py
    M ckan/model/license.py
    M ckan/model/package_relationship.py
    M ckan/model/tag.py
    M ckan/model/tracking.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/prose.less
    A ckan/templates/group/history.html
    A ckan/templates/group/snippets/history_revisions.html
    A ckan/templates/group/snippets/revisions_table.html
    M ckan/templates/organization/index.html
    A ckan/templates/package/history.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    A ckan/templates/package/snippets/history_revisions.html
    A ckan/templates/package/snippets/revisions_table.html
    A ckan/templates/revision/__init__.py
    A ckan/templates/revision/diff.html
    A ckan/templates/revision/list.html
    A ckan/templates/revision/read.html
    A ckan/templates/revision/read_base.html
    A ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/sort_by.html
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M doc/_templates/footer.html
    M doc/conf.py
    M doc/configuration.rst
    R doc/contrib.rst
    A doc/contributing.rst
    M doc/database-dumps.rst
    A doc/images/popular-dataset.png
    A doc/images/popular-resource.png
    A doc/images/sort-datasets-by-popularity.png
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/paster.rst
    M doc/post-installation.rst
    M doc/test.rst
    A doc/tracking.rst
    M test-core.ini

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


  Commit: 1c7de4a844ceabab47232c1371d6376585b3f7b7
      https://github.com/okfn/ckan/commit/1c7de4a844ceabab47232c1371d6376585b3f7b7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-17 (Wed, 17 Apr 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  [#776] Show organization search facets by default

Show faceting by organization by default on the dataset search page.
Fixes #776.


  Commit: e5fde7a4763b269fff8abf611d318339d6d32bfc
      https://github.com/okfn/ckan/commit/e5fde7a4763b269fff8abf611d318339d6d32bfc
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-17 (Wed, 17 Apr 2013)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Tweak the contact details in the README

Try to encourage people to use ckan-discuss and Stack Overflow for
support questions, and keep ckan-dev and #ckan for development
discussion.


  Commit: 250233e2fdcc47cf52db111048a24c6b350f0923
      https://github.com/okfn/ckan/commit/250233e2fdcc47cf52db111048a24c6b350f0923
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-17 (Wed, 17 Apr 2013)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/tests/functional/api/test_dashboard.py

  Log Message:
  -----------
  Merge branch '256-dashboard_activity_list_error'


  Commit: cb9849f3d4831761f4742565559e6b2aacf671dc
      https://github.com/okfn/ckan/commit/cb9849f3d4831761f4742565559e6b2aacf671dc
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-17 (Wed, 17 Apr 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/package_saver.py
    R ckan/misc.py
    M ckan/model/package.py
    M ckan/templates_legacy/package/read_core.html
    M ckan/tests/functional/test_package.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/misc/test_format_text.py
    M ckan/tests/models/test_package.py

  Log Message:
  -----------
  Merge pull request #708 from okfn/708-markdown-fixes

Markdown fixes


  Commit: 493b2a22b8bebf7bffca802ffd41a6c639552509
      https://github.com/okfn/ckan/commit/493b2a22b8bebf7bffca802ffd41a6c639552509
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-18 (Thu, 18 Apr 2013)

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

  Log Message:
  -----------
  [#784] Update the support versions of Python and Postgres


  Commit: 10312f24a0115f50d2956559e35a4457d5133fc7
      https://github.com/okfn/ckan/commit/10312f24a0115f50d2956559e35a4457d5133fc7
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-18 (Thu, 18 Apr 2013)

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

  Log Message:
  -----------
  Merge pull request #784 from okfn/784-update-supported-versions

Correct supported versions (Python, Postgres) in docs


  Commit: 78181b0d895576373512aa9b32121700055d0193
      https://github.com/okfn/ckan/commit/78181b0d895576373512aa9b32121700055d0193
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-18 (Thu, 18 Apr 2013)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Minor typo fix in the README


  Commit: 540b30975e1aca4670ef834662dcb2e3b2987421
      https://github.com/okfn/ckan/commit/540b30975e1aca4670ef834662dcb2e3b2987421
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-18 (Thu, 18 Apr 2013)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Merge pull request #779 from okfn/quiet-down-dev-list

Tweak the contact details in the README


  Commit: 8dd026e75561fafbb7a5055338a77871ef6c6e9f
      https://github.com/okfn/ckan/commit/8dd026e75561fafbb7a5055338a77871ef6c6e9f
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-19 (Fri, 19 Apr 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  Merge branch '776-show-organizaton-facets'


  Commit: d349cb0ec5828f86fbf5f7825a486d44bff18de7
      https://github.com/okfn/ckan/commit/d349cb0ec5828f86fbf5f7825a486d44bff18de7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-19 (Fri, 19 Apr 2013)

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

  Log Message:
  -----------
  [#617] Tweak source install upgrade docs


  Commit: 2daa943d986bd447a7cd067b44fd62359100fb85
      https://github.com/okfn/ckan/commit/2daa943d986bd447a7cd067b44fd62359100fb85
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-19 (Fri, 19 Apr 2013)

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

  Log Message:
  -----------
  [#617] Fix a couple of typos in the docs


  Commit: 33b7260de5a02c5d899e2f8d0e4626ecfc03d6ab
      https://github.com/okfn/ckan/commit/33b7260de5a02c5d899e2f8d0e4626ecfc03d6ab
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-19 (Fri, 19 Apr 2013)

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

  Log Message:
  -----------
  Merge branch '617-source-install-doc'


  Commit: 0b796a53399aa55753ef0eef3dd6636925cadf57
      https://github.com/okfn/ckan/commit/0b796a53399aa55753ef0eef3dd6636925cadf57
  Author: John Glover <glover.john at gmail.com>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

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

  Log Message:
  -----------
  Merge pull request #758 from okfn/739-add-extra-options-to-query

739 add extra options to query


  Commit: 0dfbc87cbd88f22cb194065c85f7b16ab79953cf
      https://github.com/okfn/ckan/commit/0dfbc87cbd88f22cb194065c85f7b16ab79953cf
  Author: John Glover <j at johnglover.net>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M README.rst
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/error.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/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.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/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/package_saver.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/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    R ckan/misc.py
    M ckan/model/__init__.py
    M ckan/model/license.py
    M ckan/model/package.py
    M ckan/model/package_relationship.py
    M ckan/model/tracking.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/prose.less
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/organization/index.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/snippets/sort_by.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/misc/test_format_text.py
    M ckan/tests/models/test_package.py
    M ckanext/datastore/commands.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M doc/_templates/footer.html
    M doc/conf.py
    M doc/configuration.rst
    A doc/contributing.rst
    M doc/database-dumps.rst
    A doc/images/popular-dataset.png
    A doc/images/popular-resource.png
    A doc/images/sort-datasets-by-popularity.png
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/paster.rst
    M doc/post-installation.rst
    A doc/tracking.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 531-data-viewer-docs


Compare: https://github.com/okfn/ckan/compare/32aa746365e7...0dfbc87cbd88


More information about the ckan-changes mailing list