[ckan-changes] [okfn/ckan] fa3bfc: [#3028] Add `followee_list` and `followee_count` a...

GitHub noreply at github.com
Wed Feb 13 15:32:15 UTC 2013


  Branch: refs/heads/318-remove-popovers
  Home:   https://github.com/okfn/ckan
  Commit: fa3bfc719e9eacf5d2534f5a57becc8b68093b65
      https://github.com/okfn/ckan/commit/fa3bfc719e9eacf5d2534f5a57becc8b68093b65
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-10 (Mon, 10 Dec 2012)

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

  Log Message:
  -----------
  [#3028] Add `followee_list` and `followee_count` action functions


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

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

  Log Message:
  -----------
  [#3028] Add search filtering to followee_list


  Commit: 965640c41712b60e637196f856eb0d603b778ab4
      https://github.com/okfn/ckan/commit/965640c41712b60e637196f856eb0d603b778ab4
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-10 (Mon, 10 Dec 2012)

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

  Log Message:
  -----------
  [#3028] Change format of dicts returned by followee_list

Match the format requested by @johnmartin for the frontend


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

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  [#3028] Refactor a couple of activity streams methods

Refactor _activites_from_users_followed_by_user_query() and
_activites_from_datsets_followed_by_user_query(), make them use an
SQLAlchemy union of _user_activity_query() for all users followed by the
given user and _package_activity_query() for all datasets followed by
the given user, respectively.

This just ensures that what appears in a user's public activity stream,
for example, is exactly what will appear in your dashboard activity
stream if you follow that user. Better than having two different
implementations of the SQL for this query.

_activites_from_groups_followed_by_user_query() already works this way.


  Commit: 06a51618cdeba1a488b9c48f6cf469ac4859fe23
      https://github.com/okfn/ckan/commit/06a51618cdeba1a488b9c48f6cf469ac4859fe23
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-10 (Mon, 10 Dec 2012)

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

  Log Message:
  -----------
  [#3028] Fix a mistake in followee_list


  Commit: 6f277a796d5a948a7f4a116f84d98ccf986f6545
      https://github.com/okfn/ckan/commit/6f277a796d5a948a7f4a116f84d98ccf986f6545
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-10 (Mon, 10 Dec 2012)

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

  Log Message:
  -----------
  [#3028] Document an undocumented param


  Commit: 0cc2dfa033460f6d744af35a6c88a57b8d3c735a
      https://github.com/okfn/ckan/commit/0cc2dfa033460f6d744af35a6c88a57b8d3c735a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-10 (Mon, 10 Dec 2012)

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

  Log Message:
  -----------
  [#3028] Update a comment


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

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

  Log Message:
  -----------
  [#3028] Fix a docstring


  Commit: 080cef490e5678904f16f35d8dd63ef10366dcb3
      https://github.com/okfn/ckan/commit/080cef490e5678904f16f35d8dd63ef10366dcb3
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    A ckan/public/base/images/full-width-nav-right.png
    M ckan/public/base/javascript/modules/dashboard.js
    M ckan/public/base/less/dashboard.less
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/user/dashboard.html

  Log Message:
  -----------
  [#3028] Dashboard now shows dropdown for filtering of activity stream

Still todo:

* Add header for context of specific item active within dropdown
* Snippetize the followee list
* Searching the dropdown (with JS enabled)


  Commit: 6ef49b705c4aa171be84772727a6c0417946dbb9
      https://github.com/okfn/ckan/commit/6ef49b705c4aa171be84772727a6c0417946dbb9
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M ckan/public/base/less/dashboard.less
    M ckan/templates/ajax_snippets/popover-context-dataset.html
    M ckan/templates/ajax_snippets/popover-context-group.html
    M ckan/templates/ajax_snippets/popover-context-user.html
    A ckan/templates/snippets/popover_context.html
    M ckan/templates/user/dashboard.html
    A ckan/templates/user/snippets/followee_dropdown.html

  Log Message:
  -----------
  [#3028] Snippetized followee dropdown and added context to dashboard when filtering


  Commit: 90b176e1fe62ec80cd0a3057fca9ac9effbc6bac
      https://github.com/okfn/ckan/commit/90b176e1fe62ec80cd0a3057fca9ac9effbc6bac
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/dashboard.js
    M ckan/templates/user/snippets/followee_dropdown.html

  Log Message:
  -----------
  [#3028] Followee dropdown on dashboard is now searchable via ajax


  Commit: 8fd5a654d19098fc1bbde03a651bfd3c53ae589e
      https://github.com/okfn/ckan/commit/8fd5a654d19098fc1bbde03a651bfd3c53ae589e
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

  Changed paths:
    A ckan/public/base/images/dashboard-followee-related.png
    M ckan/public/base/less/dashboard.less
    M ckan/templates/user/dashboard.html

  Log Message:
  -----------
  [#3028] Related context now has better arrow from right hand side


  Commit: 766aa53f4bbbaff550fec4537785d96221cddd81
      https://github.com/okfn/ckan/commit/766aa53f4bbbaff550fec4537785d96221cddd81
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

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

  Log Message:
  -----------
  [#3028] My datasets on dashboard now look's nice


  Commit: e8dcbed81bdc1456c989dcc78f4cbb08fc783b2e
      https://github.com/okfn/ckan/commit/e8dcbed81bdc1456c989dcc78f4cbb08fc783b2e
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

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

  Log Message:
  -----------
  [#3028] Small tweak to user dropdown in header


  Commit: 33827b72dde52eceb44ef1b13d7bf877ba535c71
      https://github.com/okfn/ckan/commit/33827b72dde52eceb44ef1b13d7bf877ba535c71
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/public/base/javascript/modules/dashboard.js

  Log Message:
  -----------
  [#3028] Added some doc blocks


  Commit: 63871ac798fba61b1ce8dd666c0e206896a85e8d
      https://github.com/okfn/ckan/commit/63871ac798fba61b1ce8dd666c0e206896a85e8d
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

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

  Log Message:
  -----------
  [#3028] Updated main.css


  Commit: b2a46330db649f93a872084cf7da632f1641bb7a
      https://github.com/okfn/ckan/commit/b2a46330db649f93a872084cf7da632f1641bb7a
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

  Changed paths:
    M ckan/templates/user/snippets/followee_dropdown.html

  Log Message:
  -----------
  [#3028] Small textual tweak


  Commit: b3bbf44bf424429200256e4b1a7c05cfcfa91d30
      https://github.com/okfn/ckan/commit/b3bbf44bf424429200256e4b1a7c05cfcfa91d30
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

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

  Log Message:
  -----------
  [#3028] Small textual tweak


  Commit: d50b1b0350fae46fd62a319da9b0d8a6fb43fe9b
      https://github.com/okfn/ckan/commit/d50b1b0350fae46fd62a319da9b0d8a6fb43fe9b
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/dashboard.js
    M ckan/public/base/less/dashboard.less
    M ckan/templates/user/snippets/followee_dropdown.html

  Log Message:
  -----------
  [#3028] Fix for dropdown button extending too long for long label contexts


  Commit: 1ed7e1aa3ffeee305684a177a8fcdb59f0e1657e
      https://github.com/okfn/ckan/commit/1ed7e1aa3ffeee305684a177a8fcdb59f0e1657e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

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

  Log Message:
  -----------
  [#3028] Add 'num_datasets' to group dicts

Add 'num_datasets' to the dicts returned by group_show().

This is convenient for some javascript that has to show information
about groups.

This fixes an issue where the number of datasets of a followed group was
not appearing on the user dashboard.


  Commit: 857f9fd03381a3b7998a4025b18e39c22e44454c
      https://github.com/okfn/ckan/commit/857f9fd03381a3b7998a4025b18e39c22e44454c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
    M ckan/templates/ajax_snippets/popover-context-group.html

  Log Message:
  -----------
  [#3028] Fix bug showing a group with 0 datasets on dashboard

If a followed group had 0 datasets, then it's number of datasets would
not appear when the group was previewed in the user dashboard sidebar.
Fix it to say "Datasets: 0".


  Commit: 32a3729281fd4994901ed9180df79d06aad78837
      https://github.com/okfn/ckan/commit/32a3729281fd4994901ed9180df79d06aad78837
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

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

  Log Message:
  -----------
  [#3028] Add 'num_resources' to package dicts

Add 'num_resources' to the dicts returned by package_show().

This is convenient for some javascript that has to show package
previews.

This fixes an issue where a followed dataset's number of resources would
not show up when that dataset was previewed in the sidebar on the user
dashboard page.


  Commit: 4aaab694306c3641c29ca2de5c55a7a045903bb8
      https://github.com/okfn/ckan/commit/4aaab694306c3641c29ca2de5c55a7a045903bb8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

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

  Log Message:
  -----------
  [#3028] Add 'num_tags' to package dicts

Add 'num_tags' to the dicts returned by package_show().

This is convenient for some javascript that has to show package
previews.

This fixes an issue where a followed dataset's number of tags would not
show up when that dataset was previewed in the sidebar on the user
dashboard page.


  Commit: 674bb9129cecf7ab2eff49097ecd5ca7bad433ae
      https://github.com/okfn/ckan/commit/674bb9129cecf7ab2eff49097ecd5ca7bad433ae
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
    M ckan/templates/ajax_snippets/popover-context-group.html

  Log Message:
  -----------
  [#3028] Fix dashboard display issue with groups with 0 datasets

If a group had 0 datasets then its dataset count would not show up when
the group was previewed in the user dashboard sidebar. Removing some
unnecessary if statements fixes it.


  Commit: 5e4a5ce954c38b0f52a78ed0639670edf09c23c9
      https://github.com/okfn/ckan/commit/5e4a5ce954c38b0f52a78ed0639670edf09c23c9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
    M ckan/templates/ajax_snippets/popover-context-dataset.html

  Log Message:
  -----------
  [#3028] Fix dashboard display issue with datasets with 0 tags

If a dataset had 0 tags then its tag count would not show up when the
dataset was previewed in the user dashboard sidebar.  Removing some
unnecessary if statements fixes it.


  Commit: 1ea41cff6019017457e15ad8f6d88f6e6c14bdb4
      https://github.com/okfn/ckan/commit/1ea41cff6019017457e15ad8f6d88f6e6c14bdb4
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

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

  Log Message:
  -----------
  [#3028] Fix dashboard display issue with user previews

If a followed user had 0 datasets or 0 edits, then its dataset count or
edit count would not show up when the user was previewed in the user
dashboard sidebar.  Removing some unnecessary if statements fixes it.


  Commit: ddd6ee51d708f6f27928167d8b39b8a0a593864c
      https://github.com/okfn/ckan/commit/ddd6ee51d708f6f27928167d8b39b8a0a593864c
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
    M ckan/public/base/less/dashboard.less
    M ckan/templates/user/snippets/followee_dropdown.html

  Log Message:
  -----------
  [#3028] Couple of minor fixes to the new user dashboard


  Commit: df532f5e5689b2dbaaf503c569a7bbbfb53f12f1
      https://github.com/okfn/ckan/commit/df532f5e5689b2dbaaf503c569a7bbbfb53f12f1
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
    M ckan/public/base/less/dashboard.less
    M ckan/templates/user/snippets/followee_dropdown.html

  Log Message:
  -----------
  Merge branch '3028-dashboard-activity-stream-filtering' of github.com:okfn/ckan into 3028-dashboard-activity-stream-filtering


  Commit: c620c203efd369c0579b73f7e393510c20654d9a
      https://github.com/okfn/ckan/commit/c620c203efd369c0579b73f7e393510c20654d9a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

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

  Log Message:
  -----------
  [#3028] Fix package_activity_list to accept name or id

package_activity_list should accept either a package name or package id
for the 'id' arg, but was only accepting IDs. Fix it to accept either,
and to raise NotFound if the name or id does not exist.

This fixes package activity streams not showing in the user dashboard,
when the dashboard was filtered to a package.


  Commit: 8c36cc76e3eb127bd6e318a4a88a2424f73b0413
      https://github.com/okfn/ckan/commit/8c36cc76e3eb127bd6e318a4a88a2424f73b0413
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

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

  Log Message:
  -----------
  [#3028] Fix user_activity_list to accept name or id

user_activity_list should accept either a user name or user id for the
'id' arg, but was only accepting IDs. Fix it to accept either, and to
raise NotFound if the name or id does not exist.

This fixes user activity streams not showing in the user dashboard, when
the dashboard was filtered to a user.


  Commit: 723f5bb614e2fbf869343db2f9783cb1bdb06b65
      https://github.com/okfn/ckan/commit/723f5bb614e2fbf869343db2f9783cb1bdb06b65
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#3028] Makes a if statement more Pythonic


  Commit: 41e0a7faa112d941d44e02c4eb7c7d000fe929c5
      https://github.com/okfn/ckan/commit/41e0a7faa112d941d44e02c4eb7c7d000fe929c5
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#3028] Small tweak to the dashboard filtering code


  Commit: 8a8542c148e1b1b44905164831990aa43cb52bf2
      https://github.com/okfn/ckan/commit/8a8542c148e1b1b44905164831990aa43cb52bf2
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#3028] Line break fixes and small dict fix


  Commit: 593682a612a7d018a68ed5ff04af6eab55df9fc7
      https://github.com/okfn/ckan/commit/593682a612a7d018a68ed5ff04af6eab55df9fc7
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

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

  Log Message:
  -----------
  [#3028] Removed sanitiseParams as all needed items are returned from the API call


  Commit: a65774a09fb2157c70c0dd35d1d08a9b8ec7d965
      https://github.com/okfn/ckan/commit/a65774a09fb2157c70c0dd35d1d08a9b8ec7d965
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-20 (Thu, 20 Dec 2012)

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

  Log Message:
  -----------
  [#3028] Quick IE8 fix for columns on dashboard


  Commit: e1c12dfb7b151a80033a56c9d4eeeeb68773d813
      https://github.com/okfn/ckan/commit/e1c12dfb7b151a80033a56c9d4eeeeb68773d813
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-20 (Thu, 20 Dec 2012)

  Changed paths:
    R ckan/authz.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    R ckan/controllers/group_formalchemy.py
    M ckan/controllers/home.py
    A ckan/controllers/organization.py
    M ckan/controllers/package.py
    R ckan/controllers/package_formalchemy.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/user.py
    R ckan/forms/__init__.py
    R ckan/forms/authorization_group.py
    R ckan/forms/authz.py
    R ckan/forms/builder.py
    R ckan/forms/common.py
    R ckan/forms/group.py
    R ckan/forms/package.py
    R ckan/forms/package_dict.py
    R ckan/forms/registry.py
    M ckan/i18n/check_po_files.py
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    A ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    A ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/mailer.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    R ckan/logic/auth/publisher/__init__.py
    R ckan/logic/auth/publisher/create.py
    R ckan/logic/auth/publisher/delete.py
    R ckan/logic/auth/publisher/get.py
    R ckan/logic/auth/publisher/update.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/063_org_changes.py
    A ckan/migration/versions/064_add_email_last_sent_column.py
    A ckan/migration/versions/065_add_email_notifications_preference.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/authz.py
    M ckan/model/dashboard.py
    M ckan/model/group.py
    M ckan/model/package.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/fuchsia.min.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/green.min.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/main.min.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/maroon.min.css
    M ckan/public/base/css/red.css
    M ckan/public/base/css/red.min.css
    R ckan/public/base/datapreview/css/json.css
    R ckan/public/base/datapreview/css/json.min.css
    R ckan/public/base/datapreview/css/pdf.css
    R ckan/public/base/datapreview/css/pdf.min.css
    R ckan/public/base/datapreview/css/recline.css
    R ckan/public/base/datapreview/css/recline.min.css
    R ckan/public/base/datapreview/img/ajaxload-circle.gif
    R ckan/public/base/datapreview/preview_json.js
    R ckan/public/base/datapreview/preview_json.min.js
    R ckan/public/base/datapreview/preview_pdf.js
    R ckan/public/base/datapreview/preview_pdf.min.js
    R ckan/public/base/datapreview/preview_recline.js
    R ckan/public/base/datapreview/preview_recline.min.js
    R ckan/public/base/datapreview/resource.config
    R ckan/public/base/datapreview/vendor/backbone/backbone.js
    R ckan/public/base/datapreview/vendor/backbone/backbone.min.js
    R ckan/public/base/datapreview/vendor/bootstrap/bootstrap.js
    R ckan/public/base/datapreview/vendor/bootstrap/bootstrap.min.js
    R ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.css
    R ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.min.css
    R ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings.png
    A ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
    A ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
    R ckan/public/base/datapreview/vendor/flotr2/excanvas.js
    R ckan/public/base/datapreview/vendor/flotr2/excanvas.min.js
    R ckan/public/base/datapreview/vendor/flotr2/flotr2.js
    R ckan/public/base/datapreview/vendor/flotr2/flotr2.min.js
    R ckan/public/base/datapreview/vendor/jquery.mustache/jquery.mustache.js
    R ckan/public/base/datapreview/vendor/jquery.mustache/jquery.mustache.min.js
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.js
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckan/public/base/datapreview/vendor/leaflet/images/layers.png
    R ckan/public/base/datapreview/vendor/leaflet/images/marker-icon.png
    R ckan/public/base/datapreview/vendor/leaflet/images/marker-shadow.png
    R ckan/public/base/datapreview/vendor/leaflet/images/zoom-in.png
    R ckan/public/base/datapreview/vendor/leaflet/images/zoom-out.png
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.js
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.min.js
    R ckan/public/base/datapreview/vendor/moment/moment.js
    R ckan/public/base/datapreview/vendor/moment/moment.min.js
    R ckan/public/base/datapreview/vendor/mustache/mustache.js
    R ckan/public/base/datapreview/vendor/mustache/mustache.min.js
    R ckan/public/base/datapreview/vendor/pdfjs/pdf.js
    R ckan/public/base/datapreview/vendor/pdfjs/pdf.min.js
    R ckan/public/base/datapreview/vendor/pdfviewer/compatibility.js
    R ckan/public/base/datapreview/vendor/pdfviewer/compatibility.min.js
    R ckan/public/base/datapreview/vendor/pdfviewer/debugger.js
    R ckan/public/base/datapreview/vendor/pdfviewer/debugger.min.js
    R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-check.svg
    R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-comment.svg
    R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-text.svg
    R ckan/public/base/datapreview/vendor/pdfviewer/images/loading-icon.gif
    R ckan/public/base/datapreview/vendor/pdfviewer/images/texture.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-download.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-print.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-search.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckan/public/base/datapreview/vendor/pdfviewer/locale.properties
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.css
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.js
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.css
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.js
    R ckan/public/base/datapreview/vendor/recline/css/recline.css
    R ckan/public/base/datapreview/vendor/recline/css/recline.min.css
    R ckan/public/base/datapreview/vendor/recline/recline.js
    R ckan/public/base/datapreview/vendor/recline/recline.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/MIT-LICENSE.txt
    R ckan/public/base/datapreview/vendor/slickgrid/README.txt
    R ckan/public/base/datapreview/vendor/slickgrid/images/sort-asc.gif
    R ckan/public/base/datapreview/vendor/slickgrid/images/sort-desc.gif
    R ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    R ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.js
    R ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.css
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.js
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.css
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.js
    R ckan/public/base/datapreview/vendor/underscore/underscore.js
    R ckan/public/base/datapreview/vendor/underscore/underscore.min.js
    R ckan/public/base/datapreview/vendor/webL10n/README.md
    R ckan/public/base/datapreview/vendor/webL10n/l10n.js
    R ckan/public/base/datapreview/vendor/webL10n/l10n.min.js
    A ckan/public/base/images/editing.png
    A ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/client.min.js
    M ckan/public/base/javascript/module.min.js
    A ckan/public/base/javascript/modules/activity-stream.js
    A ckan/public/base/javascript/modules/dashboard.min.js
    M ckan/public/base/javascript/modules/data-viewer.min.js
    A ckan/public/base/javascript/modules/follow.min.js
    M ckan/public/base/javascript/modules/popover-context.js
    A ckan/public/base/javascript/modules/popover-context.min.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/variables.less
    A ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
    A ckan/templates/activity_streams/activity_stream_email_notifications.text
    M ckan/templates/activity_streams/activity_stream_items.html
    R ckan/templates/ajax_snippets/popover-context-dataset.html
    R ckan/templates/ajax_snippets/popover-context-group.html
    R ckan/templates/ajax_snippets/popover-context-user.html
    A ckan/templates/ajax_snippets/popover_context_dataset.html
    A ckan/templates/ajax_snippets/popover_context_group.html
    A ckan/templates/ajax_snippets/popover_context_user.html
    M ckan/templates/base.html
    R ckan/templates/dataviewer/json.html
    R ckan/templates/dataviewer/pdf.html
    R ckan/templates/dataviewer/recline.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/page_header.html
    M ckan/templates/footer.html
    M ckan/templates/group/base_form_page.html
    A ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/index.html
    A ckan/templates/group/member_new.html
    A ckan/templates/group/members.html
    M ckan/templates/group/read.html
    A ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/header.html
    M ckan/templates/macros/form.html
    A ckan/templates/organization/about.html
    A ckan/templates/organization/admins.html
    A ckan/templates/organization/base_form_page.html
    A ckan/templates/organization/confirm_delete.html
    A ckan/templates/organization/confirm_delete_member.html
    A ckan/templates/organization/edit.html
    A ckan/templates/organization/edit_base.html
    A ckan/templates/organization/index.html
    A ckan/templates/organization/member_new.html
    A ckan/templates/organization/members.html
    A ckan/templates/organization/new.html
    A ckan/templates/organization/new_organization_form.html
    A ckan/templates/organization/read.html
    A ckan/templates/organization/read_base.html
    A ckan/templates/organization/snippets/feeds.html
    A ckan/templates/organization/snippets/info.html
    A ckan/templates/organization/snippets/organization_form.html
    A ckan/templates/organization/snippets/organization_item.html
    A ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/activity.html
    A ckan/templates/package/activity_stream.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/read.html
    A ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/page.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    A ckan/templates/snippets/organization.html
    A ckan/templates/snippets/organization_item.html
    A ckan/templates/snippets/page_header.html
    M ckan/templates/snippets/popover_context.html
    A ckan/templates/snippets/private.html
    A ckan/templates/tests/mock_json_resource_preview_template.html
    A ckan/templates/tests/mock_resource_preview_template.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/read.html
    A ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/followers.html
    M ckan/templates_legacy/admin/index.html
    M ckan/templates_legacy/admin/layout.html
    M ckan/templates_legacy/group/layout.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/forms/__init__.py
    R ckan/tests/forms/test_authz.py
    R ckan/tests/forms/test_group.py
    R ckan/tests/forms/test_package.py
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_group.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    A ckan/tests/functional/api/test_email_notifications.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_authz.py
    R ckan/tests/functional/test_edit_authz.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_edit_authz.py
    M ckan/tests/functional/test_pagination.py
    A ckan/tests/functional/test_preview_interface.py
    R ckan/tests/functional/test_publisher_auth.py
    M ckan/tests/functional/test_tag_vocab.py
    M ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    R ckan/tests/lib/test_authztool.py
    A ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    A ckan/tests/lib/test_email_notifications.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/lib/test_solr_search_index.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/logic/test_auth.py
    R ckan/tests/misc/test_auth_profiles.py
    M ckan/tests/misc/test_mock_mail_server.py
    R ckan/tests/misc/test_package_saver.py
    M ckan/tests/mock_mail_server.py
    R ckan/tests/models/test_authz.py
    R ckan/tests/models/test_repo.py
    R ckan/tests/test_authz.py
    A ckanext/jsonpreview/__init__.py
    A ckanext/jsonpreview/plugin.py
    A ckanext/jsonpreview/tests/__init__.py
    A ckanext/jsonpreview/tests/test_preview.py
    A ckanext/jsonpreview/theme/public/css/json.css
    A ckanext/jsonpreview/theme/public/css/json.min.css
    A ckanext/jsonpreview/theme/public/preview_json.js
    A ckanext/jsonpreview/theme/public/preview_json.min.js
    A ckanext/jsonpreview/theme/public/resource.config
    A ckanext/jsonpreview/theme/templates/json.html
    A ckanext/pdfpreview/__init__.py
    A ckanext/pdfpreview/plugin.py
    A ckanext/pdfpreview/tests/__init__.py
    A ckanext/pdfpreview/tests/test_preview.py
    A ckanext/pdfpreview/theme/public/css/pdf.css
    A ckanext/pdfpreview/theme/public/css/pdf.min.css
    A ckanext/pdfpreview/theme/public/css/recline.css
    A ckanext/pdfpreview/theme/public/css/recline.min.css
    A ckanext/pdfpreview/theme/public/img/ajaxload-circle.gif
    A ckanext/pdfpreview/theme/public/preview_pdf.js
    A ckanext/pdfpreview/theme/public/preview_pdf.min.js
    A ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    A ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/texture.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/README.md
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    A ckanext/pdfpreview/theme/templates/pdf.html
    A ckanext/reclinepreview/__init__.py
    A ckanext/reclinepreview/plugin.py
    A ckanext/reclinepreview/tests/__init__.py
    A ckanext/reclinepreview/tests/test_preview.py
    A ckanext/reclinepreview/theme/public/css/recline.css
    A ckanext/reclinepreview/theme/public/css/recline.min.css
    A ckanext/reclinepreview/theme/public/img/ajaxload-circle.gif
    A ckanext/reclinepreview/theme/public/preview_recline.js
    A ckanext/reclinepreview/theme/public/preview_recline.min.js
    A ckanext/reclinepreview/theme/public/resource.config
    A ckanext/reclinepreview/theme/public/vendor/backbone/backbone.js
    A ckanext/reclinepreview/theme/public/vendor/backbone/backbone.min.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.min.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.min.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings.png
    A ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.js
    A ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.min.js
    A ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.js
    A ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
    A ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.js
    A ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.min.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/layers.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-icon.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-shadow.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-in.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-out.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.js
    A ckanext/reclinepreview/theme/public/vendor/moment/moment.js
    A ckanext/reclinepreview/theme/public/vendor/moment/moment.min.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/mustache.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/mustache.min.js
    A ckanext/reclinepreview/theme/public/vendor/recline/css/recline.css
    A ckanext/reclinepreview/theme/public/vendor/recline/css/recline.min.css
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/MIT-LICENSE.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/README.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-asc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-desc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.css
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.css
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/underscore.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/underscore.min.js
    A ckanext/reclinepreview/theme/templates/recline.html
    A ckanext/resourceproxy/__init__.py
    A ckanext/resourceproxy/controller.py
    A ckanext/resourceproxy/plugin.py
    A ckanext/resourceproxy/tests/__init__.py
    A ckanext/resourceproxy/tests/file_server.py
    A ckanext/resourceproxy/tests/static/huge.json
    A ckanext/resourceproxy/tests/static/test.json
    A ckanext/resourceproxy/tests/test_proxy.py
    M doc/configuration.rst
    A doc/email-notifications.rst
    M doc/index.rst
    A doc/organizations_and_groups.rst
    M doc/toolkit.rst
    M doc/writing-extensions.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 3028-dashboard-activity-stream-filtering

Conflicts:
	ckan/controllers/user.py
	ckan/lib/helpers.py
	ckan/logic/action/get.py
	ckan/public/base/javascript/modules/popover-context.js
	ckan/templates/activity_streams/activity_stream_items.html


  Commit: 170a8f20359f76cea12d6fe58b4860107199aab0
      https://github.com/okfn/ckan/commit/170a8f20359f76cea12d6fe58b4860107199aab0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-20 (Thu, 20 Dec 2012)

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

  Log Message:
  -----------
  Merge branch '3028-dashboard-activity-stream-filtering' of github.com:okfn/ckan into 3028-dashboard-activity-stream-filtering


  Commit: 9668ad32dd62b3a2c8b4bc516fbd7993b067d909
      https://github.com/okfn/ckan/commit/9668ad32dd62b3a2c8b4bc516fbd7993b067d909
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-20 (Thu, 20 Dec 2012)

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

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 3028-dashboard-activity-stream-filtering


  Commit: 4b08c7de2842ce82b27ede3b1a1484d74b8111e8
      https://github.com/okfn/ckan/commit/4b08c7de2842ce82b27ede3b1a1484d74b8111e8
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-20 (Thu, 20 Dec 2012)

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

  Log Message:
  -----------
  [#3028] Updated main.css


  Commit: 4b94315640be2773699151a115346baac998dd36
      https://github.com/okfn/ckan/commit/4b94315640be2773699151a115346baac998dd36
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-20 (Thu, 20 Dec 2012)

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

  Log Message:
  -----------
  [#3028] Re-sanitizes params sent to view otherwise we end up with 414 errors


  Commit: 9e1ce7bc6550b08fe9b3aed884981f039ec10e51
      https://github.com/okfn/ckan/commit/9e1ce7bc6550b08fe9b3aed884981f039ec10e51
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-20 (Thu, 20 Dec 2012)

  Changed paths:
    M ckan/templates/ajax_snippets/popover_context_dataset.html
    M ckan/templates/ajax_snippets/popover_context_group.html
    M ckan/templates/ajax_snippets/popover_context_user.html

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 3028-dashboard-activity-stream-filtering


  Commit: 68fc6b825455b2c0e502f0a860d9fbab8fd229fc
      https://github.com/okfn/ckan/commit/68fc6b825455b2c0e502f0a860d9fbab8fd229fc
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-20 (Thu, 20 Dec 2012)

  Changed paths:
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/popover-context.js

  Log Message:
  -----------
  Merge branch '3028-dashboard-activity-stream-filtering' of github.com:okfn/ckan into 3028-dashboard-activity-stream-filtering


  Commit: fb9e72c1a5a8643357ab54fb6376d182b3c6c023
      https://github.com/okfn/ckan/commit/fb9e72c1a5a8643357ab54fb6376d182b3c6c023
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-21 (Fri, 21 Dec 2012)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 3028-dashboard-activity-stream-filtering


  Commit: 7d8e86fdd8b69ca74812031a7a98826d58bad0b0
      https://github.com/okfn/ckan/commit/7d8e86fdd8b69ca74812031a7a98826d58bad0b0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-14 (Mon, 14 Jan 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/celery_app.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    A ckan/migration/versions/066_default_package_type.py
    M ckan/model/package.py
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/dropdown.less
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/search.html
    M ckan/templates/snippets/facet_list.html
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_solr_search_index.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/reclinepreview/plugin.py
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/test_tag_vocab_plugin.py
    M doc/configuration.rst
    M doc/datastore-api.rst
    M doc/datastore.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 3028-dashboard-activity-stream-filtering


  Commit: ab75b525b2c69e1948b9d4043c7469f3cb916473
      https://github.com/okfn/ckan/commit/ab75b525b2c69e1948b9d4043c7469f3cb916473
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

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

  Log Message:
  -----------
  [#3028] Tweak a docstring


  Commit: 84eae23e16fe098b619c5c5425c5e7f2d7178dbb
      https://github.com/okfn/ckan/commit/84eae23e16fe098b619c5c5425c5e7f2d7178dbb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

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

  Log Message:
  -----------
  [#3028] Add validation to followee_list() action function


  Commit: f7408d841f4e82e7c3d6c8a58104518365428321
      https://github.com/okfn/ckan/commit/f7408d841f4e82e7c3d6c8a58104518365428321
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

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

  Log Message:
  -----------
  [#3028] Remove a TODO

followee_list() doesn't need any auth, anyone can see anyone's followee
list.


  Commit: 5d3d03251417e8e78ff4e7917a32064744aaf69e
      https://github.com/okfn/ckan/commit/5d3d03251417e8e78ff4e7917a32064744aaf69e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

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

  Log Message:
  -----------
  [#3028] Don't do validation 3 times in followee_count()


  Commit: 9a560165fa8a83f49719b2af45fb55581c3e1e3b
      https://github.com/okfn/ckan/commit/9a560165fa8a83f49719b2af45fb55581c3e1e3b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

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

  Log Message:
  -----------
  [#3028] Add some followee tests

Add some tests for the followee_count and followee_list actions, mainly
testing the validation


  Commit: 43b36a42ed0dc225a6dc25f90c1304365c48d2f0
      https://github.com/okfn/ckan/commit/43b36a42ed0dc225a6dc25f90c1304365c48d2f0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

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

  Log Message:
  -----------
  [#3028] Add some more followee tests


  Commit: 62104afe43ed9652c570690ccc8de4b23d0678c8
      https://github.com/okfn/ckan/commit/62104afe43ed9652c570690ccc8de4b23d0678c8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

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

  Log Message:
  -----------
  [#3028] Add some more followee tests


  Commit: e522815b241a1a1f65a3fdf5a5820693e7357f47
      https://github.com/okfn/ckan/commit/e522815b241a1a1f65a3fdf5a5820693e7357f47
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

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

  Log Message:
  -----------
  [#3028] Add some more followee tests


  Commit: 4d072917a961aaf6808adfaa4abc9ebc3e18d827
      https://github.com/okfn/ckan/commit/4d072917a961aaf6808adfaa4abc9ebc3e18d827
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-19 (Sat, 19 Jan 2013)

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

  Log Message:
  -----------
  [#3028] Test that *_activity_list() actions accept names


  Commit: e93c39466bc098599b2886193518aa25817b1bbd
      https://github.com/okfn/ckan/commit/e93c39466bc098599b2886193518aa25817b1bbd
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-19 (Sat, 19 Jan 2013)

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

  Log Message:
  -----------
  [#3028] Fix organization_activity_list action

Make it accept organization names as id param not just ids.

Also make it call an auth function, and handle the limit and offset
params as other activity list actions do.


  Commit: ce45d4e423cbe70c2dc83e5b1f9b1ef9746961c9
      https://github.com/okfn/ckan/commit/ce45d4e423cbe70c2dc83e5b1f9b1ef9746961c9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-19 (Sat, 19 Jan 2013)

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

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 3028-dashboard-activity-stream-filtering


  Commit: 5ab278a249de9262a5f2d35a558712093bfba979
      https://github.com/okfn/ckan/commit/5ab278a249de9262a5f2d35a558712093bfba979
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

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

  Log Message:
  -----------
  [#3028] Move skip_validation params into context


  Commit: 72d3036ac461dac08e81877107b87feb45d26e54
      https://github.com/okfn/ckan/commit/72d3036ac461dac08e81877107b87feb45d26e54
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#285] Remove code in base controller that is not used in the ckan codebase


  Commit: c62be33f958fe92a08e2b58cf1b004cecdb7cf8e
      https://github.com/okfn/ckan/commit/c62be33f958fe92a08e2b58cf1b004cecdb7cf8e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    A CONTRIBUTING.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/user.py
    M ckanext/datastore/bin/datastore_setup.py
    R doc/contributing-docs.rst
    R doc/contributing.rst
    M doc/datastore-setup.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/solr-setup.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 3028-dashboard-activity-stream-filtering


  Commit: 0c56ee64dbffb4a901ca6e4c3bc4190be461157f
      https://github.com/okfn/ckan/commit/0c56ee64dbffb4a901ca6e4c3bc4190be461157f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

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

  Log Message:
  -----------
  [#3028] Fix typo that was causing a lot of crashes


  Commit: 8f91b3ce702dc55d1b68c4542ccea95572b97a5a
      https://github.com/okfn/ckan/commit/8f91b3ce702dc55d1b68c4542ccea95572b97a5a
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#285] Re add function mis-used in api controller


  Commit: cdce0fcd538a1ada46fc3f4b9344f1bb32a249e7
      https://github.com/okfn/ckan/commit/cdce0fcd538a1ada46fc3f4b9344f1bb32a249e7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#285] _make_unicode() still has user


  Commit: 15c4ec216ba1e56a9893283cb5f7d1adbd18344b
      https://github.com/okfn/ckan/commit/15c4ec216ba1e56a9893283cb5f7d1adbd18344b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/update.py
    M ckan/model/group.py
    M ckan/plugins/interfaces.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/models/test_group.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 3028-dashboard-activity-stream-filtering


  Commit: df939a035789868af2732fac5aece51c8e47fa41
      https://github.com/okfn/ckan/commit/df939a035789868af2732fac5aece51c8e47fa41
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/update.py
    M ckan/model/group.py
    M ckan/plugins/interfaces.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/models/test_group.py

  Log Message:
  -----------
  Merge branch 'master' into 285-base-controller-code-removal


  Commit: 8235e06bec9b3886c09bdd194ca5a146ed9f0398
      https://github.com/okfn/ckan/commit/8235e06bec9b3886c09bdd194ca5a146ed9f0398
  Author: John Martin <me at johnmart.in>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#3028] Some small tweaks to method logic for dashboard filtering


  Commit: 2edc0a875270aad655c0cb66b02f5864c5920582
      https://github.com/okfn/ckan/commit/2edc0a875270aad655c0cb66b02f5864c5920582
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#285] Move function into only function using it


  Commit: 4e4aea6c95b4ad280d4713d3b90fe3574cfad815
      https://github.com/okfn/ckan/commit/4e4aea6c95b4ad280d4713d3b90fe3574cfad815
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/base.py

  Log Message:
  -----------
  [#285] Move function into API controller as only user


  Commit: 7e51ec6bc5fcaa80610804738ec66e416e46ab1d
      https://github.com/okfn/ckan/commit/7e51ec6bc5fcaa80610804738ec66e416e46ab1d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  [#285] Fix missing imports


  Commit: 1d5d602eb28723c3c261f9a8a0aa14e815a1af8a
      https://github.com/okfn/ckan/commit/1d5d602eb28723c3c261f9a8a0aa14e815a1af8a
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  [#285] Use json defined in h


  Commit: cdd77c9d9f114fd2891cdc10300fb930f2eb5c82
      https://github.com/okfn/ckan/commit/cdd77c9d9f114fd2891cdc10300fb930f2eb5c82
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#252] Check_access helper function does not need data_dict supplying


  Commit: fc7dc1eaded8c3978b8a43f081f6e9fc7ebc82b0
      https://github.com/okfn/ckan/commit/fc7dc1eaded8c3978b8a43f081f6e9fc7ebc82b0
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

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

  Log Message:
  -----------
  [#252] Only show add related item button if permission to add


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

  Changed paths:
    M ckan/controllers/revision.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/model/__init__.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_tag.py
    M ckan/tests/logic/test_tag.py

  Log Message:
  -----------
  309 no private datasets in activity streams, revisions, group listing and tag listings


  Commit: 3bf744f8b31d5a6d02b7f4ae17daec5068a658a2
      https://github.com/okfn/ckan/commit/3bf744f8b31d5a6d02b7f4ae17daec5068a658a2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-26 (Sat, 26 Jan 2013)

  Changed paths:
    M README.rst
    M ckan/controllers/package.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/profile.less
    M ckan/templates/ajax_snippets/popover_context_dataset.html
    M ckan/templates/ajax_snippets/popover_context_group.html
    M ckan/templates/ajax_snippets/popover_context_user.html
    M ckan/templates/group/read_base.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/read_base.html

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 3028-dashboard-activity-stream-filtering

Conflicts:
	ckan/public/base/css/main.css


  Commit: d294d0dcc9e6c95fdee4ac6aab1068777f6c4fd9
      https://github.com/okfn/ckan/commit/d294d0dcc9e6c95fdee4ac6aab1068777f6c4fd9
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-01-26 (Sat, 26 Jan 2013)

  Changed paths:
    M ckan/model/__init__.py
    M ckan/model/meta.py
    M ckan/tests/__init__.py

  Log Message:
  -----------
  [#287] Add is_datastore_supported method to tests and engine_is_pg to model


  Commit: 23c2bcaf93e9f607b57e5421d6274579a0314c4e
      https://github.com/okfn/ckan/commit/23c2bcaf93e9f607b57e5421d6274579a0314c4e
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-01-26 (Sat, 26 Jan 2013)

  Changed paths:
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py

  Log Message:
  -----------
  [#287] Log warning if the database is not a pg database. Skip datastore tests, if there is no support for them.


  Commit: 6e33f76b18db06e6f1b643cf7f9645daba059ac9
      https://github.com/okfn/ckan/commit/6e33f76b18db06e6f1b643cf7f9645daba059ac9
  Author: kindly <kindly at gmail.com>
  Date:   2013-01-28 (Mon, 28 Jan 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  make group_list_dictize reasonably fast by going through search index


  Commit: 2a74c8dc16900ce364a86ddeed746b3f5ac90661
      https://github.com/okfn/ckan/commit/2a74c8dc16900ce364a86ddeed746b3f5ac90661
  Author: kindly <kindly at gmail.com>
  Date:   2013-01-28 (Mon, 28 Jan 2013)

  Changed paths:
    M ckan/controllers/home.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/templates/snippets/organization.html
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [#309] add package count using search index


  Commit: 1fa0b1a464a44019fc5c65277f0cd7e95222b178
      https://github.com/okfn/ckan/commit/1fa0b1a464a44019fc5c65277f0cd7e95222b178
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

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

  Log Message:
  -----------
  [#257] Set timeout to 10 seconds in recline source


  Commit: e024873f596d481137845951af57988b077969fb
      https://github.com/okfn/ckan/commit/e024873f596d481137845951af57988b077969fb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/templates/group/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/user/read_base.html

  Log Message:
  -----------
  [#316] Disable follower lists

Disable follower lists for normal users

Make it so that only sysadmins can see a dataset, user or group's list
of followers.

Add auth functions to user, dataset and group follower_list functions.

user controller, group controller, package controller:
  /followers pages send 401 if not authorized

Remove followers tabs from user, dataset and group pages.

Some tests need to be fixed now


  Commit: 44a1fd16956341331e9eb534911a9d08acc6a758
      https://github.com/okfn/ckan/commit/44a1fd16956341331e9eb534911a9d08acc6a758
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

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

  Log Message:
  -----------
  [#316] Update follower api tests

Make it pass a sysadmin's API key whenever calling *_follower_list,
since only sysadmins are authorised to call that now.


  Commit: eab929e4842179dc09583cd67f58e9677d2c1b6f
      https://github.com/okfn/ckan/commit/eab929e4842179dc09583cd67f58e9677d2c1b6f
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

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

  Log Message:
  -----------
  [#257] Set the timeout outside the recline source so that it can be updated without patching the source again


  Commit: 126034925040b5f6c5a89820b4923cb72aa9095f
      https://github.com/okfn/ckan/commit/126034925040b5f6c5a89820b4923cb72aa9095f
  Author: amercader <amercadero at gmail.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  Merge and close #257


  Commit: f183205ea5474839bcd941984debd0d44c08c04a
      https://github.com/okfn/ckan/commit/f183205ea5474839bcd941984debd0d44c08c04a
  Author: John Martin <me at johnmart.in>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

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

  Log Message:
  -----------
  [#319] Added extra state to .select2-container that handles error state better


  Commit: bde08f104909d0d40df2d0dba8efd6f20c00050c
      https://github.com/okfn/ckan/commit/bde08f104909d0d40df2d0dba8efd6f20c00050c
  Author: John Martin <me at johnmart.in>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

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

  Log Message:
  -----------
  [#319] Rebuild of main.css


  Commit: 40e4630d24a81b3294d31d93d5b942f02713acff
      https://github.com/okfn/ckan/commit/40e4630d24a81b3294d31d93d5b942f02713acff
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

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

  Log Message:
  -----------
  [#316] Update follower frontend tests


  Commit: 825117eca63105ac582b7708f3dde242499c30db
      https://github.com/okfn/ckan/commit/825117eca63105ac582b7708f3dde242499c30db
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

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

  Log Message:
  -----------
  [#316] Add tests for new follower list auth


  Commit: 5c7e022a09798d02b1fd30356517a9ef071d0577
      https://github.com/okfn/ckan/commit/5c7e022a09798d02b1fd30356517a9ef071d0577
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

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

  Log Message:
  -----------
  [#316] Remove "started following" activities


  Commit: a20d0b3f9aa5cf65d1f9780a98a7faaff90f6ab7
      https://github.com/okfn/ckan/commit/a20d0b3f9aa5cf65d1f9780a98a7faaff90f6ab7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

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

  Log Message:
  -----------
  [#316] Update activity streams API tests


  Commit: b722815983378201dba41a4b2adc36c4430aafac
      https://github.com/okfn/ckan/commit/b722815983378201dba41a4b2adc36c4430aafac
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

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

  Log Message:
  -----------
  [#316] Update activity streams frontend tests


  Commit: ef89d80549214276f5c3f7ee08c50ce28597a44e
      https://github.com/okfn/ckan/commit/ef89d80549214276f5c3f7ee08c50ce28597a44e
  Author: John Glover <j at johnglover.net>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Remove theme folder from gitignore


  Commit: bd807829965929b63059d4445b3cf76387086ae8
      https://github.com/okfn/ckan/commit/bd807829965929b63059d4445b3cf76387086ae8
  Author: amercader <amercadero at gmail.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Merge branch '330-fix-gitignore'


  Commit: 7f4f0def48560951d0d171e2665dfeefaad80e82
      https://github.com/okfn/ckan/commit/7f4f0def48560951d0d171e2665dfeefaad80e82
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

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

  Log Message:
  -----------
  [#316] Add auth for followee_list APIs

Don't let visitors or other users see what a user is following.


  Commit: 6903985d1f89e8de59434ce1fdd7da3d96aaa204
      https://github.com/okfn/ckan/commit/6903985d1f89e8de59434ce1fdd7da3d96aaa204
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M .gitignore
    M ckan/lib/helpers.py
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 316-disable-follower-lists


  Commit: 6adc06072ad1535e5671ad3142a16408cae60cb5
      https://github.com/okfn/ckan/commit/6adc06072ad1535e5671ad3142a16408cae60cb5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

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

  Log Message:
  -----------
  [#316] Removed 'follow dataset' and 'follow group' activities

Forgot to remove these in earlier commit
5c7e022a09798d02b1fd30356517a9ef071d0577


  Commit: 99920836a6ee3ed4a4d8f4812ae28918d0278ee7
      https://github.com/okfn/ckan/commit/99920836a6ee3ed4a4d8f4812ae28918d0278ee7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

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

  Log Message:
  -----------
  [#316] Update user dashboard tests


  Commit: 7ea77f068fff68e669b3dafc69d31515ff535c55
      https://github.com/okfn/ckan/commit/7ea77f068fff68e669b3dafc69d31515ff535c55
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

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

  Log Message:
  -----------
  [#316] Update some more activity streams tests


  Commit: 7f938970f77ac1c710acf7f6d7141bfb85308c11
      https://github.com/okfn/ckan/commit/7f938970f77ac1c710acf7f6d7141bfb85308c11
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M .gitignore
    M ckan/lib/helpers.py
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 287-datastore-tests-only-on-pg


  Commit: 4313177506f73797d590c8c10174460f793637da
      https://github.com/okfn/ckan/commit/4313177506f73797d590c8c10174460f793637da
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M ckan/model/__init__.py
    M ckan/model/meta.py
    M ckan/tests/__init__.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py

  Log Message:
  -----------
  Merge branch '287-datastore-tests-only-on-pg'


  Commit: 07e4ec8e8c67eea69a70afe176d8e158a0816698
      https://github.com/okfn/ckan/commit/07e4ec8e8c67eea69a70afe176d8e158a0816698
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-01 (Fri, 01 Feb 2013)

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

  Log Message:
  -----------
  [#328] Simply removes the 'Administrators' tab from the group pages


  Commit: 64c321509656b7e46f6c65142a19694a4ad3c2e3
      https://github.com/okfn/ckan/commit/64c321509656b7e46f6c65142a19694a4ad3c2e3
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-01 (Fri, 01 Feb 2013)

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

  Log Message:
  -----------
  [#322] Adds the organization to the dataset page


  Commit: 01ccbbac5d97d3077cdc471bb39716c1ea03f91f
      https://github.com/okfn/ckan/commit/01ccbbac5d97d3077cdc471bb39716c1ea03f91f
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-03 (Sun, 03 Feb 2013)

  Changed paths:
    M ckan/model/meta.py

  Log Message:
  -----------
  [#345] Also recognize driver `postgres` in `engine_is_pg`


  Commit: 6c0c8957d8fd9d0187214072ed38dbecb26ae665
      https://github.com/okfn/ckan/commit/6c0c8957d8fd9d0187214072ed38dbecb26ae665
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M ckan/model/__init__.py
    M ckan/model/meta.py
    M ckan/tests/__init__.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py

  Log Message:
  -----------
  Merge branch 'master' into 316-disable-follower-lists


  Commit: ca1a7d76aaa2f8949a5150e886a993d9a3a142c4
      https://github.com/okfn/ckan/commit/ca1a7d76aaa2f8949a5150e886a993d9a3a142c4
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/templates/group/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_follow.py

  Log Message:
  -----------
  Merge branch '316-disable-follower-lists'


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/templates/group/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_follow.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 345-fix-pg-detection


  Commit: 854a0e611a3a4701c09c70ef3bfb81111af04163
      https://github.com/okfn/ckan/commit/854a0e611a3a4701c09c70ef3bfb81111af04163
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M ckan/model/meta.py

  Log Message:
  -----------
  Merge branch '345-fix-pg-detection'


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

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

  Log Message:
  -----------
  [#352] Hide "Create one now?" link if not authorized


  Commit: 5fb318e05c40717946940ca8bd94fda118db50f0
      https://github.com/okfn/ckan/commit/5fb318e05c40717946940ca8bd94fda118db50f0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M .gitignore
    M README.rst
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/model/__init__.py
    M ckan/model/meta.py
    M ckan/templates/group/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/user/read_base.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_follow.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 309-package-private-everywhere


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

  Changed paths:
    M ckan/lib/activity_streams_session_extension.py

  Log Message:
  -----------
  [#309] Tidy up a couple of comments

No point in putting "TODO" comments in the source code no one will
remember to go back and do them and the comment may become outdated/misleading.


  Commit: 72373a205becf3f16ab4c0833f25d49c931623dc
      https://github.com/okfn/ckan/commit/72373a205becf3f16ab4c0833f25d49c931623dc
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M ckan/controllers/home.py
    M ckan/controllers/revision.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/model/__init__.py
    M ckan/templates/snippets/organization.html
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_tag.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py

  Log Message:
  -----------
  Merge branch '309-package-private-everywhere'


  Commit: 680c58fffde62c6834cfb006f94d7eb1ab592845
      https://github.com/okfn/ckan/commit/680c58fffde62c6834cfb006f94d7eb1ab592845
  Author: John Glover <j at johnglover.net>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/base.py

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


  Commit: 4fe7b50f7365ae686d4fb7d7d2deb778e782964d
      https://github.com/okfn/ckan/commit/4fe7b50f7365ae686d4fb7d7d2deb778e782964d
  Author: John Glover <glover.john at gmail.com>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/base.py

  Log Message:
  -----------
  Merge pull request #285 from okfn/285-base-controller-code-removal

Clean BaseController


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

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#345] Remove confusing warning if the datastore is running on a read only db


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

  Changed paths:
    M ckan/model/meta.py

  Log Message:
  -----------
  [#345] Fix detection in engine_is_pg


  Commit: 6c5453a9938a30014a2bbe2d14de5f1306c0750e
      https://github.com/okfn/ckan/commit/6c5453a9938a30014a2bbe2d14de5f1306c0750e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/base.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/model/__init__.py
    M ckan/templates/group/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_tag.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 345-fix-pg-detection


  Commit: 27b7753192c376788b49ea93817d62d6223b848e
      https://github.com/okfn/ckan/commit/27b7753192c376788b49ea93817d62d6223b848e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

  Changed paths:
    M ckan/model/meta.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Merge branch '345-fix-pg-detection'


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

  Changed paths:
    M .gitignore
    M README.rst
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/base.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/model/__init__.py
    M ckan/model/meta.py
    M ckan/templates/group/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/read_base.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_tag.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 252-related-item-button-fix


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

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

  Log Message:
  -----------
  [#252] Delete "Add Related" link from dataset page

The "Related" sidebar box on the dataset page has both an "+Add Item"
button and an "Add Related" link, seems only one is necessary.


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

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/snippets/related.html

  Log Message:
  -----------
  Merge branch '252-related-item-button-fix'


  Commit: 6233b9ade80a26354f705c6b42c14d03cd5fd868
      https://github.com/okfn/ckan/commit/6233b9ade80a26354f705c6b42c14d03cd5fd868
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/base.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/model/__init__.py
    M ckan/model/meta.py
    M ckan/templates/group/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_tag.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  #322 merge master conflicts


  Commit: bba7c62c4324272c7295bd5e2041865b1271db3c
      https://github.com/okfn/ckan/commit/bba7c62c4324272c7295bd5e2041865b1271db3c
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

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

  Log Message:
  -----------
  Merge branch '322-show-organizations-on-dataset'


  Commit: 28e20cc88474b566f2700e5f22e556512d1b288b
      https://github.com/okfn/ckan/commit/28e20cc88474b566f2700e5f22e556512d1b288b
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

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

  Log Message:
  -----------
  Merge pull request #327 from okfn/319-taggable-input-error-state

#319 Taggable input error state


  Commit: baaf68819563f5158585362ab1822fd4aff3b02a
      https://github.com/okfn/ckan/commit/baaf68819563f5158585362ab1822fd4aff3b02a
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/forms.less
    M ckan/templates/snippets/related.html

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


  Commit: 31f819156ae1b10e11d73c7091b5081e41f5433a
      https://github.com/okfn/ckan/commit/31f819156ae1b10e11d73c7091b5081e41f5433a
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/base.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/model/__init__.py
    M ckan/model/meta.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/forms.less
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/related.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_tag.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#328] Merged master


  Commit: 2aa75befac1325184d26e4e367e5be5fd4634a84
      https://github.com/okfn/ckan/commit/2aa75befac1325184d26e4e367e5be5fd4634a84
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

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

  Log Message:
  -----------
  [#328] Removed followers tab from group read page as it's not in master


  Commit: bb635f836e876ea8d5808ebd5ac6070b62ff5914
      https://github.com/okfn/ckan/commit/bb635f836e876ea8d5808ebd5ac6070b62ff5914
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

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

  Log Message:
  -----------
  Merge pull request #342 from okfn/328-remove-administrators-from-group

#328 Remove the 'Administrators' tab from the group pages


  Commit: a19bd6097554da37f02e386b5b8f03614ed9bbe7
      https://github.com/okfn/ckan/commit/a19bd6097554da37f02e386b5b8f03614ed9bbe7
  Author: amercader <amercadero at gmail.com>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

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

  Log Message:
  -----------
  Merge branch '352'


  Commit: 6af04e7ed5e5d5f8b5081a1e59e378dbaa470047
      https://github.com/okfn/ckan/commit/6af04e7ed5e5d5f8b5081a1e59e378dbaa470047
  Author: amercader <amercadero at gmail.com>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

  Changed paths:
    M ckan/templates/admin/authz.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/organization/members.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/additional_info.html

  Log Message:
  -----------
  Accessibility standards require <th scope='row|col'> attributes.

Thanks @tauberer for the patch


  Commit: 06b8fd2d8692e33a0d3e7a90d29080e5f82f1546
      https://github.com/okfn/ckan/commit/06b8fd2d8692e33a0d3e7a90d29080e5f82f1546
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-08 (Fri, 08 Feb 2013)

  Changed paths:
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/templates/recline.html

  Log Message:
  -----------
  #324 pass site_url to leaflet so it can not get confused about where the marker is


  Commit: 3d699be62889f3085c6329ba878464b4472fe30f
      https://github.com/okfn/ckan/commit/3d699be62889f3085c6329ba878464b4472fe30f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-08 (Fri, 08 Feb 2013)

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

  Log Message:
  -----------
  Update links in source install docs

Wiki has moved from wiki.ckan.org to github


  Commit: 57afa6d3cd22bf04883284da26c999afa80f3c91
      https://github.com/okfn/ckan/commit/57afa6d3cd22bf04883284da26c999afa80f3c91
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-08 (Fri, 08 Feb 2013)

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

  Log Message:
  -----------
  Update another link in the source install docs


  Commit: 7a1aff2b73cc687421c64ffa10417b5272b5b152
      https://github.com/okfn/ckan/commit/7a1aff2b73cc687421c64ffa10417b5272b5b152
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  Changed paths:
    M .gitignore
    M README.rst
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/base.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/model/__init__.py
    M ckan/model/meta.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/forms.less
    M ckan/templates/admin/authz.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/group/read_base.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/related.html
    M ckan/templates/user/read.html
    M ckan/templates/user/read_base.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_tag.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M doc/install-from-source.rst

  Log Message:
  -----------
  [#3028] Merge branch 'master' of github.com:okfn/ckan into 3028-dashboard-activity-stream-filtering

Conflicts:
	ckan/logic/action/get.py
	ckan/tests/functional/api/test_activity.py
	ckan/tests/functional/api/test_follow.py


  Commit: cf0e3d771cd77bcb51a1df25d8b297d32739837c
      https://github.com/okfn/ckan/commit/cf0e3d771cd77bcb51a1df25d8b297d32739837c
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  Changed paths:
    M ckan/logic/schema.py
    M ckan/tests/lib/test_dictization_schema.py

  Log Message:
  -----------
  #373 use ignore_missing instead of ignore


  Commit: 04a656df38ba0f253bff0886af61d6ee0805a4b3
      https://github.com/okfn/ckan/commit/04a656df38ba0f253bff0886af61d6ee0805a4b3
  Author: John Glover <j at johnglover.net>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/public/base/javascript/modules/data-viewer.js
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  [#371] Promote download when preview not available.

Adapted from 3011-recline-updates branch.


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

  Changed paths:
    M ckan/logic/schema.py
    M ckan/tests/lib/test_dictization_schema.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/373_do_not_strip_tracking_summary'


  Commit: b4fec9565be273acdc0ac17b68ca6d10d8c85494
      https://github.com/okfn/ckan/commit/b4fec9565be273acdc0ac17b68ca6d10d8c85494
  Author: John Glover <j at johnglover.net>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  Changed paths:
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/resource.config
    A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.js
    R ckanext/reclinepreview/theme/public/vendor/backbone/backbone.js
    R ckanext/reclinepreview/theme/public/vendor/backbone/backbone.min.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings-white.png
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings.png
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.min.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.min.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings.png
    A ckanext/reclinepreview/theme/public/vendor/flot/excanvas.js
    A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.min.js
    M ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
    R ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.js
    R ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.min.js
    A ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.js
    A ckanext/reclinepreview/theme/public/vendor/json/json2.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster-src.js
    M ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/layers.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-icon.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-shadow.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-in.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-out.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.js
    A ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.js
    R ckanext/reclinepreview/theme/public/vendor/moment/moment.js
    R ckanext/reclinepreview/theme/public/vendor/moment/moment.min.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/mustache.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/mustache.min.js
    R ckanext/reclinepreview/theme/public/vendor/recline/css/recline.css
    R ckanext/reclinepreview/theme/public/vendor/recline/css/recline.min.css
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    A ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/README.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/MIT-LICENSE.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/README.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-asc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-desc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.js
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.css
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.png
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.js
    A ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/underscore.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/underscore.min.js

  Log Message:
  -----------
  [#374] Update Recline to latest version of Recline
master branch.

Remove fields widget.


  Commit: 6956b90a3202e014c39efe494cb1626c8d570fbb
      https://github.com/okfn/ckan/commit/6956b90a3202e014c39efe494cb1626c8d570fbb
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-12 (Tue, 12 Feb 2013)

  Changed paths:
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/templates/recline.html

  Log Message:
  -----------
  Merge pull request #324 from okfn/324-make-marker-on-map-load

Map data point graphic not loading


  Commit: d70d9190492975ce3a89d7e28c70d1776368edf6
      https://github.com/okfn/ckan/commit/d70d9190492975ce3a89d7e28c70d1776368edf6
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-12 (Tue, 12 Feb 2013)

  Changed paths:
    M ckan/public/base/javascript/modules/data-viewer.js
    M ckan/templates/dataviewer/snippets/data_preview.html

  Log Message:
  -----------
  [#371] Removes inline style and uses .js-hide helper class instead


  Commit: b185d1d78f69823e26deda228fdb460171c2612c
      https://github.com/okfn/ckan/commit/b185d1d78f69823e26deda228fdb460171c2612c
  Author: amercader <amercadero at gmail.com>
  Date:   2013-02-12 (Tue, 12 Feb 2013)

  Changed paths:
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/resource.config
    A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.js
    R ckanext/reclinepreview/theme/public/vendor/backbone/backbone.js
    R ckanext/reclinepreview/theme/public/vendor/backbone/backbone.min.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings-white.png
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings.png
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.min.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.min.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings.png
    A ckanext/reclinepreview/theme/public/vendor/flot/excanvas.js
    A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.min.js
    M ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
    R ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.js
    R ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.min.js
    A ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.js
    A ckanext/reclinepreview/theme/public/vendor/json/json2.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster-src.js
    M ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/layers.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-icon.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-shadow.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-in.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-out.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.js
    A ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.js
    R ckanext/reclinepreview/theme/public/vendor/moment/moment.js
    R ckanext/reclinepreview/theme/public/vendor/moment/moment.min.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/mustache.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/mustache.min.js
    R ckanext/reclinepreview/theme/public/vendor/recline/css/recline.css
    R ckanext/reclinepreview/theme/public/vendor/recline/css/recline.min.css
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    A ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/README.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/MIT-LICENSE.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/README.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-asc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-desc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.js
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.css
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.png
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.js
    A ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/underscore.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/underscore.min.js

  Log Message:
  -----------
  Merge branch '374-update-recline'


  Commit: 27268dad5e22c77a321ad704ae4611919d41ff7e
      https://github.com/okfn/ckan/commit/27268dad5e22c77a321ad704ae4611919d41ff7e
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-12 (Tue, 12 Feb 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/public/base/javascript/modules/data-viewer.js
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  Merge pull request #371 from okfn/371-promote-download

Promote download when preview is not available


  Commit: 5cd3c783b5adce11ecc81b15bb33c10b3a91c1bb
      https://github.com/okfn/ckan/commit/5cd3c783b5adce11ecc81b15bb33c10b3a91c1bb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/logic/schema.py
    M ckan/public/base/javascript/modules/data-viewer.js
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/tests/lib/test_dictization_schema.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/resource.config
    A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.js
    R ckanext/reclinepreview/theme/public/vendor/backbone/backbone.js
    R ckanext/reclinepreview/theme/public/vendor/backbone/backbone.min.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings-white.png
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings.png
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.min.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.min.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings.png
    A ckanext/reclinepreview/theme/public/vendor/flot/excanvas.js
    A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.min.js
    M ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
    R ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.js
    R ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.min.js
    A ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.js
    A ckanext/reclinepreview/theme/public/vendor/json/json2.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster-src.js
    M ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/layers.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-icon.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-shadow.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-in.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-out.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.js
    A ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.js
    R ckanext/reclinepreview/theme/public/vendor/moment/moment.js
    R ckanext/reclinepreview/theme/public/vendor/moment/moment.min.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/mustache.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/mustache.min.js
    R ckanext/reclinepreview/theme/public/vendor/recline/css/recline.css
    R ckanext/reclinepreview/theme/public/vendor/recline/css/recline.min.css
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    A ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/README.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/MIT-LICENSE.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/README.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-asc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-desc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.js
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.css
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.png
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.js
    A ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/underscore.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/underscore.min.js
    M ckanext/reclinepreview/theme/templates/recline.html

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 3028-dashboard-activity-stream-filtering


  Commit: 58e25590670ea57c61b1e4b1ca651084f7f15779
      https://github.com/okfn/ckan/commit/58e25590670ea57c61b1e4b1ca651084f7f15779
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#3028] Add num_resources and num_tags in package_dictize not in package_show


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

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/public/base/javascript/modules/popover-context.js
    M ckan/templates/ajax_snippets/popover_context_group.html
    M ckan/templates/snippets/popover_context.html

  Log Message:
  -----------
  [#3028] Remove num_datasets from dataset dicts

There's already a package_count, use that instead.


  Commit: 7e43abb53e5eadd960b1ccbd02bf3114e69de6ed
      https://github.com/okfn/ckan/commit/7e43abb53e5eadd960b1ccbd02bf3114e69de6ed
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

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

  Log Message:
  -----------
  [#3028] Update tests broken by commit ad4c95258ca2


  Commit: 17ba23b035e44d16e37f4c717b623489c9c9f206
      https://github.com/okfn/ckan/commit/17ba23b035e44d16e37f4c717b623489c9c9f206
  Author: amercader <amercadero at gmail.com>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

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

  Log Message:
  -----------
  [#347] Minor UI fixes

Thanks @tauberer for the patch


  Commit: f2c8b126dd7c48e34b29e967da3822db89a05539
      https://github.com/okfn/ckan/commit/f2c8b126dd7c48e34b29e967da3822db89a05539
  Author: amercader <amercadero at gmail.com>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/model/activity.py
    M ckan/public/base/css/main.css
    A ckan/public/base/images/dashboard-followee-related.png
    A ckan/public/base/images/full-width-nav-right.png
    M ckan/public/base/javascript/modules/dashboard.js
    M ckan/public/base/javascript/modules/popover-context.js
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/masthead.less
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/ajax_snippets/popover_context_group.html
    A ckan/templates/snippets/popover_context.html
    M ckan/templates/user/dashboard.html
    A ckan/templates/user/snippets/followee_dropdown.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  Merge branch '3028-dashboard-activity-stream-filtering'


  Commit: 4d9f69df2c348ce14341aaac668414e5e3ef0840
      https://github.com/okfn/ckan/commit/4d9f69df2c348ce14341aaac668414e5e3ef0840
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

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

  Log Message:
  -----------
  [#318] Merged master back in


  Commit: 426a996520e056ebac50503e6631fc31e676ee2c
      https://github.com/okfn/ckan/commit/426a996520e056ebac50503e6631fc31e676ee2c
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    A ckan/templates/snippets/context.html
    A ckan/templates/snippets/context/dataset.html
    A ckan/templates/snippets/context/group.html
    A ckan/templates/snippets/context/user.html
    R ckan/templates/snippets/popover_context.html
    M ckan/templates/user/dashboard.html

  Log Message:
  -----------
  [#318] Moved around context for right nav in dashboard from #205 merge


Compare: https://github.com/okfn/ckan/compare/42fd32862b5f...426a996520e0


More information about the ckan-changes mailing list