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

• Previous message: [ckan-changes] [okfn/ckan] 6a7c9c: Fix user redirect after login
• Next message: [ckan-changes] [okfn/ckan] 372c73: Clarify an example in the docs
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/master
  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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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'


Compare: https://github.com/okfn/ckan/compare/6289cb53313d...6198a324bd4d

• Previous message: [ckan-changes] [okfn/ckan] 6a7c9c: Fix user redirect after login
• Next message: [ckan-changes] [okfn/ckan] 372c73: Clarify an example in the docs
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]