[ckan-changes] [okfn/ckan] fa3bfc: [#3028] Add `followee_list` and `followee_count` a...
GitHub
noreply at github.com
Wed Feb 13 16:22:56 UTC 2013
Branch: refs/heads/354-ia-review
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: 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: 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: 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: 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: 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: 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: e3bc093cd017f6a8fcdbd2f071cd9c23d4389096
https://github.com/okfn/ckan/commit/e3bc093cd017f6a8fcdbd2f071cd9c23d4389096
Author: John Martin <me at johnmart.in>
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/api_info.html
M ckan/templates/ajax_snippets/popover_context_group.html
M ckan/templates/home/index.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:
-----------
[#354] Merge fixes for master
Commit: 10cdaa7d0650dc4e5a3b802ef98457ff6eeb13ad
https://github.com/okfn/ckan/commit/10cdaa7d0650dc4e5a3b802ef98457ff6eeb13ad
Author: John Martin <me at johnmart.in>
Date: 2013-02-13 (Wed, 13 Feb 2013)
Changed paths:
M ckan/public/base/less/masthead.less
Log Message:
-----------
[#354] Merge fixes for masthead
Commit: 17afa129e6aee6f2d16f58d365c7b6b86b8ca6c1
https://github.com/okfn/ckan/commit/17afa129e6aee6f2d16f58d365c7b6b86b8ca6c1
Author: John Martin <me at johnmart.in>
Date: 2013-02-13 (Wed, 13 Feb 2013)
Changed paths:
M ckan/public/base/less/dashboard.less
M ckan/templates/user/dashboard.html
Log Message:
-----------
[#354] Tweaks to dashboard after master merge
Compare: https://github.com/okfn/ckan/compare/6fc6a5793318...17afa129e6ae
More information about the ckan-changes
mailing list