[ckan-changes] [okfn/ckan] f926e4: Added type to activity stream output

• Previous message: [ckan-changes] [okfn/ckan] 819d19: The dashboard now displays which items are actuall...
• Next message: [ckan-changes] [okfn/ckan] a57a75: [#3012] Add authorized field to user model
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/2939-orgs
  Home:   https://github.com/okfn/ckan
  Commit: f926e4533ecc0ea08ab602b73828b481fde6d742
      https://github.com/okfn/ckan/commit/f926e4533ecc0ea08ab602b73828b481fde6d742
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-25 (Tue, 25 Sep 2012)

  Changed paths:
    M ckan/lib/activity_streams.py

  Log Message:
  -----------
  Added type to activity stream output


  Commit: da732930b8afd06e165bcde7d0239ee06f32d60e
      https://github.com/okfn/ckan/commit/da732930b8afd06e165bcde7d0239ee06f32d60e
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M ckan/lib/activity_streams.py
    M ckan/lib/helpers.py
    A ckan/public/base/images/dotted.png
    A ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/variables.less
    M ckan/templates/activity_streams/activity_stream_items.html

  Log Message:
  -----------
  Acvitity streams in demo now look nice


  Commit: 8c92daafde3ff60bae95c32d8716587abe0234c9
      https://github.com/okfn/ckan/commit/8c92daafde3ff60bae95c32d8716587abe0234c9
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M ckan/public/base/less/profile.less
    M ckan/templates/user/read.html

  Log Message:
  -----------
  User profiles now work a little nicer


  Commit: 8634f01d1d8b223a715917c2ab77fdb7e1feeef5
      https://github.com/okfn/ckan/commit/8634f01d1d8b223a715917c2ab77fdb7e1feeef5
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M ckan/public/base/less/profile.less
    M ckan/templates/user/read.html

  Log Message:
  -----------
  Made the API key on the user profile  a fixed width font


  Commit: 8f6111eccd43cc1f92b7a34e66846cb96fb0c08a
      https://github.com/okfn/ckan/commit/8f6111eccd43cc1f92b7a34e66846cb96fb0c08a
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/client.js
    A ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/resource.config
    M ckan/templates/package/read.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/user/read.html

  Log Message:
  -----------
  Added follow button to dataset and user profiles


  Commit: ac14fdbbf38d557fe41477c9aa79a5d14df63afe
      https://github.com/okfn/ckan/commit/ac14fdbbf38d557fe41477c9aa79a5d14df63afe
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M ckan/templates/package/read.html
    M ckan/templates/user/read.html

  Log Message:
  -----------
  Moved follow buttons so they are always in the same place


  Commit: e02ff1f70f8b28487078141647f1bc5d8508ffe9
      https://github.com/okfn/ckan/commit/e02ff1f70f8b28487078141647f1bc5d8508ffe9
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M ckan/templates/activity_streams/activity_stream_items.html
    A ckan/templates/snippets/activity_item.html

  Log Message:
  -----------
  Created a template snippet for a activity item


  Commit: f8851b26ee2f343c04f22d9acf854ea0c540e2b0
      https://github.com/okfn/ckan/commit/f8851b26ee2f343c04f22d9acf854ea0c540e2b0
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/modules/follow.js
    A ckan/public/base/javascript/modules/user-context.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    A ckan/public/base/vendor/bootstrap/js/bootstrap-popover.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.js
    M ckan/public/base/vendor/resource.config
    A ckan/templates/ajax_snippets/user-context.html
    M ckan/templates/header.html

  Log Message:
  -----------
  Popovers for user context now are included wherever an activity stream has a gravatar


  Commit: b160598ba883182f4febf0032255e4f4589d7c0f
      https://github.com/okfn/ckan/commit/b160598ba883182f4febf0032255e4f4589d7c0f
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M ckan/public/base/javascript/module.js

  Log Message:
  -----------
  Added initialiseElement to ckan.module to allow for after dom ready initialization of js modules


  Commit: 1dc06056c417a2c387d0eb6e41411fab23b20f61
      https://github.com/okfn/ckan/commit/1dc06056c417a2c387d0eb6e41411fab23b20f61
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/user-context.js

  Log Message:
  -----------
  The follow button on the popover now works


  Commit: 98872ab2b62228a64abaa9916c7475baa5c3914c
      https://github.com/okfn/ckan/commit/98872ab2b62228a64abaa9916c7475baa5c3914c
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/module.js
    M ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/modules/user-context.js

  Log Message:
  -----------
  Added DOC blocks to all new JS code


  Commit: 0a96fa96e8457bfcdd91f600d98e8dd12b15815d
      https://github.com/okfn/ckan/commit/0a96fa96e8457bfcdd91f600d98e8dd12b15815d
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    R ckan/templates/ajax_snippets/user-context.html

  Log Message:
  -----------
  Deleted uneeded file


  Commit: 38c09e9e659f4598f26d1057a6b4937d6c1d45a4
      https://github.com/okfn/ckan/commit/38c09e9e659f4598f26d1057a6b4937d6c1d45a4
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/lib/cli.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/helpers.py
    R ckan/public/base/datapreview/css/datapreview.css
    A ckan/public/base/datapreview/css/json.css
    A ckan/public/base/datapreview/css/pdf.css
    A ckan/public/base/datapreview/css/recline.css
    R ckan/public/base/datapreview/datapreview.js
    A ckan/public/base/datapreview/img/ajaxload-circle.gif
    A ckan/public/base/datapreview/preview_json.js
    A ckan/public/base/datapreview/preview_pdf.js
    A ckan/public/base/datapreview/preview_recline.js
    M ckan/public/base/datapreview/resource.config
    A ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.css
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.css
    A ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/datapreview/vendor/flot/0.7/excanvas.js
    R ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.js
    A ckan/public/base/datapreview/vendor/flotr2/excanvas.js
    A ckan/public/base/datapreview/vendor/flotr2/flotr2.js
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/layers.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/marker-shadow.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/marker.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/popup-close.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/zoom-in.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/zoom-out.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.js
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.css
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.ie.css
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.js
    A ckan/public/base/datapreview/vendor/leaflet/images/layers.png
    A ckan/public/base/datapreview/vendor/leaflet/images/marker-icon.png
    A ckan/public/base/datapreview/vendor/leaflet/images/marker-shadow.png
    A ckan/public/base/datapreview/vendor/leaflet/images/zoom-in.png
    A ckan/public/base/datapreview/vendor/leaflet/images/zoom-out.png
    A ckan/public/base/datapreview/vendor/pdfjs/pdf.js
    A ckan/public/base/datapreview/vendor/pdfviewer/compatibility.js
    A ckan/public/base/datapreview/vendor/pdfviewer/debugger.js
    A ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-check.svg
    A ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-comment.svg
    A ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-text.svg
    A ckan/public/base/datapreview/vendor/pdfviewer/images/loading-icon.gif
    A ckan/public/base/datapreview/vendor/pdfviewer/images/texture.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-bookmark.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-download.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-openFile.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-print.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-search.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    A ckan/public/base/datapreview/vendor/pdfviewer/locale.properties
    A ckan/public/base/datapreview/vendor/pdfviewer/viewer.css
    A ckan/public/base/datapreview/vendor/pdfviewer/viewer.js
    M ckan/public/base/datapreview/vendor/recline/recline.js
    A ckan/public/base/datapreview/vendor/webL10n/README.md
    A ckan/public/base/datapreview/vendor/webL10n/l10n.js
    A ckan/public/base/javascript/modules/data-viewer.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/module.less
    A ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.js
    M ckan/public/base/vendor/resource.config
    M ckan/public/scripts/application.js
    A ckan/public/scripts/outside.js
    A ckan/public/scripts/vendor/resize/resize.js
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/base.html
    A ckan/templates/dataviewer/base.html
    A ckan/templates/dataviewer/json.html
    A ckan/templates/dataviewer/pdf.html
    A ckan/templates/dataviewer/recline.html
    A ckan/templates/dataviewer/snippets/data_preview.html
    A ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/data_api_button.html
    R ckan/templates/snippets/recline-extra-footer.html
    R ckan/templates/snippets/recline-extra-header.html
    M ckan/templates_legacy/package/resource_read.html
    A ckan/templates_legacy/package/snippets/data_preview.html
    M ckan/tests/wsgi_ckanclient.py
    A ckanext/datastore/bin/create_datastore_db_and_read_only_user.sql
    A 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
    M ckanext/datastore/tests/test_datastore.py
    M doc/apiv3.rst
    M doc/datastore.rst
    M doc/using-data-api.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merged master


  Commit: a06974b4545de11abd3427cb5a1d7c20f069afbf
      https://github.com/okfn/ckan/commit/a06974b4545de11abd3427cb5a1d7c20f069afbf
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/user-context.js

  Log Message:
  -----------
  i18n support in user-context.js


  Commit: 4aa84b31892543103935895894ed8ae748f16b61
      https://github.com/okfn/ckan/commit/4aa84b31892543103935895894ed8ae748f16b61
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
    M ckan/templates/user/dashboard.html
    R ckan/templates/user/snippets/things_to_do.html

  Log Message:
  -----------
  Added 'my datasets' to the dashboard page


  Commit: 284bad0ffd128126c345af67b83852d3d2eea497
      https://github.com/okfn/ckan/commit/284bad0ffd128126c345af67b83852d3d2eea497
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-03 (Wed, 03 Oct 2012)

  Changed paths:
    M ckan/public/base/datapreview/resource.config
    M ckan/public/base/datapreview/vendor/flotr2/flotr2.js
    M ckan/public/base/datapreview/vendor/recline/css/recline.css
    M ckan/public/base/datapreview/vendor/recline/recline.js

  Log Message:
  -----------
  Update to the latest recline


  Commit: 8fdf80990cc66869c385c892390e45f9c622511c
      https://github.com/okfn/ckan/commit/8fdf80990cc66869c385c892390e45f9c622511c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings.png
    M ckan/public/base/datapreview/vendor/recline/recline.js

  Log Message:
  -----------
  Updated recline to the latest version.


  Commit: 2902773231a2b8f5d4fb36cfae2b7b2183dee4db
      https://github.com/okfn/ckan/commit/2902773231a2b8f5d4fb36cfae2b7b2183dee4db
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/public/base/datapreview/preview_recline.js

  Log Message:
  -----------
  Removed embed code since it is not used


  Commit: 97b42ca83e243a9f9af306151a87cc198baf8901
      https://github.com/okfn/ckan/commit/97b42ca83e243a9f9af306151a87cc198baf8901
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/public/base/datapreview/css/recline.css
    M ckan/public/base/datapreview/preview_recline.js
    M ckan/public/base/datapreview/resource.config

  Log Message:
  -----------
  more space for slackgrid with scrollbars, changed vendor order to be the same, still issues


  Commit: ca5882a8f5ecd3b55eb21174223e6c29c26dd19a
      https://github.com/okfn/ckan/commit/ca5882a8f5ecd3b55eb21174223e6c29c26dd19a
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/templates/package/edit.html
    M ckan/templates/package/snippets/resources.html

  Log Message:
  -----------
  Added resources the the side bar of the edit dataset page


  Commit: 60407fb42ff1b641dc43141d861d6418354082d0
      https://github.com/okfn/ckan/commit/60407fb42ff1b641dc43141d861d6418354082d0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/render.py
    R ckan/public/base/.gitignore
    A ckan/public/base/css/fuchsia.min.css
    A ckan/public/base/css/green.min.css
    A ckan/public/base/css/main.min.css
    A ckan/public/base/css/maroon.min.css
    A ckan/public/base/css/red.min.css
    A ckan/public/base/datapreview/css/json.min.css
    A ckan/public/base/datapreview/css/pdf.min.css
    A ckan/public/base/datapreview/css/recline.min.css
    A ckan/public/base/datapreview/preview_json.min.js
    A ckan/public/base/datapreview/preview_pdf.min.js
    A ckan/public/base/datapreview/preview_recline.min.js
    A ckan/public/base/datapreview/vendor/backbone/0.5.1/backbone.min.js
    A ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.css
    A ckan/public/base/datapreview/vendor/flotr2/excanvas.min.js
    A ckan/public/base/datapreview/vendor/flotr2/flotr2.min.js
    A ckan/public/base/datapreview/vendor/jquery.mustache/jquery.mustache.min.js
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.ie.min.css
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.min.css
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.min.js
    A ckan/public/base/datapreview/vendor/moment/1.6.2/moment.min.js
    A ckan/public/base/datapreview/vendor/mustache/0.5.0-dev/mustache.min.js
    A ckan/public/base/datapreview/vendor/pdfjs/pdf.min.js
    A ckan/public/base/datapreview/vendor/pdfviewer/compatibility.min.js
    A ckan/public/base/datapreview/vendor/pdfviewer/debugger.min.js
    A ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.css
    A ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.js
    A ckan/public/base/datapreview/vendor/recline/css/recline.min.css
    A ckan/public/base/datapreview/vendor/recline/recline.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.css
    A ckan/public/base/datapreview/vendor/underscore/1.1.6/underscore.min.js
    A ckan/public/base/datapreview/vendor/webL10n/l10n.min.js
    A ckan/public/base/i18n/bg.min.js
    A ckan/public/base/i18n/ca.min.js
    A ckan/public/base/i18n/cs_CZ.min.js
    A ckan/public/base/i18n/de.min.js
    A ckan/public/base/i18n/el.min.js
    A ckan/public/base/i18n/es.min.js
    A ckan/public/base/i18n/fi.min.js
    A ckan/public/base/i18n/fr.min.js
    A ckan/public/base/i18n/hu.min.js
    A ckan/public/base/i18n/it.min.js
    A ckan/public/base/i18n/lt.min.js
    A ckan/public/base/i18n/lv.min.js
    A ckan/public/base/i18n/nl.min.js
    A ckan/public/base/i18n/no.min.js
    A ckan/public/base/i18n/pl.min.js
    A ckan/public/base/i18n/pt_BR.min.js
    A ckan/public/base/i18n/ro.min.js
    A ckan/public/base/i18n/ru.min.js
    A ckan/public/base/i18n/sk.min.js
    A ckan/public/base/i18n/sl.min.js
    A ckan/public/base/i18n/sq.min.js
    A ckan/public/base/i18n/sr.min.js
    A ckan/public/base/i18n/sr_Latn.min.js
    A ckan/public/base/i18n/sv.min.js
    A ckan/public/base/i18n/zh_TW.min.js
    A ckan/public/base/javascript/client.min.js
    A ckan/public/base/javascript/i18n.min.js
    A ckan/public/base/javascript/main.min.js
    A ckan/public/base/javascript/module.min.js
    A ckan/public/base/javascript/modules/api-info.min.js
    A ckan/public/base/javascript/modules/autocomplete.min.js
    A ckan/public/base/javascript/modules/basic-form.min.js
    A ckan/public/base/javascript/modules/confirm-action.min.js
    A ckan/public/base/javascript/modules/custom-fields.min.js
    A ckan/public/base/javascript/modules/data-viewer.min.js
    A ckan/public/base/javascript/modules/related-item.min.js
    A ckan/public/base/javascript/modules/resource-form.min.js
    A ckan/public/base/javascript/modules/resource-upload-field.min.js
    A ckan/public/base/javascript/modules/select-switch.min.js
    A ckan/public/base/javascript/modules/slug-preview.min.js
    A ckan/public/base/javascript/notify.min.js
    A ckan/public/base/javascript/plugins/jquery.date-helpers.min.js
    A ckan/public/base/javascript/plugins/jquery.form-warning.min.js
    A ckan/public/base/javascript/plugins/jquery.inherit.min.js
    A ckan/public/base/javascript/plugins/jquery.proxy-all.min.js
    A ckan/public/base/javascript/plugins/jquery.slug-preview.min.js
    A ckan/public/base/javascript/plugins/jquery.slug.min.js
    A ckan/public/base/javascript/plugins/jquery.truncator.min.js
    A ckan/public/base/javascript/plugins/jquery.url-helpers.min.js
    A ckan/public/base/javascript/pubsub.min.js
    A ckan/public/base/javascript/sandbox.min.js
    A ckan/public/base/javascript/tracking.min.js
    A ckan/public/base/test/spec/ckan.spec.min.js
    A ckan/public/base/test/spec/client.spec.min.js
    A ckan/public/base/test/spec/module.spec.min.js
    A ckan/public/base/test/spec/modules/autocomplete.spec.min.js
    A ckan/public/base/test/spec/modules/basic-form.spec.min.js
    A ckan/public/base/test/spec/modules/confirm-action.spec.min.js
    A ckan/public/base/test/spec/modules/custom-fields.spec.min.js
    A ckan/public/base/test/spec/modules/related-item.spec.min.js
    A ckan/public/base/test/spec/modules/resource-form.spec.min.js
    A ckan/public/base/test/spec/modules/resource-upload-field.spec.min.js
    A ckan/public/base/test/spec/notify.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.date-helpers.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.form-warning.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.inherit.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.proxy-all.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.slug-preview.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.slug.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.url-helpers.spec.min.js
    A ckan/public/base/test/spec/pubsub.spec.min.js
    A ckan/public/base/test/spec/sandbox.spec.min.js
    A ckan/public/base/test/vendor/chai.min.js
    A ckan/public/base/test/vendor/less.min.js
    A ckan/public/base/test/vendor/mocha.min.css
    A ckan/public/base/test/vendor/mocha.min.js
    A ckan/public/base/test/vendor/sinon.min.js
    A ckan/public/base/vendor/bootstrap.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-alert.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-button.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-modal.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-tab.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-transition.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.min.js
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    A ckan/public/base/vendor/html5.min.js
    A ckan/public/base/vendor/jed.min.js
    A ckan/public/base/vendor/jquery-fileupload/jquery.fileupload-ui.min.js
    A ckan/public/base/vendor/jquery-fileupload/jquery.fileupload.min.js
    A ckan/public/base/vendor/jquery-fileupload/jquery.iframe-transport.min.js
    A ckan/public/base/vendor/jquery.min.js
    A ckan/public/base/vendor/jquery.ui.widget.min.js
    A ckan/public/base/vendor/select2/select2.min.css
    A ckan/public/base/vendor/select2/select2.min.js
    M ckanext/datastore/bin/create_datastore_db_and_read_only_user.sql
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_datastore.py
    M doc/datastore.rst
    M doc/domain-model-resource.rst
    M setup.py

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


  Commit: 8d9889419272abce1a1a2ff74edf1f1849f08e79
      https://github.com/okfn/ckan/commit/8d9889419272abce1a1a2ff74edf1f1849f08e79
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/render.py
    R ckan/public/base/.gitignore
    A ckan/public/base/css/fuchsia.min.css
    A ckan/public/base/css/green.min.css
    A ckan/public/base/css/main.min.css
    A ckan/public/base/css/maroon.min.css
    A ckan/public/base/css/red.min.css
    A ckan/public/base/datapreview/css/json.min.css
    A ckan/public/base/datapreview/css/pdf.min.css
    A ckan/public/base/datapreview/css/recline.min.css
    A ckan/public/base/datapreview/preview_json.min.js
    A ckan/public/base/datapreview/preview_pdf.min.js
    A ckan/public/base/datapreview/preview_recline.min.js
    A ckan/public/base/datapreview/vendor/backbone/0.5.1/backbone.min.js
    A ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.css
    A ckan/public/base/datapreview/vendor/flotr2/excanvas.min.js
    A ckan/public/base/datapreview/vendor/flotr2/flotr2.min.js
    A ckan/public/base/datapreview/vendor/jquery.mustache/jquery.mustache.min.js
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.ie.min.css
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.min.css
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.min.js
    A ckan/public/base/datapreview/vendor/moment/1.6.2/moment.min.js
    A ckan/public/base/datapreview/vendor/mustache/0.5.0-dev/mustache.min.js
    A ckan/public/base/datapreview/vendor/pdfjs/pdf.min.js
    A ckan/public/base/datapreview/vendor/pdfviewer/compatibility.min.js
    A ckan/public/base/datapreview/vendor/pdfviewer/debugger.min.js
    A ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.css
    A ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.js
    A ckan/public/base/datapreview/vendor/recline/css/recline.min.css
    A ckan/public/base/datapreview/vendor/recline/recline.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.css
    A ckan/public/base/datapreview/vendor/underscore/1.1.6/underscore.min.js
    A ckan/public/base/datapreview/vendor/webL10n/l10n.min.js
    A ckan/public/base/i18n/bg.min.js
    A ckan/public/base/i18n/ca.min.js
    A ckan/public/base/i18n/cs_CZ.min.js
    A ckan/public/base/i18n/de.min.js
    A ckan/public/base/i18n/el.min.js
    A ckan/public/base/i18n/es.min.js
    A ckan/public/base/i18n/fi.min.js
    A ckan/public/base/i18n/fr.min.js
    A ckan/public/base/i18n/hu.min.js
    A ckan/public/base/i18n/it.min.js
    A ckan/public/base/i18n/lt.min.js
    A ckan/public/base/i18n/lv.min.js
    A ckan/public/base/i18n/nl.min.js
    A ckan/public/base/i18n/no.min.js
    A ckan/public/base/i18n/pl.min.js
    A ckan/public/base/i18n/pt_BR.min.js
    A ckan/public/base/i18n/ro.min.js
    A ckan/public/base/i18n/ru.min.js
    A ckan/public/base/i18n/sk.min.js
    A ckan/public/base/i18n/sl.min.js
    A ckan/public/base/i18n/sq.min.js
    A ckan/public/base/i18n/sr.min.js
    A ckan/public/base/i18n/sr_Latn.min.js
    A ckan/public/base/i18n/sv.min.js
    A ckan/public/base/i18n/zh_TW.min.js
    A ckan/public/base/javascript/client.min.js
    A ckan/public/base/javascript/i18n.min.js
    A ckan/public/base/javascript/main.min.js
    A ckan/public/base/javascript/module.min.js
    A ckan/public/base/javascript/modules/api-info.min.js
    A ckan/public/base/javascript/modules/autocomplete.min.js
    A ckan/public/base/javascript/modules/basic-form.min.js
    A ckan/public/base/javascript/modules/confirm-action.min.js
    A ckan/public/base/javascript/modules/custom-fields.min.js
    A ckan/public/base/javascript/modules/data-viewer.min.js
    A ckan/public/base/javascript/modules/related-item.min.js
    A ckan/public/base/javascript/modules/resource-form.min.js
    A ckan/public/base/javascript/modules/resource-upload-field.min.js
    A ckan/public/base/javascript/modules/select-switch.min.js
    A ckan/public/base/javascript/modules/slug-preview.min.js
    A ckan/public/base/javascript/notify.min.js
    A ckan/public/base/javascript/plugins/jquery.date-helpers.min.js
    A ckan/public/base/javascript/plugins/jquery.form-warning.min.js
    A ckan/public/base/javascript/plugins/jquery.inherit.min.js
    A ckan/public/base/javascript/plugins/jquery.proxy-all.min.js
    A ckan/public/base/javascript/plugins/jquery.slug-preview.min.js
    A ckan/public/base/javascript/plugins/jquery.slug.min.js
    A ckan/public/base/javascript/plugins/jquery.truncator.min.js
    A ckan/public/base/javascript/plugins/jquery.url-helpers.min.js
    A ckan/public/base/javascript/pubsub.min.js
    A ckan/public/base/javascript/sandbox.min.js
    A ckan/public/base/javascript/tracking.min.js
    A ckan/public/base/test/spec/ckan.spec.min.js
    A ckan/public/base/test/spec/client.spec.min.js
    A ckan/public/base/test/spec/module.spec.min.js
    A ckan/public/base/test/spec/modules/autocomplete.spec.min.js
    A ckan/public/base/test/spec/modules/basic-form.spec.min.js
    A ckan/public/base/test/spec/modules/confirm-action.spec.min.js
    A ckan/public/base/test/spec/modules/custom-fields.spec.min.js
    A ckan/public/base/test/spec/modules/related-item.spec.min.js
    A ckan/public/base/test/spec/modules/resource-form.spec.min.js
    A ckan/public/base/test/spec/modules/resource-upload-field.spec.min.js
    A ckan/public/base/test/spec/notify.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.date-helpers.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.form-warning.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.inherit.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.proxy-all.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.slug-preview.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.slug.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.url-helpers.spec.min.js
    A ckan/public/base/test/spec/pubsub.spec.min.js
    A ckan/public/base/test/spec/sandbox.spec.min.js
    A ckan/public/base/test/vendor/chai.min.js
    A ckan/public/base/test/vendor/less.min.js
    A ckan/public/base/test/vendor/mocha.min.css
    A ckan/public/base/test/vendor/mocha.min.js
    A ckan/public/base/test/vendor/sinon.min.js
    A ckan/public/base/vendor/bootstrap.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-alert.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-button.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-modal.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-tab.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-transition.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.min.js
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    A ckan/public/base/vendor/html5.min.js
    A ckan/public/base/vendor/jed.min.js
    A ckan/public/base/vendor/jquery-fileupload/jquery.fileupload-ui.min.js
    A ckan/public/base/vendor/jquery-fileupload/jquery.fileupload.min.js
    A ckan/public/base/vendor/jquery-fileupload/jquery.iframe-transport.min.js
    A ckan/public/base/vendor/jquery.min.js
    A ckan/public/base/vendor/jquery.ui.widget.min.js
    A ckan/public/base/vendor/select2/select2.min.css
    A ckan/public/base/vendor/select2/select2.min.js
    M ckan/templates/ajax_snippets/api_info.html
    M ckanext/datastore/bin/create_datastore_db_and_read_only_user.sql
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_datastore.py
    M doc/datastore.rst
    M doc/domain-model-resource.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 2955-update-recline


  Commit: b34fc5deceb55bbe8fa781e101cd04bee9c7505b
      https://github.com/okfn/ckan/commit/b34fc5deceb55bbe8fa781e101cd04bee9c7505b
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    A ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.js

  Log Message:
  -----------
  Add missing markercluster files


  Commit: ed37c6384a48d9ac411a431449f5a6986b0688c8
      https://github.com/okfn/ckan/commit/ed37c6384a48d9ac411a431449f5a6986b0688c8
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/public/base/less/module.less
    M ckan/templates/package/edit.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/snippets/back_to_package_action.html
    A ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/resources.html

  Log Message:
  -----------
  Added left hand nav to the edit/add resource pages to allow users to move from editing each different resource easily


  Commit: 4c0a22eb554161ec318878203dbf8286598f02fa
      https://github.com/okfn/ckan/commit/4c0a22eb554161ec318878203dbf8286598f02fa
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

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

  Log Message:
  -----------
  Don't change user names to ids in user_id_or_name_exists

The user_id_or_name_exists() validator was returning the user id if the
given argument was a user name. Return the user name instead. If the
given argument is a user id, still return the user id as before.

Also added a convert_user_id_or_name_to_id() converter for when you
don't want the id returned if a name is given.


  Commit: c5556c9953f3aee84661152c42f8539a15c28d9b
      https://github.com/okfn/ckan/commit/c5556c9953f3aee84661152c42f8539a15c28d9b
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/public/base/datapreview/resource.config
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/vendor/resource.config
    M ckan/templates/page.html

  Log Message:
  -----------
  Finally fixed some recline issues by reordering libraries.


  Commit: efddd9e02c6988a9c32222a4350ba5949c35a727
      https://github.com/okfn/ckan/commit/efddd9e02c6988a9c32222a4350ba5949c35a727
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/modules/user-context.js

  Log Message:
  -----------
  Fix so that popovers with follow buttons all remain in sync with each other


  Commit: 05ea51c313c0c99322bdb900635750f2d1b0291b
      https://github.com/okfn/ckan/commit/05ea51c313c0c99322bdb900635750f2d1b0291b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/user.py
    M ckan/logic/action/create.py
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#2941] Add /user/follow/NAME page

To follow a user without javascript


  Commit: 1e1bd1dc61b812bd378fd5ab8252ca75d33a4c55
      https://github.com/okfn/ckan/commit/1e1bd1dc61b812bd378fd5ab8252ca75d33a4c55
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/logic/converters.py

  Log Message:
  -----------
  Fix a bug in convert_user_name_or_id_to_id


  Commit: ae937e07d9cb239f039ba03fffceb2891633eb0f
      https://github.com/okfn/ckan/commit/ae937e07d9cb239f039ba03fffceb2891633eb0f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/modules/user-context.js

  Log Message:
  -----------
  Merge branch '2941-follower-support' of github.com:okfn/ckan into 2941-follower-support


  Commit: 499552e92872538a86ff9f2cfe1d1d2b4b2b9f1b
      https://github.com/okfn/ckan/commit/499552e92872538a86ff9f2cfe1d1d2b4b2b9f1b
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/public/base/datapreview/resource.config
    R ckan/public/base/datapreview/vendor/backbone/0.5.1/backbone.js
    R ckan/public/base/datapreview/vendor/backbone/0.5.1/backbone.min.js
    A ckan/public/base/datapreview/vendor/backbone/backbone.js
    A ckan/public/base/datapreview/vendor/backbone/backbone.min.js
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.css
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.js
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.css
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.js
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/img/glyphicons-halflings-white.png
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/img/glyphicons-halflings.png
    A ckan/public/base/datapreview/vendor/bootstrap/bootstrap.js
    A ckan/public/base/datapreview/vendor/bootstrap/bootstrap.min.js
    A ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.css
    A ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.min.css
    M ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings-white.png
    M ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.css
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.ie.css
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.js
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.min.js
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.css
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.css
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.min.css
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.js
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.min.js
    R ckan/public/base/datapreview/vendor/moment/1.6.2/moment.js
    R ckan/public/base/datapreview/vendor/moment/1.6.2/moment.min.js
    A ckan/public/base/datapreview/vendor/moment/moment.js
    A ckan/public/base/datapreview/vendor/moment/moment.min.js
    R ckan/public/base/datapreview/vendor/mustache/0.5.0-dev/mustache.js
    R ckan/public/base/datapreview/vendor/mustache/0.5.0-dev/mustache.min.js
    A ckan/public/base/datapreview/vendor/mustache/mustache.js
    A ckan/public/base/datapreview/vendor/mustache/mustache.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/README.txt
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/images/sort-asc.gif
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/images/sort-desc.gif
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.css
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.css
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/MIT-LICENSE.txt
    A ckan/public/base/datapreview/vendor/slickgrid/README.txt
    A ckan/public/base/datapreview/vendor/slickgrid/images/sort-asc.gif
    A ckan/public/base/datapreview/vendor/slickgrid/images/sort-desc.gif
    A ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    A ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.js
    A ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/slick.grid.css
    A ckan/public/base/datapreview/vendor/slickgrid/slick.grid.js
    A ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.css
    A ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.js
    R ckan/public/base/datapreview/vendor/underscore/1.1.6/underscore.js
    R ckan/public/base/datapreview/vendor/underscore/1.1.6/underscore.min.js
    A ckan/public/base/datapreview/vendor/underscore/underscore.js
    A ckan/public/base/datapreview/vendor/underscore/underscore.min.js

  Log Message:
  -----------
  Moved vendor libraries out of specific folders for certain versions.


  Commit: 7ad9887725b00a32c54e85d744dc5ba087e582ab
      https://github.com/okfn/ckan/commit/7ad9887725b00a32c54e85d744dc5ba087e582ab
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/user-context.js
    M ckan/public/base/less/profile.less
    M ckan/templates/user/followers.html
    M ckan/templates/user/read.html

  Log Message:
  -----------
  Added links to the user followers page and some small UI tweaks around the user-context popovers


  Commit: fa8e0a70bc978eb9d402393067c895f58453ef7b
      https://github.com/okfn/ckan/commit/fa8e0a70bc978eb9d402393067c895f58453ef7b
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/data-viewer.js

  Log Message:
  -----------
  Merge branch 'master' into 2955-update-recline


  Commit: a663b5c10b00536712358bc3c354434fafd34df2
      https://github.com/okfn/ckan/commit/a663b5c10b00536712358bc3c354434fafd34df2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/user.py
    M ckan/logic/action/delete.py

  Log Message:
  -----------
   [#2941] Add /user/unfollow/NAME page

 To unfollow a user without javascript


  Commit: f6a5271a35ae7170e020015d5c0acb6c4261e174
      https://github.com/okfn/ckan/commit/f6a5271a35ae7170e020015d5c0acb6c4261e174
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/user-context.js
    M ckan/public/base/less/profile.less
    M ckan/templates/user/followers.html
    M ckan/templates/user/read.html

  Log Message:
  -----------
  Merge branch '2941-follower-support' of github.com:okfn/ckan into 2941-follower-support


  Commit: fad70d74620f3dea089916781d2bae7b2c9d3159
      https://github.com/okfn/ckan/commit/fad70d74620f3dea089916781d2bae7b2c9d3159
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/public/base/javascript/resource.config

  Log Message:
  -----------
  Add resources to the ckan group. 


  Commit: 5dab7f13ea0da8eaf4e00e2360fb93b7f0a2ec64
      https://github.com/okfn/ckan/commit/5dab7f13ea0da8eaf4e00e2360fb93b7f0a2ec64
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/data-viewer.js

  Log Message:
  -----------
  Merge branch '2955-update-recline' of github.com:okfn/ckan into 2955-update-recline


  Commit: b71bc7b011cbc85b4454aaecbf5c275c7a0413f4
      https://github.com/okfn/ckan/commit/b71bc7b011cbc85b4454aaecbf5c275c7a0413f4
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/public/base/javascript/resource.config
    M ckan/templates/page.html

  Log Message:
  -----------
  remove vendor/vendor from page.html because main depends on vendor


  Commit: 76d70134773cd908a971c86ab5624920e3060ef2
      https://github.com/okfn/ckan/commit/76d70134773cd908a971c86ab5624920e3060ef2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/logic/action/create.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#2941] Add /dataset/follow/* and /dataset/unfollow/*

So you can follow and unfollow datasets without javascript.


  Commit: 372ad9333820de3fbf9004474d01d0d723268f52
      https://github.com/okfn/ckan/commit/372ad9333820de3fbf9004474d01d0d723268f52
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  Don't convert package names to ids in package_id_or_name_exists() validator

Always return the given package id or name unmodified, if the package
exists. This is a validator not a converter.


  Commit: d5cfdbe3b91c06340b1905b7abe40d96e15c74fa
      https://github.com/okfn/ckan/commit/d5cfdbe3b91c06340b1905b7abe40d96e15c74fa
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/lib/activity_streams.py

  Log Message:
  -----------
  Changed the icon for resource in activity streams


  Commit: 982a0f342e73b7a388b6d21aab864086312a8462
      https://github.com/okfn/ckan/commit/982a0f342e73b7a388b6d21aab864086312a8462
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/templates/package/followers.html
    M ckan/templates/package/read.html
    M ckan/templates/user/followers.html

  Log Message:
  -----------
  Added followers button to the dataset page


  Commit: 5d9be2cf364d611f5ca9c799128972c604a2bd06
      https://github.com/okfn/ckan/commit/5d9be2cf364d611f5ca9c799128972c604a2bd06
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/public/base/javascript/resource.config
    M ckan/templates/page.html

  Log Message:
  -----------
  Fix missing main library


  Commit: 895025e6aa46671a92128f02b7eba0a80e5b03f4
      https://github.com/okfn/ckan/commit/895025e6aa46671a92128f02b7eba0a80e5b03f4
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/public/base/javascript/resource.config

  Log Message:
  -----------
  Formatting


  Commit: 7332e09d3e812c45ab87b28a2642c213d79c325c
      https://github.com/okfn/ckan/commit/7332e09d3e812c45ab87b28a2642c213d79c325c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/public/base/datapreview/resource.config

  Log Message:
  -----------
  Fix leaflet marker popups styling.


  Commit: 16f7931f322788c1d81fea0212aa114d05a82c31
      https://github.com/okfn/ckan/commit/16f7931f322788c1d81fea0212aa114d05a82c31
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/public/base/datapreview/vendor/pdfviewer/viewer.css

  Log Message:
  -----------
  Fix pdf preview in webkit


  Commit: 3921136b3cd97b926559851764cd80454110d9ec
      https://github.com/okfn/ckan/commit/3921136b3cd97b926559851764cd80454110d9ec
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/public/base/datapreview/vendor/pdfjs/pdf.js
    M ckan/public/base/datapreview/vendor/pdfviewer/viewer.css
    M ckan/public/base/datapreview/vendor/pdfviewer/viewer.js
    M ckan/templates/dataviewer/pdf.html

  Log Message:
  -----------
  Upgrade pdf.js to latest version.


  Commit: 9e6c8014656031fe6db9d45afff7f86cfcf8fde1
      https://github.com/okfn/ckan/commit/9e6c8014656031fe6db9d45afff7f86cfcf8fde1
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M ckan/public/base/datapreview/vendor/pdfviewer/viewer.js

  Log Message:
  -----------
  Notes on how to update pdf.js


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

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

  Log Message:
  -----------
  [#2941] Add 'num_followers' to dict returned by user_show


  Commit: 694e57c8a724ab6499fb0660309788e60d4394c2
      https://github.com/okfn/ckan/commit/694e57c8a724ab6499fb0660309788e60d4394c2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-05 (Fri, 05 Oct 2012)

  Changed paths:
    M ckan/lib/activity_streams.py
    M ckan/templates/package/followers.html
    M ckan/templates/package/read.html
    M ckan/templates/user/followers.html

  Log Message:
  -----------
  Merge branch '2941-follower-support' of github.com:okfn/ckan into 2941-follower-support


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

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

  Log Message:
  -----------
  [#2941] Fix a couple of follower tests

These tests were broken by changes to error messages in an earlier
commit


  Commit: 1d6b1f5a1bbd3cd1d4d03b1e9326163afe3bff5b
      https://github.com/okfn/ckan/commit/1d6b1f5a1bbd3cd1d4d03b1e9326163afe3bff5b
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

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

  Log Message:
  -----------
  Hide details if no preview available. @tobes


  Commit: 1602ca2e7da3004cd1bb6a5aeb9f5eacecf61282
      https://github.com/okfn/ckan/commit/1602ca2e7da3004cd1bb6a5aeb9f5eacecf61282
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

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

  Log Message:
  -----------
  Updated follow button snippet to have correc url_for


  Commit: 06b5a281544ba9b1c4535d223b395560bf27dfba
      https://github.com/okfn/ckan/commit/06b5a281544ba9b1c4535d223b395560bf27dfba
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/user-context.js

  Log Message:
  -----------
  Removed extra call to get followers of user as it's been added to user_show


  Commit: ef3f161e278e3e59e4b573684f826aea415c0de5
      https://github.com/okfn/ckan/commit/ef3f161e278e3e59e4b573684f826aea415c0de5
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

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

  Log Message:
  -----------
  Fixed number of followers number on user profile pages


  Commit: 2cdec66eef37d3e96773aea2e9ad0e0a5335a57a
      https://github.com/okfn/ckan/commit/2cdec66eef37d3e96773aea2e9ad0e0a5335a57a
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

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

  Log Message:
  -----------
  Fixed follow button on datasets


  Commit: b09f878c0e2e91729f8739d0269417d491fa7a41
      https://github.com/okfn/ckan/commit/b09f878c0e2e91729f8739d0269417d491fa7a41
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Fixed method call to use named params


  Commit: 4b7b33494f05ac412bebdffbf984d7ace1a40306
      https://github.com/okfn/ckan/commit/4b7b33494f05ac412bebdffbf984d7ace1a40306
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
    M ckan/lib/activity_streams.py
    M ckan/lib/helpers.py
    M ckan/public/base/javascript/modules/user-context.js
    M ckan/public/base/less/activity.less

  Log Message:
  -----------
  Removed user-context from low-level helper gravatar into the actual templates for activity streams


  Commit: e53f0da7cc22d99bfd8866eabeb8725b789620bb
      https://github.com/okfn/ckan/commit/e53f0da7cc22d99bfd8866eabeb8725b789620bb
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/user-context.js
    M ckan/public/base/less/profile.less
    A ckan/templates/user/activity.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/read.html

  Log Message:
  -----------
  Getting ready with a proper header on the user profile page


  Commit: 102bdd580b9a9d663f61903144dd15699c3e7f69
      https://github.com/okfn/ckan/commit/102bdd580b9a9d663f61903144dd15699c3e7f69
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-10 (Wed, 10 Oct 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/user.py
    A ckan/templates/user/activity_stream.html

  Log Message:
  -----------
  [#2941] Add /user/activity/USER_NAME page


  Commit: 66f1e7acf9ad5c1e37b64eb3ac4fe12d51372945
      https://github.com/okfn/ckan/commit/66f1e7acf9ad5c1e37b64eb3ac4fe12d51372945
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-10 (Wed, 10 Oct 2012)

  Changed paths:
    M ckan/lib/activity_streams.py
    M ckan/lib/helpers.py
    M ckan/public/base/javascript/modules/user-context.js
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/profile.less
    A ckan/templates/user/activity.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/read.html

  Log Message:
  -----------
  Merge branch '2941-follower-support' of github.com:okfn/ckan into 2941-follower-support


  Commit: b19a66d47e9579bda265cacb02e062511a509628
      https://github.com/okfn/ckan/commit/b19a66d47e9579bda265cacb02e062511a509628
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-10 (Wed, 10 Oct 2012)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#2941] Remove c.user_activity_stream from user read page

No longer needed


  Commit: 32da1d83b7ae8bf554333b24bb81424f58d2b71e
      https://github.com/okfn/ckan/commit/32da1d83b7ae8bf554333b24bb81424f58d2b71e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-10 (Wed, 10 Oct 2012)

  Changed paths:
    M ckan/lib/activity_streams.py

  Log Message:
  -----------
  Fix 'USER started following USER' activity

It was saying the follower's name twice instead of the follower's name
and then the followee's name, e.g.
Sean Hammond started following Sean Hammond,
fix to Sean Hammond started following Joe Admin.


  Commit: d243678f94c3b6d31f234802fd24f21257c2f486
      https://github.com/okfn/ckan/commit/d243678f94c3b6d31f234802fd24f21257c2f486
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-10 (Wed, 10 Oct 2012)

  Changed paths:
    R ckan/templates/user/activity.html
    M ckan/templates/user/activity_stream.html

  Log Message:
  -----------
  Activity stream tabs now work on user profile pages


  Commit: 3001398527c97a080d03d10434a978035365e77e
      https://github.com/okfn/ckan/commit/3001398527c97a080d03d10434a978035365e77e
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-10 (Wed, 10 Oct 2012)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Added c.about_formatted to al user pages


  Commit: 719cae6c7ee2735f23991ae9a37e607ca9419316
      https://github.com/okfn/ckan/commit/719cae6c7ee2735f23991ae9a37e607ca9419316
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/follower-list.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/toolbar.less
    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/user/activity_stream.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/read.html
    A ckan/templates/user/snippets/followers.html

  Log Message:
  -----------
  iA tweaks on follower lists as well as package pages


  Commit: 54ee884228c087ec46bf1ff84b10d4b27599521e
      https://github.com/okfn/ckan/commit/54ee884228c087ec46bf1ff84b10d4b27599521e
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

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

  Log Message:
  -----------
  Tweaked font color for links are they were not obvious


  Commit: c9afe336b9b893d0d20fd0f1345acbb457fd7b3b
      https://github.com/okfn/ckan/commit/c9afe336b9b893d0d20fd0f1345acbb457fd7b3b
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-13 (Sat, 13 Oct 2012)

  Changed paths:
    M CHANGELOG.txt
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/controllers/storage.py
    M ckan/lib/helpers.py
    M ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/tests/functional/api/test_revision_search.py
    M ckan/tests/lib/test_helpers.py
    A ckanext/datastore/bin/__init__.py
    R ckanext/datastore/bin/create_datastore_db_and_read_only_user.sql
    A ckanext/datastore/bin/datastore_setup.py
    A ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/helpers.py
    A ckanext/datastore/tests/test_create.py
    R ckanext/datastore/tests/test_datastore.py
    A ckanext/datastore/tests/test_delete.py
    A ckanext/datastore/tests/test_search.py
    A ckanext/datastore/tests/test_unit.py
    A ckanext/datastore/tests/test_upsert.py
    M doc/apiv3.rst
    M doc/coding-standards.rst
    M doc/configuration.rst
    A doc/datastore-api.rst
    A doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/index.rst
    R doc/using-data-api.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 2955-update-recline


  Commit: 47251739757b02fc4b27a8945de6a17bea6b02ba
      https://github.com/okfn/ckan/commit/47251739757b02fc4b27a8945de6a17bea6b02ba
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-13 (Sat, 13 Oct 2012)

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

  Log Message:
  -----------
  Merge branch 'dataviewer-iframe' into 2955-update-recline


  Commit: 9b3784f7fa3a5a06ca9948b623a88d1c58ccaf67
      https://github.com/okfn/ckan/commit/9b3784f7fa3a5a06ca9948b623a88d1c58ccaf67
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-13 (Sat, 13 Oct 2012)

  Changed paths:
    M ckan/public/base/datapreview/vendor/recline/recline.js

  Log Message:
  -----------
  Updated to latest recline master


  Commit: 8c5ed2cda49ce75a1c8e46833f1f9aa47a9ca20e
      https://github.com/okfn/ckan/commit/8c5ed2cda49ce75a1c8e46833f1f9aa47a9ca20e
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-14 (Sun, 14 Oct 2012)

  Changed paths:
    M ckan/public/base/datapreview/vendor/recline/recline.js

  Log Message:
  -----------
  updated to latest recline from master


  Commit: 9ae6d0f0a4f1805b527ae9523fead80fca45e63c
      https://github.com/okfn/ckan/commit/9ae6d0f0a4f1805b527ae9523fead80fca45e63c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-15 (Mon, 15 Oct 2012)

  Changed paths:
    M doc/extension-templating.rst

  Log Message:
  -----------
  Small docs fix


  Commit: b625eb5dc0ac659eeea2e06657be6972269fc3de
      https://github.com/okfn/ckan/commit/b625eb5dc0ac659eeea2e06657be6972269fc3de
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-15 (Mon, 15 Oct 2012)

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

  Log Message:
  -----------
  Documented some undocumented related_list params


  Commit: 6aa9de3cf8749037edc6e55d255df0a822540062
      https://github.com/okfn/ckan/commit/6aa9de3cf8749037edc6e55d255df0a822540062
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-15 (Mon, 15 Oct 2012)

  Changed paths:
    M ckan/public/base/datapreview/preview_recline.js

  Log Message:
  -----------
  Fixed preview code for recline. Thanks to @rgrp.


  Commit: 0e297f32ed98aeb66c97c4af6ae599022d4cfce4
      https://github.com/okfn/ckan/commit/0e297f32ed98aeb66c97c4af6ae599022d4cfce4
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-15 (Mon, 15 Oct 2012)

  Changed paths:
    M ckan/public/base/datapreview/preview_recline.js

  Log Message:
  -----------
  Only set endpoint for ckan backend


  Commit: b12ef89c5e80b822cf6e8312f6bee11213955115
      https://github.com/okfn/ckan/commit/b12ef89c5e80b822cf6e8312f6bee11213955115
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-15 (Mon, 15 Oct 2012)

  Changed paths:
    M ckan/public/base/datapreview/preview_recline.js

  Log Message:
  -----------
  Right comment for last changes


  Commit: 9edc19955032454b0dc75c441381cd220db088a7
      https://github.com/okfn/ckan/commit/9edc19955032454b0dc75c441381cd220db088a7
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

  Changed paths:
    M ckan/public/base/less/dataset.less
    M ckan/templates/package/snippets/resource_item.html

  Log Message:
  -----------
  Tweaks to the resource listing on the dataset page


  Commit: cb821c859a7e67d9f8afaac099053dd3bd627363
      https://github.com/okfn/ckan/commit/cb821c859a7e67d9f8afaac099053dd3bd627363
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

  Changed paths:
    M ckan/lib/activity_streams.py
    A ckan/public/base/javascript/modules/popover-context.js
    R ckan/public/base/javascript/modules/user-context.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/popover-context.less
    A ckan/templates/ajax_snippets/follow_button.html
    A ckan/templates/ajax_snippets/popover-context-dataset.html
    A ckan/templates/ajax_snippets/popover-context-user.html
    M ckan/templates/user/snippets/followers.html

  Log Message:
  -----------
  Re-structre of user-context into more generic popover-context

This means that we have context popovers on datasets as well.


  Commit: 7cd60e27bcf396ace917a099c983593b3a3571a5
      https://github.com/okfn/ckan/commit/7cd60e27bcf396ace917a099c983593b3a3571a5
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

  Changed paths:
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/modules/popover-context.js
    M ckan/public/base/less/popover-context.less
    M ckan/templates/ajax_snippets/popover-context-dataset.html
    M ckan/templates/ajax_snippets/popover-context-user.html

  Log Message:
  -----------
  Final tweaks to get popover-context fully working


  Commit: bab3906edd686fcad9e683347b82a83c1c74797b
      https://github.com/okfn/ckan/commit/bab3906edd686fcad9e683347b82a83c1c74797b
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

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

  Log Message:
  -----------
  Fix for new dataset step 2 showing edit navigation menu on left


  Commit: 2a4969fe52f399d302409faf5bb2d12ededec759
      https://github.com/okfn/ckan/commit/2a4969fe52f399d302409faf5bb2d12ededec759
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

  Changed paths:
    M ckan/public/base/less/module.less
    M ckan/templates/package/edit.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/snippets/back_to_package_action.html
    A ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/resources.html

  Log Message:
  -----------
  Merge branch '2956-resource-editing'


  Commit: 77aff9a5e9d49e2d36a382935cd5e5effadedcc6
      https://github.com/okfn/ckan/commit/77aff9a5e9d49e2d36a382935cd5e5effadedcc6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

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

  Log Message:
  -----------
  [#2941] Fix crashing user followers page


  Commit: eb20c5d812b631f8ef067ef49be7f2e988691089
      https://github.com/okfn/ckan/commit/eb20c5d812b631f8ef067ef49be7f2e988691089
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/public/base/less/masthead.less
    A ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/header.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/read.html

  Log Message:
  -----------
  Load of final ui tweaks


  Commit: ce289ef5bb4aee25f2e64abbe13762c7009adcd2
      https://github.com/okfn/ckan/commit/ce289ef5bb4aee25f2e64abbe13762c7009adcd2
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

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

  Log Message:
  -----------
  Text tweak


  Commit: ba15ea34b73fbaa0be378e0cebdf38719ee691e7
      https://github.com/okfn/ckan/commit/ba15ea34b73fbaa0be378e0cebdf38719ee691e7
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M CHANGELOG.txt
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/controllers/storage.py
    M ckan/lib/helpers.py
    M ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/logic/action/get.py
    M ckan/public/base/javascript/modules/data-viewer.js
    M ckan/public/base/less/module.less
    M ckan/templates/package/edit.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/snippets/back_to_package_action.html
    A ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/resources.html
    M ckan/tests/functional/api/test_revision_search.py
    M ckan/tests/lib/test_helpers.py
    A ckanext/datastore/bin/__init__.py
    R ckanext/datastore/bin/create_datastore_db_and_read_only_user.sql
    A ckanext/datastore/bin/datastore_setup.py
    A ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/helpers.py
    A ckanext/datastore/tests/test_create.py
    R ckanext/datastore/tests/test_datastore.py
    A ckanext/datastore/tests/test_delete.py
    A ckanext/datastore/tests/test_search.py
    A ckanext/datastore/tests/test_unit.py
    A ckanext/datastore/tests/test_upsert.py
    M doc/apiv3.rst
    M doc/coding-standards.rst
    M doc/configuration.rst
    A doc/datastore-api.rst
    A doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/extension-templating.rst
    M doc/index.rst
    R doc/using-data-api.rst
    M test-core.ini

  Log Message:
  -----------
  Merged master


  Commit: 6289cb53313d22ecc37716134dc9548647c02876
      https://github.com/okfn/ckan/commit/6289cb53313d22ecc37716134dc9548647c02876
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M ckan/public/base/datapreview/css/recline.css
    M ckan/public/base/datapreview/preview_recline.js
    M ckan/public/base/datapreview/resource.config
    R ckan/public/base/datapreview/vendor/backbone/0.5.1/backbone.js
    R ckan/public/base/datapreview/vendor/backbone/0.5.1/backbone.min.js
    A ckan/public/base/datapreview/vendor/backbone/backbone.js
    A ckan/public/base/datapreview/vendor/backbone/backbone.min.js
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.css
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.js
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.css
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.js
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/img/glyphicons-halflings-white.png
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/img/glyphicons-halflings.png
    A ckan/public/base/datapreview/vendor/bootstrap/bootstrap.js
    A ckan/public/base/datapreview/vendor/bootstrap/bootstrap.min.js
    A ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.css
    A ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.min.css
    A ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings-white.png
    M ckan/public/base/datapreview/vendor/flotr2/flotr2.js
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.css
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.ie.css
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.js
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.min.js
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.css
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.css
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.min.css
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.js
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.min.js
    R ckan/public/base/datapreview/vendor/moment/1.6.2/moment.js
    R ckan/public/base/datapreview/vendor/moment/1.6.2/moment.min.js
    A ckan/public/base/datapreview/vendor/moment/moment.js
    A ckan/public/base/datapreview/vendor/moment/moment.min.js
    R ckan/public/base/datapreview/vendor/mustache/0.5.0-dev/mustache.js
    R ckan/public/base/datapreview/vendor/mustache/0.5.0-dev/mustache.min.js
    A ckan/public/base/datapreview/vendor/mustache/mustache.js
    A ckan/public/base/datapreview/vendor/mustache/mustache.min.js
    M ckan/public/base/datapreview/vendor/pdfjs/pdf.js
    M ckan/public/base/datapreview/vendor/pdfviewer/viewer.css
    M ckan/public/base/datapreview/vendor/pdfviewer/viewer.js
    M ckan/public/base/datapreview/vendor/recline/css/recline.css
    M ckan/public/base/datapreview/vendor/recline/recline.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/README.txt
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/images/sort-asc.gif
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/images/sort-desc.gif
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.css
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.css
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/MIT-LICENSE.txt
    A ckan/public/base/datapreview/vendor/slickgrid/README.txt
    A ckan/public/base/datapreview/vendor/slickgrid/images/sort-asc.gif
    A ckan/public/base/datapreview/vendor/slickgrid/images/sort-desc.gif
    A ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    A ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.js
    A ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/slick.grid.css
    A ckan/public/base/datapreview/vendor/slickgrid/slick.grid.js
    A ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.css
    A ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.js
    R ckan/public/base/datapreview/vendor/underscore/1.1.6/underscore.js
    R ckan/public/base/datapreview/vendor/underscore/1.1.6/underscore.min.js
    A ckan/public/base/datapreview/vendor/underscore/underscore.js
    A ckan/public/base/datapreview/vendor/underscore/underscore.min.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/vendor/resource.config
    M ckan/templates/dataviewer/pdf.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/page.html

  Log Message:
  -----------
  Merge pull request #148 from okfn/2955-update-recline

2955 update recline


  Commit: 3e42e9ac43117b0cbc6f40bbc10888e3702b83e0
      https://github.com/okfn/ckan/commit/3e42e9ac43117b0cbc6f40bbc10888e3702b83e0
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M ckan/public/base/datapreview/css/recline.css
    M ckan/public/base/datapreview/preview_recline.js
    M ckan/public/base/datapreview/resource.config
    R ckan/public/base/datapreview/vendor/backbone/0.5.1/backbone.js
    R ckan/public/base/datapreview/vendor/backbone/0.5.1/backbone.min.js
    A ckan/public/base/datapreview/vendor/backbone/backbone.js
    A ckan/public/base/datapreview/vendor/backbone/backbone.min.js
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.css
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.js
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.css
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.js
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/img/glyphicons-halflings-white.png
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/img/glyphicons-halflings.png
    A ckan/public/base/datapreview/vendor/bootstrap/bootstrap.js
    A ckan/public/base/datapreview/vendor/bootstrap/bootstrap.min.js
    A ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.css
    A ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.min.css
    A ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings-white.png
    M ckan/public/base/datapreview/vendor/flotr2/flotr2.js
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.css
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.ie.css
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.js
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.min.js
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.css
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.css
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.min.css
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.js
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.min.js
    R ckan/public/base/datapreview/vendor/moment/1.6.2/moment.js
    R ckan/public/base/datapreview/vendor/moment/1.6.2/moment.min.js
    A ckan/public/base/datapreview/vendor/moment/moment.js
    A ckan/public/base/datapreview/vendor/moment/moment.min.js
    R ckan/public/base/datapreview/vendor/mustache/0.5.0-dev/mustache.js
    R ckan/public/base/datapreview/vendor/mustache/0.5.0-dev/mustache.min.js
    A ckan/public/base/datapreview/vendor/mustache/mustache.js
    A ckan/public/base/datapreview/vendor/mustache/mustache.min.js
    M ckan/public/base/datapreview/vendor/pdfjs/pdf.js
    M ckan/public/base/datapreview/vendor/pdfviewer/viewer.css
    M ckan/public/base/datapreview/vendor/pdfviewer/viewer.js
    M ckan/public/base/datapreview/vendor/recline/css/recline.css
    M ckan/public/base/datapreview/vendor/recline/recline.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/README.txt
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/images/sort-asc.gif
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/images/sort-desc.gif
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.css
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.css
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/MIT-LICENSE.txt
    A ckan/public/base/datapreview/vendor/slickgrid/README.txt
    A ckan/public/base/datapreview/vendor/slickgrid/images/sort-asc.gif
    A ckan/public/base/datapreview/vendor/slickgrid/images/sort-desc.gif
    A ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    A ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.js
    A ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/slick.grid.css
    A ckan/public/base/datapreview/vendor/slickgrid/slick.grid.js
    A ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.css
    A ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.js
    R ckan/public/base/datapreview/vendor/underscore/1.1.6/underscore.js
    R ckan/public/base/datapreview/vendor/underscore/1.1.6/underscore.min.js
    A ckan/public/base/datapreview/vendor/underscore/underscore.js
    A ckan/public/base/datapreview/vendor/underscore/underscore.min.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/vendor/resource.config
    M ckan/templates/dataviewer/pdf.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/page.html
    M ckan/templates/user/dashboard.html

  Log Message:
  -----------
  Merge master and text tweak


  Commit: c00a4a60a85ff39dad6afc35423024989549ad9f
      https://github.com/okfn/ckan/commit/c00a4a60a85ff39dad6afc35423024989549ad9f
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

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

  Log Message:
  -----------
  Rebuilt main.css ready for deploy


  Commit: 935a3559ba71086a4c3c12604e163126d1eed1f8
      https://github.com/okfn/ckan/commit/935a3559ba71086a4c3c12604e163126d1eed1f8
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M ckan/public/base/javascript/resource.config

  Log Message:
  -----------
  Fix for bad merge


  Commit: 6a7c9ceb3f26e8734a08f71ac8fa1fceef959a3b
      https://github.com/okfn/ckan/commit/6a7c9ceb3f26e8734a08f71ac8fa1fceef959a3b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Fix user redirect after login

Make it redirect to the /logged_in page and then redirect again to
/dashboard. This is what it was already doing with legacy templates, fix
to do the same with new templates as well. This fixes a user test that
was failing.


  Commit: c332dc16e701f1f85dca83e73685674dfe9023e7
      https://github.com/okfn/ckan/commit/c332dc16e701f1f85dca83e73685674dfe9023e7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Put activity stream back on user profile in legacy templates

Put the user's activity stream back into the template context for legacy
templates as they still use it, the new templates do not. This fixes an
activity streams test that was failing.


  Commit: 6198a324bd4d76eac06adf3806b37c7659ffe240
      https://github.com/okfn/ckan/commit/6198a324bd4d76eac06adf3806b37c7659ffe240
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.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/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/public/base/css/main.css
    A ckan/public/base/images/dotted.png
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/module.js
    A ckan/public/base/javascript/modules/follow.js
    A ckan/public/base/javascript/modules/popover-context.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    A ckan/public/base/less/follower-list.less
    M ckan/public/base/less/masthead.less
    A 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
    A ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-popover.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/activity_streams/activity_stream_items.html
    A ckan/templates/ajax_snippets/follow_button.html
    A ckan/templates/ajax_snippets/popover-context-dataset.html
    A ckan/templates/ajax_snippets/popover-context-user.html
    M ckan/templates/header.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/snippets/resource_item.html
    A ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/follow_button.html
    A ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/read.html
    A ckan/templates/user/snippets/followers.html
    R ckan/templates/user/snippets/things_to_do.html
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  Merge branch '2941-follower-support'


  Commit: 372c73fedd4fae78d42ab8be4a87fcd94cd9bede
      https://github.com/okfn/ckan/commit/372c73fedd4fae78d42ab8be4a87fcd94cd9bede
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-18 (Thu, 18 Oct 2012)

  Changed paths:
    M doc/resources.rst

  Log Message:
  -----------
  Clarify an example in the docs

In the diff this looks like a much bigger change than it is because the
lines are hard-wrapped and had to be re-wrapped. I just tweaked a couple
of fanstatic examples to make it clear that, for example, resource names
have to be in '...'


  Commit: 97a7f85b4d3c2eaef0a97cced3f3289d86744606
      https://github.com/okfn/ckan/commit/97a7f85b4d3c2eaef0a97cced3f3289d86744606
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-18 (Thu, 18 Oct 2012)

  Changed paths:
    M doc/frontend-development.rst

  Log Message:
  -----------
  Update doc/frontend-development.rst

CKAN 2.0 less documents do not work with the latest version of less
(1.3.1) therefore I've updated the documentation to only install the
supported version (1.3.0).

I'm working on fixing the actual documents to work in 1.3.1 now.


  Commit: 7018335708e2cb3e9d10d70a522af524677e51c4
      https://github.com/okfn/ckan/commit/7018335708e2cb3e9d10d70a522af524677e51c4
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-18 (Thu, 18 Oct 2012)

  Changed paths:
    A ckan/public/base/less/custom.less

  Log Message:
  -----------
  Added custom.less into repo

It's needed now as less 1.3.1 causes `./bin/less` to not compile


  Commit: b806bb0142e5615b697ef1a108874c6ce52b84db
      https://github.com/okfn/ckan/commit/b806bb0142e5615b697ef1a108874c6ce52b84db
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-18 (Thu, 18 Oct 2012)

  Changed paths:
    M doc/frontend-development.rst

  Log Message:
  -----------
  Reverted previous change as main.less is now fixed for less 1.3.1


  Commit: 079af723ca86af5c3a8844354ea8c9f7085b1fe6
      https://github.com/okfn/ckan/commit/079af723ca86af5c3a8844354ea8c9f7085b1fe6
  Author: amercader <amercadero at gmail.com>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Fix small bug in datastore command, which made other paster commands fail


  Commit: f61458f30a84ed80bcf600ac5234568d50cff34a
      https://github.com/okfn/ckan/commit/f61458f30a84ed80bcf600ac5234568d50cff34a
  Author: Joshua Tauberer <jt at occams.info>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M ckan/lib/authztool.py

  Log Message:
  -----------
  authztool s/RIGHTS_HELP/self.usage/, otherwise it dies


  Commit: 41f72718d8067001e21ff81933028c6423feb159
      https://github.com/okfn/ckan/commit/41f72718d8067001e21ff81933028c6423feb159
  Author: Joshua Tauberer <jt at occams.info>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M ckan/templates/ajax_snippets/api_info.html

  Log Message:
  -----------
  DataStore api_info.html s/Pyhton/Python/


  Commit: f0e2ca2222294c57bbb8970259376e96a5e62408
      https://github.com/okfn/ckan/commit/f0e2ca2222294c57bbb8970259376e96a5e62408
  Author: Joshua Tauberer <jt at occams.info>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M ckan/lib/authztool.py

  Log Message:
  -----------
  authztool.py s/ROLES_HELP/self.usage/


  Commit: f98b3b84db7d9d7515b4977ba1bab4d50842dbaf
      https://github.com/okfn/ckan/commit/f98b3b84db7d9d7515b4977ba1bab4d50842dbaf
  Author: amercader <amercadero at gmail.com>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Add node_modules to .gitignore

Thanks @srkunze for the patch


  Commit: e1e132f0db4e50303be90389ef2f4c1de21c28a5
      https://github.com/okfn/ckan/commit/e1e132f0db4e50303be90389ef2f4c1de21c28a5
  Author: amercader <amercadero at gmail.com>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Remove python 2.7 only format in log message

Thanks to @srkunze for the patch


  Commit: 8fb39c4a585d0eb3581e4ba34b604e7ca3df8894
      https://github.com/okfn/ckan/commit/8fb39c4a585d0eb3581e4ba34b604e7ca3df8894
  Author: amercader <amercadero at gmail.com>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M doc/datastore-setup.rst
    M doc/index.rst

  Log Message:
  -----------
  Tone down datastore warning and fix typo


  Commit: ba439ef8b0a3339ff05e0f7f1571a05731b5c526
      https://github.com/okfn/ckan/commit/ba439ef8b0a3339ff05e0f7f1571a05731b5c526
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

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

  Log Message:
  -----------
  Add resource-url-analytics CSS class to 'Raw Data' links

ckanext-googleanalytics uses the resource-url-analytics CSS class to
find links to add Google Analytics Event Tracking to. The Download links
on resource read pages already have this class. Add it to the Raw Data
links next to the resources on dataset read pages as well.


  Commit: 1311da880eccee45a8cafc226e511d31f15dd9d5
      https://github.com/okfn/ckan/commit/1311da880eccee45a8cafc226e511d31f15dd9d5
  Author: amercader <amercadero at gmail.com>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M CHANGELOG.txt

  Log Message:
  -----------
  Update CHANGELOG with changes from releases 1.8 and 1.7.2

Conflicts:

	CHANGELOG.txt


  Commit: cbfee2a5c6b0f04f725ae34dbdf3512b7131aced
      https://github.com/okfn/ckan/commit/cbfee2a5c6b0f04f725ae34dbdf3512b7131aced
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-25 (Thu, 25 Oct 2012)

  Changed paths:
    R doc/howto-editing-database-ownership.rst
    M doc/paster.rst

  Log Message:
  -----------
  [docs] Remove docs about editing database ownership

Remove some docs that seem to refer to the old way of running multiple
CKAN instances on one server where each CKAN has its own linux user
called ckanINSTANCE. I don't think these docs are relevant any more and
just confuses people.


  Commit: fd37c90e614c75f1d874f38e2733586e4ca93214
      https://github.com/okfn/ckan/commit/fd37c90e614c75f1d874f38e2733586e4ca93214
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

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

  Log Message:
  -----------
  [#1664] Make group activity streams smarter

Make group_activity_list() return all activities where the object of the
activity is either the group or any of the group's datasets, instead of just
the group as before.

Also check that the user has 'group_show' access to the group before returning
the activity stream, this plugs an access leak where a user who did not have
'group_show' access could still get the group's activity stream.

Update some existing tests that were broken by the new permission check.

Tests for the new group activity stream content need to be added.


  Commit: 9cc0f849b32301be98669d5b725ebc48b305b7f1
      https://github.com/okfn/ckan/commit/9cc0f849b32301be98669d5b725ebc48b305b7f1
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/group.py
    A ckan/templates/group/activity_stream.html

  Log Message:
  -----------
  [#1664] Add group activity stream page

You can now see a group's activity stream at /group/activity/GROUP_NAME.

This page is not integrated into the rest of the group pages yet like
the user activity stream page is with the user pages, but can be in
future if we want.

Also remove c.group_activity_stream from the group read context as it's
not used so no need to compute it.


  Commit: 8facd097f6f98cff9f0a448d19e5e29fc747a173
      https://github.com/okfn/ckan/commit/8facd097f6f98cff9f0a448d19e5e29fc747a173
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

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

  Log Message:
  -----------
  Remove direct logic function access from test_activity.py

Make functional/api/test_activity.py post to the API whenever it wants
to create, update or delete users, packages, groups, etc.

Also gets rid of the need to access resource_list_dictize() directly.


  Commit: c4240fbd72a8c953487ed46f951866c90fbbae7b
      https://github.com/okfn/ckan/commit/c4240fbd72a8c953487ed46f951866c90fbbae7b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

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

  Log Message:
  -----------
  Remove direct model access from test_activity.py

Import ckan.model only where needed and don't retain model objects, in
many cases replace accessing the model with going through the API


  Commit: 7ebf0c1e4ecc48661e39e13c18dc8125f39f016e
      https://github.com/okfn/ckan/commit/7ebf0c1e4ecc48661e39e13c18dc8125f39f016e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

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

  Log Message:
  -----------
  Fix an import in test_activity.py

Follow the CKAN Coding Standards for imports


  Commit: e5039423d1ba9e34dddb9387efc645c2be9cd892
      https://github.com/okfn/ckan/commit/e5039423d1ba9e34dddb9387efc645c2be9cd892
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

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

  Log Message:
  -----------
  test_activity.py PEP8 fixes


  Commit: 306d9c37d582f7b2d1e0101bb259d7971837d2db
      https://github.com/okfn/ckan/commit/306d9c37d582f7b2d1e0101bb259d7971837d2db
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

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

  Log Message:
  -----------
  Remove some commented-out tests


  Commit: 952ec8efbfb9da6cab6efdb9f43661b5776d9a42
      https://github.com/okfn/ckan/commit/952ec8efbfb9da6cab6efdb9f43661b5776d9a42
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-29 (Mon, 29 Oct 2012)

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

  Log Message:
  -----------
  [#1664] Convert group names to ids in group_activity_list()

This fixes a bug where calling group_activity_list with the group's name
as the id parameter would return less results than if you called it with
the group's id.


  Commit: 5d926d91d00075ff144c56c3bb8af3308803f64d
      https://github.com/okfn/ckan/commit/5d926d91d00075ff144c56c3bb8af3308803f64d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-29 (Mon, 29 Oct 2012)

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

  Log Message:
  -----------
  [#1664] Add some tests for group activity streams

Add some tests for the new smarter group activity streams. There were
already tests that changes to the group itself (created, updated or
deleted group) appear in the group's activity stream, now add some tests
that changes to the group's packages appear in the group's activity
stream.

These tests are not ideal, test_activity.py needs refactoring it's too
complicated.


  Commit: 22b5ff34dbb0a0456bba5988b6e9aacba627d5e2
      https://github.com/okfn/ckan/commit/22b5ff34dbb0a0456bba5988b6e9aacba627d5e2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-29 (Mon, 29 Oct 2012)

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

  Log Message:
  -----------
  Add auth checks to activity streams API functions


  Commit: 1c64b4cf756fc879272b0ec8b8b30f45721beaf2
      https://github.com/okfn/ckan/commit/1c64b4cf756fc879272b0ec8b8b30f45721beaf2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-29 (Mon, 29 Oct 2012)

  Changed paths:
    R doc/howto-editing-database-ownership.rst
    M doc/paster.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-1664-smarter-group-activity-streams


  Commit: f88ed2ed0ee6c159465ddf14c80a961829e7b945
      https://github.com/okfn/ckan/commit/f88ed2ed0ee6c159465ddf14c80a961829e7b945
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-30 (Tue, 30 Oct 2012)

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

  Log Message:
  -----------
  Merge pull request #163 from okfn/add-analytics-class-to-resource-links

Add resource-url-analytics CSS class to 'Raw Data' links


  Commit: 594b70b6f3cd95722d7a7092a833eb0432c9b6df
      https://github.com/okfn/ckan/commit/594b70b6f3cd95722d7a7092a833eb0432c9b6df
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-31 (Wed, 31 Oct 2012)

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

  Log Message:
  -----------
  Re-ran production less compilation to keep it up to date


  Commit: ec893c36fca0cf22365bfe641c22d7a9fcc231b3
      https://github.com/okfn/ckan/commit/ec893c36fca0cf22365bfe641c22d7a9fcc231b3
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-31 (Wed, 31 Oct 2012)

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

  Log Message:
  -----------
  Removed uneeded disqus.less empty file that was causing LESS compilation problems


  Commit: c04db955d7611d2847eaee227b0e241b955ee80a
      https://github.com/okfn/ckan/commit/c04db955d7611d2847eaee227b0e241b955ee80a
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-31 (Wed, 31 Oct 2012)

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

  Log Message:
  -----------
  Re-ran ./bin/less and re-compiled main.css


  Commit: 9ebc00217997acb6505a4e18e62bd45a3a595407
      https://github.com/okfn/ckan/commit/9ebc00217997acb6505a4e18e62bd45a3a595407
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#1664] Use field name in internationalized error.


  Commit: 97eb5f89e0db128dae729ead7d94a357386ca1f6
      https://github.com/okfn/ckan/commit/97eb5f89e0db128dae729ead7d94a357386ca1f6
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/logic/action/get.py
    A ckan/templates/group/activity_stream.html
    M ckan/tests/functional/api/test_activity.py

  Log Message:
  -----------
  Merge branch 'feature-1664-smarter-group-activity-streams'


  Commit: c59b304cb6b8a6dce09b8e9f708f9cb4d684cab4
      https://github.com/okfn/ckan/commit/c59b304cb6b8a6dce09b8e9f708f9cb4d684cab4
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-11-03 (Sat, 03 Nov 2012)

  Changed paths:
    M doc/_themes/sphinx-theme-okfn

  Log Message:
  -----------
  [doc/theme][xs]: update to latest version of the doc theme.


  Commit: 430ba1d6474df678b19f8cde44f7523a32fd7d30
      https://github.com/okfn/ckan/commit/430ba1d6474df678b19f8cde44f7523a32fd7d30
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-08 (Thu, 08 Nov 2012)

  Changed paths:
    M .gitignore
    M CHANGELOG.txt
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/authztool.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/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/public/base/css/main.css
    M ckan/public/base/datapreview/css/recline.css
    M ckan/public/base/datapreview/preview_recline.js
    M ckan/public/base/datapreview/resource.config
    R ckan/public/base/datapreview/vendor/backbone/0.5.1/backbone.js
    R ckan/public/base/datapreview/vendor/backbone/0.5.1/backbone.min.js
    A ckan/public/base/datapreview/vendor/backbone/backbone.js
    A ckan/public/base/datapreview/vendor/backbone/backbone.min.js
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.css
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.js
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.css
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.js
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/img/glyphicons-halflings-white.png
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/img/glyphicons-halflings.png
    A ckan/public/base/datapreview/vendor/bootstrap/bootstrap.js
    A ckan/public/base/datapreview/vendor/bootstrap/bootstrap.min.js
    A ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.css
    A ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.min.css
    A ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings-white.png
    M ckan/public/base/datapreview/vendor/flotr2/flotr2.js
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.css
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.ie.css
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.js
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.min.js
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.css
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.css
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.min.css
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.js
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css
    A ckan/public/base/datapreview/vendor/leaflet/leaflet.min.js
    R ckan/public/base/datapreview/vendor/moment/1.6.2/moment.js
    R ckan/public/base/datapreview/vendor/moment/1.6.2/moment.min.js
    A ckan/public/base/datapreview/vendor/moment/moment.js
    A ckan/public/base/datapreview/vendor/moment/moment.min.js
    R ckan/public/base/datapreview/vendor/mustache/0.5.0-dev/mustache.js
    R ckan/public/base/datapreview/vendor/mustache/0.5.0-dev/mustache.min.js
    A ckan/public/base/datapreview/vendor/mustache/mustache.js
    A ckan/public/base/datapreview/vendor/mustache/mustache.min.js
    M ckan/public/base/datapreview/vendor/pdfjs/pdf.js
    M ckan/public/base/datapreview/vendor/pdfviewer/viewer.css
    M ckan/public/base/datapreview/vendor/pdfviewer/viewer.js
    M ckan/public/base/datapreview/vendor/recline/css/recline.css
    M ckan/public/base/datapreview/vendor/recline/recline.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/README.txt
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/images/sort-asc.gif
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/images/sort-desc.gif
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.css
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.js
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.css
    R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/MIT-LICENSE.txt
    A ckan/public/base/datapreview/vendor/slickgrid/README.txt
    A ckan/public/base/datapreview/vendor/slickgrid/images/sort-asc.gif
    A ckan/public/base/datapreview/vendor/slickgrid/images/sort-desc.gif
    A ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    A ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.js
    A ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/slick.grid.css
    A ckan/public/base/datapreview/vendor/slickgrid/slick.grid.js
    A ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.css
    A ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.js
    R ckan/public/base/datapreview/vendor/underscore/1.1.6/underscore.js
    R ckan/public/base/datapreview/vendor/underscore/1.1.6/underscore.min.js
    A ckan/public/base/datapreview/vendor/underscore/underscore.js
    A ckan/public/base/datapreview/vendor/underscore/underscore.min.js
    A ckan/public/base/images/dotted.png
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/module.js
    A ckan/public/base/javascript/modules/follow.js
    A ckan/public/base/javascript/modules/popover-context.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/custom.less
    M ckan/public/base/less/dataset.less
    R ckan/public/base/less/disqus.less
    A ckan/public/base/less/follower-list.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/module.less
    A 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
    A ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-popover.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/ajax_snippets/api_info.html
    A ckan/templates/ajax_snippets/follow_button.html
    A ckan/templates/ajax_snippets/popover-context-dataset.html
    A ckan/templates/ajax_snippets/popover-context-user.html
    M ckan/templates/dataviewer/pdf.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    A ckan/templates/group/activity_stream.html
    M ckan/templates/header.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.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/snippets/back_to_package_action.html
    A ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/page.html
    A ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/follow_button.html
    A ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/read.html
    A ckan/templates/user/snippets/followers.html
    R ckan/templates/user/snippets/things_to_do.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_follow.py
    M ckanext/datastore/plugin.py
    M doc/_themes/sphinx-theme-okfn
    M doc/datastore-setup.rst
    M doc/extension-templating.rst
    R doc/howto-editing-database-ownership.rst
    M doc/index.rst
    M doc/paster.rst
    M doc/resources.rst

  Log Message:
  -----------
  Merge branch 'master' into 2939-orgs

Conflicts:
	ckan/config/routing.py
   trivial merge

	ckan/controllers/group.py
   activity list html no longer added to c

	ckan/logic/action/delete.py
   schema now passed to _unfollow

	ckan/templates/package/read.html
   help text is now added to sidebar

	ckan/tests/functional/api/test_activity.py
   fix test to run as sysadmin due to package_show rights


Compare: https://github.com/okfn/ckan/compare/21eabcecf322...430ba1d6474d

• Previous message: [ckan-changes] [okfn/ckan] 819d19: The dashboard now displays which items are actuall...
• Next message: [ckan-changes] [okfn/ckan] a57a75: [#3012] Add authorized field to user model
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]