[ckan-changes] [okfn/ckan] e27b46: First version of the loading of more items in the ...
GitHub
noreply at github.com
Thu Dec 13 02:49:33 UTC 2012
Branch: refs/heads/3021-logout-without-js
Home: https://github.com/okfn/ckan
Commit: e27b46b4e0161b39463fcfdf8e9aefe8f5e4409c
https://github.com/okfn/ckan/commit/e27b46b4e0161b39463fcfdf8e9aefe8f5e4409c
Author: John Martin <me at johnmart.in>
Date: 2012-11-14 (Wed, 14 Nov 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/activity_streams.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
A ckan/public/base/javascript/modules/activity-stream.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/forms.less
M ckan/templates/activity_streams/activity_stream_items.html
A ckan/templates/package/activity_stream.html
M ckan/templates/package/read.html
M ckan/templates/user/dashboard.html
Log Message:
-----------
First version of the loading of more items in the activity streams
Commit: 72d33301c31a06362aaef8bff8bf5815b7595585
https://github.com/okfn/ckan/commit/72d33301c31a06362aaef8bff8bf5815b7595585
Author: John Martin <me at johnmart.in>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/public/base/javascript/modules/activity-stream.js
Log Message:
-----------
Added doc blocks and infinite scrolling on the activity streams
Commit: cb128801c78ccc1ad445c1e8dd8f07ad734295c9
https://github.com/okfn/ckan/commit/cb128801c78ccc1ad445c1e8dd8f07ad734295c9
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Prevent version *.pyc conflicts
Commit: d1acb58f2e4b094c04d5461d63ca24dabc23e4ff
https://github.com/okfn/ckan/commit/d1acb58f2e4b094c04d5461d63ca24dabc23e4ff
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
fix sa warning in tests/functional/api/test_activity.py:TestActivity.test_create_group
Commit: 90a342c53e6940de3bec59c207e9da96c22939cd
https://github.com/okfn/ckan/commit/90a342c53e6940de3bec59c207e9da96c22939cd
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Merge branch 'remove-migrate-versions-on-clean'
Commit: 0326af359aaf6a85eb0f047f7113aca34e9b7365
https://github.com/okfn/ckan/commit/0326af359aaf6a85eb0f047f7113aca34e9b7365
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
PEP8
Commit: 611b87ad94feaca192c09b18c05b03a4b92720d4
https://github.com/okfn/ckan/commit/611b87ad94feaca192c09b18c05b03a4b92720d4
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/logic/auth/get.py
M ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
Fix a crash in dashboard_activity_list auth
Fix the dashboard_activity_list auth function to not crash when no user
is logged in, and add some tests for this case.
Commit: 9c5f314efcccc90f1980ce8a0ea807f81de17a38
https://github.com/okfn/ckan/commit/9c5f314efcccc90f1980ce8a0ea807f81de17a38
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/logic/auth/get.py
Log Message:
-----------
Add a couple of FIXMEs that should be done after 2939-orgs is merged
Commit: 996d1b27bec65a9209538d2fd4c44a06d602f1a7
https://github.com/okfn/ckan/commit/996d1b27bec65a9209538d2fd4c44a06d602f1a7
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/lib/cli.py
M ckan/logic/auth/get.py
M ckan/public/base/css/main.css
M ckan/tests/functional/api/test_dashboard.py
M ckan_deb/usr/lib/ckan/common.sh
A doc/architecture.rst
R doc/buildbot.rst
R doc/coding-standards.rst
A doc/contributing-docs.rst
A doc/contributing.rst
A doc/css-coding-standards.rst
M doc/datastore-setup.rst
R doc/domain-model-dataset.rst
R doc/domain-model-resource.rst
R doc/domain-model-task-status.rst
R doc/domain-model.rst
A doc/html-coding-standards.rst
M doc/index.rst
M doc/install-from-source.rst
A doc/javascript-coding-standards.rst
A doc/migration.rst
A doc/python-coding-standards.rst
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into fix-SA-warning
Commit: a8de2f027371b6a08b68b1ce890840fca5e57a6a
https://github.com/okfn/ckan/commit/a8de2f027371b6a08b68b1ce890840fca5e57a6a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Merge branch 'fix-SA-warning'
Commit: a6392b5ba64e5fa91fffeefc28e0974a028a3dda
https://github.com/okfn/ckan/commit/a6392b5ba64e5fa91fffeefc28e0974a028a3dda
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/logic/auth/get.py
Log Message:
-----------
Add a FIXME for an unhandled case
Commit: b0f19c95209e61057e93b78e20cc50ae5b45ae63
https://github.com/okfn/ckan/commit/b0f19c95209e61057e93b78e20cc50ae5b45ae63
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/logic/auth/get.py
M ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
Merge branch 'bug-dashboard-activity-list-auth'
Commit: 3836d3a2cbba67811d0c224549bd2b80f193db26
https://github.com/okfn/ckan/commit/3836d3a2cbba67811d0c224549bd2b80f193db26
Author: John Martin <me at johnmart.in>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/user.py
M ckan/lib/activity_streams.py
M ckan/lib/base.py
M ckan/logic/action/get.py
M ckan/logic/auth/get.py
M ckan/logic/auth/publisher/get.py
A ckan/migration/versions/062_add_dashboard_table.py
M ckan/model/__init__.py
M ckan/model/activity.py
A ckan/model/dashboard.py
M ckan/public/base/css/main.css
A ckan/public/base/javascript/modules/dashboard.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/ckan.less
A ckan/public/base/less/dashboard.less
M ckan/public/base/less/footer.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/less/masthead.less
M ckan/templates/header.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/user/dashboard.html
M ckan/tests/functional/api/test_activity.py
A ckan/tests/functional/api/test_dashboard.py
M ckan_deb/usr/lib/ckan/common.sh
A doc/architecture.rst
R doc/buildbot.rst
R doc/coding-standards.rst
M doc/common-error-messages.rst
A doc/contributing-docs.rst
A doc/contributing.rst
A doc/css-coding-standards.rst
M doc/datastore-setup.rst
R doc/domain-model-dataset.rst
R doc/domain-model-resource.rst
R doc/domain-model-task-status.rst
R doc/domain-model.rst
A doc/html-coding-standards.rst
M doc/index.rst
M doc/install-from-source.rst
A doc/javascript-coding-standards.rst
A doc/migration.rst
A doc/python-coding-standards.rst
Log Message:
-----------
Merged master back into branch
Commit: cdf6da0c9e0865042266901e7681ca1f4c8ebc2c
https://github.com/okfn/ckan/commit/cdf6da0c9e0865042266901e7681ca1f4c8ebc2c
Author: John Martin <me at johnmart.in>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Fix after merge
Commit: a2423eb8849b5b2b837acfd5bff822dd41b03712
https://github.com/okfn/ckan/commit/a2423eb8849b5b2b837acfd5bff822dd41b03712
Author: John Martin <me at johnmart.in>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/model/activity.py
Log Message:
-----------
Changed param ordering of offset and limit within activity_list functions
Commit: 0094cb71140634e0650d9035615d87b63a33c944
https://github.com/okfn/ckan/commit/0094cb71140634e0650d9035615d87b63a33c944
Author: John Martin <me at johnmart.in>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Removed uneeded print
Commit: 9ed808b81c908775b9c6e7b9c570707cdc97d5d1
https://github.com/okfn/ckan/commit/9ed808b81c908775b9c6e7b9c570707cdc97d5d1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M doc/install-from-source.rst
Log Message:
-----------
Add a step to the source install docs
It seems it's sometimes necessary to deactivate and reactivate your
virtualenv after installing everything, to get the copy of paster right.
Commit: e28ed887185326511aeccaf8b80b06976d8bc013
https://github.com/okfn/ckan/commit/e28ed887185326511aeccaf8b80b06976d8bc013
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/lib/app_globals.py
M ckan/templates/header.html
Log Message:
-----------
Config option to show hide header config info
Commit: 239fb1555f9c738fdb4b3cdc957394571316948d
https://github.com/okfn/ckan/commit/239fb1555f9c738fdb4b3cdc957394571316948d
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M ckan/public/base/less/masthead.less
Log Message:
-----------
Move header debug info back into the header
Commit: 3bffcb8d426e43de2fec160c22405bd9e69454f0
https://github.com/okfn/ckan/commit/3bffcb8d426e43de2fec160c22405bd9e69454f0
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/logic/auth/get.py
M ckan/tests/functional/api/test_dashboard.py
M doc/install-from-source.rst
Log Message:
-----------
Merge branch 'master' into debug-header-info
Commit: 88d0aafe484bc1d589ab4955cd7883f9e1a3519f
https://github.com/okfn/ckan/commit/88d0aafe484bc1d589ab4955cd7883f9e1a3519f
Author: John Martin <me at johnmart.in>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Code cleanup
Commit: c5a66fd60eb5971464e375c6a7fa5c83439e9d56
https://github.com/okfn/ckan/commit/c5a66fd60eb5971464e375c6a7fa5c83439e9d56
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M README.rst
Log Message:
-----------
Update the README
Added links to how to contribute and coding standards sections in docs, IRC channel, updated wiki link, etc.
Commit: 7406c83785ec8ac5eab40a48c0b6dff0f406f1f2
https://github.com/okfn/ckan/commit/7406c83785ec8ac5eab40a48c0b6dff0f406f1f2
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M README.rst
Log Message:
-----------
Add heading to README and tweak intro text
Commit: 79edb76ebb307a0edead05edfd4c84226497d71e
https://github.com/okfn/ckan/commit/79edb76ebb307a0edead05edfd4c84226497d71e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M README.rst
Log Message:
-----------
README: Add link to CKAN tag on Stack Overflow
Commit: c81ee8f9642e00a456d5c871f3c46c3c22ed3cee
https://github.com/okfn/ckan/commit/c81ee8f9642e00a456d5c871f3c46c3c22ed3cee
Author: John Martin <me at johnmart.in>
Date: 2012-11-22 (Thu, 22 Nov 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/lib/app_globals.py
M ckan/public/base/less/masthead.less
M ckan/templates/header.html
Log Message:
-----------
Merge pull request #181 from okfn/debug-header-info
Debug header info
Commit: 3a22c90824427ffb90f5a6359ae0d7d7eb3299f6
https://github.com/okfn/ckan/commit/3a22c90824427ffb90f5a6359ae0d7d7eb3299f6
Author: John Martin <me at johnmart.in>
Date: 2012-11-23 (Fri, 23 Nov 2012)
Changed paths:
A doc/frontend-testing.rst
Log Message:
-----------
First version of the suggested front end testing document
Commit: 4b2b0f6d3171291f5dea9decabd1894430086a5f
https://github.com/okfn/ckan/commit/4b2b0f6d3171291f5dea9decabd1894430086a5f
Author: John Martin <me at johnmart.in>
Date: 2012-11-23 (Fri, 23 Nov 2012)
Changed paths:
M doc/frontend-testing.rst
Log Message:
-----------
Final tweaks to front end testing doc
Commit: f0669af5071080742ca80663fcd0e221f4ae44e6
https://github.com/okfn/ckan/commit/f0669af5071080742ca80663fcd0e221f4ae44e6
Author: John Martin <me at johnmart.in>
Date: 2012-11-23 (Fri, 23 Nov 2012)
Changed paths:
M doc/frontend-testing.rst
Log Message:
-----------
Clarified browser stats and added some code samples
Commit: 1625ecf2e4552e82222b9bc65e03ffd0070fd5fe
https://github.com/okfn/ckan/commit/1625ecf2e4552e82222b9bc65e03ffd0070fd5fe
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-23 (Fri, 23 Nov 2012)
Changed paths:
M doc/frontend-testing.rst
Log Message:
-----------
Minor doc tweeks
Commit: 77f8224a16bf861a058ee81302f8df6f5a39c448
https://github.com/okfn/ckan/commit/77f8224a16bf861a058ee81302f8df6f5a39c448
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-25 (Sun, 25 Nov 2012)
Changed paths:
M doc/python-coding-standards.rst
Log Message:
-----------
Clarify single-quotes rule in Python coding standards
Commit: 24b94da868b702d15acfc55fbf11861387223e2f
https://github.com/okfn/ckan/commit/24b94da868b702d15acfc55fbf11861387223e2f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-25 (Sun, 25 Nov 2012)
Changed paths:
M doc/contributing.rst
Log Message:
-----------
Add CHANGELOG and docs to pull review process
Commit: 52cf81fe051ddd6e0819d6221f7d7f3f1444205e
https://github.com/okfn/ckan/commit/52cf81fe051ddd6e0819d6221f7d7f3f1444205e
Author: John Martin <me at johnmart.in>
Date: 2012-11-26 (Mon, 26 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/model/activity.py
Log Message:
-----------
Few code style tweaks
Commit: 7f630a9c497a62e991bc237c42570abad77b171b
https://github.com/okfn/ckan/commit/7f630a9c497a62e991bc237c42570abad77b171b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-26 (Mon, 26 Nov 2012)
Changed paths:
M ckan/config/routing.py
M ckan/templates/user/dashboard.html
M ckan/tests/functional/test_user.py
Log Message:
-----------
Move URL /user/dashboard to /dashboard
We decided this makes more sense
Commit: a09752ea4351126c39e9d32771ab92282d13f212
https://github.com/okfn/ckan/commit/a09752ea4351126c39e9d32771ab92282d13f212
Author: Florian Marienfeld <florian.marienfeld at fokus.fraunhofer.de>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan_deb/usr/lib/ckan/common.sh
Log Message:
-----------
easy_install --ignore-installed pastescript fails. corrected into pip install --ignore-installed
Commit: 9bc76a0eed3f0318a85ec8771b6224e8ddb4aeb7
https://github.com/okfn/ckan/commit/9bc76a0eed3f0318a85ec8771b6224e8ddb4aeb7
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/package.py
A ckan/templates/package/activity.html
M ckan/templates/package/read.html
Log Message:
-----------
Add activity stream tab to dataset page
Commit: 0594077936740949f9875766f14365bc0363fd6e
https://github.com/okfn/ckan/commit/0594077936740949f9875766f14365bc0363fd6e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/tests/functional/api/__init__.py
Log Message:
-----------
Fix some PEP8 issues
Commit: b1f46c40298e741c3d6c2b01b14ef7eabc010192
https://github.com/okfn/ckan/commit/b1f46c40298e741c3d6c2b01b14ef7eabc010192
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/tests/functional/api/__init__.py
Log Message:
-----------
Tidy a couple of docstrings
Commit: 3b84c92210aa3aaf761d3f03bea6a94f0f929038
https://github.com/okfn/ckan/commit/3b84c92210aa3aaf761d3f03bea6a94f0f929038
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/tests/functional/api/__init__.py
Log Message:
-----------
Delete a commented-out set_trace()
Commit: eb55a659db75a21803a0a9bf66d50e6918152c87
https://github.com/okfn/ckan/commit/eb55a659db75a21803a0a9bf66d50e6918152c87
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_dashboard.py
M ckan/tests/functional/api/test_follow.py
Log Message:
-----------
Refactor dashboard activity stream tests
- Move tests for contents of dashboard activity stream out of test_activity.py,
this test module was way too long and confusing, leave it for testing the
public activity streams only. Add a docstring to the module saying so.
- Add a docstring to test_follow.py explaining that it tests the follower
functions only (follow, unfollow, etc.) and not the contents of the dashboard
activity stream that is generated from what you're folllowing.
- Add new tests for the contents of the dashboard activity stream in
test_dashboard.py along with other dashboard tests.
Currently some of these tests are failing because activities from followed
groups are not appearing in the dashboard.
Commit: 0235f1a812cd879c3f540807afb6a462f3ccecf3
https://github.com/okfn/ckan/commit/0235f1a812cd879c3f540807afb6a462f3ccecf3
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/model/activity.py
Log Message:
-----------
Add activities from followed groups to dashboard activity stream
Add activities from groups that a user is following (e.g. when someone
updates a group) to the user's dashboard activity stream.
There are still some test_dashboard.py tests failing because activities
from datasets belonging to followed groups dob't appear in the dashboard
yet.
Commit: 5847bd00065b4fc92121432d57a002fc1fd688dd
https://github.com/okfn/ckan/commit/5847bd00065b4fc92121432d57a002fc1fd688dd
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/model/group.py
Log Message:
-----------
Move group_package_show SQLAlchemy into model
Move the SQLAlchemy query that the group_package_show() action function
uses into the model. I need this for architectural reasons for upcoming
commits, and we're supposed to encapsulate SQLAlchemy in the model
anyway.
I made the new model function support the 'return_query' option but note
that there are no tests covering this, all the tests pass even without
this option.
Commit: 8f5c897c06633b1f2e7cb7d7cd78573fac5fb57d
https://github.com/okfn/ckan/commit/8f5c897c06633b1f2e7cb7d7cd78573fac5fb57d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/model/group.py
Log Message:
-----------
Remove group.members_of_type()
Remove group.members_of_type() and related code. It isn't used anywhere
except in the old publisher and organizations extensions which are to be
replaced by a new organizations implementation in CKAN core. Also it
duplicates functionality provided by group.active_packages().
Commit: bdc72d7abd41fbdad5a5a30c8468ce6ea370ebc1
https://github.com/okfn/ckan/commit/bdc72d7abd41fbdad5a5a30c8468ce6ea370ebc1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/get.py
M ckan/model/group.py
M ckan/tests/functional/test_group.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/models/test_group.py
Log Message:
-----------
Remove duplicate methods to get a group's packages
Refactor active_packages() and get_package_revisions(), both of which
return a group's packages (but in slightly different ways), replace with
just one method packages().
We now have just one way to get a group's packages, the packages()
method of the group model. The group_package_show() action function
calls it.
Commit: e9a55a11c26e037da62b4230d54ee11611a431e4
https://github.com/okfn/ckan/commit/e9a55a11c26e037da62b4230d54ee11611a431e4
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/model/activity.py
M ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
Fix following of groups
Add activities from the datasets of followed groups into the user's
dashboard activity stream. All the test_dashboard.py tests now pass.
Move SQLAlchemy from group_activity_list() into model, alongside the SQLAlchemy
queries for the other types of activity stream.
Change the SQLAlchemy in activities_from_groups_followed_by_user() to be the
union of group_activity_list() for each of the followed groups.
Update some tests.
Commit: 8e2f2a0baa703998337e3f035ab97064341cca4d
https://github.com/okfn/ckan/commit/8e2f2a0baa703998337e3f035ab97064341cca4d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/model/activity.py
Log Message:
-----------
Add docstring to group_activity_list()
Commit: 3a8c37c41efa548a0f59f475e01c748a3a0669d6
https://github.com/okfn/ckan/commit/3a8c37c41efa548a0f59f475e01c748a3a0669d6
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/model/activity.py
Log Message:
-----------
Add some docstrings to model/activity.py
Commit: a96757e1cd082f6c449ec5cb9eb4a60c4b610d84
https://github.com/okfn/ckan/commit/a96757e1cd082f6c449ec5cb9eb4a60c4b610d84
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/model/activity.py
M ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
Fix dashboard activity stream from followed groups
It was returning all activities from the entire site, fix to return
activities from followed groups only.
The tests didn't catch this error because they didn't test doing random
activities that should _not_ appear in the user's dashboard and
asserting that they don't.
Add a quick test that catches this.
This is probably a problem for the other activity streams tests in
test_activity.py as well.
Commit: bc179530aa05f3aa8ff6927f31ba298234093085
https://github.com/okfn/ckan/commit/bc179530aa05f3aa8ff6927f31ba298234093085
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/get.py
M ckan/model/activity.py
M ckan/model/group.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_group.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/models/test_group.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: afcce35935daa0ce4136d41bfbc66c496e46cba3
https://github.com/okfn/ckan/commit/afcce35935daa0ce4136d41bfbc66c496e46cba3
Author: amercader <amercadero at gmail.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M pip-requirements-test.txt
M pip-requirements.txt
Log Message:
-----------
Add requests to core requirements
Commit: aeddf425583e58d72f3ab3259ff0c4347f2a7903
https://github.com/okfn/ckan/commit/aeddf425583e58d72f3ab3259ff0c4347f2a7903
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/model/activity.py
Log Message:
-----------
Fix an activity streams crash
It seems that _group_activity_query() can sometimes be called for a
group that doesn't exist (though I'm not sure exactly how this happens).
A test was failing. Not sure how this crept into master. Fix it to
handle this case.
Commit: 81a471c5e58436ce27931916ae6fd4e928d737cf
https://github.com/okfn/ckan/commit/81a471c5e58436ce27931916ae6fd4e928d737cf
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M pip-requirements-test.txt
M pip-requirements.txt
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: e4f38380deab1ec8711ffd8b0fe5b69091782752
https://github.com/okfn/ckan/commit/e4f38380deab1ec8711ffd8b0fe5b69091782752
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/tests/mock_publisher_auth.py
Log Message:
-----------
Fix a crash in mock_publisher_auth
mock_publisher_auth uses `log` but doesn't initialise it. Import logging
and initialise log.
Commit: 6aad4b8aa4549d613769ac57896773532287172f
https://github.com/okfn/ckan/commit/6aad4b8aa4549d613769ac57896773532287172f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/tests/mock_publisher_auth.py
Log Message:
-----------
Delete an unused import
Commit: 53013843af361b7310a6418b3609c2ff1fc0378e
https://github.com/okfn/ckan/commit/53013843af361b7310a6418b3609c2ff1fc0378e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/tests/mock_publisher_auth.py
Log Message:
-----------
PEP8 fixes
Commit: 3ea18168e62ae887d38a2d46948434d8b60ebe66
https://github.com/okfn/ckan/commit/3ea18168e62ae887d38a2d46948434d8b60ebe66
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-29 (Thu, 29 Nov 2012)
Changed paths:
M ckan/tests/__init__.py
M ckan/tests/functional/api/test_follow.py
Log Message:
-----------
Add test helper function for posting to CKAN API
Add ckan.tests.post(), a helper function for posting to CKAN's action API and
getting the result, that handles forming the correct action API URL, converting
the apikey to a string and putting it in a headers dict like TestApp expects,
collecting params into a dict and dumping them to a JSON string, and checking
the 'success' field of the response.
This can save a lot of lines of code and make tests more readable. I've
converted test_follow.py as an example of how much can be saved.
Similar savings could be made in many other test modules:
ckan/tests/functional/api/model/test_vocabulary.py,
ckan/tests/functional/api/model/test_group.py,
ckan/tests/functional/api/test_dashboard.py,
ckan/tests/functional/api/test_activity.py,
ckan/tests/functional/test_follow.py,
ckan/tests/functional/test_tag_vocab.py,
ckan/tests/functional/test_related.py,
ckan/tests/logic/test_action.py
ckan/tests/logic/test_tag.py.
ckan/tests/functional/api/model/test_package.py could also be changed to use
this function. It currently uses a similar function defined in
ckan.tests.functional.api.base:ApiTestCase.
Commit: 740a0d887021abad60324ad421f06c36ffaa6f93
https://github.com/okfn/ckan/commit/740a0d887021abad60324ad421f06c36ffaa6f93
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-29 (Thu, 29 Nov 2012)
Changed paths:
M ckan/tests/__init__.py
M ckan/tests/functional/api/test_follow.py
Log Message:
-----------
Rename post -> call_action_api
More descriptive name
Commit: 9a3c682a67eb02600aa2a53f0bd003b6b9a570b9
https://github.com/okfn/ckan/commit/9a3c682a67eb02600aa2a53f0bd003b6b9a570b9
Author: amercader <amercadero at gmail.com>
Date: 2012-12-01 (Sat, 01 Dec 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
Support icon param on nav_named_link helper function
Commit: 8ccc414bd222146ff9d34576f00954228ad9c92e
https://github.com/okfn/ckan/commit/8ccc414bd222146ff9d34576f00954228ad9c92e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-12-02 (Sun, 02 Dec 2012)
Changed paths:
M ckan/controllers/home.py
Log Message:
-----------
Fix a deprecation warning
Loading the front page was logging "`order_by` deprecated please use
`sort`". Change HomeController to use sort and thereby get rid of the
warning.
Commit: 783cf829412fa9d59eec3d64a5e003a46f5e5661
https://github.com/okfn/ckan/commit/783cf829412fa9d59eec3d64a5e003a46f5e5661
Author: kindly <kindly at gmail.com>
Date: 2012-12-03 (Mon, 03 Dec 2012)
Changed paths:
A ckan/config/solr/schema-2.0.xml
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/tests/functional/test_search.py
M ckan/tests/lib/test_solr_package_search.py
M ckan/tests/lib/test_solr_package_search_synchronous_update.py
M ckanext/multilingual/solr/schema.xml
Log Message:
-----------
[3027] all tests pass for 1.4, 3.6, 4.0, changed mm
Commit: e5407f47f5d9ace7ac15bc3030f2438d3a8f4803
https://github.com/okfn/ckan/commit/e5407f47f5d9ace7ac15bc3030f2438d3a8f4803
Author: kindly <kindly at gmail.com>
Date: 2012-12-04 (Tue, 04 Dec 2012)
Changed paths:
M ckan/lib/search/index.py
Log Message:
-----------
[3027] add no solr commit flag
Commit: c68cdae676248a9c9a1631dd46fc07b88412b9d1
https://github.com/okfn/ckan/commit/c68cdae676248a9c9a1631dd46fc07b88412b9d1
Author: kindly <kindly at gmail.com>
Date: 2012-12-04 (Tue, 04 Dec 2012)
Changed paths:
M ckan/config/solr/schema-2.0.xml
M ckanext/multilingual/solr/schema.xml
Log Message:
-----------
[3027] add dataset_type field
Commit: bd25e663fcf4ba397fb682b9b48a6d8daa6e08ff
https://github.com/okfn/ckan/commit/bd25e663fcf4ba397fb682b9b48a6d8daa6e08ff
Author: kindly <kindly at gmail.com>
Date: 2012-12-04 (Tue, 04 Dec 2012)
Changed paths:
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M doc/configuration.rst
Log Message:
-----------
[3027] document solr commit option
Commit: 98345563cc65a928d97f330bc831952d859060bd
https://github.com/okfn/ckan/commit/98345563cc65a928d97f330bc831952d859060bd
Author: amercader <amercadero at gmail.com>
Date: 2012-12-05 (Wed, 05 Dec 2012)
Changed paths:
M ckan/config/solr/CHANGELOG.txt
Log Message:
-----------
[3027] Update schema CHANGELOG
Commit: 26456b19872f73667bec6b245cb4ced79da03812
https://github.com/okfn/ckan/commit/26456b19872f73667bec6b245cb4ced79da03812
Author: amercader <amercadero at gmail.com>
Date: 2012-12-05 (Wed, 05 Dec 2012)
Changed paths:
M ckan/config/solr/CHANGELOG.txt
A ckan/config/solr/schema-2.0.xml
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/tests/functional/test_search.py
M ckan/tests/lib/test_solr_package_search.py
M ckan/tests/lib/test_solr_package_search_synchronous_update.py
M ckanext/multilingual/solr/schema.xml
M doc/configuration.rst
Log Message:
-----------
Merge branch 'feature-3027-solr-2.0'
Commit: 5f2429b5a35fe666e90f9ab3b0a5210a1b712a3c
https://github.com/okfn/ckan/commit/5f2429b5a35fe666e90f9ab3b0a5210a1b712a3c
Author: John Martin <me at johnmart.in>
Date: 2012-12-05 (Wed, 05 Dec 2012)
Changed paths:
M README.rst
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
M ckan/config/solr/CHANGELOG.txt
A ckan/config/solr/schema-2.0.xml
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/lib/app_globals.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/logic/action/get.py
M ckan/logic/auth/get.py
M ckan/model/activity.py
M ckan/model/group.py
M ckan/public/base/less/masthead.less
M ckan/templates/header.html
A ckan/templates/package/activity.html
M ckan/templates/user/dashboard.html
M ckan/tests/__init__.py
M ckan/tests/functional/api/__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_group.py
M ckan/tests/functional/test_search.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_solr_package_search.py
M ckan/tests/lib/test_solr_package_search_synchronous_update.py
M ckan/tests/mock_publisher_auth.py
M ckan/tests/models/test_group.py
M ckanext/multilingual/solr/schema.xml
M doc/configuration.rst
M doc/contributing.rst
A doc/frontend-testing.rst
M doc/install-from-source.rst
M doc/python-coding-standards.rst
M pip-requirements-test.txt
M pip-requirements.txt
Log Message:
-----------
Merged master back into branch
Commit: ce822a563019c119be43f470d3a4a710e8c1e2f0
https://github.com/okfn/ckan/commit/ce822a563019c119be43f470d3a4a710e8c1e2f0
Author: John Martin <me at johnmart.in>
Date: 2012-12-05 (Wed, 05 Dec 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/model/activity.py
Log Message:
-----------
Fix after merge
Commit: 2f2368d52fa5623fa256c17bd1b282e52e21c00c
https://github.com/okfn/ckan/commit/2f2368d52fa5623fa256c17bd1b282e52e21c00c
Author: John Martin <me at johnmart.in>
Date: 2012-12-05 (Wed, 05 Dec 2012)
Changed paths:
M ckan/model/activity.py
Log Message:
-----------
Revert incorrect doc changes from confusing merge
Commit: 0f5ffac1d6e8af82aa002cf36220ee37f571dec5
https://github.com/okfn/ckan/commit/0f5ffac1d6e8af82aa002cf36220ee37f571dec5
Author: John Martin <me at johnmart.in>
Date: 2012-12-06 (Thu, 06 Dec 2012)
Changed paths:
M ckan/lib/base.py
M ckan/logic/action/get.py
M ckan/model/activity.py
Log Message:
-----------
pep8 tweak, doc block and comma add. yuk.
Commit: 4afc00d3d39cee3fa6588dc6d61af7fdc39bc09d
https://github.com/okfn/ckan/commit/4afc00d3d39cee3fa6588dc6d61af7fdc39bc09d
Author: John Martin <me at johnmart.in>
Date: 2012-12-06 (Thu, 06 Dec 2012)
Changed paths:
M ckan/model/activity.py
Log Message:
-----------
Fix for indentation error
Commit: dd521acb113810ec0ab39cffc21203bcb7f13e99
https://github.com/okfn/ckan/commit/dd521acb113810ec0ab39cffc21203bcb7f13e99
Author: John Martin <me at johnmart.in>
Date: 2012-12-06 (Thu, 06 Dec 2012)
Changed paths:
M ckan/lib/base.py
Log Message:
-----------
Removed uneeded offset that got included from confusing merge
Commit: dc2baa692e828c950b879d8cf45520c07e80624a
https://github.com/okfn/ckan/commit/dc2baa692e828c950b879d8cf45520c07e80624a
Author: John Martin <me at johnmart.in>
Date: 2012-12-06 (Thu, 06 Dec 2012)
Changed paths:
M ckan/lib/activity_streams.py
Log Message:
-----------
Doc block for new method
Commit: f67a1c7e8b15929c98531b82f935d35f047cb4ac
https://github.com/okfn/ckan/commit/f67a1c7e8b15929c98531b82f935d35f047cb4ac
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-12-06 (Thu, 06 Dec 2012)
Changed paths:
M ckan_deb/usr/lib/ckan/common.sh
Log Message:
-----------
Merge pull request #188 from flowma/master
ckan-create-instance broken! use pip install instead of easy_install
Commit: 2e40147f6a5f92a1baebf488ac5895300d840077
https://github.com/okfn/ckan/commit/2e40147f6a5f92a1baebf488ac5895300d840077
Author: John Martin <me at johnmart.in>
Date: 2012-12-06 (Thu, 06 Dec 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Doc block additions
Commit: 2cb80ce87524dd0d92b98072a7be9b8735d30374
https://github.com/okfn/ckan/commit/2cb80ce87524dd0d92b98072a7be9b8735d30374
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-12-07 (Fri, 07 Dec 2012)
Changed paths:
M ckan/lib/activity_streams.py
M ckan/logic/action/get.py
Log Message:
-----------
[#3018] Small docstring and param name tweak
Commit: 44833cd3e8e0bf8a86dd4d07c6b5bab87f07caa1
https://github.com/okfn/ckan/commit/44833cd3e8e0bf8a86dd4d07c6b5bab87f07caa1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-12-07 (Fri, 07 Dec 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#3018] Clean up some docstrings formatting
Commit: 47a07fba543113b20f84dc79916b7fb60810fc4f
https://github.com/okfn/ckan/commit/47a07fba543113b20f84dc79916b7fb60810fc4f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-12-07 (Fri, 07 Dec 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/logic/action/get.py
M ckan/model/activity.py
M test-core.ini
Log Message:
-----------
[#3018] Add ckan.activity_list_limit setting
Add `limit` param to activity stream action functions.
Remove default limit and offset values from model/activity.py, handling the
options and defaults has moved into the logic package.
Add ckan.activity_list_limit = 15 to test-core.ini, the failing activity
streams tests pass now.
Commit: 25b54bedb1fa08d9e82e13cffbf085d41c30794d
https://github.com/okfn/ckan/commit/25b54bedb1fa08d9e82e13cffbf085d41c30794d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-12-07 (Fri, 07 Dec 2012)
Changed paths:
M ckan_deb/usr/lib/ckan/common.sh
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 3018-activity-streams-load-more
Commit: c703e495ec451adc12bf3edb7cf4c23f839c9423
https://github.com/okfn/ckan/commit/c703e495ec451adc12bf3edb7cf4c23f839c9423
Author: John Martin <me at johnmart.in>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/templates/activity_streams/activity_stream_items.html
Log Message:
-----------
[#3018] Updated template to use new config option
>From feedback from @seanh see: https://github.com/okfn/ckan/pull/171#discussion_r2348697
Commit: 1daea396bccb3ca57725aa90267ee72bce0726fd
https://github.com/okfn/ckan/commit/1daea396bccb3ca57725aa90267ee72bce0726fd
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/controllers/home.py
M ckan/lib/helpers.py
Log Message:
-----------
Make recently_changed_packages_activity_stream a helper
recently_changed_packages_activity_stream was an @property of the
HomeController, but it wasn't working, accessing the property just
returned a property object e.g. <property object at 0x7f7210087e68> not
the HTML string as desired.
I think this is because the @property was declared inside a method, and
properties only work at class-level.
The @property cannot simply be moved to class level because it uses
`context`, a param of the index() function it was defined in.
Instead move recently_changed_packages_activity_stream into helpers.py,
where any template (not just the front page) can access it like this:
{{ h.recently_changed_packages_activity_stream() }}
dashboard_activity_stream is already done the same way (but other
activity streams are not).
This means any existing home/index.html templates that were accessing
recently_changed_packages_activity_stream as an attribute of the
template context itself, will no longer work. However, apparently they
weren't working anyway.
Commit: 60d638414b54a2126dd0346189ac78337c62c697
https://github.com/okfn/ckan/commit/60d638414b54a2126dd0346189ac78337c62c697
Author: John Martin <me at johnmart.in>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/templates/activity_streams/activity_stream_items.html
Log Message:
-----------
[#3018] Added type cast to config item in template
After feedback from @tobes at https://github.com/okfn/ckan/pull/171#commitcomment-2287166
Commit: 09059f6198922a1b1175f0811520328c7e93e527
https://github.com/okfn/ckan/commit/09059f6198922a1b1175f0811520328c7e93e527
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/plugins/interfaces.py
Log Message:
-----------
Added ISearchFacets plugin interface
Commit: 1636f4b8277d1974241f8434ede8cdf8f554a6e6
https://github.com/okfn/ckan/commit/1636f4b8277d1974241f8434ede8cdf8f554a6e6
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/plugins/interfaces.py
Log Message:
-----------
Moved update_facet_titles to IPackageController
Commit: 798004fb5c449005e82f0c81df30a93a9061c9b0
https://github.com/okfn/ckan/commit/798004fb5c449005e82f0c81df30a93a9061c9b0
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/plugins/interfaces.py
Log Message:
-----------
Clean whitespace errors
Commit: 0c7d76c225299adef206f7cd7e603d0d692ac541
https://github.com/okfn/ckan/commit/0c7d76c225299adef206f7cd7e603d0d692ac541
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/lib/helpers.py
M ckan/plugins/interfaces.py
Log Message:
-----------
Merge branch 'master' into 3018-activity-streams-load-more
Commit: c127fa642dd8bd8e1cbe25217d19a39b3c00bfcf
https://github.com/okfn/ckan/commit/c127fa642dd8bd8e1cbe25217d19a39b3c00bfcf
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/tests/functional/test_package.py
Log Message:
-----------
Fix tests
Commit: 67a6121e8c597a157e6b0064764b0da62f17b488
https://github.com/okfn/ckan/commit/67a6121e8c597a157e6b0064764b0da62f17b488
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/user.py
M ckan/lib/activity_streams.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/model/activity.py
A ckan/public/base/javascript/modules/activity-stream.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/forms.less
M ckan/templates/activity_streams/activity_stream_items.html
A ckan/templates/package/activity_stream.html
M test-core.ini
Log Message:
-----------
Merge branch '3018-activity-streams-load-more'
Commit: 69f4b9bdc9dc0c6879a17e9f04cf99bffe0dc6b1
https://github.com/okfn/ckan/commit/69f4b9bdc9dc0c6879a17e9f04cf99bffe0dc6b1
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M README.rst
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
M ckan/config/solr/CHANGELOG.txt
A ckan/config/solr/schema-2.0.xml
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/activity_streams.py
M ckan/lib/app_globals.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/logic/action/get.py
M ckan/logic/auth/get.py
M ckan/model/activity.py
M ckan/model/group.py
M ckan/plugins/interfaces.py
A ckan/public/base/javascript/modules/activity-stream.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/masthead.less
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/header.html
A ckan/templates/package/activity.html
A ckan/templates/package/activity_stream.html
M ckan/templates/package/read.html
M ckan/templates/user/dashboard.html
M ckan/tests/__init__.py
M ckan/tests/functional/api/__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_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_search.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_solr_package_search.py
M ckan/tests/lib/test_solr_package_search_synchronous_update.py
M ckan/tests/mock_publisher_auth.py
M ckan/tests/models/test_group.py
M ckan_deb/usr/lib/ckan/common.sh
M ckanext/multilingual/solr/schema.xml
M doc/configuration.rst
M doc/contributing.rst
A doc/frontend-testing.rst
M doc/install-from-source.rst
M doc/python-coding-standards.rst
M pip-requirements-test.txt
M pip-requirements.txt
M test-core.ini
Log Message:
-----------
Merge branch 'master' into 3021-logout-without-js
Compare: https://github.com/okfn/ckan/compare/d031ee63779d...69f4b9bdc9dc
More information about the ckan-changes
mailing list