[ckan-changes] [okfn/ckan] 729ff8: Pass activity and context to activity_stream_strin...

GitHub noreply at github.com
Thu May 30 05:11:30 UTC 2013 

  Branch: refs/heads/356-auth-create-user-option
  Home:   https://github.com/okfn/ckan
  Commit: 729ff8f3c688a3d435c921c68b7b34dff073ca14
      https://github.com/okfn/ckan/commit/729ff8f3c688a3d435c921c68b7b34dff073ca14
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M ckan/lib/activity_streams.py

  Log Message:
  -----------
  Pass activity and context to activity_stream_string functions


  Commit: b8bfdf5c2dcf3188b921c03bf8e2ef562958b4b6
      https://github.com/okfn/ckan/commit/b8bfdf5c2dcf3188b921c03bf8e2ef562958b4b6
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

  Changed paths:
    M ckan/lib/activity_streams.py

  Log Message:
  -----------
  Change the text of the activity stream string


  Commit: 5c1170efd1fcdf4c9f37611ff462e6785397bc75
      https://github.com/okfn/ckan/commit/5c1170efd1fcdf4c9f37611ff462e6785397bc75
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-01-20 (Sun, 20 Jan 2013)

  Changed paths:
    A .travis.yml
    M README.rst
    M ckan/__init__.py
    M ckan/logic/action/get.py
    M ckan/templates/macros/form.html
    M ckan/templates/snippets/package_item.html
    M doc/test.rst

  Log Message:
  -----------
  Merge branch 'master' into 283-activity-stream-fixes


  Commit: 635d1d8190d4b46893fd780e438ff1a7ccbc8b9b
      https://github.com/okfn/ckan/commit/635d1d8190d4b46893fd780e438ff1a7ccbc8b9b
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M ckan/lib/activity_streams.py

  Log Message:
  -----------
  Fix activity name, correct function all, and remove print statement


  Commit: b9fdf29cebfaee21d5f825ef8c28427816cb6075
      https://github.com/okfn/ckan/commit/b9fdf29cebfaee21d5f825ef8c28427816cb6075
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

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

  Log Message:
  -----------
  Add code to create an activity


  Commit: 5ef3f1671dab2ba66b76ad626c6b56f74de946be
      https://github.com/okfn/ckan/commit/5ef3f1671dab2ba66b76ad626c6b56f74de946be
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  Create validator for new activity


  Commit: c296f375164fefd11ee22051e5c024486c6676bc
      https://github.com/okfn/ckan/commit/c296f375164fefd11ee22051e5c024486c6676bc
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

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

  Log Message:
  -----------
  test for create, update, and delete related item


  Commit: fda40076b7092863ef729aa2455a6aabf5c8f083
      https://github.com/okfn/ckan/commit/fda40076b7092863ef729aa2455a6aabf5c8f083
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

  Changed paths:
    A CONTRIBUTING.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.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/update.py
    M ckan/model/group.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/profile.less
    M ckan/templates/ajax_snippets/popover_context_dataset.html
    M ckan/templates/ajax_snippets/popover_context_group.html
    M ckan/templates/ajax_snippets/popover_context_user.html
    M ckan/templates/group/read_base.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/models/test_group.py
    M ckanext/datastore/bin/datastore_setup.py
    R doc/contributing-docs.rst
    R doc/contributing.rst
    M doc/datastore-setup.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/solr-setup.rst

  Log Message:
  -----------
  Merge branch 'master' into 283-activity-stream-fixes


  Commit: 9168b8cdc5285455edd9f3f2b7cabf8094a79255
      https://github.com/okfn/ckan/commit/9168b8cdc5285455edd9f3f2b7cabf8094a79255
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

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

  Log Message:
  -----------
  Remove print statement and ignore_auth


  Commit: 567a53eaf6d164c3c8d1a2642f622f64bc527499
      https://github.com/okfn/ckan/commit/567a53eaf6d164c3c8d1a2642f622f64bc527499
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-02-02 (Sat, 02 Feb 2013)

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

  Log Message:
  -----------
  fix nits, check for datasets


  Commit: c451237c9b79da5306726d36336c624146345bf0
      https://github.com/okfn/ckan/commit/c451237c9b79da5306726d36336c624146345bf0
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-02-02 (Sat, 02 Feb 2013)

  Changed paths:
    M .gitignore
    M README.rst
    M ckan/lib/helpers.py
    M ckan/model/__init__.py
    M ckan/model/meta.py
    M ckan/tests/__init__.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  Merge branch 'master' into 283-activity-stream-fixes


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

  Changed paths:
    A ckan/templates/package/history.html
    A ckan/templates/package/snippets/history_revisions.html
    A ckan/templates/package/snippets/revisions_table.html

  Log Message:
  -----------
  [#368] Ported revision history page to new template system


  Commit: fca5f2828b44d9b0e2c9177ba9b6e54387215b4c
      https://github.com/okfn/ckan/commit/fca5f2828b44d9b0e2c9177ba9b6e54387215b4c
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

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

  Log Message:
  -----------
  Fix a few more styling nitpicks


  Commit: 7b71f6bf0e651088eef219da970b4fc7d0746a74
      https://github.com/okfn/ckan/commit/7b71f6bf0e651088eef219da970b4fc7d0746a74
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

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

  Log Message:
  -----------
  Merge branch 'master' into 283-activity-stream-fixes


  Commit: 9dd51d21bd9a1ac0b41604c4ac5d6e9e84e13c2b
      https://github.com/okfn/ckan/commit/9dd51d21bd9a1ac0b41604c4ac5d6e9e84e13c2b
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

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

  Log Message:
  -----------
  Remove the apikey variable


  Commit: aee95d715b0fd2d20ed8858259dddc791b75dccb
      https://github.com/okfn/ckan/commit/aee95d715b0fd2d20ed8858259dddc791b75dccb
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-02-19 (Tue, 19 Feb 2013)

  Changed paths:
    M ckan/lib/activity_streams.py

  Log Message:
  -----------
  Change the if condition around


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

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

  Log Message:
  -----------
  [#368] Refactor truncate in revisions table


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

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

  Log Message:
  -----------
  [#368] Revisions table should not be condensed which would otherwise lead to display errors with in radio buttons


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

  Changed paths:
    A ckan/templates/revision/__init__.py

  Log Message:
  -----------
  [#368] New templates for revisions


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

  Changed paths:
    A ckan/templates/revision/diff.html

  Log Message:
  -----------
  [#368] New template for revision diff


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

  Changed paths:
    A ckan/templates/revision/read.html

  Log Message:
  -----------
  [#368] New template for revision read


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

  Changed paths:
    A ckan/templates/revision/list.html
    A ckan/templates/revision/snippets/revisions_list.html

  Log Message:
  -----------
  [#368] New template for revision list


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

  Changed paths:
    A ckan/templates/group/history.html
    A ckan/templates/group/snippets/history_revisions.html
    A ckan/templates/group/snippets/revisions_table.html

  Log Message:
  -----------
  [#368] New template for group history


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

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

  Log Message:
  -----------
  Merge remote-tracking branch 'okfn/master' into 368-new-history-page


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

  Changed paths:
    M ckan/templates/revision/read.html

  Log Message:
  -----------
  [#368] Fix display of action buttons for revisions which broke after I merged in the latest master with new bootstrap.


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

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

  Log Message:
  -----------
  [#368] Add `num_followers` after validating the group_dict against a schema.
This makes sure that is still there and is necessary because we require a schema in controllers.group.history but there is no `num_followers` field in logic.schema.default_group_schema.


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

  Changed paths:
    M ckan/lib/navl/validators.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#368] Add `num_followers` to group schema


  Commit: 5e77d3a133e0be5efde97e8b930f9db2a47acc40
      https://github.com/okfn/ckan/commit/5e77d3a133e0be5efde97e8b930f9db2a47acc40
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-02-22 (Fri, 22 Feb 2013)

  Changed paths:
    M .travis.yml
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    R ckan/controllers/datastore.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    A ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/model/group_extra.py
    M ckan/model/package_extra.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/public/base/css/main.css
    A ckan/public/base/images/bg.png
    M ckan/public/base/images/ckan-logo-footer.png
    M ckan/public/base/images/ckan-logo.png
    M ckan/public/base/images/dashboard-followee-related.png
    A ckan/public/base/images/nav-active.png
    A ckan/public/base/images/nav.png
    M ckan/public/base/images/placeholder-application.png
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-image.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/javascript/modules/dashboard.js
    M ckan/public/base/javascript/modules/popover-context.js
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/dataset.less
    R ckan/public/base/less/follower-list.less
    A ckan/public/base/less/font-awesome.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    A ckan/public/base/less/homepage.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/main.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/less/variables.less
    R ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings-white.png
    R ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    A ckan/public/base/vendor/bootstrap/js/.jshintrc
    R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-button.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-button.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    M ckan/public/base/vendor/bootstrap/less/accordion.less
    M ckan/public/base/vendor/bootstrap/less/alerts.less
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/breadcrumbs.less
    M ckan/public/base/vendor/bootstrap/less/button-groups.less
    M ckan/public/base/vendor/bootstrap/less/buttons.less
    M ckan/public/base/vendor/bootstrap/less/carousel.less
    M ckan/public/base/vendor/bootstrap/less/close.less
    M ckan/public/base/vendor/bootstrap/less/code.less
    M ckan/public/base/vendor/bootstrap/less/component-animations.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/forms.less
    M ckan/public/base/vendor/bootstrap/less/grid.less
    M ckan/public/base/vendor/bootstrap/less/hero-unit.less
    M ckan/public/base/vendor/bootstrap/less/labels-badges.less
    M ckan/public/base/vendor/bootstrap/less/layouts.less
    A ckan/public/base/vendor/bootstrap/less/media.less
    M ckan/public/base/vendor/bootstrap/less/mixins.less
    M ckan/public/base/vendor/bootstrap/less/modals.less
    M ckan/public/base/vendor/bootstrap/less/navbar.less
    M ckan/public/base/vendor/bootstrap/less/navs.less
    M ckan/public/base/vendor/bootstrap/less/pager.less
    M ckan/public/base/vendor/bootstrap/less/pagination.less
    M ckan/public/base/vendor/bootstrap/less/popovers.less
    M ckan/public/base/vendor/bootstrap/less/progress-bars.less
    M ckan/public/base/vendor/bootstrap/less/reset.less
    M ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
    M ckan/public/base/vendor/bootstrap/less/responsive-767px-max.less
    M ckan/public/base/vendor/bootstrap/less/responsive-768px-979px.less
    M ckan/public/base/vendor/bootstrap/less/responsive-navbar.less
    M ckan/public/base/vendor/bootstrap/less/responsive-utilities.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/bootstrap/less/scaffolding.less
    M ckan/public/base/vendor/bootstrap/less/sprites.less
    M ckan/public/base/vendor/bootstrap/less/tables.less
    A ckan/public/base/vendor/bootstrap/less/tests/buttons.html
    A ckan/public/base/vendor/bootstrap/less/tests/css-tests.css
    A ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
    A ckan/public/base/vendor/bootstrap/less/tests/forms-responsive.html
    A ckan/public/base/vendor/bootstrap/less/tests/forms.html
    A ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    A ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
    A ckan/public/base/vendor/bootstrap/less/tests/navbar.html
    M ckan/public/base/vendor/bootstrap/less/thumbnails.less
    M ckan/public/base/vendor/bootstrap/less/tooltip.less
    M ckan/public/base/vendor/bootstrap/less/type.less
    M ckan/public/base/vendor/bootstrap/less/utilities.less
    M ckan/public/base/vendor/bootstrap/less/variables.less
    M ckan/public/base/vendor/bootstrap/less/wells.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    M ckan/public/base/vendor/resource.config
    R ckan/templates/admin/authz.html
    A ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/confirm_reset.html
    M ckan/templates/admin/index.html
    R ckan/templates/admin/snippets/header.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/snippets/list.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/toolbar.html
    M ckan/templates/error_document_template.html
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/index.html
    M ckan/templates/group/members.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/header.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    A ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    R ckan/templates/package/resource_api_data.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    R ckan/templates/package/snippets/back_to_package_action.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    A ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/context.html
    M ckan/templates/snippets/context/dataset.html
    M ckan/templates/snippets/context/group.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/social.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    A ckan/templates/user/edit_base.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/list.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/back_to_user_action.html
    M ckan/templates/user/snippets/followers.html
    M ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    M ckan/tests/ckantestplugin/setup.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_email_notifications.py
    M ckan/tests/functional/test_activity.py
    R ckan/tests/functional/test_datastore.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_storage.py
    M ckan/tests/functional/test_upload.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/bin/datastore_setup.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/jsonpreview/tests/test_preview.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M ckanext/resourceproxy/tests/file_server.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/tests/__init__.py
    M ckanext/stats/tests/test_stats_lib.py
    M doc/writing-extensions.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 283-activity-stream-fixes


  Commit: dd491f08cba5aa4bddd359c37aef7c44dc200b9e
      https://github.com/okfn/ckan/commit/dd491f08cba5aa4bddd359c37aef7c44dc200b9e
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-02-22 (Fri, 22 Feb 2013)

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

  Log Message:
  -----------
  first cut at splitting the tests


  Commit: 007277e6e56f4b70711a7ab47f3d95ebc1bb2e42
      https://github.com/okfn/ckan/commit/007277e6e56f4b70711a7ab47f3d95ebc1bb2e42
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M .travis.yml
    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/tag.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/064_add_email_last_sent_column.py
    M ckan/model/group.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/images/nav-active.png
    M ckan/public/base/images/placeholder-application.png
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-image.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/toolbar.less
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/index.html
    M ckan/templates/group/read_base.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/search.html
    M ckan/templates/page.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/read_base.html
    M ckan/templates_legacy/package/search.html
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_group.py
    M ckan/tests/functional/api/model/test_licenses.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_ratings.py
    M ckan/tests/functional/api/model/test_relationships.py
    M ckan/tests/functional/api/model/test_revisions.py
    M ckan/tests/functional/api/model/test_tag.py
    M ckan/tests/functional/api/test_api.py
    M ckan/tests/functional/api/test_misc.py
    M ckan/tests/functional/api/test_package_search.py
    M ckan/tests/functional/api/test_resource_search.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/models/test_group.py
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_unit.py
    A ckanext/example_itemplatehelpers/__init__.py
    A ckanext/example_itemplatehelpers/plugin.py
    A ckanext/example_itemplatehelpers/templates/home/index.html
    M ckanext/jsonpreview/tests/test_preview.py
    M ckanext/multilingual/plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/resourceproxy/controller.py
    M pip-requirements-test.txt
    M pip-requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 283-activity-stream-fixes


  Commit: 9e4be30c9e4c563722cffc14e2d4ea8ac251111c
      https://github.com/okfn/ckan/commit/9e4be30c9e4c563722cffc14e2d4ea8ac251111c
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

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

  Log Message:
  -----------
  Dictize only if absolutely necessary


  Commit: 78ffa07458a66cc54f3926c7eb79e634566da71a
      https://github.com/okfn/ckan/commit/78ffa07458a66cc54f3926c7eb79e634566da71a
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

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

  Log Message:
  -----------
  Split the tests nicely


  Commit: 5c5daf6ea7a324f4d82ca9a1beda2e07bf09c0c6
      https://github.com/okfn/ckan/commit/5c5daf6ea7a324f4d82ca9a1beda2e07bf09c0c6
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

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

  Log Message:
  -----------
  Add ignore_auth=True to activity_create call.

ignore_auth=True was missing causing tests to fail.


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

  Changed paths:
    M CHANGELOG.txt

  Log Message:
  -----------
  First stab at updating the CHANGELOG for 2.0

Probably more to do here..


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

  Changed paths:
    M .travis.yml
    M bin/osx-postgres-mem.sh
    M doc/install-from-source.rst
    M test-core.ini

  Log Message:
  -----------
  [#517] First try on a separate testing db


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

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  [#517] sed the fixes


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

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  [#517] Stupid config files suck


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

  Changed paths:
    M test-core.ini

  Log Message:
  -----------
  [#517] Make Dominik happy plus minor re addition


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

  Changed paths:
    M .travis.yml
    M test-core.ini

  Log Message:
  -----------
  [#517] remove the development.ini dependency


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

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  [#517] Grrrrrrrrrrrrrrrrrrrrrrrrrrrrr


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

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  [#517] Travis specify the config


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

  Changed paths:
    M test-core.ini

  Log Message:
  -----------
  [#517] Tests need beaker secret key


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

  Changed paths:
    M .travis.yml
    M bin/osx-postgres-mem.sh
    M ckan/config/deployment.ini_tmpl
    M doc/install-from-source.rst
    M test-core.ini

  Log Message:
  -----------
  [#517]  Rename databases to ckan_dev and ckan_test


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

  Changed paths:
    M ckan/lib/navl/validators.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py

  Log Message:
  -----------
  Revert "[#368] Add `num_followers` to group schema"

This reverts commit c7bc31565811444ef225d3716a6b43d761801b9d.


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

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

  Log Message:
  -----------
  Revert "[#368] Add `num_followers` after validating the group_dict against a schema."

This reverts commit c81edd2572d56b0a74c82eb76a7f97cafc3ac9c4.


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

  Changed paths:
    M .travis.yml
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    R ckan/controllers/datastore.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/maintain.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/027_adjust_harvester.py
    M ckan/migration/versions/045_user_name_unique.py
    M ckan/migration/versions/064_add_email_last_sent_column.py
    A ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/model/group.py
    M ckan/model/group_extra.py
    M ckan/model/package_extra.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    R ckan/public/base/css/fuchsia.min.css
    R ckan/public/base/css/green.min.css
    M ckan/public/base/css/main.css
    R ckan/public/base/css/main.min.css
    R ckan/public/base/css/maroon.min.css
    R ckan/public/base/css/red.min.css
    R ckan/public/base/i18n/bg.min.js
    R ckan/public/base/i18n/ca.min.js
    R ckan/public/base/i18n/cs_CZ.min.js
    R ckan/public/base/i18n/de.min.js
    R ckan/public/base/i18n/el.min.js
    R ckan/public/base/i18n/es.min.js
    R ckan/public/base/i18n/fi.min.js
    R ckan/public/base/i18n/fr.min.js
    R ckan/public/base/i18n/hu.min.js
    R ckan/public/base/i18n/it.min.js
    R ckan/public/base/i18n/lt.min.js
    R ckan/public/base/i18n/lv.min.js
    R ckan/public/base/i18n/nl.min.js
    R ckan/public/base/i18n/no.min.js
    R ckan/public/base/i18n/pl.min.js
    R ckan/public/base/i18n/pt_BR.min.js
    R ckan/public/base/i18n/ro.min.js
    R ckan/public/base/i18n/ru.min.js
    R ckan/public/base/i18n/sk.min.js
    R ckan/public/base/i18n/sl.min.js
    R ckan/public/base/i18n/sq.min.js
    R ckan/public/base/i18n/sr.min.js
    R ckan/public/base/i18n/sr_Latn.min.js
    R ckan/public/base/i18n/sv.min.js
    R ckan/public/base/i18n/zh_TW.min.js
    A ckan/public/base/images/bg.png
    M ckan/public/base/images/dashboard-followee-related.png
    A ckan/public/base/images/nav-active.png
    A ckan/public/base/images/nav.png
    M ckan/public/base/images/placeholder-application.png
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-image.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/javascript/client.js
    R ckan/public/base/javascript/client.min.js
    R ckan/public/base/javascript/i18n.min.js
    M ckan/public/base/javascript/main.js
    R ckan/public/base/javascript/main.min.js
    R ckan/public/base/javascript/module.min.js
    R ckan/public/base/javascript/modules/api-info.min.js
    M ckan/public/base/javascript/modules/autocomplete.js
    R ckan/public/base/javascript/modules/autocomplete.min.js
    R ckan/public/base/javascript/modules/basic-form.min.js
    R ckan/public/base/javascript/modules/confirm-action.min.js
    R ckan/public/base/javascript/modules/custom-fields.min.js
    M ckan/public/base/javascript/modules/dashboard.js
    R ckan/public/base/javascript/modules/dashboard.min.js
    R ckan/public/base/javascript/modules/data-viewer.min.js
    R ckan/public/base/javascript/modules/follow.min.js
    R ckan/public/base/javascript/modules/related-item.min.js
    R ckan/public/base/javascript/modules/resource-form.min.js
    R ckan/public/base/javascript/modules/resource-upload-field.min.js
    R ckan/public/base/javascript/modules/select-switch.min.js
    R ckan/public/base/javascript/modules/slug-preview.min.js
    A ckan/public/base/javascript/modules/table-selectable-rows.js
    R ckan/public/base/javascript/notify.min.js
    R ckan/public/base/javascript/plugins/jquery.date-helpers.min.js
    R ckan/public/base/javascript/plugins/jquery.form-warning.min.js
    R ckan/public/base/javascript/plugins/jquery.inherit.min.js
    R ckan/public/base/javascript/plugins/jquery.proxy-all.min.js
    R ckan/public/base/javascript/plugins/jquery.slug-preview.min.js
    R ckan/public/base/javascript/plugins/jquery.slug.min.js
    R ckan/public/base/javascript/plugins/jquery.truncator.min.js
    R ckan/public/base/javascript/plugins/jquery.url-helpers.min.js
    R ckan/public/base/javascript/pubsub.min.js
    M ckan/public/base/javascript/resource.config
    R ckan/public/base/javascript/sandbox.min.js
    R ckan/public/base/javascript/tracking.min.js
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/dataset.less
    R ckan/public/base/less/follower-list.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    A ckan/public/base/less/homepage.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/profile.less
    A ckan/public/base/less/tables.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/less/variables.less
    R ckan/public/base/test/spec/ckan.spec.min.js
    R ckan/public/base/test/spec/client.spec.min.js
    R ckan/public/base/test/spec/module.spec.min.js
    R ckan/public/base/test/spec/modules/autocomplete.spec.min.js
    R ckan/public/base/test/spec/modules/basic-form.spec.min.js
    R ckan/public/base/test/spec/modules/confirm-action.spec.min.js
    R ckan/public/base/test/spec/modules/custom-fields.spec.min.js
    R ckan/public/base/test/spec/modules/related-item.spec.min.js
    R ckan/public/base/test/spec/modules/resource-form.spec.min.js
    R ckan/public/base/test/spec/modules/resource-upload-field.spec.min.js
    R ckan/public/base/test/spec/notify.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.date-helpers.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.form-warning.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.inherit.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.proxy-all.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.slug-preview.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.slug.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.url-helpers.spec.min.js
    R ckan/public/base/test/spec/pubsub.spec.min.js
    R ckan/public/base/test/spec/sandbox.spec.min.js
    R ckan/templates/admin/authz.html
    A ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/confirm_reset.html
    M ckan/templates/admin/index.html
    R ckan/templates/admin/snippets/header.html
    M ckan/templates/error_document_template.html
    M ckan/templates/group/about.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/index.html
    M ckan/templates/group/members.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/header.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/base_form_page.html
    A ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    A ckan/templates/organization/snippets/help.html
    M ckan/templates/organization/snippets/organization_item.html
    A ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    R ckan/templates/package/resource_api_data.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    R ckan/templates/package/snippets/back_to_package_action.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/info.html
    A ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/page.html
    M ckan/templates/snippets/context.html
    M ckan/templates/snippets/context/dataset.html
    M ckan/templates/snippets/context/group.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    A ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    A ckan/templates/user/edit_base.html
    M ckan/templates/user/list.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/back_to_user_action.html
    M ckan/templates/user/snippets/followers.html
    M ckan/templates_legacy/package/search.html
    M ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    M ckan/tests/ckantestplugin/setup.py
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_group.py
    M ckan/tests/functional/api/model/test_licenses.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_ratings.py
    M ckan/tests/functional/api/model/test_relationships.py
    M ckan/tests/functional/api/model/test_revisions.py
    M ckan/tests/functional/api/model/test_tag.py
    M ckan/tests/functional/api/test_api.py
    M ckan/tests/functional/api/test_email_notifications.py
    M ckan/tests/functional/api/test_misc.py
    M ckan/tests/functional/api/test_package_search.py
    M ckan/tests/functional/api/test_resource_search.py
    M ckan/tests/functional/test_activity.py
    R ckan/tests/functional/test_datastore.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_storage.py
    M ckan/tests/functional/test_upload.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_group.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/bin/datastore_setup.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    A ckanext/example_itemplatehelpers/__init__.py
    A ckanext/example_itemplatehelpers/plugin.py
    A ckanext/example_itemplatehelpers/templates/home/index.html
    M ckanext/jsonpreview/tests/test_preview.py
    R ckanext/jsonpreview/theme/public/css/json.min.css
    R ckanext/jsonpreview/theme/public/preview_json.min.js
    M ckanext/multilingual/plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    R ckanext/pdfpreview/theme/public/css/pdf.min.css
    R ckanext/pdfpreview/theme/public/css/recline.min.css
    R ckanext/pdfpreview/theme/public/preview_pdf.min.js
    M ckanext/reclinepreview/tests/test_preview.py
    R ckanext/reclinepreview/theme/public/css/recline.min.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/file_server.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/tests/__init__.py
    M ckanext/stats/tests/test_stats_lib.py
    M doc/writing-extensions.rst
    M pip-requirements-test.txt
    M pip-requirements.txt
    M setup.py
    M test-core.ini

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


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

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#368] Use the correct schema to validate against in controllers.group.history


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

  Changed paths:
    A ckan/templates/package/history.html
    A ckan/templates/package/snippets/history_revisions.html
    A ckan/templates/package/snippets/revisions_table.html

  Log Message:
  -----------
  [#368] Ported revision history page to new template system


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

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

  Log Message:
  -----------
  [#368] Refactor truncate in revisions table


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

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

  Log Message:
  -----------
  [#368] Revisions table should not be condensed which would otherwise lead to display errors with in radio buttons


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

  Changed paths:
    A ckan/templates/revision/__init__.py

  Log Message:
  -----------
  [#368] New templates for revisions


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

  Changed paths:
    A ckan/templates/revision/diff.html

  Log Message:
  -----------
  [#368] New template for revision diff


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

  Changed paths:
    A ckan/templates/revision/read.html

  Log Message:
  -----------
  [#368] New template for revision read


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

  Changed paths:
    A ckan/templates/revision/list.html
    A ckan/templates/revision/snippets/revisions_list.html

  Log Message:
  -----------
  [#368] New template for revision list


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

  Changed paths:
    A ckan/templates/group/history.html
    A ckan/templates/group/snippets/history_revisions.html
    A ckan/templates/group/snippets/revisions_table.html

  Log Message:
  -----------
  [#368] New template for group history


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

  Changed paths:
    M ckan/templates/revision/read.html

  Log Message:
  -----------
  [#368] Fix display of action buttons for revisions which broke after I merged in the latest master with new bootstrap.


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

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#368] Use the correct schema to validate against in controllers.group.history


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

  Changed paths:
    M ckan/templates/group/snippets/revisions_table.html

  Log Message:
  -----------
  [#368] Groups do not support reading them as of a certain date. So let's not link to it in the revisions table.


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

  Changed paths:
    M ckan/templates/revision/diff.html
    M ckan/templates/revision/list.html
    M ckan/templates/revision/read.html
    A ckan/templates/revision/read_base.html

  Log Message:
  -----------
  [#368] Show sidebar on revisions pages


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

  Changed paths:
    M test-core.ini

  Log Message:
  -----------
  [#517] Remove unwanted comment


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

  Changed paths:
    M test-core.ini

  Log Message:
  -----------
  [#517] Remove another unwanted comment


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

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

  Log Message:
  -----------
  [#517] Update testing doc


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

  Changed paths:
    M ckan/lib/activity_streams.py

  Log Message:
  -----------
  Display dataset on the activity stream


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

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

  Log Message:
  -----------
  Add the dataset to the resource_update activity_dict


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

  Changed paths:
    M .travis.yml
    A bin/travis-build
    A ckan/common.py
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    R ckan/lib/authztool.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dumper.py
    M ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/jsonp.py
    M ckan/lib/mailer.py
    M ckan/lib/plugins.py
    M ckan/lib/repoze_patch.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/022_add_group_extras.py
    M ckan/migration/versions/029_version_groups.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    R ckan/public/base/css/fuchsia.min.css
    R ckan/public/base/css/green.min.css
    M ckan/public/base/css/main.css
    R ckan/public/base/css/main.min.css
    R ckan/public/base/css/maroon.min.css
    R ckan/public/base/css/red.min.css
    R ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
    R ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckan/public/base/i18n/bg.min.js
    R ckan/public/base/i18n/ca.min.js
    R ckan/public/base/i18n/cs_CZ.min.js
    R ckan/public/base/i18n/de.min.js
    R ckan/public/base/i18n/el.min.js
    R ckan/public/base/i18n/es.min.js
    R ckan/public/base/i18n/fi.min.js
    R ckan/public/base/i18n/fr.min.js
    R ckan/public/base/i18n/hu.min.js
    R ckan/public/base/i18n/it.min.js
    R ckan/public/base/i18n/lt.min.js
    R ckan/public/base/i18n/lv.min.js
    R ckan/public/base/i18n/nl.min.js
    R ckan/public/base/i18n/no.min.js
    R ckan/public/base/i18n/pl.min.js
    R ckan/public/base/i18n/pt_BR.min.js
    R ckan/public/base/i18n/ro.min.js
    R ckan/public/base/i18n/ru.min.js
    R ckan/public/base/i18n/sk.min.js
    R ckan/public/base/i18n/sl.min.js
    R ckan/public/base/i18n/sq.min.js
    R ckan/public/base/i18n/sr.min.js
    R ckan/public/base/i18n/sr_Latn.min.js
    R ckan/public/base/i18n/sv.min.js
    R ckan/public/base/i18n/zh_TW.min.js
    A ckan/public/base/images/table-seperator.png
    R ckan/public/base/javascript/client.min.js
    R ckan/public/base/javascript/i18n.min.js
    R ckan/public/base/javascript/main.min.js
    R ckan/public/base/javascript/module.min.js
    R ckan/public/base/javascript/modules/api-info.min.js
    R ckan/public/base/javascript/modules/autocomplete.min.js
    R ckan/public/base/javascript/modules/basic-form.min.js
    R ckan/public/base/javascript/modules/confirm-action.min.js
    R ckan/public/base/javascript/modules/custom-fields.min.js
    R ckan/public/base/javascript/modules/dashboard.min.js
    R ckan/public/base/javascript/modules/data-viewer.min.js
    R ckan/public/base/javascript/modules/follow.min.js
    R ckan/public/base/javascript/modules/related-item.min.js
    R ckan/public/base/javascript/modules/resource-form.min.js
    R ckan/public/base/javascript/modules/resource-upload-field.min.js
    R ckan/public/base/javascript/modules/select-switch.min.js
    R ckan/public/base/javascript/modules/slug-preview.min.js
    A ckan/public/base/javascript/modules/table-toggle-more.js
    R ckan/public/base/javascript/notify.min.js
    R ckan/public/base/javascript/plugins/jquery.date-helpers.min.js
    R ckan/public/base/javascript/plugins/jquery.form-warning.min.js
    R ckan/public/base/javascript/plugins/jquery.inherit.min.js
    R ckan/public/base/javascript/plugins/jquery.proxy-all.min.js
    R ckan/public/base/javascript/plugins/jquery.slug-preview.min.js
    R ckan/public/base/javascript/plugins/jquery.slug.min.js
    R ckan/public/base/javascript/plugins/jquery.truncator.min.js
    R ckan/public/base/javascript/plugins/jquery.url-helpers.min.js
    R ckan/public/base/javascript/pubsub.min.js
    M ckan/public/base/javascript/resource.config
    R ckan/public/base/javascript/sandbox.min.js
    R ckan/public/base/javascript/tracking.min.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/tables.less
    M ckan/public/base/less/variables.less
    R ckan/public/base/test/spec/ckan.spec.min.js
    R ckan/public/base/test/spec/client.spec.min.js
    R ckan/public/base/test/spec/module.spec.min.js
    R ckan/public/base/test/spec/modules/autocomplete.spec.min.js
    R ckan/public/base/test/spec/modules/basic-form.spec.min.js
    R ckan/public/base/test/spec/modules/confirm-action.spec.min.js
    R ckan/public/base/test/spec/modules/custom-fields.spec.min.js
    R ckan/public/base/test/spec/modules/related-item.spec.min.js
    R ckan/public/base/test/spec/modules/resource-form.spec.min.js
    R ckan/public/base/test/spec/modules/resource-upload-field.spec.min.js
    R ckan/public/base/test/spec/notify.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.date-helpers.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.form-warning.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.inherit.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.proxy-all.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.slug-preview.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.slug.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.url-helpers.spec.min.js
    R ckan/public/base/test/spec/pubsub.spec.min.js
    R ckan/public/base/test/spec/sandbox.spec.min.js
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/error_document_template.html
    M ckan/templates/footer.html
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/home/snippets/about_text.html
    A ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/snippets/related_form.html
    M ckan/templates/snippets/datapreview_embed_dialog.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    R ckan/templates/snippets/page_header.html
    M ckan/templates/snippets/popular.html
    M ckan/templates/snippets/related.html
    A ckan/templates/snippets/search_result_text.html
    M ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_solr_search_index.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/misc/test_sync.py
    R ckan/tests/mock_publisher_auth.py
    M ckan/tests/test_dumper.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    R ckanext/jsonpreview/theme/public/css/json.min.css
    R ckanext/jsonpreview/theme/public/preview_json.min.js
    R ckanext/pdfpreview/theme/public/css/pdf.min.css
    R ckanext/pdfpreview/theme/public/css/recline.min.css
    R ckanext/pdfpreview/theme/public/preview_pdf.min.js
    R ckanext/publisher_form/__init__.py
    R ckanext/publisher_form/forms.py
    R ckanext/publisher_form/templates/dataset_form.html
    R ckanext/publisher_form/templates/publisher_form.html
    R ckanext/publisher_form/templates/publisher_index.html
    R ckanext/publisher_form/templates/publisher_layout.html
    R ckanext/publisher_form/templates/publisher_new.html
    R ckanext/publisher_form/templates/publisher_read.html
    R ckanext/reclinepreview/theme/public/css/recline.min.css
    R doc/api-tutorial.rst
    R doc/api-util.rst
    R doc/api-v2.rst
    M doc/api.rst
    R doc/apiv3.rst
    M doc/architecture.rst
    A doc/ckan.logic.action.create.rst
    A doc/ckan.logic.action.delete.rst
    A doc/ckan.logic.action.get.rst
    A doc/ckan.logic.action.update.rst
    M doc/conf.py
    M doc/datastore-api.rst
    A doc/filestore-api.rst
    M doc/filestore.rst
    M doc/index.rst
    M doc/install-from-source.rst
    A doc/legacy-api.rst
    M doc/loading-data.rst
    M doc/multilingual.rst
    M doc/python-coding-standards.rst
    M doc/tag-vocabularies.rst
    M pip-requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 517-test-db

Conflicts:
	.travis.yml

    move to bin/travis-build


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

  Changed paths:
    M ckan/templates/group/snippets/revisions_table.html
    M ckan/templates/revision/diff.html
    M ckan/templates/revision/list.html
    M ckan/templates/revision/read.html
    A ckan/templates/revision/read_base.html

  Log Message:
  -----------
  Merge branch '368-new-history-page-2' of github.com:okfn/ckan into 368-new-history-page-2

Conflicts:
	ckan/templates/group/snippets/revisions_table.html
	ckan/templates/revision/diff.html
	ckan/templates/revision/list.html
	ckan/templates/revision/read.html


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

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

  Log Message:
  -----------
  Use the activity api for the tests


  Commit: 76f15609506ace9b947efacdc2a9cbf5a0f94916
      https://github.com/okfn/ckan/commit/76f15609506ace9b947efacdc2a9cbf5a0f94916
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

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

  Log Message:
  -----------
  Merge branch 'master' into 283-activity-stream-fixes


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

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#517] Debug patch


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

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#517] Update correct config


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

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#517] Use correct config for paster


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

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#517] Does this work?


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

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#517] Actually import the requirements


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

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#517] Hopefully this fixes 8.4 tests


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

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#517] Remove datastore.read_url for 8.4


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

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#517] This may be a better fix I hate shell scripts


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

  Changed paths:
    M ckan/model/tag.py

  Log Message:
  -----------
  [#368] Return utf-8 encoded string from __repr__ so that pprint which calls repr() does not choke on unicode characters in tags


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

  Changed paths:
    M doc/authorization.rst

  Log Message:
  -----------
  [#530] authz docs take 1


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

  Changed paths:
    R doc/publisher-profile.rst

  Log Message:
  -----------
  [#530] remove publisher profile doc


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

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#517] Bash?


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

  Changed paths:
    A ckanext/datastore/controller.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_dump.py
    M doc/datastore-api.rst

  Log Message:
  -----------
  [#628] Implement a way to dump a whole datastore resource as csv


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

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

  Log Message:
  -----------
  Use normal user in datastore search tests


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

  Changed paths:
    M pip-requirements.txt

  Log Message:
  -----------
  [#628] Add unicodecsv requirement


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

  Changed paths:
    M ckan/logic/validators.py
    M ckan/templates/package/snippets/package_basic_fields.html

  Log Message:
  -----------
  [#664] Fix Group selector in dataset forms


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

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

  Log Message:
  -----------
  [#669] Fix member_list call when given valid group name.

Now returns lists of (id, type, capacity) tuples
where type is a string. Previously, type was a
Python class object which could not always be
serialized to JSON in the API controller.


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

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

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


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

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

  Log Message:
  -----------
  [#669] Raise NotFound if group is not found in member_list.

Allows a proper error to be generated in the API
controller instead of just giving a 500 error.


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

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

  Log Message:
  -----------
  [#669] Tidy up imports


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

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Initial clean of extensions.rst


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

  Changed paths:
    M doc/writing-extensions.rst

  Log Message:
  -----------
  [#523] Edit writing-extensions.rst part I


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

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

  Log Message:
  -----------
  [#686] Fix datastore validation error


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

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  [#691] Remove fq on legacy search API and force public datasets

Even if it is a backwards breaking change we sholdn't be allowing the fq
parameter to be set through the API as it can lead to privacy issues. We
will also enforce that all datasets available through the API are public
(as the v3 API does)


  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: 191503abcd53e0b49e4ad22c41cfd96bc1e01ff8
      https://github.com/okfn/ckan/commit/191503abcd53e0b49e4ad22c41cfd96bc1e01ff8
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    R doc/about.rst

  Log Message:
  -----------
  Delete the about page (Fixes #539)


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

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

  Log Message:
  -----------
  [#517] Clarify custom db sqlalchemy.url setting


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

  Changed paths:
    M doc/test.rst

  Log Message:
  -----------
  [#517] Typo


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

  Changed paths:
    M CHANGELOG.txt

  Log Message:
  -----------
  CHANGELOG tweaks suggested in pr


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

  Changed paths:
    M CHANGELOG.txt

  Log Message:
  -----------
  Add some more stuff to the changelog


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

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

  Log Message:
  -----------
  [#368] Move package_revision_info block and fix wrong tag (div->p) to make the sidebar float correctly on package read pages if a certain revision of a package is requested


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

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#642] Log possible problems with the datastore permission checks instead of raising an exception.
If postgres is set to a language other than english, some strings might not occur in the error message returned from the database. This change makes the checks less strict but in almost all cases, this should not be a problem because the only error raised during executing of the permission check statements are (expected) permission errors.


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

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

  Log Message:
  -----------
  Merge branch 'master' into 283-activity-stream-fixes


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

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

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

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


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

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

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

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


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

  Changed paths:
    M ckanext/datastore/bin/set_permissions.sql

  Log Message:
  -----------
  [#701] Use double quotes instead of single for database names.


  Commit: 603ac47679adfe3ec1c33bc70be4abaeececb620
      https://github.com/okfn/ckan/commit/603ac47679adfe3ec1c33bc70be4abaeececb620
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

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

  Log Message:
  -----------
  Fix line width issues


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

  Changed paths:
    M ckan/logic/validators.py
    M ckan/templates/package/snippets/package_basic_fields.html

  Log Message:
  -----------
  Merge branch '664-group-form-issues'


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

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

  Log Message:
  -----------
  Merge branch '669-member-list-broken'


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

  Changed paths:
    M .travis.yml
    A bin/travis-build
    A ckan/common.py
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/app_globals.py
    R ckan/lib/authztool.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dumper.py
    M ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/jsonp.py
    M ckan/lib/mailer.py
    M ckan/lib/plugins.py
    M ckan/lib/repoze_patch.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/022_add_group_extras.py
    M ckan/migration/versions/029_version_groups.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    R ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
    R ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
    A ckan/public/base/images/table-seperator.png
    A ckan/public/base/javascript/modules/table-toggle-more.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/tables.less
    M ckan/public/base/less/variables.less
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/error_document_template.html
    M ckan/templates/footer.html
    M ckan/templates/group/index.html
    M ckan/templates/group/read_base.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/home/snippets/about_text.html
    A ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/base.html
    M ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/snippets/related_form.html
    M ckan/templates/snippets/datapreview_embed_dialog.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    R ckan/templates/snippets/page_header.html
    M ckan/templates/snippets/popular.html
    M ckan/templates/snippets/related.html
    A ckan/templates/snippets/search_result_text.html
    M ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    A ckan/templates/tag/index.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates_legacy/group/layout.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/revision/layout.html
    M ckan/templates_legacy/user/layout.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_solr_search_index.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/misc/test_sync.py
    R ckan/tests/mock_publisher_auth.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_dumper.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    A ckanext/example_idatasetform/__init__.py
    A ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/templates/package/read.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    R ckanext/organizations/__init__.py
    R ckanext/organizations/controllers.py
    R ckanext/organizations/forms.py
    R ckanext/organizations/templates/email/join_publisher_request.txt
    R ckanext/organizations/templates/organization_edit.html
    R ckanext/organizations/templates/organizations/form.html
    R ckanext/organizations/templates/organizations/index.html
    R ckanext/organizations/templates/organizations/new.html
    R ckanext/organizations/templates/organizations/read.html
    R ckanext/organizations/templates/organizations/users.html
    R ckanext/organizations/templates/organizations/users_form.html
    R ckanext/organizations/templates_legacy/organizations/apply.html
    R ckanext/organizations/templates_legacy/organizations/apply_form.html
    R ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
    R ckanext/organizations/templates_legacy/organizations/form.html
    R ckanext/organizations/templates_legacy/organizations/history.html
    R ckanext/organizations/templates_legacy/organizations/index.html
    R ckanext/organizations/templates_legacy/organizations/layout.html
    R ckanext/organizations/templates_legacy/organizations/new.html
    R ckanext/organizations/templates_legacy/organizations/package_form.html
    R ckanext/organizations/templates_legacy/organizations/read.html
    R ckanext/organizations/templates_legacy/organizations/users.html
    R ckanext/organizations/templates_legacy/organizations/users_form.html
    R ckanext/publisher_form/__init__.py
    R ckanext/publisher_form/forms.py
    R ckanext/publisher_form/templates/dataset_form.html
    R ckanext/publisher_form/templates/publisher_form.html
    R ckanext/publisher_form/templates/publisher_index.html
    R ckanext/publisher_form/templates/publisher_layout.html
    R ckanext/publisher_form/templates/publisher_new.html
    R ckanext/publisher_form/templates/publisher_read.html
    R ckanext/resourceproxy/tests/file_server.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/test_tag_vocab_plugin.py
    R doc/administrative-dashboard.rst
    R doc/api-tutorial.rst
    R doc/api-util.rst
    R doc/api-v2.rst
    M doc/api.rst
    R doc/apiv3.rst
    M doc/architecture.rst
    A doc/ckan.logic.action.create.rst
    A doc/ckan.logic.action.delete.rst
    A doc/ckan.logic.action.get.rst
    A doc/ckan.logic.action.update.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/datastore-api.rst
    A doc/filestore-api.rst
    M doc/filestore.rst
    R doc/forms.rst
    M doc/index.rst
    M doc/install-from-source.rst
    A doc/legacy-api.rst
    M doc/loading-data.rst
    M doc/multilingual.rst
    M doc/python-coding-standards.rst
    M doc/tag-vocabularies.rst
    M pip-requirements-test.txt
    M pip-requirements.txt
    M setup.py

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

Conflicts:
	ckan/templates/package/read_base.html


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

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

  Log Message:
  -----------
  Merge branch 'master' into 517-test-db


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

  Changed paths:
    R doc/about.rst

  Log Message:
  -----------
  Merge pull request #697 from okfn/539-delete-about

Delete the about page (Fixes #539)


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

  Changed paths:
    M doc/test.rst

  Log Message:
  -----------
  [#517] Update docs to create test datastore db


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

  Changed paths:
    M test-core.ini

  Log Message:
  -----------
  [#517] Update test-core.ini with correct datastore db and solr url


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

  Changed paths:
    M doc/test.rst

  Log Message:
  -----------
  [#517] Add readonly user added for testing


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

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

  Log Message:
  -----------
  Merge branch '517-test-db' of github.com:okfn/ckan into 517-test-db

Conflicts:
	doc/test.rst

    fixed doc


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

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

  Log Message:
  -----------
  [#517] Doc fix


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

  Changed paths:
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/members.html

  Log Message:
  -----------
  [#688] Adds page_heading and inner blocks to group templates


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

  Changed paths:
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/read.html

  Log Message:
  -----------
  [#688] Adds page_heading and inner blocks to org templates


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

  Changed paths:
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/related_list.html

  Log Message:
  -----------
  [#688] Adds page_heading and inner blocks to package templates


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

  Changed paths:
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/dashboard.html

  Log Message:
  -----------
  [#688] Adds page_heading and inner blocks to related templates


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

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

  Log Message:
  -----------
  [#688] Adds page_heading and inner blocks to tag template


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

  Changed paths:
    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/new.html
    M ckan/templates/user/read.html

  Log Message:
  -----------
  [#688] Adds page_heading and inner blocks to user templates


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

  Changed paths:
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/new.html

  Log Message:
  -----------
  [#688] Simplifies modify org templates around the page_heading


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

  Changed paths:
    M ckan/misc.py

  Log Message:
  -----------
  [#703] Fix <b> or <b ...> ok but <b...> bad


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

  Changed paths:
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/organization/confirm_delete_member.html

  Log Message:
  -----------
  [#688] Adds form blocks to confirm delete pages within groups and orgs


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

  Changed paths:
    M ckan/templates/user/login.html
    M ckan/templates/user/logout.html
    M ckan/templates/user/perform_reset.html

  Log Message:
  -----------
  [#688] Adds page_heading blocks to login, logout and perform_reset


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

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

  Log Message:
  -----------
  [#688] Adds a few more blocks to the group templates


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

  Changed paths:
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html

  Log Message:
  -----------
  [#688] Lot's of more blocks for the package templates


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

  Changed paths:
    M ckan/templates/header.html

  Log Message:
  -----------
  [#688] Adds a few more generic blocks to header


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

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

  Log Message:
  -----------
  [#688] Adds loads more blocks around editing/adding dataset form


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

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

  Log Message:
  -----------
  [#688] Moves endblock to correct position


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

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

  Log Message:
  -----------
  [#688] Adds more blocks into some package snippets


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

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

  Log Message:
  -----------
  [#688] Adds more blocks around dataset listings with search forms


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

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

  Log Message:
  -----------
  [#688] Small logic fix in template


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

  Changed paths:
    M ckan/misc.py

  Log Message:
  -----------
  Merge branch '703-html-attribs'


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

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#642] Add spaces to log messages where they are missing


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

  Changed paths:
    M ckanext/datastore/bin/set_permissions.sql

  Log Message:
  -----------
  Merge pull request #701 from okfn/701-fix-datastore-set-permissions

paster datastore set-permissions fails if database name contains "-"


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

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

  Log Message:
  -----------
  Merge branch '688-template-blocks'


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

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#642] Use has_table_privilege and has_schema_privilege instead of experimental privilege checks.


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

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#642] Make check functions consistent (return bool instead of raising exceptions)


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

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#705] remove_url_params supports multiple params

Sometimes is useful to remove more than one parameter from the URL to
clear a filter. This change does not modify any logic, just adds support
for the first parameter being a list instead of a string.

The value and replace parameters only will apply to the first element of
the list (or the provided param if key is a string)


  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: 43ddc88c6f589b1972b946bf3e6c9681b92cad4f
      https://github.com/okfn/ckan/commit/43ddc88c6f589b1972b946bf3e6c9681b92cad4f
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M ckan/migration/versions/067_turn_extras_to_strings.py

  Log Message:
  -----------
  [#706] make substr index from correct character


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

  Changed paths:
    M ckan/migration/versions/067_turn_extras_to_strings.py

  Log Message:
  -----------
  Merge branch '706-fix-data-migration'


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

  Changed paths:
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py

  Log Message:
  -----------
  [#642] Refactor datastore plugin configuration, improve (and fix ;-)) tests


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

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#710] Use "Unnamed resource" instead of URL

Use "Unnamed resource" instead of URL for resource display name when
resource has no name. This looks better especially in the heading on the
resource read page. Fixes #710


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

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#534] Update configuration flags' documentation


  Commit: 5621e48c89a22983fbae95651254cbbb9fba550e
      https://github.com/okfn/ckan/commit/5621e48c89a22983fbae95651254cbbb9fba550e
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#534] Reorganize configuration flags' order in the docs


  Commit: 67b01d5dae0d844cb0f7f5518e7e9efaaf9801c6
      https://github.com/okfn/ckan/commit/67b01d5dae0d844cb0f7f5518e7e9efaaf9801c6
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M doc/index.rst
    R doc/user-stories-list.rst
    R doc/user-stories.rst

  Log Message:
  -----------
  [#536] Remove user stories from doc for 2.0


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

  Changed paths:
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py

  Log Message:
  -----------
  [#642] Fix how the check for separate urls is ignored in legacy mode.
I put the check for the legacy mode in this function to make it testable.


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

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

  Log Message:
  -----------
  [#713] Blockify package_basic_fields.html

Add a package_basic_fields_custom block to package_basic_fields.html,
which IDatasetForm plugins can use to add custom fields to the first
page of the new package form without duplicating any template code.
Update example_idatasetform to use this new block for one of its custom
fields.

Fixes #713.


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

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

  Log Message:
  -----------
  [#716] Allow to pass the schema as part of the context

In some cases extensions need to tweak the schema used on package
creation or update. For instance harvesters may want to create a package
with a certain id, or relax the default tags schema. There used to be an
option via `form_to_db_schema_options` to provide a custom schema via
the context, but this was removed on the last IDatasetForm refactor.

This adds back the option to pass the schema as part of the context.


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

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#642] Simplify check for debug mode, only create _foo once


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

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#718] Use error codes instead of relying on english error messages in datastore


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

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#718] Move pg error codes in a separate dictionary


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

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

  Log Message:
  -----------
  Merge pull request #713 from okfn/713-blockify-package-basic-fields.html

Blockify package_basic_fields.html


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

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge pull request #710 from okfn/710-use-unnamed-resource-instead-of-url

Use "Unnamed resource" not URL for display name when resource has no name


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

  Changed paths:
    M doc/index.rst
    R doc/user-stories-list.rst
    R doc/user-stories.rst

  Log Message:
  -----------
  Merge pull request #711 from okfn/536-delete-userstories

Remove user stories from doc for 2.0


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

  Changed paths:
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py

  Log Message:
  -----------
  [#642] Refactored datastore config to make it easier to understand and easier to test


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

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#718] Try to avoid PL/pgSQL since we cannot guarantee that is is activated


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

  Changed paths:
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py

  Log Message:
  -----------
  [#642] Ignore permission check in legacy mode and improve configuration tests


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

  Changed paths:
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py

  Log Message:
  -----------
  [#642] Inject `error_handler` instead of explicitly passing it as an argument, split large test into smaller tests


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

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

  Log Message:
  -----------
  [#642] Add plugin loading and unloading. This does not fix the singleton issue but is better anyway.


  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: 66c450a6d655c52e679e3de9a25d36a810bc73da
      https://github.com/okfn/ckan/commit/66c450a6d655c52e679e3de9a25d36a810bc73da
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#642] Use single quotes where possible


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

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

  Log Message:
  -----------
  [#642] Refactor and fix Datastore tests

Datastore is a SingletonPlugin, so it doesn't matter if we call
plugin.DatastorePlugin() many times: we always end up with the same instance.
I've added a workaround that, first, saves and unloads the current datastore
instance, then sets:

  pyutilib.component.core.PluginGlobals.singleton_services()[plugin.DatastorePlugin] = True

This will make plugin.DatastorePlugin not be a Singleton anymore, so any
subsequent calls to ckan.plugins.load('datastore') will create a new instance.
Then, in the next line, we create a new DatastorePlugin instance by loading
it, and save it into self.p and
pyutilib.component.core.PluginGlobals.singleton_services()[plugin.DatastorePlugin].
This turns DatastorePlugin into a Singleton again, and subsequent calls to
ckan.plugins.load('datastore') will return this new instance instead.

Then, in the teardown, we unload the current the datastore, which gets rid of
our test instance, and put the original datastore back in its place, so the
environment before setUp() is the same as after tearDown().

For InvalidUrlsOrPermissionsException, what I wanted was a way to check if
_check_urls_and_permissions() failed. I did this by overloading _log_or_raise()
with an unique Exception, and checking if it's raised. If so, I guarantee that
_log_or_raise() was called. This feels like too much boilerplate, but we don't
have a stub/mock library, so we have to write it.

Conflicts:
	ckanext/datastore/tests/test_configure.py


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

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

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


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

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py

  Log Message:
  -----------
  Merge pull request #642 from okfn/642-localization-independent-datastore-permission-ckecks

datastore plugin's permission checks will fail on a non english environnement


  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: 8eca49719cb2be394e103890e81cd8c315e74b2a
      https://github.com/okfn/ckan/commit/8eca49719cb2be394e103890e81cd8c315e74b2a
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M doc/legacy-api.rst

  Log Message:
  -----------
  [#691] Add note to legacy search docs about private datasets


  Commit: 8ac95963a6a8a274dca6bd2a2a25ed8b841dfd23
      https://github.com/okfn/ckan/commit/8ac95963a6a8a274dca6bd2a2a25ed8b841dfd23
  Author: John Glover <glover.john at gmail.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M ckan/controllers/api.py
    M doc/legacy-api.rst

  Log Message:
  -----------
  Merge pull request #691 from okfn/691-override-fq-on-legacy-api

Disallow fq parameter on the legacy search API and force to search only public datasets


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

  Changed paths:
    M doc/writing-extensions.rst

  Log Message:
  -----------
  [#523] More writing extensions updates


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

  Changed paths:
    M doc/toolkit.rst
    M doc/writing-extensions.rst

  Log Message:
  -----------
  [#523] Toolkit update and other fixes


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

  Changed paths:
    M doc/extensions.rst
    R doc/writing-extensions.rst

  Log Message:
  -----------
  [#523] Merge extensions and writing extensions


  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: 7d75f0805191e7eeecce788baa886fbb5b3557e5
      https://github.com/okfn/ckan/commit/7d75f0805191e7eeecce788baa886fbb5b3557e5
  Author: John Martin <me at johnmart.in>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

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

  Log Message:
  -----------
  Remove {{ value }} when h.list_dict_filter is used


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

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#517] Rename datastore -> ckan_test_datastore


  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: 893c1b6eb285a2fd542ddb1535204d233523d5d5
      https://github.com/okfn/ckan/commit/893c1b6eb285a2fd542ddb1535204d233523d5d5
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Merge pull request #719 from okfn/718-datastore-depends-on-localisation-for-2.1

[#718] Use error codes instead of relying on english error messages in d...


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

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

  Log Message:
  -----------
  [#537] Remove 'Contrib & Tools' page from documentation

It was moved to GitHub wiki, at https://github.com/okfn/ckan/wiki/Contrib-and-Tools


  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: f9bb3ee1146acc10f11eb0a9c62968257335f8aa
      https://github.com/okfn/ckan/commit/f9bb3ee1146acc10f11eb0a9c62968257335f8aa
  Author: kindly <kindly at gmail.com>
  Date:   2013-04-06 (Sat, 06 Apr 2013)

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

  Log Message:
  -----------
  739 add extra options to solr query


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

  Changed paths:
    A ckan/tests/test_coding_standards.py
    M pip-requirements-test.txt

  Log Message:
  -----------
  Add coding standards tests


  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: 4e149cbd888e93465c77731a7f18f603f6299ec8
      https://github.com/okfn/ckan/commit/4e149cbd888e93465c77731a7f18f603f6299ec8
  Author: kindly <kindly at gmail.com>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  #739 remove whitespace between : and term for comaptibility with edismax search


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

  Changed paths:
    M ckan/templates/revision/snippets/revisions_list.html

  Log Message:
  -----------
  [#368] Fix links in revision list


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

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

  Log Message:
  -----------
  [#386] Display old revision message as a notice


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

  Changed paths:
    M ckan/controllers/group.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
    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

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


  Commit: 28fe3090165e435facdb8ff29e0fe8bc21321f4d
      https://github.com/okfn/ckan/commit/28fe3090165e435facdb8ff29e0fe8bc21321f4d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#517] Small refactoring in travis-build script


  Commit: 5df70179acab1a614264644376e58fa23629c493
      https://github.com/okfn/ckan/commit/5df70179acab1a614264644376e58fa23629c493
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

  Changed paths:
    M bin/osx-postgres-mem.sh
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M doc/install-from-source.rst
    M doc/test.rst
    M test-core.ini

  Log Message:
  -----------
  Merge pull request #517 from okfn/517-test-db

Testing to run on own database


  Commit: 05bc0be1a14b7cae8a631b507e47faefbf7a2674
      https://github.com/okfn/ckan/commit/05bc0be1a14b7cae8a631b507e47faefbf7a2674
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

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

  Log Message:
  -----------
  [#716] Fix typo in check_data_dict check


  Commit: 22c1845b277fae269dbb4d602937b660fc4d2658
      https://github.com/okfn/ckan/commit/22c1845b277fae269dbb4d602937b660fc4d2658
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

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

  Log Message:
  -----------
  [#716] Do not use provided schema on later package_show calls

Make sure that if users provide a schema in the context, it is only used
for creating or updating the packages, but not on the package_show call
at the end of the functions.


  Commit: 6b2d32fb8ff4cb7a3a8c06d8d029fd1c61bbcdba
      https://github.com/okfn/ckan/commit/6b2d32fb8ff4cb7a3a8c06d8d029fd1c61bbcdba
  Author: kindly <kindly at gmail.com>
  Date:   2013-04-09 (Tue, 09 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/helpers.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
    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 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/contrib.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' into 716-pass-schema-in-context


  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: 96dee5fa6a3e7244f2fd40158d9a8485d5ef450f
      https://github.com/okfn/ckan/commit/96dee5fa6a3e7244f2fd40158d9a8485d5ef450f
  Author: John Glover <glover.john at gmail.com>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

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

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

Add extra options to search queries


  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: bafb816ccd92bce520da390a6d08508c3da76635
      https://github.com/okfn/ckan/commit/bafb816ccd92bce520da390a6d08508c3da76635
  Author: John Martin <me at johnmart.in>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

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

  Log Message:
  -----------
  [#752] Hide data-api button instead of disable


  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: 7059686abc269cb7a74fc1335e2e02a8eb0cbeb1
      https://github.com/okfn/ckan/commit/7059686abc269cb7a74fc1335e2e02a8eb0cbeb1
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Fix name of failing file


  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: 23183c3c8a84ca62dba1a05218d7554f6635c424
      https://github.com/okfn/ckan/commit/23183c3c8a84ca62dba1a05218d7554f6635c424
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-11 (Thu, 11 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/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/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
    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
    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
    A doc/contributing.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/test.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into coding-standards-tests


  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: 4452547bca9f3963456c722dcdfcf61fd4f8a785
      https://github.com/okfn/ckan/commit/4452547bca9f3963456c722dcdfcf61fd4f8a785
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-12 (Fri, 12 Apr 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Remove now pep8 compliant files from blacklist


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

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Coding standards test logic auth/action functions


  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: 3d8f8a0bd7135213cf43f7ec74232a0a38cb8b12
      https://github.com/okfn/ckan/commit/3d8f8a0bd7135213cf43f7ec74232a0a38cb8b12
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Add some comments


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

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Better import * reg ex


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

  Changed paths:
    M doc/authorization.rst

  Log Message:
  -----------
  [#530] Reformat


  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: 9a8f5ffc29c48512ab560bd4f3cf7c5971137fea
      https://github.com/okfn/ckan/commit/9a8f5ffc29c48512ab560bd4f3cf7c5971137fea
  Author: John Martin <me at johnmart.in>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M doc/frontend-development.rst
    M doc/index.rst

  Log Message:
  -----------
  [#540] Tweaks to main front end docs


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

  Changed paths:
    M doc/css-coding-standards.rst
    M doc/frontend-development.rst
    M doc/index.rst
    M doc/resources.rst
    M doc/templating.rst

  Log Message:
  -----------
  [#540] Small tweaks to the docs regarding CSS and HTML info


  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: ad379bf29154826c3399b0ee74b8cb4f3f31e6db
      https://github.com/okfn/ckan/commit/ad379bf29154826c3399b0ee74b8cb4f3f31e6db
  Author: John Martin <me at johnmart.in>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M doc/javascript-coding-standards.rst
    M doc/javascript-module-tutorial.rst

  Log Message:
  -----------
  [#540] Add note and link to module tutorial


  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: 0328008fec9b33d0796ac519357b40813e2fa685
      https://github.com/okfn/ckan/commit/0328008fec9b33d0796ac519357b40813e2fa685
  Author: John Martin <me at johnmart.in>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/actions.html
    A ckan/templates/development/snippets/context.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/media_grid.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html

  Log Message:
  -----------
  [#540] Fixes primer page for references in docs


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

  Changed paths:
    R ckan/templates/development/snippets/toolbar.html

  Log Message:
  -----------
  [#540] Remove old primer snippet


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

  Changed paths:
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js

  Log Message:
  -----------
  [#540] Fixes for failing front-end JS tests


  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: 3913148413cd84927f2f11878a43ed143bb5629e
      https://github.com/okfn/ckan/commit/3913148413cd84927f2f11878a43ed143bb5629e
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-19 (Fri, 19 Apr 2013)

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/new_authz.py

  Log Message:
  -----------
  [#786] Allow dataset_show style actions


  Commit: 93e65f66b3a823b0fcdf38b7de1e830aa9819521
      https://github.com/okfn/ckan/commit/93e65f66b3a823b0fcdf38b7de1e830aa9819521
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-19 (Fri, 19 Apr 2013)

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

  Log Message:
  -----------
  [#788] Default facet number


  Commit: 6f8fcbf7a5c6e4abeb7ffbabc12cac38238a3d6a
      https://github.com/okfn/ckan/commit/6f8fcbf7a5c6e4abeb7ffbabc12cac38238a3d6a
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-19 (Fri, 19 Apr 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#788] Facet config options.


  Commit: 93a475bbdcd435b5fa87fede7f6126b3e5777f90
      https://github.com/okfn/ckan/commit/93a475bbdcd435b5fa87fede7f6126b3e5777f90
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-19 (Fri, 19 Apr 2013)

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

  Log Message:
  -----------
  [#788] Improve no facet message


  Commit: 91d64ce721b5f10dd2b6ee9d0780b5635e008b88
      https://github.com/okfn/ckan/commit/91d64ce721b5f10dd2b6ee9d0780b5635e008b88
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-19 (Fri, 19 Apr 2013)

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

  Log Message:
  -----------
  [#788] Allow hiding of empty facets via hide_empty option


  Commit: 0a19826d1020529789eebf2445b0d1235e3fa41f
      https://github.com/okfn/ckan/commit/0a19826d1020529789eebf2445b0d1235e3fa41f
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-19 (Fri, 19 Apr 2013)

  Changed paths:
    R doc/organizations_and_groups.rst

  Log Message:
  -----------
  [#530] Remove org & groups old info


  Commit: 0668c45d94345fbd2eff8cad9f0f2fc3993dc2c2
      https://github.com/okfn/ckan/commit/0668c45d94345fbd2eff8cad9f0f2fc3993dc2c2
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-19 (Fri, 19 Apr 2013)

  Changed paths:
    M doc/authorization.rst

  Log Message:
  -----------
  [#530] Improve readability


  Commit: 44810c842b8a1ac57dc3f33c5f2c1d74039a201e
      https://github.com/okfn/ckan/commit/44810c842b8a1ac57dc3f33c5f2c1d74039a201e
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-19 (Fri, 19 Apr 2013)

  Changed paths:
    M doc/authorization.rst

  Log Message:
  -----------
  [#530] Reformat member types


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

  Changed paths:
    M README.rst
    M ckan/config/environment.py
    M ckan/controllers/api.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/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/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/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
    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 branch 'master' into coding-standards-tests


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

  Changed paths:
    M ckan/controllers/user.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Coding Standards: Unblacklist good files and fix pep8 error in user controller


  Commit: 56588ef9550895eac6b6317670e470d5c5e90188
      https://github.com/okfn/ckan/commit/56588ef9550895eac6b6317670e470d5c5e90188
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523]  Remove erroneous section on plugin ordering


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

  Changed paths:
    M doc/authorization.rst

  Log Message:
  -----------
  [#530] Use versionchanged in auth docs


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

  Changed paths:
    M doc/authorization.rst

  Log Message:
  -----------
  [#530] Clarify opening paragraph in auth docs


  Commit: 7138432975f00c0199ee4a7c9b0139021bb73af9
      https://github.com/okfn/ckan/commit/7138432975f00c0199ee4a7c9b0139021bb73af9
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M doc/authorization.rst

  Log Message:
  -----------
  [#530] Amendments recommended in review


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

  Changed paths:
    M doc/data-viewer.rst

  Log Message:
  -----------
  [#531] Update data viewer docs for CKAN 2.0


  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


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

  Changed paths:
    M doc/authorization.rst

  Log Message:
  -----------
  [#530] Edit authorization docs

Just editing for clarity, especially in exactly what org admins, editors
and members can do, and what the config options do.


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

  Changed paths:
    M doc/authorization.rst

  Log Message:
  -----------
  [#530] Document difference between sysadmin and org admin


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

  Changed paths:
    M doc/authorization.rst

  Log Message:
  -----------
  [#530] Add intro para to orgs docs


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

  Changed paths:
    A doc/importing-datasets.rst
    M doc/index.rst
    R doc/loading-data.rst

  Log Message:
  -----------
  [#529] Rename loading-data to importing-datasets


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

  Changed paths:
    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
    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 branch 'master' of github.com:okfn/ckan into 752-data-api-button


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

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

  Log Message:
  -----------
  Merge branch '752-data-api-button'


  Commit: 33fd2fefd1785dff74187af6fadcfe0b2b28e2f0
      https://github.com/okfn/ckan/commit/33fd2fefd1785dff74187af6fadcfe0b2b28e2f0
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M doc/common-error-messages.rst
    M doc/index.rst
    M doc/test.rst

  Log Message:
  -----------
  [#535] Move error messages related to test to a separate page.

The idea is to write the common errors that might happen closer to where they're
more common, so you have the information nearby when you need it.

This works well for test errors. For install/upgrade, as we have two methods,
we can't simply add to the same page. I've changed the index so the common
errors page is under the Installation section. Only installation/upgrade
issues should be added there.


  Commit: 3c5130e45b690625c9a317d33c74fb2482529a8c
      https://github.com/okfn/ckan/commit/3c5130e45b690625c9a317d33c74fb2482529a8c
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M doc/configuration.rst
    M doc/email-notifications.rst
    M doc/filestore.rst
    M doc/solr-setup.rst

  Log Message:
  -----------
  [#534] Add documentation for some configuration flags


  Commit: 3153b2ee3cd755a70274a696d97a124d5242987d
      https://github.com/okfn/ckan/commit/3153b2ee3cd755a70274a696d97a124d5242987d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#534] Remove useless indexes in configuration page


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

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#534] Minor styling adjustements


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

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M doc/configuration.rst
    M test-core.ini

  Log Message:
  -----------
  [#534] Remove unused configuration flags


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

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

  Log Message:
  -----------
  [#522] Remove comments and commenting docs

Fixes #522


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

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

  Log Message:
  -----------
  [#788] Added doc block for within_tertiary


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

  Changed paths:
    M doc/importing-datasets.rst

  Log Message:
  -----------
  [#529] Update importing datasets doc for 2.0.

Remove section on loader scripts.


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

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

  Log Message:
  -----------
  Add and refactor member_create tests, and raise better exception when "id" isn't received

If "id" wasn't received, instead of throwing the seemingly unrelated error:

    AttributeError: 'NoneType' object has no attribute 'id'

We now throw:

    ValidationError: {u'id': u'Missing value'}


  Commit: 28b54cf75adfdbcc809a39a66059be5e948fa725
      https://github.com/okfn/ckan/commit/28b54cf75adfdbcc809a39a66059be5e948fa725
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

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

  Log Message:
  -----------
  member_create accepts either the object's id or name, and have extra validations.

Even though its documentation said it accepted the object's id or name, this
wasn't the case. This is fixed now.

I've also added validations to check that the group, the object, and
object_type exists and are valid.

Now we always save the object's id in our members table, even if someone
calls member_create passing its name as obj_id.


  Commit: 57b631bd652d75d8be5eda1f37571462a726eac3
      https://github.com/okfn/ckan/commit/57b631bd652d75d8be5eda1f37571462a726eac3
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    A ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py

  Log Message:
  -----------
  member_delete accepts either the object's id or name, and have extra validations.

To make member_delete consistent with member_update, I've changed it to accept
either the object's id or name.

I've also added validations to check that the group, the object, and
object_type exists and are valid.


  Commit: 1674cc4ed36b5c308651ccf31d4159fb433454b8
      https://github.com/okfn/ckan/commit/1674cc4ed36b5c308651ccf31d4159fb433454b8
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

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

  Log Message:
  -----------
  Limit lines to 80 characters


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

  Changed paths:
    M doc/authorization.rst

  Log Message:
  -----------
  [#530] Auth doc updates


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

  Changed paths:
    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/templates/package/snippets/data_api_button.html
    A ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py

  Log Message:
  -----------
  Merge branch 'master' into 788-facet-num-fixes


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

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

  Log Message:
  -----------
  [#797] Removed float for old footer code


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

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

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


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

  Changed paths:
    M doc/frontend-development.rst

  Log Message:
  -----------
  [#540] Tweaks to frontend root docs


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

  Changed paths:
    M doc/frontend-development.rst

  Log Message:
  -----------
  [#540] Add link to the frontend testing doc


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

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

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


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

  Changed paths:
    M doc/authorization.rst

  Log Message:
  -----------
  Merge branch '530-auth-docs' of github.com:okfn/ckan into 530-auth-docs

Conflicts:
	doc/authorization.rst


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

  Changed paths:
    M doc/authorization.rst

  Log Message:
  -----------
  [#530] Auth doc updates


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

  Changed paths:
    M doc/javascript-coding-standards.rst

  Log Message:
  -----------
  [#540] Tweaks to the JS coding standards


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

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

  Log Message:
  -----------
  Merge branch '686-fix-datastore-validation'


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

  Changed paths:
    M doc/frontend-development.rst

  Log Message:
  -----------
  [#540] Typo fix


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

  Changed paths:
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/actions.html
    A ckan/templates/development/snippets/context.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/media_grid.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    R ckan/templates/development/snippets/toolbar.html
    M doc/css-coding-standards.rst
    M doc/frontend-development.rst
    M doc/index.rst
    M doc/javascript-coding-standards.rst
    M doc/javascript-module-tutorial.rst
    M doc/resources.rst
    M doc/templating.rst

  Log Message:
  -----------
  Merge branch '540-frontend-docs'


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

  Changed paths:
    M ckan/model/package.py

  Log Message:
  -----------
  [#795] Fix and deprecate model.Package.is_private


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

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

  Log Message:
  -----------
  [#795] Fix template to use correct attribute


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

  Changed paths:
    M ckan/model/package.py

  Log Message:
  -----------
  [#795] Minor cleanup of import in model.package


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

  Changed paths:
    M doc/publishing-datasets.rst

  Log Message:
  -----------
  [#528] Updates to the publishing datasets doc for CKAN 2.0.


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

  Changed paths:
    M doc/authorization.rst

  Log Message:
  -----------
  [#530] Edit authorization docs

Minor edits


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

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Improve docs based on Sean's feedback


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

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

  Log Message:
  -----------
  Merge branch '522'


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

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#802] Changes  to have correct colour generation for custom themes


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

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#802] Small tweak to fuschia theme base colour


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

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] More Extension docs reworking


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

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Remove adding plugin interface code.


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

  Changed paths:
    M doc/authorization.rst
    R doc/organizations_and_groups.rst
    R doc/publisher-profile.rst

  Log Message:
  -----------
  Merge branch '530-auth-docs'


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

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Fix sphinx warnings.


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

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Minor fixes.


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

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Reflow and better link to toolkit.


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

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] More cleanups.


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

  Changed paths:
    M doc/release-cycle.rst

  Log Message:
  -----------
  [#751] Update release docs


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

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [#520] First swing at the theming docs


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

  Changed paths:
    M doc/importing-datasets.rst

  Log Message:
  -----------
  [#529] Edit "Importing Datasets" docs

Minor edits, and removed the stuff about how to use ckanext-harvest,
just link to the harvester's own README instead.


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

  Changed paths:
    A doc/importing-datasets.rst
    M doc/index.rst
    R doc/loading-data.rst

  Log Message:
  -----------
  Merge branch '529-docs-import-datasets'


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

  Changed paths:
    M doc/publishing-datasets.rst

  Log Message:
  -----------
  [#528] Edit "Publishing Datasets" docs

Just a couple of typos


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

  Changed paths:
    M doc/publishing-datasets.rst

  Log Message:
  -----------
  Merge branch '528-docs-publishing-datasets'


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

  Changed paths:
    M ckan/i18n/check_po_files.py

  Log Message:
  -----------
  [i18n] Small fix to check_po_files.py

It seems to have started complaining about all the untranslated strings,
make it skip them.


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

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Remove enable plugin section etc.


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

  Changed paths:
    M ckan/new_authz.py

  Log Message:
  -----------
  [#811] Remove legacy auth.profile config option


  Commit: 8d51a5ac2848f902a13a929c394b6ce7c57bb46e
      https://github.com/okfn/ckan/commit/8d51a5ac2848f902a13a929c394b6ce7c57bb46e
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M ckan/new_authz.py

  Log Message:
  -----------
  Merge pull request #811 from okfn/811-remove-auth-profile-config

Authz some old code survived


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

  Changed paths:
    M ckan/public/base/images/flags.png
    M ckan/public/base/less/footer.less

  Log Message:
  -----------
  [#813] Updates flag image and adds all country codes to CSS


  Commit: 52d925c750af97adaad6c74564320669d7030cf7
      https://github.com/okfn/ckan/commit/52d925c750af97adaad6c74564320669d7030cf7
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M doc/index.rst
    M doc/release-cycle.rst
    A doc/release-process.rst

  Log Message:
  -----------
  [#751] Move and update release process docs

Updated version from the ones currently on the wiki.


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

  Changed paths:
    M ckan/public/base/images/flags.png

  Log Message:
  -----------
  [#813] 'en' is split flag now


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

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

  Log Message:
  -----------
  [#817] Adds untruncated tooltip to facet lists


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

  Changed paths:
    M ckan/public/base/images/flags.png

  Log Message:
  -----------
  [#813] Update to the greek flag


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

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

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


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

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

  Log Message:
  -----------
  [#817] Only shows title if it's truncated


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/i18n/check_po_files.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/new_authz.py
    M ckan/public/base/css/main.css
    M ckan/public/base/images/flags.png
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/actions.html
    A ckan/templates/development/snippets/context.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/media_grid.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    R ckan/templates/development/snippets/toolbar.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/snippets/facet_list.html
    A ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_search.py
    M doc/authorization.rst
    R doc/commenting.rst
    M doc/configuration.rst
    M doc/css-coding-standards.rst
    M doc/frontend-development.rst
    A doc/importing-datasets.rst
    M doc/index.rst
    M doc/javascript-coding-standards.rst
    M doc/javascript-module-tutorial.rst
    R doc/loading-data.rst
    R doc/organizations_and_groups.rst
    R doc/publisher-profile.rst
    M doc/publishing-datasets.rst
    M doc/resources.rst
    M doc/templating.rst

  Log Message:
  -----------
  Merge branch 'master' into coding-standards-tests


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

  Changed paths:
    M ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py

  Log Message:
  -----------
  Coding Standards fix newly introduced pep8 errors


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

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Coding Standards move blacklists into test classes


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

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Coding Standards better blacklist names


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

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Coding Standards check for action function docstrings


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

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

  Log Message:
  -----------
  Merge branch '817-facet-tooltips'


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

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Coding Standards pep8 fixes to coding standards - the irony


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

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Coding Standards add translated exceptions check


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

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#819] Fix code error on abort in user controller


  Commit: 4ed9265512418aa6298fbddeebdb3d855f1c3b9b
      https://github.com/okfn/ckan/commit/4ed9265512418aa6298fbddeebdb3d855f1c3b9b
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/new_authz.py

  Log Message:
  -----------
  Merge pull request #786 from okfn/786-update-action-names

update actions to use correct names


  Commit: 167be530eb0ed5b9d99fc1bb6a3a035877c203f7
      https://github.com/okfn/ckan/commit/167be530eb0ed5b9d99fc1bb6a3a035877c203f7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#799] Travis remove sed crap

Instead of hacking on development.ini, we simply use the defaults in test-core.ini.


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

  Changed paths:
    M doc/extensions.rst
    M doc/multilingual.rst

  Log Message:
  -----------
  [#523] Fix formatting in extensions list in docs


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

  Changed paths:
    M ckan/public/base/images/flags.png

  Log Message:
  -----------
  [#824] Adds correct flags for sweden, slovakia and slovenia


  Commit: 0746d2d40599df0f37f6947e7f0416c416e5e6da
      https://github.com/okfn/ckan/commit/0746d2d40599df0f37f6947e7f0416c416e5e6da
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523]  Some more updates add example etc


  Commit: 554dc917f55f583118d67d0650064a07b4b773fe
      https://github.com/okfn/ckan/commit/554dc917f55f583118d67d0650064a07b4b773fe
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M doc/extensions.rst
    M doc/multilingual.rst

  Log Message:
  -----------
  Merge branch '523-docs-extensions' of github.com:okfn/ckan into 523-docs-extensions


  Commit: 98ad884259f60a84c21b4161c9e5daa8420873e8
      https://github.com/okfn/ckan/commit/98ad884259f60a84c21b4161c9e5daa8420873e8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Add example


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

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Fix formatting


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

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] More improvements


  Commit: 13d4caea7d2edf8c9e809c2a370c03954dca850e
      https://github.com/okfn/ckan/commit/13d4caea7d2edf8c9e809c2a370c03954dca850e
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

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

  Log Message:
  -----------
  [#825] Replace % with %% to escape it in sql statements


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

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

  Log Message:
  -----------
  [#827] Adds  to button for full ga integration


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

  Changed paths:
    M doc/configuration.rst
    M doc/i18n.rst

  Log Message:
  -----------
  [#534] Document some undocumented config options

The added options are:

  ckan.tracking_enabled
  search.facet.limits
  ckan.root_path
  ckan.site_intro_text


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

  Changed paths:
    M CONTRIBUTING.rst
    M README.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/i18n/check_po_files.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/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/067_turn_extras_to_strings.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/tag.py
    M ckan/model/tracking.py
    M ckan/new_authz.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/images/flags.png
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/prose.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/actions.html
    A ckan/templates/development/snippets/context.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/media_grid.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    R ckan/templates/development/snippets/toolbar.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
    M ckan/templates/package/snippets/data_api_button.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/facet_list.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/sort_by.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/templates_legacy/package/read_core.html
    M ckan/tests/functional/api/model/test_vocabulary.py
    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
    A ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/misc/test_format_text.py
    M ckan/tests/models/test_package.py
    M ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_search.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
    R doc/about.rst
    M doc/authorization.rst
    R doc/commenting.rst
    M doc/conf.py
    M doc/configuration.rst
    R doc/contrib.rst
    A doc/contributing.rst
    M doc/css-coding-standards.rst
    M doc/database-dumps.rst
    M doc/frontend-development.rst
    A doc/images/popular-dataset.png
    A doc/images/popular-resource.png
    A doc/images/sort-datasets-by-popularity.png
    A doc/importing-datasets.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/javascript-coding-standards.rst
    M doc/javascript-module-tutorial.rst
    M doc/legacy-api.rst
    R doc/loading-data.rst
    R doc/organizations_and_groups.rst
    M doc/paster.rst
    M doc/post-installation.rst
    R doc/publisher-profile.rst
    M doc/publishing-datasets.rst
    M doc/resources.rst
    M doc/templating.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 'upstream/master' into 534

Conflicts:
	doc/configuration.rst


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

  Changed paths:
    M doc/configuration.rst
    M doc/email-notifications.rst
    M doc/tracking.rst

  Log Message:
  -----------
  [#534] Add E-mail Settings section and add cross-references to the config options.


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

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

  Log Message:
  -----------
  Merge branch '825-percent-in-sql'


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

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M doc/configuration.rst
    M doc/email-notifications.rst
    M doc/filestore.rst
    M doc/i18n.rst
    M doc/solr-setup.rst
    M doc/tracking.rst
    M test-core.ini

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


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

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M doc/configuration.rst
    M doc/email-notifications.rst
    M doc/filestore.rst
    M doc/i18n.rst
    M doc/solr-setup.rst
    M doc/tracking.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'vitorbaptista-534' into 534-update-config-options-docs


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

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#534] Remove legacy config options

These ones are no longer used and will just confuse:

* package_form
* carrot_messaging_library
* amqp_hostname & amqp_port & amqp_user_id & amqp_password
* ckan.log_dir
* ckan.dump_dir
* ckan.backup_dir

Also some minor formatting fixes.


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

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#534] Rearrange sections and items

Sections rearranged by importance/usage and items put to their relevant
one.
Sections are now:

 *General Settings
 * Database Settings
 * Site Settings
 * Search Settings
 * Plugin Settings
 * Front-End Settings
 * Theming Settings
 * Activity Streams Settings
 * Feeds Settings
 * Internationalisation Settings
 * Storage Settings
 * Form Settings
 * E-mail Settings


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

  Changed paths:
    M doc/authorization.rst
    M doc/configuration.rst

  Log Message:
  -----------
  [#534] Move authorization setting to config options docs

They are one of the most important ones and they should be found on the
conguration options docs. To avoid duplicating them the include rst
directive is used:

.. include:: /configuration.rst
   :start-after: start_config-authorization
   :end-before: end_config-authorization

This requires setting the two markers on the imported file, eg:

.. start_config-authorization

    ... stuff to include ...

.. end_config-authorization


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

  Changed paths:
    M doc/apps-ideas.rst
    M doc/configuration.rst
    M doc/email-notifications.rst
    M doc/i18n.rst
    M doc/solr-setup.rst
    M doc/tracking.rst

  Log Message:
  -----------
  [#534] Make reST labels for config settings consistent

Make the reST label for cross-referencing each config setting the same
as the name of the config setitng itself, e.g.
ckan.activity_streams_email_notifications, don't mix and match different
styles of ., _ and - like ckan-activity-streams-email-notifications,
ckan_activity_streams_email_notifications, etc.


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

  Changed paths:
    M doc/configuration.rst
    M doc/form-integration.rst

  Log Message:
  -----------
  [#534] Add reST labels to all config options

Now we can easily cross-reference any config option from any file in
docs/.


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

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#534] Edit top of configuration docs page

Use the default ini file locations; Clarify what the [app:main] section
is; say "restart webserver" not Apache, webserver may not be Apache.


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

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#534] Use .. deprecated:: in config docs


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

  Changed paths:
    M doc/release-cycle.rst

  Log Message:
  -----------
  [#751] Edit the release cycle docs


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

  Changed paths:
    M doc/index.rst
    M doc/release-cycle.rst
    A doc/release-process.rst

  Log Message:
  -----------
  Merge branch '751-release-docs'


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

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#838] Postgres error codes are five character strings, not integers


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

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Merge branch '838-pgcode-string'


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

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

  Log Message:
  -----------
  Merge branch '827-ga-fix'


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

  Changed paths:
    M doc/configuration.rst
    M doc/data-viewer.rst

  Log Message:
  -----------
  [#531] Update data viewer docs


  Commit: 8d4cbb951a542599274069f1b4b57ce1137dacf5
      https://github.com/okfn/ckan/commit/8d4cbb951a542599274069f1b4b57ce1137dacf5
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M ckan/public/base/images/flags.png

  Log Message:
  -----------
  Merge branch '824-flags'


  Commit: 4fb36e6ae7c25c0635b869e7cce78979db3d9cb5
      https://github.com/okfn/ckan/commit/4fb36e6ae7c25c0635b869e7cce78979db3d9cb5
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M ckan/lib/base.py
    M ckan/lib/render.py

  Log Message:
  -----------
  [#808] Fix unicode template 500 error


  Commit: 07ecbaa86dea992b320e9e5380b671e99b65b25d
      https://github.com/okfn/ckan/commit/07ecbaa86dea992b320e9e5380b671e99b65b25d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M doc/common-error-messages.rst

  Log Message:
  -----------
  [#535] Remove errors that aren't valid anymore


  Commit: 2ebe3446258cac50d345468afa2f29c037bb4fba
      https://github.com/okfn/ckan/commit/2ebe3446258cac50d345468afa2f29c037bb4fba
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#534] Document ckan.template_title_deliminater


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

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#534] Calm down over-the-top warning


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

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#534] Fix some formatting issues in the docs


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

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#534] Docs correction: template_footer_end is not legacy

Appears in jinja templates


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

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#534] Update ckan.site_url docs

This is used by much more than just the API


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

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#534] Typo


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

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#534] Docs: correct default value fopr ckan.cache_expires


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

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#534] Correct ckan.page_cache_enabled

Fix typos, and mark the feature as experimental


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

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#534] Typo


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

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#534] Fix ckan.plugins docs

It's a list of plugins, not a list of extensions


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

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#534] Fix a couple of formatting issues in docs


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

  Changed paths:
    M doc/data-viewer.rst

  Log Message:
  -----------
  [#531] Add note about /preview URL for resources.


  Commit: e193a7707fa2a1d3dac60d267952db1cebb474be
      https://github.com/okfn/ckan/commit/e193a7707fa2a1d3dac60d267952db1cebb474be
  Author: Ian Ward <ian at excess.org>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  prettifying ValidationErrors makes them less useful


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

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [#520] Minor textual tweaks


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

  Changed paths:
    M doc/templating.rst

  Log Message:
  -----------
  [#520] Jinja2 not Jinja


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

  Changed paths:
    R doc/geospatial.rst
    R doc/harvesting.rst

  Log Message:
  -----------
  [#523] Remove geospatial and harvester docs form core


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

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Fix some titles in the extensions docs


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

  Changed paths:
    M doc/extensions.rst
    A doc/overview.rst
    M doc/toolkit.rst
    A doc/writing-documentation.rst

  Log Message:
  -----------
  [#523] Edit the extensions docs

Just a couple of small edits


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

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M doc/apps-ideas.rst
    M doc/authorization.rst
    M doc/configuration.rst
    M doc/email-notifications.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    M doc/i18n.rst
    M doc/tracking.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch '534-update-config-options-docs'


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

  Changed paths:
    R doc/extension-templating.rst
    M doc/templating.rst

  Log Message:
  -----------
  [#520] Removes doc/extenstion-templating.html as it's inaccurate and wrong


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

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [#520] Few more textual tweaks


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

  Changed paths:
    M doc/templating.rst
    M doc/theming.rst

  Log Message:
  -----------
  [#520] Added more context to how to add templates within an extension


  Commit: 2afe4269097e21c46547cec68ad80f7a293c5a1a
      https://github.com/okfn/ckan/commit/2afe4269097e21c46547cec68ad80f7a293c5a1a
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

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

  Log Message:
  -----------
  [#853] Fix license facets

The current default facets were using a 'license' field which is not present
in the Solr index. Changed it to 'license_id' and added some logic in
package_search to return a display name for them.


  Commit: f6e2750e86305742d68d55890e2114bccda2c461
      https://github.com/okfn/ckan/commit/f6e2750e86305742d68d55890e2114bccda2c461
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/i18n/check_po_files.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/new_authz.py
    M ckan/public/base/css/main.css
    M ckan/public/base/images/flags.png
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/actions.html
    A ckan/templates/development/snippets/context.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/media_grid.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    R ckan/templates/development/snippets/toolbar.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/snippets/facet_list.html
    A ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_search.py
    M doc/apps-ideas.rst
    M doc/authorization.rst
    R doc/commenting.rst
    M doc/configuration.rst
    M doc/css-coding-standards.rst
    M doc/email-notifications.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    M doc/frontend-development.rst
    M doc/i18n.rst
    A doc/importing-datasets.rst
    M doc/index.rst
    M doc/javascript-coding-standards.rst
    M doc/javascript-module-tutorial.rst
    R doc/loading-data.rst
    R doc/organizations_and_groups.rst
    R doc/publisher-profile.rst
    M doc/publishing-datasets.rst
    M doc/release-cycle.rst
    A doc/release-process.rst
    M doc/resources.rst
    M doc/templating.rst
    M doc/tracking.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 531-data-viewer-docs

Conflicts:
	doc/configuration.rst


  Commit: f5724214fe9ecc4eeab5aedfeddf6b0b7abfbf8f
      https://github.com/okfn/ckan/commit/f5724214fe9ecc4eeab5aedfeddf6b0b7abfbf8f
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M doc/data-viewer.rst

  Log Message:
  -----------
  [#531] Fix references after merge


  Commit: 30c5ff751dec5435eea00d8ee736ae3c2893f5f0
      https://github.com/okfn/ckan/commit/30c5ff751dec5435eea00d8ee736ae3c2893f5f0
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M doc/data-viewer.rst

  Log Message:
  -----------
  Merge pull request #531 from okfn/531-data-viewer-docs

Update Data Viewer docs for 2.0


  Commit: 2a6c4408faa8ee4c0ff0416304b8667c04c3f90d
      https://github.com/okfn/ckan/commit/2a6c4408faa8ee4c0ff0416304b8667c04c3f90d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

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

  Log Message:
  -----------
  Merge branch '853-license-facet'


  Commit: 596d53a8545e99704ba3973b080c1972aef54d0a
      https://github.com/okfn/ckan/commit/596d53a8545e99704ba3973b080c1972aef54d0a
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-01 (Wed, 01 May 2013)

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

  Log Message:
  -----------
  [#787] Adds max-width to inner image to prevent 100% width in IE10


  Commit: e4055530a835770de6f8db20ca9bc2d82f9e1d60
      https://github.com/okfn/ckan/commit/e4055530a835770de6f8db20ca9bc2d82f9e1d60
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    R ckan/public/base/images/flags.png
    M ckan/public/base/less/footer.less

  Log Message:
  -----------
  [#822] Removes flags from language dropdown in footer


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

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

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

The default sort ordering for dataset searches is supposed to be
most-recently-modified first, but it's actually most-recently-created
first. This appears to have been a typo/accidental change in this
commit: bc496ff. Change it back to most-recently-modified.


  Commit: 811b5467a81d07d4db12e1d200539121f90b8f63
      https://github.com/okfn/ckan/commit/811b5467a81d07d4db12e1d200539121f90b8f63
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    R doc/overview.rst
    R doc/writing-documentation.rst

  Log Message:
  -----------
  [#523] Remove a couple of accidentally-completed files

A couple of draft docs files got committed by accident, remove them.


  Commit: 2ef6f37303a5d5d227d38a8385cc9bc2094ae681
      https://github.com/okfn/ckan/commit/2ef6f37303a5d5d227d38a8385cc9bc2094ae681
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M doc/architecture.rst
    M doc/background-tasks.rst
    M doc/extensions.rst
    M doc/index.rst
    M doc/tag-vocabularies.rst

  Log Message:
  -----------
  [#523] sphinx fixes


  Commit: 8fe645977f2c34f8fac81ee3c241eb3968e09625
      https://github.com/okfn/ckan/commit/8fe645977f2c34f8fac81ee3c241eb3968e09625
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    R doc/overview.rst
    R doc/writing-documentation.rst

  Log Message:
  -----------
  Merge branch '523-docs-extensions' of github.com:okfn/ckan into 523-docs-extensions


  Commit: 915d2982d5fd864dc01e217652252b0b5a7fd400
      https://github.com/okfn/ckan/commit/915d2982d5fd864dc01e217652252b0b5a7fd400
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#830] Dashboard filter fix


  Commit: 8dea7ebdb7b71f47bcad48ddda86d613be0f8987
      https://github.com/okfn/ckan/commit/8dea7ebdb7b71f47bcad48ddda86d613be0f8987
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#866] Logic no longer circular import


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

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#866] Double quotes -> single quotes


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

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#866] Better import path


  Commit: 18e43b89e81ddab76a5ecf9d887d21f62799168f
      https://github.com/okfn/ckan/commit/18e43b89e81ddab76a5ecf9d887d21f62799168f
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#866] Some Pep8 fixes


  Commit: 24730306f01bc75e7b9797ff9fcf834d0dd08098
      https://github.com/okfn/ckan/commit/24730306f01bc75e7b9797ff9fcf834d0dd08098
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-02 (Thu, 02 May 2013)

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

  Log Message:
  -----------
  [#869] Validate that the user exists in _group_or_org_member_create


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

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

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


  Commit: 9c49713242dbb39a5387ef9c99e3c7d0fcc3e406
      https://github.com/okfn/ckan/commit/9c49713242dbb39a5387ef9c99e3c7d0fcc3e406
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-02 (Thu, 02 May 2013)

  Changed paths:
    M ckan/public/base/css/main.css
    R ckan/public/base/images/flags.png
    M ckan/public/base/less/footer.less

  Log Message:
  -----------
  Merge branch 'master' into 866-lib-helpers-cleanups


  Commit: 0e789022bab14772e044260d6d291c6570f5fd7d
      https://github.com/okfn/ckan/commit/0e789022bab14772e044260d6d291c6570f5fd7d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-02 (Thu, 02 May 2013)

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

  Log Message:
  -----------
  Merge branch '859-fix-default-sort-ordering'


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

  Changed paths:
    M doc/templating.rst

  Log Message:
  -----------
  [#520] Added blank line for better code rendering


  Commit: 7d0723e24e837efd4d5b5679a50bdf5998b3c525
      https://github.com/okfn/ckan/commit/7d0723e24e837efd4d5b5679a50bdf5998b3c525
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-02 (Thu, 02 May 2013)

  Changed paths:
    R doc/extension-templating.rst
    M doc/templating.rst
    M doc/theming.rst

  Log Message:
  -----------
  Merge branch '520-templating-docs'


  Commit: 40409401184ee15876826d359789ea784f7241ce
      https://github.com/okfn/ckan/commit/40409401184ee15876826d359789ea784f7241ce
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-02 (Thu, 02 May 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Merge pull request #830 from okfn/830-dashboard-fix

Server error 500 on http://beta.ckan.org/dashboard?type=user&name=shevski


  Commit: 675c0a84bf5ff30a8da0559c166e090d0606cd12
      https://github.com/okfn/ckan/commit/675c0a84bf5ff30a8da0559c166e090d0606cd12
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-03 (Fri, 03 May 2013)

  Changed paths:
    M doc/common-error-messages.rst
    M doc/index.rst
    M doc/test.rst

  Log Message:
  -----------
  Merge pull request #804 from vitorbaptista/535

[#535] Move error messages related to test to a separate page.


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

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Fix a typo in the docs


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

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#523] Remove broken reference to plugins.rst


  Commit: 3cebb3934e5fd13043435ae2362dc66b079d13c2
      https://github.com/okfn/ckan/commit/3cebb3934e5fd13043435ae2362dc66b079d13c2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-03 (Fri, 03 May 2013)

  Changed paths:
    M ckan/plugins/interfaces.py
    M doc/architecture.rst
    M doc/background-tasks.rst
    M doc/extensions.rst
    R doc/geospatial.rst
    R doc/harvesting.rst
    M doc/index.rst
    M doc/multilingual.rst
    M doc/tag-vocabularies.rst
    M doc/toolkit.rst
    R doc/writing-extensions.rst

  Log Message:
  -----------
  Merge branch '523-docs-extensions'


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

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M doc/conf.py
    M doc/datastore-setup.rst
    M doc/install-from-source.rst
    M doc/solr-setup.rst
    M doc/test.rst
    M test-core.ini

  Log Message:
  -----------
  [#519] Update source install docs for 2.0

Update the source install and related docs (datastore setup, solr setup,
testing) and files (deployment.ini_tmp, test-core.ini) for CKAN 2.0.

The idea is to document the setup process that OKFN is currently using
on its servers, so that the deployment docs can become the docs for the
OKFN dev team and we can dogfood our own docs, instead of having a bunch
of wiki pages, READMEs, etc. that we follow and ignoring the "official"
docs. Hopefully those can all be deleted or cut down massively once this
is done.

So both the docs now describe the layout we use on our servers, where
there's space for multiple CKAN sites on the same server, with
virtualenvs in /usr/lib/ckan/ and config files in /etc/ckan/.

- Changed default virtualenv location from `~/pyenv` to `/usr/lib/ckan/default`

- Changed default config files dir to `/etc/ckan/default`

- Added tip for developers in source install docsS symlink `/usr/lib/ckan` and
  `/etc/ckan` to directories in your homedir to install ckan in your homedir

- Changed default database user from `ckanuser` to `ckan_default`

- Changed default database from `ckan_dev` to `ckan_default`

- Changed default datastore database from `datastore` to `datastore_default`

- Changed default datastore database user from `readonlyuser` to `datastore_default`

- Changed default test databases from `ckan_test` and `ckan_test_datastore` to
  `ckan_test` and `datastore_test`

- Changed default `ckan.site_id` from `ckan.net` to `default`

- Disabled file log handler, rely on Apache's log files only (as we do on our
  servers)

- Changed the docs to use restructured text substitutions for things like the
  paths to the virtualenv and config files, database names, etc. instead of
  typing them out each time

- Lots of minor formatting fixes and editing

So now we have:

    virtualenv:        /usr/lib/ckan/default
    development.ini:   /etc/ckan/default/development.ini
    production.ini:    /etc/ckan/default/production.ini
    ckan.site_id:      default
    Database user:     ckan_default
    Database:          ckan_default
    Datastore user:    datastore_default
    Datastore db:      datastore_default
    Test database:     ckan_test
    Test datastore db: datastore_test


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

  Changed paths:
    M doc/post-installation.rst

  Log Message:
  -----------
  [#519] Update post-installation docs

Make them fit with the changes in commit
6e1d325d61ea66cd197864dc9a5af5c65af183c0


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

  Changed paths:
    M doc/conf.py
    M doc/deployment.rst

  Log Message:
  -----------
  [#519] Update deployment docs

Uses the same directory structure as the updated source install docs, so
you can step through the source install docs and then the deployment
docs as written and it all works.

Also updated the apache.wsgi and sites-available files to match those
that we use on our servers.

Removed CORS setup instructions as this has been builtin since CKAN 1.5.


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

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

  Log Message:
  -----------
  [#519] Edit source install docs

Minor edits to install from source docs


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

  Changed paths:
    M doc/solr-setup.rst

  Log Message:
  -----------
  [#519] Edit solr setup docs

Minor edits to solr setup docs


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

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M doc/conf.py
    M doc/filestore.rst

  Log Message:
  -----------
  [#519] Update FileStore setup instructions


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

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#519] Fix Travis build

Update the database and user names in travis build


  Commit: 281c8d6ddbb28278bc311eda8c831ff660576b43
      https://github.com/okfn/ckan/commit/281c8d6ddbb28278bc311eda8c831ff660576b43
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-05 (Sun, 05 May 2013)

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

  Log Message:
  -----------
  [#839] Add basic documentation for stats extension


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

  Changed paths:
    M doc/solr-setup.rst

  Log Message:
  -----------
  [#519] Minor edits to solr setup docs


  Commit: 427ee0f6c19ff1e5ab93f5f348fdbf9e9dd00788
      https://github.com/okfn/ckan/commit/427ee0f6c19ff1e5ab93f5f348fdbf9e9dd00788
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M doc/deployment.rst

  Log Message:
  -----------
  [#519] Add postfix to deployment docs


  Commit: 6cbdcb1d1325f5115dafe68ef33db9f328e23273
      https://github.com/okfn/ckan/commit/6cbdcb1d1325f5115dafe68ef33db9f328e23273
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M doc/datastore-setup.rst

  Log Message:
  -----------
  [#519] Minor edits to datastore docs

Minor edits to the datastore docs, from Dominik. See:

https://github.com/okfn/ckan/pull/807


  Commit: c77012a7c2c20e09092e35e546f06e5361405f93
      https://github.com/okfn/ckan/commit/c77012a7c2c20e09092e35e546f06e5361405f93
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M ckan/lib/base.py
    M ckan/lib/render.py

  Log Message:
  -----------
  Merge branch '808-unicode-template-fix2'


  Commit: 94a367fef3fb2b2ca2bd63dce19de692ef143c89
      https://github.com/okfn/ckan/commit/94a367fef3fb2b2ca2bd63dce19de692ef143c89
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    A ckan/config/install.py
    M setup.py

  Log Message:
  -----------
  [#746] Extend Pylons installer to tweak deployment.ini_tmpl

With the new 'paste.app_install' entry point on setup.py, we can define
a custom "installer" that basically allows us to define new variables to
be used on the deployment.ini_tmpl file. This is useful eg for defining
the ckan version and provide a link to the relevant documentation for
the configuration options.


  Commit: 88f9c6aa8d5acd293e906ee20ba0572b65125ad4
      https://github.com/okfn/ckan/commit/88f9c6aa8d5acd293e906ee20ba0572b65125ad4
  Author: John Glover <glover.john at gmail.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Merge pull request #819 from okfn/819-abort-error-in-user-controller

Abort error in user controller


  Commit: 7ced6fc9bf0347487f5032305fd0e2b5973d2634
      https://github.com/okfn/ckan/commit/7ced6fc9bf0347487f5032305fd0e2b5973d2634
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M doc/conf.py
    M doc/filestore.rst

  Log Message:
  -----------
  [#519] Docs: change restart_apache substitution to reload_apache


  Commit: 6032a292d97018cf8343b597cf66e9a87372e1f5
      https://github.com/okfn/ckan/commit/6032a292d97018cf8343b597cf66e9a87372e1f5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

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

  Log Message:
  -----------
  [#519] Docs: use the reload_apache substitution


  Commit: 1240f0290b115761fac2d37ed90791560ebbd466
      https://github.com/okfn/ckan/commit/1240f0290b115761fac2d37ed90791560ebbd466
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M doc/deployment.rst

  Log Message:
  -----------
  [#519] Remove non-root URL deployment instructions

We've had reports from some users that this causes problems with some
CKAN features, so we don't want to recommend it until tested.


  Commit: 36fff9664e20a6f7f282fffe73626629eb5ffe65
      https://github.com/okfn/ckan/commit/36fff9664e20a6f7f282fffe73626629eb5ffe65
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M doc/configuration.rst
    M doc/datastore-setup.rst

  Log Message:
  -----------
  [#746] Document datastore db url config options

And include them from the datastore setup documentation to avoid
duplication.


  Commit: b674dbe4f5371f378788c3d7a7bb8b55b44a4dfa
      https://github.com/okfn/ckan/commit/b674dbe4f5371f378788c3d7a7bb8b55b44a4dfa
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#746] Update configuration.rst

* Document ckan.email_notifications_since
* Remove duplicate search.facet.limits
* Minor formatting tweaks


  Commit: a36ea43d936cebab6b7e4c9ada5df8801833784d
      https://github.com/okfn/ckan/commit/a36ea43d936cebab6b7e4c9ada5df8801833784d
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#746] Document file store options in configuration.rst

TODO: Expand them


  Commit: ddef4f59b89cbbe6f331589f1f8e16860d78c706
      https://github.com/okfn/ckan/commit/ddef4f59b89cbbe6f331589f1f8e16860d78c706
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#746] Update deployment.ini_tmpl

Remove legacy  and unused options, add new ones. Change the structure to
follow more closely the documentation on configuration.rst. Remove all inline
comments to avoid having documentation in more than one place.


  Commit: 40c13ed746ef91370ac7fa7fd0b98156a91e41ad
      https://github.com/okfn/ckan/commit/40c13ed746ef91370ac7fa7fd0b98156a91e41ad
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M doc/stats.rst

  Log Message:
  -----------
  Add note about ckanext.stats.cache_enabled


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

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

  Log Message:
  -----------
  [#519] Replace seanh with `whoami` in source install docs


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

  Changed paths:
    M doc/solr-setup.rst

  Log Message:
  -----------
  [#519] Docs: changed 'supported' to 'recommended'


  Commit: 929ebc8ac1b613074312503e73692ae1c6c4e71d
      https://github.com/okfn/ckan/commit/929ebc8ac1b613074312503e73692ae1c6c4e71d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M doc/datastore-setup.rst

  Log Message:
  -----------
  [#746] No : at end of sentence.


  Commit: 36c47991cec95c6342ea1c2418142e7fb053e79d
      https://github.com/okfn/ckan/commit/36c47991cec95c6342ea1c2418142e7fb053e79d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Coding Standard:  Minor cleanups


  Commit: 745c679d9eede8cc257e35c686487070542c6816
      https://github.com/okfn/ckan/commit/745c679d9eede8cc257e35c686487070542c6816
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Coding Standard:  More cleanups


  Commit: e88b2fbb67bcd845ea32d93a6509f025a016cc8e
      https://github.com/okfn/ckan/commit/e88b2fbb67bcd845ea32d93a6509f025a016cc8e
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M doc/conf.py
    M doc/datastore-setup.rst
    M doc/deployment.rst
    M doc/email-notifications.rst
    M doc/filestore.rst
    M doc/install-from-source.rst
    M doc/post-installation.rst
    M doc/solr-setup.rst
    M doc/test.rst
    M test-core.ini

  Log Message:
  -----------
  Merge pull request #874 from okfn/519-update-deployment-docs-second-try

519 update deployment docs second try


  Commit: 87d955cb17de4fb6b9dd8fd8b1dfb4cd0b447414
      https://github.com/okfn/ckan/commit/87d955cb17de4fb6b9dd8fd8b1dfb4cd0b447414
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/render.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    R ckan/public/base/images/flags.png
    M ckan/public/base/less/footer.less
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/snippets/facet_list.html
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_search.py
    M doc/apps-ideas.rst
    M doc/architecture.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    M doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore-setup.rst
    M doc/deployment.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    M doc/extensions.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    R doc/geospatial.rst
    R doc/harvesting.rst
    M doc/i18n.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/multilingual.rst
    M doc/post-installation.rst
    M doc/release-cycle.rst
    A doc/release-process.rst
    M doc/solr-setup.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    M doc/tracking.rst
    R doc/writing-extensions.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into coding-standards-tests

Conflicts:
	ckan/controllers/user.py
trivial merge


  Commit: 5cfeaeef249de4475271f6c15869c10226b7654d
      https://github.com/okfn/ckan/commit/5cfeaeef249de4475271f6c15869c10226b7654d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#746] Edit a docstring in deployment.ini_tmpl

Minor edits


  Commit: 6c37a3b21a05c21b142048be4dfc13bc539f2132
      https://github.com/okfn/ckan/commit/6c37a3b21a05c21b142048be4dfc13bc539f2132
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#746] Minor edits to configuration docs


  Commit: 873c693c4ea0839208003394c2ba5ae7e7cf4629
      https://github.com/okfn/ckan/commit/873c693c4ea0839208003394c2ba5ae7e7cf4629
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Coding Standard:  rename for pep8


  Commit: 819849838ad145d16a5449cd7ec0506cf9e14fa8
      https://github.com/okfn/ckan/commit/819849838ad145d16a5449cd7ec0506cf9e14fa8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

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

  Log Message:
  -----------
  Merge branch '787-ie10-media-item-image-height'


  Commit: 2597b4b97022d2c1ee43bcacf767cff71df75ba3
      https://github.com/okfn/ckan/commit/2597b4b97022d2c1ee43bcacf767cff71df75ba3
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

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

  Log Message:
  -----------
  css recompile


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

  Changed paths:
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/user.py
    M doc/conf.py
    M doc/datastore-setup.rst
    M doc/deployment.rst
    M doc/email-notifications.rst
    M doc/filestore.rst
    M doc/install-from-source.rst
    M doc/post-installation.rst
    M doc/solr-setup.rst
    M doc/test.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 746-update-deployment.ini_tmpl

Conflicts:
	ckan/config/deployment.ini_tmpl
	doc/datastore-setup.rst


  Commit: 6df1539b9ab5cb1fc8621a0c4599e7b11207449b
      https://github.com/okfn/ckan/commit/6df1539b9ab5cb1fc8621a0c4599e7b11207449b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    A ckan/config/install.py
    M doc/configuration.rst
    M doc/datastore-setup.rst
    M setup.py

  Log Message:
  -----------
  Merge branch '746-update-deployment.ini_tmpl'


  Commit: a111a7a3d685355db4fb853561e13c41fd38d936
      https://github.com/okfn/ckan/commit/a111a7a3d685355db4fb853561e13c41fd38d936
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Coding Standard: Add better error messages


  Commit: fee27f3c3a4101a7f313ef28d110dfb74947d180
      https://github.com/okfn/ckan/commit/fee27f3c3a4101a7f313ef28d110dfb74947d180
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Coding Standard: Remove from blacklist message


  Commit: b454a6e7ab6a0eb9504a8e31b9dd82b29a7865aa
      https://github.com/okfn/ckan/commit/b454a6e7ab6a0eb9504a8e31b9dd82b29a7865aa
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-08 (Wed, 08 May 2013)

  Changed paths:
    M ckan/public/base/javascript/modules/basic-form.js

  Log Message:
  -----------
  [#881] Adds generic fix for basic-form module to ensure <button> values are submitted in IE7


  Commit: 61f8911cbcc71177d13b4f4dd774b02db507d2b4
      https://github.com/okfn/ckan/commit/61f8911cbcc71177d13b4f4dd774b02db507d2b4
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-08 (Wed, 08 May 2013)

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

  Log Message:
  -----------
  [#881] Adds basic-form module to forms that need it in order to work in IE7


  Commit: 940605bdc8f47f414877a0c174fa76f4c594ee1b
      https://github.com/okfn/ckan/commit/940605bdc8f47f414877a0c174fa76f4c594ee1b
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-08 (Wed, 08 May 2013)

  Changed paths:
    M doc/stats.rst

  Log Message:
  -----------
  [#839] Make clear what the different between the stats extension and the page tracking feature are, improve style.


  Commit: a3bf3a01b0bb086c12d07e00a4ec75940fec734b
      https://github.com/okfn/ckan/commit/a3bf3a01b0bb086c12d07e00a4ec75940fec734b
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-08 (Wed, 08 May 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#839] Add link to stats extension from extensions docs


  Commit: 15ce695cc624abbf5c075c4f0602170a5255ad1d
      https://github.com/okfn/ckan/commit/15ce695cc624abbf5c075c4f0602170a5255ad1d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-08 (Wed, 08 May 2013)

  Changed paths:
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    A ckan/config/install.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/render.py
    M ckan/logic/action/get.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    R ckan/public/base/images/flags.png
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/group.less
    M doc/architecture.rst
    M doc/background-tasks.rst
    M doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore-setup.rst
    M doc/deployment.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    M doc/extensions.rst
    M doc/filestore.rst
    R doc/geospatial.rst
    R doc/harvesting.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/multilingual.rst
    M doc/post-installation.rst
    M doc/solr-setup.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    R doc/writing-extensions.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'okfn/master' into 839-stats-doc

Conflicts:
	doc/extensions.rst


  Commit: a49e874c119850d95ee0519b2ba898dea9c06d3e
      https://github.com/okfn/ckan/commit/a49e874c119850d95ee0519b2ba898dea9c06d3e
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-08 (Wed, 08 May 2013)

  Changed paths:
    M doc/stats.rst

  Log Message:
  -----------
  [#839] Make the docs sound better


  Commit: 4ac59173892f1b7e487ac3cec280a2c46d9e273d
      https://github.com/okfn/ckan/commit/4ac59173892f1b7e487ac3cec280a2c46d9e273d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-08 (Wed, 08 May 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#869] Link to stats docs from extension docs


  Commit: a9039e6848f3c90b3c0f58923848b699ec9708ed
      https://github.com/okfn/ckan/commit/a9039e6848f3c90b3c0f58923848b699ec9708ed
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-09 (Thu, 09 May 2013)

  Changed paths:
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst

  Log Message:
  -----------
  [#538] Created package install instructions

* Deleted virtualbox specific instructions (outdated).
* Deleted ec2 instructions (outdated).


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

  Changed paths:
    M doc/stats.rst

  Log Message:
  -----------
  [#839] Minor edits to stats extension docs

- Edit the opening sentence, it's the stats extension that analyzes the db
  not CKAN (this is picky)
- Also mention that there are tables and graphs!
- Remove weird capitalization in bullet list
- Put built-in page view tracking before ckanext-googleanalytics and tweak
  the link to read a little better
- Add an example of ckan.plugins = stats, also cross-ref to the ckan.plugins
  docs
- Add link to stats page on demo


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

  Changed paths:
    M doc/extensions.rst
    M doc/index.rst
    A doc/stats.rst

  Log Message:
  -----------
  Merge branch '839-stats-doc'


  Commit: f01267ab5d579cf5dd042f33ff91decad90299bf
      https://github.com/okfn/ckan/commit/f01267ab5d579cf5dd042f33ff91decad90299bf
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-09 (Thu, 09 May 2013)

  Changed paths:
    M ckan/public/base/javascript/tracking.js

  Log Message:
  -----------
  [#886] Remove  from tracking.js because it breaks IE


  Commit: 956a1b6ca4f91b19451d0f33d55a30ead574d35f
      https://github.com/okfn/ckan/commit/956a1b6ca4f91b19451d0f33d55a30ead574d35f
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-09 (Thu, 09 May 2013)

  Changed paths:
    M ckan/public/base/javascript/tracking.js

  Log Message:
  -----------
  Merge pull request #886 from okfn/886-js-console-log

IE bug with tracking.js


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

  Changed paths:
    M doc/authorization.rst

  Log Message:
  -----------
  Docs: add note about where an org's first admin comes from


  Commit: 366f1620da29ffaecf7e39d400b5223c8a56417e
      https://github.com/okfn/ckan/commit/366f1620da29ffaecf7e39d400b5223c8a56417e
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-09 (Thu, 09 May 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/who.ini
    M doc/install-from-source.rst

  Log Message:
  -----------
  [#888] Change path for cache dir and simplify options

The data, sessions and sstore dirs were created in /etc/ckan/default.
This creates permission problems and is not the natural place to store
this kind of files. The main cache dir is now /tmp/s(ckan.site_id)s
(generally /tmp/default). The beaker dirs will be created there if not
defined in the config file. This will ease the packaging and simplify
the installation. Also our cron jobs for cleaning files look for them in
/tmp.


  Commit: 0ef8ef0c2dbc785571e91c5b8e0c5436f3c00ebb
      https://github.com/okfn/ckan/commit/0ef8ef0c2dbc785571e91c5b8e0c5436f3c00ebb
  Author: kindly <kindly at gmail.com>
  Date:   2013-05-09 (Thu, 09 May 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/who.ini
    M doc/install-from-source.rst

  Log Message:
  -----------
  Merge pull request #888 from okfn/888-cache_dir-path-deployment.ini_tmpl

Fix cache_dir and beaker paths on deployment.ini_tmpl


  Commit: c9d34dd8d32d48e604abb4188d2ffbf75c111775
      https://github.com/okfn/ckan/commit/c9d34dd8d32d48e604abb4188d2ffbf75c111775
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-09 (Thu, 09 May 2013)

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

  Log Message:
  -----------
  [#538] Various tweaks on the package install docs

They include all the comments made on the pull request discussion.


  Commit: 95ac6bdfd47f69ce6d4c6b8a4b63962c29f22c6e
      https://github.com/okfn/ckan/commit/95ac6bdfd47f69ce6d4c6b8a4b63962c29f22c6e
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-09 (Thu, 09 May 2013)

  Changed paths:
    M doc/deployment.rst

  Log Message:
  -----------
  [#888] Remove data and session dirs from deployment docs


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

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

  Log Message:
  -----------
  [#538] Edit install from package docs

This is some fairly heavy editing:

- Some general editing: correcting typos and formatting errors,
  re-writing some sentences in ways that (I hope) makes them clearer

- Use |solr| substitution everywhere (spells Solr consistently with a
  capital S)

- Also use |postgresql| which spells PostgreSQL with the correct caps

- Use |production.ini| substitution for path to production.ini file

- Put the note about Ubuntu 64 only right at the top, and point them to
  the source install

- Also moved _Common error messages_ link to top, where it's more
  prominent (as on source install page)

- Removed stuff about virtualbox, ec2, rackspace, etc. This seems
  unnecessary to me

- Removed "The overall process is the following:" bullet-list from the
  top, it's unnecessary and seems to imply that upgrading is part of the
  installing process which doesn't make any sense

- Numbered the major steps of the install process, like in the source
  install

- Also within major steps, broke things down into individual numbered
  steps to make things clearer and easier to follow

- Tweaked the note about installing solr and postgres on separate servers

- Rewrote the stuff at the top of the _Upgrading_ section, I hope this
  makes it a bit clearer about major vs minor versions and the two
  different upgrade processes

- Moved moving the production.ini file into its own step, so that people
  don't miss it


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

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

  Log Message:
  -----------
  [#538] Don't spell SOLR in ALL-CAPS


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

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

  Log Message:
  -----------
  [#538] Minor edits to package upgrade docs


  Commit: e0e778b508048545327b2aa481d236122d0d1759
      https://github.com/okfn/ckan/commit/e0e778b508048545327b2aa481d236122d0d1759
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-09 (Thu, 09 May 2013)

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

  Log Message:
  -----------
  Merge pull request #889 from okfn/538-package-install-docs-seanh-rewrite

[#538] Edit install from package docs


  Commit: 97e04bf00be2b7f5e5a69386a4cd50eeb3aa32d4
      https://github.com/okfn/ckan/commit/97e04bf00be2b7f5e5a69386a4cd50eeb3aa32d4
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-10 (Fri, 10 May 2013)

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

  Log Message:
  -----------
  [#869] Fix how string with username is translated


  Commit: b25ff880fb0fdce1d332ea44341736de92a294f2
      https://github.com/okfn/ckan/commit/b25ff880fb0fdce1d332ea44341736de92a294f2
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-10 (Fri, 10 May 2013)

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

  Log Message:
  -----------
  Remove ckan user references


  Commit: ea792a060369d81d822c018a003f9f99a7d3525f
      https://github.com/okfn/ckan/commit/ea792a060369d81d822c018a003f9f99a7d3525f
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-10 (Fri, 10 May 2013)

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

  Log Message:
  -----------
  Merge branch '869-validate-username-in-new-member'


  Commit: d4bcbeca6ae24e9f67cd9f13c1ac80267a5b150f
      https://github.com/okfn/ckan/commit/d4bcbeca6ae24e9f67cd9f13c1ac80267a5b150f
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-10 (Fri, 10 May 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#891] Mark new_resource_show from datastore side effect free


  Commit: 05e7b6eef5b8aa79dd91a47e12e9cefb93b4d1e9
      https://github.com/okfn/ckan/commit/05e7b6eef5b8aa79dd91a47e12e9cefb93b4d1e9
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-10 (Fri, 10 May 2013)

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

  Log Message:
  -----------
  [#538] More tweaks to package install docs

* Re-add wget install

* Mention filestore

* Update upgrade instructions: removed old 1.x upgrade instructions
  (there is still a link to them) and leave a single "Upgrading to 2.0
  section" with an overview of the steps and the main changes in
  extensions.


  Commit: cc7ddd7b3e4696b0cb3ba7527bfe7f9638c3be9c
      https://github.com/okfn/ckan/commit/cc7ddd7b3e4696b0cb3ba7527bfe7f9638c3be9c
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-10 (Fri, 10 May 2013)

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

  Log Message:
  -----------
  [#538] Further tweaks to package upgrade insructions


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

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

  Log Message:
  -----------
  [#538] Edit the CKAN 2.0 package install upgrade docs


  Commit: b6097906c6b190b85a424026c2c10e69138a3dbc
      https://github.com/okfn/ckan/commit/b6097906c6b190b85a424026c2c10e69138a3dbc
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-10 (Fri, 10 May 2013)

  Changed paths:
    M .travis.yml
    M CONTRIBUTING.rst
    M README.rst
    M bin/osx-postgres-mem.sh
    A bin/travis-build
    A ckan/common.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    A ckan/config/install.py
    M ckan/config/routing.py
    M ckan/config/who.ini
    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/i18n/check_po_files.py
    M ckan/lib/activity_streams.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    R ckan/lib/authztool.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/dumper.py
    M ckan/lib/email_notifications.py
    M ckan/lib/field_types.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/jsonp.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/repoze_patch.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/022_add_group_extras.py
    M ckan/migration/versions/027_adjust_harvester.py
    M ckan/migration/versions/029_version_groups.py
    M ckan/migration/versions/045_user_name_unique.py
    M ckan/migration/versions/067_turn_extras_to_strings.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/tag.py
    M ckan/model/tracking.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    R ckan/public/base/css/fuchsia.min.css
    R ckan/public/base/css/green.min.css
    M ckan/public/base/css/main.css
    R ckan/public/base/css/main.min.css
    R ckan/public/base/css/maroon.min.css
    R ckan/public/base/css/red.min.css
    R ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
    R ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckan/public/base/i18n/bg.min.js
    R ckan/public/base/i18n/ca.min.js
    R ckan/public/base/i18n/cs_CZ.min.js
    R ckan/public/base/i18n/de.min.js
    R ckan/public/base/i18n/el.min.js
    R ckan/public/base/i18n/es.min.js
    R ckan/public/base/i18n/fi.min.js
    R ckan/public/base/i18n/fr.min.js
    R ckan/public/base/i18n/hu.min.js
    R ckan/public/base/i18n/it.min.js
    R ckan/public/base/i18n/lt.min.js
    R ckan/public/base/i18n/lv.min.js
    R ckan/public/base/i18n/nl.min.js
    R ckan/public/base/i18n/no.min.js
    R ckan/public/base/i18n/pl.min.js
    R ckan/public/base/i18n/pt_BR.min.js
    R ckan/public/base/i18n/ro.min.js
    R ckan/public/base/i18n/ru.min.js
    R ckan/public/base/i18n/sk.min.js
    R ckan/public/base/i18n/sl.min.js
    R ckan/public/base/i18n/sq.min.js
    R ckan/public/base/i18n/sr.min.js
    R ckan/public/base/i18n/sr_Latn.min.js
    R ckan/public/base/i18n/sv.min.js
    R ckan/public/base/i18n/zh_TW.min.js
    R ckan/public/base/images/flags.png
    A ckan/public/base/images/table-seperator.png
    R ckan/public/base/javascript/client.min.js
    R ckan/public/base/javascript/i18n.min.js
    R ckan/public/base/javascript/main.min.js
    R ckan/public/base/javascript/module.min.js
    R ckan/public/base/javascript/modules/api-info.min.js
    R ckan/public/base/javascript/modules/autocomplete.min.js
    M ckan/public/base/javascript/modules/basic-form.js
    R ckan/public/base/javascript/modules/basic-form.min.js
    R ckan/public/base/javascript/modules/confirm-action.min.js
    R ckan/public/base/javascript/modules/custom-fields.min.js
    R ckan/public/base/javascript/modules/dashboard.min.js
    R ckan/public/base/javascript/modules/data-viewer.min.js
    R ckan/public/base/javascript/modules/follow.min.js
    R ckan/public/base/javascript/modules/related-item.min.js
    R ckan/public/base/javascript/modules/resource-form.min.js
    R ckan/public/base/javascript/modules/resource-upload-field.min.js
    R ckan/public/base/javascript/modules/select-switch.min.js
    R ckan/public/base/javascript/modules/slug-preview.min.js
    A ckan/public/base/javascript/modules/table-selectable-rows.js
    A ckan/public/base/javascript/modules/table-toggle-more.js
    R ckan/public/base/javascript/notify.min.js
    R ckan/public/base/javascript/plugins/jquery.date-helpers.min.js
    R ckan/public/base/javascript/plugins/jquery.form-warning.min.js
    R ckan/public/base/javascript/plugins/jquery.inherit.min.js
    R ckan/public/base/javascript/plugins/jquery.proxy-all.min.js
    R ckan/public/base/javascript/plugins/jquery.slug-preview.min.js
    R ckan/public/base/javascript/plugins/jquery.slug.min.js
    R ckan/public/base/javascript/plugins/jquery.truncator.min.js
    R ckan/public/base/javascript/plugins/jquery.url-helpers.min.js
    R ckan/public/base/javascript/pubsub.min.js
    M ckan/public/base/javascript/resource.config
    R ckan/public/base/javascript/sandbox.min.js
    M ckan/public/base/javascript/tracking.js
    R ckan/public/base/javascript/tracking.min.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/prose.less
    A ckan/public/base/less/tables.less
    M ckan/public/base/less/variables.less
    M ckan/public/base/test/index.html
    R ckan/public/base/test/spec/ckan.spec.min.js
    M ckan/public/base/test/spec/client.spec.js
    R ckan/public/base/test/spec/client.spec.min.js
    R ckan/public/base/test/spec/module.spec.min.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    R ckan/public/base/test/spec/modules/autocomplete.spec.min.js
    R ckan/public/base/test/spec/modules/basic-form.spec.min.js
    R ckan/public/base/test/spec/modules/confirm-action.spec.min.js
    R ckan/public/base/test/spec/modules/custom-fields.spec.min.js
    R ckan/public/base/test/spec/modules/related-item.spec.min.js
    R ckan/public/base/test/spec/modules/resource-form.spec.min.js
    R ckan/public/base/test/spec/modules/resource-upload-field.spec.min.js
    R ckan/public/base/test/spec/notify.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.date-helpers.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.form-warning.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.inherit.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.proxy-all.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.slug-preview.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.slug.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.url-helpers.spec.min.js
    R ckan/public/base/test/spec/pubsub.spec.min.js
    R ckan/public/base/test/spec/sandbox.spec.min.js
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/actions.html
    A ckan/templates/development/snippets/context.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/media_grid.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    R ckan/templates/development/snippets/toolbar.html
    M ckan/templates/error_document_template.html
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/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
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_item.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/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/home/snippets/about_text.html
    M ckan/templates/organization/about.html
    A ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    A 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/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    A ckan/templates/organization/snippets/help.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.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/new_package_metadata.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/data_api_button.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/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_form.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/datapreview_embed_dialog.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    R ckan/templates/snippets/page_header.html
    M ckan/templates/snippets/popular.html
    M ckan/templates/snippets/related.html
    A ckan/templates/snippets/search_result_text.html
    A ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/sort_by.html
    M ckan/templates/snippets/subscribe.html
    A ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_base.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/logout_first.html
    M ckan/templates/user/new.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates_legacy/group/layout.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/revision/layout.html
    M ckan/templates_legacy/user/layout.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/lib/test_solr_search_index.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    A ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/misc/test_format_text.py
    M ckan/tests/misc/test_sync.py
    R ckan/tests/mock_publisher_auth.py
    M ckan/tests/models/test_package.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_dumper.py
    M ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    A ckanext/example_idatasetform/__init__.py
    A ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/templates/package/read.html
    A ckanext/example_idatasetform/templates/package/snippets/package_basic_fields.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    R ckanext/jsonpreview/theme/public/css/json.min.css
    R ckanext/jsonpreview/theme/public/preview_json.min.js
    R ckanext/organizations/__init__.py
    R ckanext/organizations/controllers.py
    R ckanext/organizations/forms.py
    R ckanext/organizations/templates/email/join_publisher_request.txt
    R ckanext/organizations/templates/organization_edit.html
    R ckanext/organizations/templates/organizations/form.html
    R ckanext/organizations/templates/organizations/index.html
    R ckanext/organizations/templates/organizations/new.html
    R ckanext/organizations/templates/organizations/read.html
    R ckanext/organizations/templates/organizations/users.html
    R ckanext/organizations/templates/organizations/users_form.html
    R ckanext/organizations/templates_legacy/organizations/apply.html
    R ckanext/organizations/templates_legacy/organizations/apply_form.html
    R ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
    R ckanext/organizations/templates_legacy/organizations/form.html
    R ckanext/organizations/templates_legacy/organizations/history.html
    R ckanext/organizations/templates_legacy/organizations/index.html
    R ckanext/organizations/templates_legacy/organizations/layout.html
    R ckanext/organizations/templates_legacy/organizations/new.html
    R ckanext/organizations/templates_legacy/organizations/package_form.html
    R ckanext/organizations/templates_legacy/organizations/read.html
    R ckanext/organizations/templates_legacy/organizations/users.html
    R ckanext/organizations/templates_legacy/organizations/users_form.html
    R ckanext/pdfpreview/theme/public/css/pdf.min.css
    R ckanext/pdfpreview/theme/public/css/recline.min.css
    R ckanext/pdfpreview/theme/public/preview_pdf.min.js
    R ckanext/publisher_form/__init__.py
    R ckanext/publisher_form/forms.py
    R ckanext/publisher_form/templates/dataset_form.html
    R ckanext/publisher_form/templates/publisher_form.html
    R ckanext/publisher_form/templates/publisher_index.html
    R ckanext/publisher_form/templates/publisher_layout.html
    R ckanext/publisher_form/templates/publisher_new.html
    R ckanext/publisher_form/templates/publisher_read.html
    R ckanext/reclinepreview/theme/public/css/recline.min.css
    M ckanext/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
    R ckanext/resourceproxy/tests/file_server.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/test_tag_vocab_plugin.py
    M doc/_templates/footer.html
    R doc/about.rst
    R doc/administrative-dashboard.rst
    R doc/api-tutorial.rst
    R doc/api-util.rst
    R doc/api-v2.rst
    M doc/api.rst
    R doc/apiv3.rst
    M doc/apps-ideas.rst
    M doc/architecture.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    A doc/ckan.logic.action.create.rst
    A doc/ckan.logic.action.delete.rst
    A doc/ckan.logic.action.get.rst
    A doc/ckan.logic.action.update.rst
    R doc/commenting.rst
    M doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    R doc/contrib.rst
    A doc/contributing.rst
    M doc/css-coding-standards.rst
    M doc/data-viewer.rst
    M doc/database-dumps.rst
    M doc/datastore-api.rst
    M doc/datastore-setup.rst
    M doc/deployment.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    M doc/extensions.rst
    A doc/filestore-api.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    R doc/forms.rst
    M doc/frontend-development.rst
    R doc/geospatial.rst
    R doc/harvesting.rst
    M doc/i18n.rst
    A doc/images/popular-dataset.png
    A doc/images/popular-resource.png
    A doc/images/sort-datasets-by-popularity.png
    A doc/importing-datasets.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/javascript-coding-standards.rst
    M doc/javascript-module-tutorial.rst
    A doc/legacy-api.rst
    R doc/loading-data.rst
    M doc/multilingual.rst
    R doc/organizations_and_groups.rst
    M doc/paster.rst
    M doc/post-installation.rst
    R doc/publisher-profile.rst
    M doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    M doc/release-cycle.rst
    A doc/release-process.rst
    M doc/resources.rst
    M doc/solr-setup.rst
    A doc/stats.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    A doc/tracking.rst
    R doc/user-stories-list.rst
    R doc/user-stories.rst
    R doc/writing-extensions.rst
    M pip-requirements-test.txt
    M pip-requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into update-changeloge-for-2.0


  Commit: 79638fb4241575b8e013be76dfe8e6d7f3842a90
      https://github.com/okfn/ckan/commit/79638fb4241575b8e013be76dfe8e6d7f3842a90
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-10 (Fri, 10 May 2013)

  Changed paths:
    M CHANGELOG.txt

  Log Message:
  -----------
  Update CHANGELOG for 2.0


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

  Changed paths:
    M doc/conf.py
    M doc/deployment.rst
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst

  Log Message:
  -----------
  Merge branch '538-package-install-docs'


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

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/who.ini
    M ckan/controllers/group.py
    M ckan/logic/action/create.py
    M doc/install-from-source.rst

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


  Commit: 6e4ea3a8f4671ab2562e9d98cfe85df5a76c5e88
      https://github.com/okfn/ckan/commit/6e4ea3a8f4671ab2562e9d98cfe85df5a76c5e88
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-10 (Fri, 10 May 2013)

  Changed paths:
    M CHANGELOG.txt

  Log Message:
  -----------
  Merge branch 'update-changeloge-for-2.0'


  Commit: 813f09340d4b9aecb2636f08eadfd3c7d0ae76e4
      https://github.com/okfn/ckan/commit/813f09340d4b9aecb2636f08eadfd3c7d0ae76e4
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-10 (Fri, 10 May 2013)

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

  Log Message:
  -----------
  [#538] Fix tiny but crucial typo on install docs


  Commit: 1b71730157ede1dcc441e8afcca3af470b0dd836
      https://github.com/okfn/ckan/commit/1b71730157ede1dcc441e8afcca3af470b0dd836
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-10 (Fri, 10 May 2013)

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

  Log Message:
  -----------
  [#538] Fix wrong URL for package install


  Commit: cd8d87a1b6585f17593b588ec9c2985fc3d4aceb
      https://github.com/okfn/ckan/commit/cd8d87a1b6585f17593b588ec9c2985fc3d4aceb
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-11 (Sat, 11 May 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#891] Correct comment


  Commit: 44650133256f449cba4895dd2083b5f3b4a046ed
      https://github.com/okfn/ckan/commit/44650133256f449cba4895dd2083b5f3b4a046ed
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-11 (Sat, 11 May 2013)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#895] Close connections in datastore when we don't need them any more. Also make sure that transactions variables are in current context.


  Commit: 923d75084498f9afef0f0b9bf915dd6d1302ebbf
      https://github.com/okfn/ckan/commit/923d75084498f9afef0f0b9bf915dd6d1302ebbf
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-13 (Mon, 13 May 2013)

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

  Log Message:
  -----------
  [#897] use IDatasetForm schema for resource_update


  Commit: cf7acb33571db57bec3980dfdc142c3a9ab86f1b
      https://github.com/okfn/ckan/commit/cf7acb33571db57bec3980dfdc142c3a9ab86f1b
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M ckan/model/package.py
    M ckan/templates_legacy/package/resource_read.html

  Log Message:
  -----------
  Merge pull request #795 from okfn/795-package-is_private

package.is_private needs to die


  Commit: 52282f154a8aed5fed23487bdca27d1a2d692f06
      https://github.com/okfn/ckan/commit/52282f154a8aed5fed23487bdca27d1a2d692f06
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  Merge pull request #845 from open-data/more-useful-validation-errors

Prettifying ValidationErrors makes them less useful


  Commit: 70970f93daff29046ab433fbb6c361d8da01ebdd
      https://github.com/okfn/ckan/commit/70970f93daff29046ab433fbb6c361d8da01ebdd
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Merge branch '891-resource-show-does-not-support-get'


  Commit: accfa9184aa26261bdca77ed3d2cb5711e7f93b5
      https://github.com/okfn/ckan/commit/accfa9184aa26261bdca77ed3d2cb5711e7f93b5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-14 (Tue, 14 May 2013)

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

  Log Message:
  -----------
  Merge branch '897-fix-resource-update-idatasetform-validation'


  Commit: 4e1848e44876f572d47e8ccbd34393f0f54c626c
      https://github.com/okfn/ckan/commit/4e1848e44876f572d47e8ccbd34393f0f54c626c
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-15 (Wed, 15 May 2013)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Merge branch '895-close-datastore-connections'


  Commit: 1ae1b0a9ddccd782f66889b3fdb58b96ce640056
      https://github.com/okfn/ckan/commit/1ae1b0a9ddccd782f66889b3fdb58b96ce640056
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-15 (Wed, 15 May 2013)

  Changed paths:
    M CHANGELOG.txt
    M ckan/config/deployment.ini_tmpl
    A ckan/config/install.py
    M ckan/config/who.ini
    M ckan/controllers/group.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/model/package.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/tracking.js
    M ckan/public/base/less/group.less
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/revision/read.html
    M ckan/templates_legacy/package/resource_read.html
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    M doc/authorization.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/datastore-setup.rst
    M doc/deployment.rst
    M doc/extensions.rst
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    M doc/index.rst
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    A doc/stats.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into coding-standards-tests


  Commit: 22538f9b3a54c65e38db4b9e1d905202b8ba17ba
      https://github.com/okfn/ckan/commit/22538f9b3a54c65e38db4b9e1d905202b8ba17ba
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-15 (Wed, 15 May 2013)

  Changed paths:
    M ckan/config/install.py

  Log Message:
  -----------
  Coding standards: pep8 fix for config/install.py


  Commit: 1fe28d260358e8eb7b63853d7ade498fad0c0af3
      https://github.com/okfn/ckan/commit/1fe28d260358e8eb7b63853d7ade498fad0c0af3
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-15 (Wed, 15 May 2013)

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

  Log Message:
  -----------
  [#283] Save validated data dicts in activity_create

activity_create() was validating the data dict passed to it, but then
passing the original, unvalidated data dict on to model save. Make it pass
the validated data dict instead.

Fixing this reveals another problem, a JSONDecodeError when pulling
activities out of the database. Invalid JSON is getting into the data
column of the activity table. default_create_activity_schema() runs
unicode() on the 'data' field of the activity dict. This has the effect of
turning a Python dict (the 'data' field's value) into a Python string. The
schema should not do this, because the data field uses SQLAlchemy's
JsonDictType at the model level, so the dict is turned into a string at
the model level, it doesn't need to be turned into a string at the schema
level first.

To fix the second problem, just remove the unicode from
default_create_activity_schema.


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

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#283] Accept user name or id in activity_create

The activity_create docstring claims that 'user_id' can be either name
or an id, but in fact only ids work. Change the schema to allow names or
ids.


  Commit: 300f6bc9fc48dbd72d573d8798537b538317d740
      https://github.com/okfn/ckan/commit/300f6bc9fc48dbd72d573d8798537b538317d740
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-15 (Wed, 15 May 2013)

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

  Log Message:
  -----------
  [#283] Don't raise NotAuthorized in related_update()

There's no need for related_update logic function to check whether 'user'
is in the context and raise NotAuthorised. 'user' is always in the
context, and if the user is not logged in or not authorised to edit the
related item, then the related_update authorization function will raise an
error.


  Commit: 1ee1f71b29c2b5d7211e9eb7aed3f9dc9c267c08
      https://github.com/okfn/ckan/commit/1ee1f71b29c2b5d7211e9eb7aed3f9dc9c267c08
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-15 (Wed, 15 May 2013)

  Changed paths:
    M CHANGELOG.txt
    M CONTRIBUTING.rst
    M README.rst
    M bin/osx-postgres-mem.sh
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    A ckan/config/install.py
    M ckan/config/routing.py
    M ckan/config/who.ini
    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/i18n/check_po_files.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/render.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
    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/tag.py
    M ckan/model/tracking.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    R ckan/public/base/images/flags.png
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/tracking.js
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/prose.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/actions.html
    A ckan/templates/development/snippets/context.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/media_grid.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    R ckan/templates/development/snippets/toolbar.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
    M ckan/templates/package/snippets/data_api_button.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/facet_list.html
    M ckan/templates/snippets/sort_by.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/templates_legacy/package/read_core.html
    M ckan/templates_legacy/package/resource_read.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
    A ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/misc/test_format_text.py
    M ckan/tests/models/test_package.py
    M ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_search.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
    R doc/about.rst
    M doc/apps-ideas.rst
    M doc/architecture.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    R doc/commenting.rst
    M doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    R doc/contrib.rst
    A doc/contributing.rst
    M doc/css-coding-standards.rst
    M doc/data-viewer.rst
    M doc/database-dumps.rst
    M doc/datastore-setup.rst
    M doc/deployment.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    M doc/extensions.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    M doc/frontend-development.rst
    R doc/geospatial.rst
    R doc/harvesting.rst
    M doc/i18n.rst
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    A doc/images/popular-dataset.png
    A doc/images/popular-resource.png
    A doc/images/sort-datasets-by-popularity.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    A doc/importing-datasets.rst
    M doc/index.rst
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/javascript-coding-standards.rst
    M doc/javascript-module-tutorial.rst
    M doc/legacy-api.rst
    R doc/loading-data.rst
    M doc/multilingual.rst
    R doc/organizations_and_groups.rst
    M doc/paster.rst
    M doc/post-installation.rst
    R doc/publisher-profile.rst
    M doc/publishing-datasets.rst
    M doc/release-cycle.rst
    A doc/release-process.rst
    M doc/resources.rst
    M doc/solr-setup.rst
    A doc/stats.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    A doc/tracking.rst
    R doc/user-stories-list.rst
    R doc/user-stories.rst
    R doc/writing-extensions.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 283-activity-stream-fixes

Conflicts:
	ckan/logic/action/update.py


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

  Changed paths:
    M ckan/config/install.py
    M ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    A ckan/tests/test_coding_standards.py
    M pip-requirements-test.txt

  Log Message:
  -----------
  Merge branch 'coding-standards-tests'


  Commit: 1dc67189be7c46c719b580e2bcf8ef21cf1ae60a
      https://github.com/okfn/ckan/commit/1dc67189be7c46c719b580e2bcf8ef21cf1ae60a
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-15 (Wed, 15 May 2013)

  Changed paths:
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_unit.py

  Log Message:
  -----------
  [#905] Validate datastore actions against a schema


  Commit: 6efb9285dca9d64bff1385ba6e519948e30e98ee
      https://github.com/okfn/ckan/commit/6efb9285dca9d64bff1385ba6e519948e30e98ee
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-15 (Wed, 15 May 2013)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#905] Do not raise 500 if the wrong type is passed to datastore_create or datastore_upsert


  Commit: a66c3c8e112425ad78a272d35cb28f943943947d
      https://github.com/okfn/ckan/commit/a66c3c8e112425ad78a272d35cb28f943943947d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-15 (Wed, 15 May 2013)

  Changed paths:
    M ckan/lib/activity_streams.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/tests/functional/api/test_activity.py

  Log Message:
  -----------
  Merge branch '283-activity-stream-fixes'


  Commit: c18b7e633397047e672cc4eb06466bab3ad9e7e7
      https://github.com/okfn/ckan/commit/c18b7e633397047e672cc4eb06466bab3ad9e7e7
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-16 (Thu, 16 May 2013)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#905] CLean up import, capitalized constants


  Commit: 39206622efada8c34f6af750787348f9a337291d
      https://github.com/okfn/ckan/commit/39206622efada8c34f6af750787348f9a337291d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-16 (Thu, 16 May 2013)

  Changed paths:
    A ckanext/datastore/logic/schema.py

  Log Message:
  -----------
  [#905] Add missing schema file. Thanks @tobes


  Commit: 32d3a15cee154e8638f8f8c504d599bb8f45c6f8
      https://github.com/okfn/ckan/commit/32d3a15cee154e8638f8f8c504d599bb8f45c6f8
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-16 (Thu, 16 May 2013)

  Changed paths:
    M ckanext/datastore/logic/schema.py

  Log Message:
  -----------
  [#905] Explicitly get validators from toolkit


  Commit: 38dd3c1f117eacdc554c2a63aaf711321b652cce
      https://github.com/okfn/ckan/commit/38dd3c1f117eacdc554c2a63aaf711321b652cce
  Author: John Glover <glover.john at gmail.com>
  Date:   2013-05-21 (Tue, 21 May 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge pull request #866 from okfn/866-lib-helpers-cleanups

lib.helpers cleanups


  Commit: 8f66eae11618ec663b92e4cf0082acb7621e94e2
      https://github.com/okfn/ckan/commit/8f66eae11618ec663b92e4cf0082acb7621e94e2
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-22 (Wed, 22 May 2013)

  Changed paths:
    M ckan/logic/__init__.py
    M ckanext/datastore/logic/schema.py

  Log Message:
  -----------
  [#905] Get OneOf from toolkit


  Commit: a2d27c943488af0ab57e80d543388017fcc64860
      https://github.com/okfn/ckan/commit/a2d27c943488af0ab57e80d543388017fcc64860
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-22 (Wed, 22 May 2013)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  [#905] Validate filters and parse them to json, even if they are strings, fixes #917


  Commit: 394d85a2337dc4afabb6e37b112c351302ee62f4
      https://github.com/okfn/ckan/commit/394d85a2337dc4afabb6e37b112c351302ee62f4
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-23 (Thu, 23 May 2013)

  Changed paths:
    M ckanext/datastore/logic/schema.py

  Log Message:
  -----------
  [#905] Fix pep8 isssue


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

  Changed paths:
    M .tx/config
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    A ckan/i18n/id/LC_MESSAGES/ckan.mo
    A ckan/i18n/id/LC_MESSAGES/ckan.po
    A ckan/i18n/is/LC_MESSAGES/ckan.mo
    A ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Update strings files before CKAN 2.0 call for translations

Pull the latest strings from the CKAN 1.8 resource on Transifex into the
po files (some new translations have been added to 1.8 on Transifex,
since 1.8 was released). I've checked these using check-po-files and
they seem okay.

I did not commit the zh_CN (Chinese) or dv (Divehi) strings files as
these currently have 0% translations for CKAN 2.0, maybe they'll be
added before the release.

Update the ckan.pot file with the strings from the source files on the
release-v2.0 branch. I've pushed this updated pot file to Transifex as
the resource CKAN 2.0.

Update the resource slug in .tx/config.

Recompile the mo files from the updated po files.


  Commit: 0943719205580a12c7c5368cd4857728fe3a4e2f
      https://github.com/okfn/ckan/commit/0943719205580a12c7c5368cd4857728fe3a4e2f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-23 (Thu, 23 May 2013)

  Changed paths:
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Add British English translation from Transifex

For now I've added British English to the filtered-out languages, until
we can do the work to get it displaying properly in the Language:
drop-down.

Conflicts:
	ckan/config/deployment.ini_tmpl


  Commit: 82f45de2b010e892408a861037b46737358c480c
      https://github.com/okfn/ckan/commit/82f45de2b010e892408a861037b46737358c480c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-23 (Thu, 23 May 2013)

  Changed paths:
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    A ckan/i18n/dv/LC_MESSAGES/ckan.mo
    A ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/tr/LC_MESSAGES/ckan.mo
    A ckan/i18n/tr/LC_MESSAGES/ckan.po
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  [i18n] Pull translations from Transifex

Pulled the latest translations from Transifex with `tx pull`, checked
them with `check_po_files.py`, compiled the mo files with
`compile_messages`.


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

  Changed paths:
    M doc/release-process.rst

  Log Message:
  -----------
  [#929] Add a step to the release process i18n docs

Add a step to the release process i18n docs, that you have to
cherry-pick the i18n commits from the release branch to master, after
the release has been finalized.


  Commit: f2dc22feb0da81067e6666c407751210228dc310
      https://github.com/okfn/ckan/commit/f2dc22feb0da81067e6666c407751210228dc310
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-27 (Mon, 27 May 2013)

  Changed paths:
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/related/snippets/related_item.html

  Log Message:
  -----------
  [#948] Use h.url_for_static for placeholder images

Placeholder images in 3 templates were not using h.url_for_static,
causing placeholder images to be broken when CKAN is mounted on
non-root URL.


  Commit: dfe9ce897a81d6a119471fcd982993d9e3c9bc9d
      https://github.com/okfn/ckan/commit/dfe9ce897a81d6a119471fcd982993d9e3c9bc9d
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    A ckanext/datastore/controller.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M doc/datastore-api.rst
    M pip-requirements.txt

  Log Message:
  -----------
  Merge pull request #628 from okfn/628-datastore-dump

Datastore dumps


  Commit: 994a75c874f533fabd182bfdfa65ed491e98eb19
      https://github.com/okfn/ckan/commit/994a75c874f533fabd182bfdfa65ed491e98eb19
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

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

  Log Message:
  -----------
  [#628] Fix PEP 8 so that the test don't fail any more


  Commit: e16cf4f4d9ab720b536f6d8157e44cee29b6a02d
      https://github.com/okfn/ckan/commit/e16cf4f4d9ab720b536f6d8157e44cee29b6a02d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/related/snippets/related_item.html

  Log Message:
  -----------
  Merge branch '948-helper-function-img'


  Commit: 4a3d35ecd4f314a3d9b76830b2a637f8b6dfec0e
      https://github.com/okfn/ckan/commit/4a3d35ecd4f314a3d9b76830b2a637f8b6dfec0e
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

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

  Log Message:
  -----------
  [#628] More PEP8 fixes


  Commit: e713ad31d351eafaae8c78234078e6cb3287239f
      https://github.com/okfn/ckan/commit/e713ad31d351eafaae8c78234078e6cb3287239f
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

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

  Log Message:
  -----------
  Merge pull request #950 from okfn/travis-fix

[#628] Fix PEP 8 so that the test don't fail any more


  Commit: 9b52a86d2e367439e6d4c43216b9d9d91179e346
      https://github.com/okfn/ckan/commit/9b52a86d2e367439e6d4c43216b9d9d91179e346
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-28 (Tue, 28 May 2013)

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

  Log Message:
  -----------
  [#867] Adds better font sizes for headings


  Commit: 3959f278af39bd37b98737f1a0b0acff0e366c89
      https://github.com/okfn/ckan/commit/3959f278af39bd37b98737f1a0b0acff0e366c89
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-28 (Tue, 28 May 2013)

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

  Log Message:
  -----------
  [#914] Increases pill line-height to allow for spacing between lines


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

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

  Log Message:
  -----------
  Merge branch '867-heading-sizes'


  Commit: 143acfe377e298531e954ea9ea3f571a3d538af8
      https://github.com/okfn/ckan/commit/143acfe377e298531e954ea9ea3f571a3d538af8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

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

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


  Commit: d3076304eac1d518c469a4b0560fb73be7e59753
      https://github.com/okfn/ckan/commit/d3076304eac1d518c469a4b0560fb73be7e59753
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    M doc/release-process.rst

  Log Message:
  -----------
  Merge branch '929'


  Commit: 3773511d821cb02860b99f552b066e55f40dfcb4
      https://github.com/okfn/ckan/commit/3773511d821cb02860b99f552b066e55f40dfcb4
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M ckan/logic/__init__.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#905] Sort imports correctly, improve PEP8, remove unused code


  Commit: f84e58a4522727479ef7b241db02235f9270e075
      https://github.com/okfn/ckan/commit/f84e58a4522727479ef7b241db02235f9270e075
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M .tx/config
    M ckan/config/install.py
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    A ckan/i18n/dv/LC_MESSAGES/ckan.mo
    A ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    A ckan/i18n/id/LC_MESSAGES/ckan.mo
    A ckan/i18n/id/LC_MESSAGES/ckan.po
    A ckan/i18n/is/LC_MESSAGES/ckan.mo
    A ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/tr/LC_MESSAGES/ckan.mo
    A ckan/i18n/tr/LC_MESSAGES/ckan.po
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/helpers.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/package.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/prose.less
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    A ckan/tests/test_coding_standards.py
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M doc/datastore-api.rst
    M doc/release-process.rst
    M pip-requirements-test.txt
    M pip-requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 905-datastore-validation

Conflicts:
	ckanext/datastore/db.py
	ckanext/datastore/plugin.py


  Commit: cbbcfb46a2fe8c90b4723d50e2c0eaf75a587f04
      https://github.com/okfn/ckan/commit/cbbcfb46a2fe8c90b4723d50e2c0eaf75a587f04
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M ckanext/datastore/controller.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_dump.py
    M doc/datastore-api.rst

  Log Message:
  -----------
  [#905] Fix merge, add limit and offset parameter to dump which is compatible with new schema validation


  Commit: ecf8b639d810d37e9b7a3ee06b71a65d603dede2
      https://github.com/okfn/ckan/commit/ecf8b639d810d37e9b7a3ee06b71a65d603dede2
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#905] Do not require PEP8 blacklisting any more


  Commit: 2c1082a182ad0e3f3ba23985e49fe495dcfdbeff
      https://github.com/okfn/ckan/commit/2c1082a182ad0e3f3ba23985e49fe495dcfdbeff
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M .tx/config
    M CHANGELOG.txt
    M CONTRIBUTING.rst
    M README.rst
    M bin/osx-postgres-mem.sh
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    A ckan/config/install.py
    M ckan/config/routing.py
    M ckan/config/who.ini
    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/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/check_po_files.py
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    A ckan/i18n/dv/LC_MESSAGES/ckan.mo
    A ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    A ckan/i18n/id/LC_MESSAGES/ckan.mo
    A ckan/i18n/id/LC_MESSAGES/ckan.po
    A ckan/i18n/is/LC_MESSAGES/ckan.mo
    A ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/tr/LC_MESSAGES/ckan.mo
    A ckan/i18n/tr/LC_MESSAGES/ckan.po
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    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/render.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
    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/tag.py
    M ckan/model/tracking.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    R ckan/public/base/images/flags.png
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/tracking.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/prose.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/actions.html
    A ckan/templates/development/snippets/context.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/media_grid.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    R ckan/templates/development/snippets/toolbar.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
    M ckan/templates/group/snippets/group_item.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/organization/snippets/organization_item.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
    M ckan/templates/package/snippets/data_api_button.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
    M ckan/templates/related/snippets/related_item.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/facet_list.html
    M ckan/templates/snippets/sort_by.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/templates_legacy/package/read_core.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/functional/api/test_activity.py
    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
    A ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/misc/test_format_text.py
    M ckan/tests/models/test_package.py
    A ckan/tests/test_coding_standards.py
    M ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/commands.py
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    A ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.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
    R doc/about.rst
    M doc/apps-ideas.rst
    M doc/architecture.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    R doc/commenting.rst
    M doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    R doc/contrib.rst
    A doc/contributing.rst
    M doc/css-coding-standards.rst
    M doc/data-viewer.rst
    M doc/database-dumps.rst
    M doc/datastore-api.rst
    M doc/datastore-setup.rst
    M doc/deployment.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    M doc/extensions.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    M doc/frontend-development.rst
    R doc/geospatial.rst
    R doc/harvesting.rst
    M doc/i18n.rst
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    A doc/images/popular-dataset.png
    A doc/images/popular-resource.png
    A doc/images/sort-datasets-by-popularity.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    A doc/importing-datasets.rst
    M doc/index.rst
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/javascript-coding-standards.rst
    M doc/javascript-module-tutorial.rst
    M doc/legacy-api.rst
    R doc/loading-data.rst
    M doc/multilingual.rst
    M doc/paster.rst
    M doc/post-installation.rst
    R doc/publisher-profile.rst
    M doc/publishing-datasets.rst
    M doc/release-cycle.rst
    A doc/release-process.rst
    M doc/resources.rst
    M doc/solr-setup.rst
    A doc/stats.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    A doc/tracking.rst
    R doc/user-stories-list.rst
    R doc/user-stories.rst
    R doc/writing-extensions.rst
    M pip-requirements-test.txt
    M pip-requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 356-auth-create-user-option

Conflicts:
	ckan/templates/header.html
	doc/organizations_and_groups.rst


Compare: https://github.com/okfn/ckan/compare/95ae003b7798...2c1082a182ad

More information about the ckan-changes mailing list