[ckan-changes] [okfn/ckan] 729ff8: Pass activity and context to activity_stream_strin...
GitHub
noreply at github.com
Wed May 15 14:38:41 UTC 2013
Branch: refs/heads/master
Home: https://github.com/okfn/ckan
Commit: 729ff8f3c688a3d435c921c68b7b34dff073ca14
https://github.com/okfn/ckan/commit/729ff8f3c688a3d435c921c68b7b34dff073ca14
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-01-17 (Thu, 17 Jan 2013)
Changed paths:
M ckan/lib/activity_streams.py
Log Message:
-----------
Pass activity and context to activity_stream_string functions
Commit: b8bfdf5c2dcf3188b921c03bf8e2ef562958b4b6
https://github.com/okfn/ckan/commit/b8bfdf5c2dcf3188b921c03bf8e2ef562958b4b6
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-01-18 (Fri, 18 Jan 2013)
Changed paths:
M ckan/lib/activity_streams.py
Log Message:
-----------
Change the text of the activity stream string
Commit: 5c1170efd1fcdf4c9f37611ff462e6785397bc75
https://github.com/okfn/ckan/commit/5c1170efd1fcdf4c9f37611ff462e6785397bc75
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-01-20 (Sun, 20 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' into 283-activity-stream-fixes
Commit: 635d1d8190d4b46893fd780e438ff1a7ccbc8b9b
https://github.com/okfn/ckan/commit/635d1d8190d4b46893fd780e438ff1a7ccbc8b9b
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-01-24 (Thu, 24 Jan 2013)
Changed paths:
M ckan/lib/activity_streams.py
Log Message:
-----------
Fix activity name, correct function all, and remove print statement
Commit: b9fdf29cebfaee21d5f825ef8c28427816cb6075
https://github.com/okfn/ckan/commit/b9fdf29cebfaee21d5f825ef8c28427816cb6075
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-01-24 (Thu, 24 Jan 2013)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
Add code to create an activity
Commit: 5ef3f1671dab2ba66b76ad626c6b56f74de946be
https://github.com/okfn/ckan/commit/5ef3f1671dab2ba66b76ad626c6b56f74de946be
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-01-24 (Thu, 24 Jan 2013)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
Create validator for new activity
Commit: c296f375164fefd11ee22051e5c024486c6676bc
https://github.com/okfn/ckan/commit/c296f375164fefd11ee22051e5c024486c6676bc
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-01-25 (Fri, 25 Jan 2013)
Changed paths:
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
test for create, update, and delete related item
Commit: fda40076b7092863ef729aa2455a6aabf5c8f083
https://github.com/okfn/ckan/commit/fda40076b7092863ef729aa2455a6aabf5c8f083
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-01-25 (Fri, 25 Jan 2013)
Changed paths:
A CONTRIBUTING.rst
M ckan/config/deployment.ini_tmpl
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/formatters.py
M ckan/lib/helpers.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/update.py
M ckan/model/group.py
M ckan/plugins/interfaces.py
M ckan/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
M ckan/tests/functional/test_package.py
M ckan/tests/models/test_group.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' into 283-activity-stream-fixes
Commit: 9168b8cdc5285455edd9f3f2b7cabf8094a79255
https://github.com/okfn/ckan/commit/9168b8cdc5285455edd9f3f2b7cabf8094a79255
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-01-25 (Fri, 25 Jan 2013)
Changed paths:
M ckan/lib/activity_streams.py
M ckan/logic/action/update.py
Log Message:
-----------
Remove print statement and ignore_auth
Commit: 567a53eaf6d164c3c8d1a2642f622f64bc527499
https://github.com/okfn/ckan/commit/567a53eaf6d164c3c8d1a2642f622f64bc527499
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-02-02 (Sat, 02 Feb 2013)
Changed paths:
M ckan/lib/activity_streams.py
M ckan/logic/action/create.py
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
fix nits, check for datasets
Commit: c451237c9b79da5306726d36336c624146345bf0
https://github.com/okfn/ckan/commit/c451237c9b79da5306726d36336c624146345bf0
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-02-02 (Sat, 02 Feb 2013)
Changed paths:
M .gitignore
M README.rst
M ckan/lib/helpers.py
M ckan/model/__init__.py
M ckan/model/meta.py
M ckan/tests/__init__.py
M ckanext/datastore/plugin.py
M ckanext/datastore/tests/test_create.py
M ckanext/datastore/tests/test_delete.py
M ckanext/datastore/tests/test_search.py
M ckanext/datastore/tests/test_upsert.py
M ckanext/reclinepreview/theme/public/preview_recline.js
Log Message:
-----------
Merge branch 'master' into 283-activity-stream-fixes
Commit: fca5f2828b44d9b0e2c9177ba9b6e54387215b4c
https://github.com/okfn/ckan/commit/fca5f2828b44d9b0e2c9177ba9b6e54387215b4c
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-02-14 (Thu, 14 Feb 2013)
Changed paths:
M ckan/lib/activity_streams.py
M ckan/logic/action/create.py
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
Fix a few more styling nitpicks
Commit: 7b71f6bf0e651088eef219da970b4fc7d0746a74
https://github.com/okfn/ckan/commit/7b71f6bf0e651088eef219da970b4fc7d0746a74
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-02-14 (Thu, 14 Feb 2013)
Changed paths:
M ckan/controllers/api.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/user.py
M ckan/lib/activity_streams.py
M ckan/lib/activity_streams_session_extension.py
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/auth/get.py
M ckan/logic/schema.py
M ckan/model/__init__.py
M ckan/model/activity.py
M ckan/model/meta.py
M ckan/plugins/core.py
M ckan/public/base/css/main.css
A ckan/public/base/images/dashboard-followee-related.png
A ckan/public/base/images/full-width-nav-right.png
M ckan/public/base/javascript/modules/dashboard.js
M ckan/public/base/javascript/modules/data-viewer.js
M ckan/public/base/javascript/modules/popover-context.js
R ckan/public/base/javascript/modules/popover-context.min.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/dashboard.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/main.less
M ckan/public/base/less/masthead.less
R ckan/public/base/less/popover-context.less
M ckan/public/base/vendor/resource.config
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/authz.html
M ckan/templates/ajax_snippets/api_info.html
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
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/group/read_base.html
M ckan/templates/home/index.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read_base.html
M ckan/templates/package/read_base.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/related/dashboard.html
A ckan/templates/snippets/context.html
A ckan/templates/snippets/context/dataset.html
A ckan/templates/snippets/context/group.html
A ckan/templates/snippets/context/user.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/related.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/read.html
M ckan/templates/user/read_base.html
A ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/functional/api/model/test_tag.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_dashboard.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_follow.py
M ckan/tests/functional/test_group.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_tag.py
M ckanext/datastore/plugin.py
M ckanext/reclinepreview/theme/public/preview_recline.js
R ckanext/reclinepreview/theme/public/preview_recline.min.js
M ckanext/reclinepreview/theme/public/resource.config
A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.js
A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.min.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/bootstrap.min.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-responsive.min.css
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.css
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.min.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/excanvas.min.js
A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.js
A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.min.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
M 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/jquery/1.7.1/jquery.min.js
A ckanext/reclinepreview/theme/public/vendor/json/json2.js
A ckanext/reclinepreview/theme/public/vendor/json/json2.min.js
M 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-src.min.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.ie.min.css
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.js
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.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
A ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.min.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
A ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.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
A ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
M 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/showdown/20120615/showdown.min.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-ui-1.8.16.custom.min.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/jquery.event.drag-2.0.min.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
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.css
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.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.min.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/timeline/20120520/js/timeline.min.js
A ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.js
A ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.min.js
A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.js
A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.min.js
R ckanext/reclinepreview/theme/public/vendor/underscore/underscore.js
R ckanext/reclinepreview/theme/public/vendor/underscore/underscore.min.js
M ckanext/reclinepreview/theme/templates/recline.html
M doc/install-from-source.rst
M doc/writing-extensions.rst
M test-core.ini
Log Message:
-----------
Merge branch 'master' into 283-activity-stream-fixes
Commit: 9dd51d21bd9a1ac0b41604c4ac5d6e9e84e13c2b
https://github.com/okfn/ckan/commit/9dd51d21bd9a1ac0b41604c4ac5d6e9e84e13c2b
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-02-14 (Thu, 14 Feb 2013)
Changed paths:
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
Remove the apikey variable
Commit: aee95d715b0fd2d20ed8858259dddc791b75dccb
https://github.com/okfn/ckan/commit/aee95d715b0fd2d20ed8858259dddc791b75dccb
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/lib/activity_streams.py
Log Message:
-----------
Change the if condition around
Commit: 5e77d3a133e0be5efde97e8b930f9db2a47acc40
https://github.com/okfn/ckan/commit/5e77d3a133e0be5efde97e8b930f9db2a47acc40
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-02-22 (Fri, 22 Feb 2013)
Changed paths:
M .travis.yml
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/controllers/admin.py
R ckan/controllers/datastore.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/lib/app_globals.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/lib/maintain.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/plugins.py
M ckan/lib/search/index.py
M ckan/logic/__init__.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
A ckan/migration/versions/067_turn_extras_to_strings.py
M ckan/model/group_extra.py
M ckan/model/package_extra.py
M ckan/new_authz.py
M ckan/plugins/core.py
M ckan/public/base/css/main.css
A ckan/public/base/images/bg.png
M ckan/public/base/images/ckan-logo-footer.png
M ckan/public/base/images/ckan-logo.png
M ckan/public/base/images/dashboard-followee-related.png
A ckan/public/base/images/nav-active.png
A ckan/public/base/images/nav.png
M ckan/public/base/images/placeholder-application.png
M ckan/public/base/images/placeholder-group.png
M ckan/public/base/images/placeholder-image.png
M ckan/public/base/images/placeholder-organization.png
M ckan/public/base/javascript/modules/dashboard.js
M ckan/public/base/javascript/modules/popover-context.js
M ckan/public/base/javascript/plugins/jquery.slug-preview.js
M ckan/public/base/less/activity.less
M ckan/public/base/less/ckan.less
M ckan/public/base/less/dashboard.less
M ckan/public/base/less/dataset.less
R ckan/public/base/less/follower-list.less
A ckan/public/base/less/font-awesome.less
M ckan/public/base/less/footer.less
M ckan/public/base/less/forms.less
A ckan/public/base/less/homepage.less
M ckan/public/base/less/icons.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/main.less
M ckan/public/base/less/masthead.less
M ckan/public/base/less/media.less
M ckan/public/base/less/mixins.less
M ckan/public/base/less/module.less
M ckan/public/base/less/nav.less
M ckan/public/base/less/profile.less
M ckan/public/base/less/toolbar.less
M ckan/public/base/less/variables.less
R ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings-white.png
R ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings.png
A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
A ckan/public/base/vendor/bootstrap/js/.jshintrc
R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-button.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-button.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap.js
A ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
M ckan/public/base/vendor/bootstrap/less/accordion.less
M ckan/public/base/vendor/bootstrap/less/alerts.less
M ckan/public/base/vendor/bootstrap/less/bootstrap.less
M ckan/public/base/vendor/bootstrap/less/breadcrumbs.less
M ckan/public/base/vendor/bootstrap/less/button-groups.less
M ckan/public/base/vendor/bootstrap/less/buttons.less
M ckan/public/base/vendor/bootstrap/less/carousel.less
M ckan/public/base/vendor/bootstrap/less/close.less
M ckan/public/base/vendor/bootstrap/less/code.less
M ckan/public/base/vendor/bootstrap/less/component-animations.less
M ckan/public/base/vendor/bootstrap/less/dropdowns.less
M ckan/public/base/vendor/bootstrap/less/forms.less
M ckan/public/base/vendor/bootstrap/less/grid.less
M ckan/public/base/vendor/bootstrap/less/hero-unit.less
M ckan/public/base/vendor/bootstrap/less/labels-badges.less
M ckan/public/base/vendor/bootstrap/less/layouts.less
A ckan/public/base/vendor/bootstrap/less/media.less
M ckan/public/base/vendor/bootstrap/less/mixins.less
M ckan/public/base/vendor/bootstrap/less/modals.less
M ckan/public/base/vendor/bootstrap/less/navbar.less
M ckan/public/base/vendor/bootstrap/less/navs.less
M ckan/public/base/vendor/bootstrap/less/pager.less
M ckan/public/base/vendor/bootstrap/less/pagination.less
M ckan/public/base/vendor/bootstrap/less/popovers.less
M ckan/public/base/vendor/bootstrap/less/progress-bars.less
M ckan/public/base/vendor/bootstrap/less/reset.less
M ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
M ckan/public/base/vendor/bootstrap/less/responsive-767px-max.less
M ckan/public/base/vendor/bootstrap/less/responsive-768px-979px.less
M ckan/public/base/vendor/bootstrap/less/responsive-navbar.less
M ckan/public/base/vendor/bootstrap/less/responsive-utilities.less
M ckan/public/base/vendor/bootstrap/less/responsive.less
M ckan/public/base/vendor/bootstrap/less/scaffolding.less
M ckan/public/base/vendor/bootstrap/less/sprites.less
M ckan/public/base/vendor/bootstrap/less/tables.less
A ckan/public/base/vendor/bootstrap/less/tests/buttons.html
A ckan/public/base/vendor/bootstrap/less/tests/css-tests.css
A ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
A ckan/public/base/vendor/bootstrap/less/tests/forms-responsive.html
A ckan/public/base/vendor/bootstrap/less/tests/forms.html
A ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
A ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
A ckan/public/base/vendor/bootstrap/less/tests/navbar.html
M ckan/public/base/vendor/bootstrap/less/thumbnails.less
M ckan/public/base/vendor/bootstrap/less/tooltip.less
M ckan/public/base/vendor/bootstrap/less/type.less
M ckan/public/base/vendor/bootstrap/less/utilities.less
M ckan/public/base/vendor/bootstrap/less/variables.less
M ckan/public/base/vendor/bootstrap/less/wells.less
M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
A ckan/public/base/vendor/font-awesome/css/font-awesome.css
A ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
M ckan/public/base/vendor/font-awesome/less/font-awesome.less
M ckan/public/base/vendor/resource.config
R ckan/templates/admin/authz.html
A ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/admin/confirm_reset.html
M ckan/templates/admin/index.html
R ckan/templates/admin/snippets/header.html
M ckan/templates/dataviewer/snippets/no_preview.html
M ckan/templates/development/snippets/list.html
M ckan/templates/development/snippets/nav.html
M ckan/templates/development/snippets/toolbar.html
M ckan/templates/error_document_template.html
M ckan/templates/footer.html
M ckan/templates/group/about.html
M ckan/templates/group/index.html
M ckan/templates/group/members.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/group/read_base.html
M ckan/templates/header.html
M ckan/templates/home/about.html
M ckan/templates/home/index.html
M ckan/templates/macros/form.html
M ckan/templates/organization/about.html
M ckan/templates/organization/edit.html
M ckan/templates/organization/edit_base.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
A ckan/templates/package/base.html
M ckan/templates/package/base_form_page.html
M ckan/templates/package/edit.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
R ckan/templates/package/resource_api_data.html
M ckan/templates/package/resource_edit.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
R ckan/templates/package/snippets/back_to_package_action.html
M ckan/templates/package/snippets/data_api_button.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
A ckan/templates/package/snippets/package_context.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/context.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/snippets/group_item.html
M ckan/templates/snippets/home_breadcrumb_item.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/package_item.html
M ckan/templates/snippets/social.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
A ckan/templates/user/edit_base.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/list.html
M ckan/templates/user/read_base.html
M ckan/templates/user/snippets/back_to_user_action.html
M ckan/templates/user/snippets/followers.html
M ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
M ckan/tests/ckantestplugin/setup.py
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_email_notifications.py
M ckan/tests/functional/test_activity.py
R ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_pagination.py
M ckan/tests/functional/test_related.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_upload.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_helpers.py
M ckan/tests/lib/test_solr_package_search_synchronous_update.py
M ckan/tests/test_plugins.py
M ckanext/datastore/bin/datastore_setup.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/jsonpreview/tests/test_preview.py
M ckanext/pdfpreview/tests/test_preview.py
M ckanext/reclinepreview/tests/test_preview.py
M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
M ckanext/resourceproxy/tests/file_server.py
M ckanext/resourceproxy/tests/test_proxy.py
M ckanext/stats/tests/__init__.py
M ckanext/stats/tests/test_stats_lib.py
M doc/writing-extensions.rst
M setup.py
Log Message:
-----------
Merge branch 'master' into 283-activity-stream-fixes
Commit: dd491f08cba5aa4bddd359c37aef7c44dc200b9e
https://github.com/okfn/ckan/commit/dd491f08cba5aa4bddd359c37aef7c44dc200b9e
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-02-22 (Fri, 22 Feb 2013)
Changed paths:
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
first cut at splitting the tests
Commit: 007277e6e56f4b70711a7ab47f3d95ebc1bb2e42
https://github.com/okfn/ckan/commit/007277e6e56f4b70711a7ab47f3d95ebc1bb2e42
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-02-27 (Wed, 27 Feb 2013)
Changed paths:
M .travis.yml
M ckan/controllers/feed.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/tag.py
M ckan/controllers/template.py
M ckan/controllers/user.py
M ckan/lib/base.py
M ckan/lib/helpers.py
M ckan/lib/jinja_extensions.py
M ckan/lib/plugins.py
M ckan/lib/search/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/migration/versions/064_add_email_last_sent_column.py
M ckan/model/group.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/main.css
M ckan/public/base/images/nav-active.png
M ckan/public/base/images/placeholder-application.png
M ckan/public/base/images/placeholder-group.png
M ckan/public/base/images/placeholder-image.png
M ckan/public/base/images/placeholder-organization.png
M ckan/public/base/javascript/main.js
M ckan/public/base/javascript/modules/autocomplete.js
M ckan/public/base/less/activity.less
M ckan/public/base/less/dataset.less
M ckan/public/base/less/homepage.less
M ckan/public/base/less/icons.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/less/masthead.less
M ckan/public/base/less/module.less
M ckan/public/base/less/nav.less
M ckan/public/base/less/toolbar.less
M ckan/templates/group/base_form_page.html
M ckan/templates/group/index.html
M ckan/templates/group/read_base.html
M ckan/templates/header.html
M ckan/templates/home/index.html
M ckan/templates/organization/edit_base.html
M ckan/templates/organization/index.html
M ckan/templates/organization/read_base.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/search.html
M ckan/templates/page.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/read_base.html
M ckan/templates_legacy/package/search.html
M ckan/tests/functional/api/base.py
M ckan/tests/functional/api/model/test_group.py
M ckan/tests/functional/api/model/test_licenses.py
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/functional/api/model/test_ratings.py
M ckan/tests/functional/api/model/test_relationships.py
M ckan/tests/functional/api/model/test_revisions.py
M ckan/tests/functional/api/model/test_tag.py
M ckan/tests/functional/api/test_api.py
M ckan/tests/functional/api/test_misc.py
M ckan/tests/functional/api/test_package_search.py
M ckan/tests/functional/api/test_resource_search.py
M ckan/tests/functional/test_group.py
M ckan/tests/models/test_group.py
M ckanext/datastore/db.py
M ckanext/datastore/tests/test_create.py
M ckanext/datastore/tests/test_unit.py
A ckanext/example_itemplatehelpers/__init__.py
A ckanext/example_itemplatehelpers/plugin.py
A ckanext/example_itemplatehelpers/templates/home/index.html
M ckanext/jsonpreview/tests/test_preview.py
M ckanext/multilingual/plugin.py
M ckanext/pdfpreview/tests/test_preview.py
M ckanext/reclinepreview/tests/test_preview.py
M ckanext/resourceproxy/controller.py
M pip-requirements-test.txt
M pip-requirements.txt
M setup.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' into 283-activity-stream-fixes
Commit: 9e4be30c9e4c563722cffc14e2d4ea8ac251111c
https://github.com/okfn/ckan/commit/9e4be30c9e4c563722cffc14e2d4ea8ac251111c
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
Dictize only if absolutely necessary
Commit: 78ffa07458a66cc54f3926c7eb79e634566da71a
https://github.com/okfn/ckan/commit/78ffa07458a66cc54f3926c7eb79e634566da71a
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)
Changed paths:
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
Split the tests nicely
Commit: 5c5daf6ea7a324f4d82ca9a1beda2e07bf09c0c6
https://github.com/okfn/ckan/commit/5c5daf6ea7a324f4d82ca9a1beda2e07bf09c0c6
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)
Changed paths:
M ckan/logic/action/update.py
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
Add ignore_auth=True to activity_create call.
ignore_auth=True was missing causing tests to fail.
Commit: fbbaa5cd90b261174c5b48606e21bb476a5f14c6
https://github.com/okfn/ckan/commit/fbbaa5cd90b261174c5b48606e21bb476a5f14c6
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-03-14 (Thu, 14 Mar 2013)
Changed paths:
M ckan/lib/activity_streams.py
Log Message:
-----------
Display dataset on the activity stream
Commit: ae9803e50112bead1616404c33e54c0c52004173
https://github.com/okfn/ckan/commit/ae9803e50112bead1616404c33e54c0c52004173
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-03-14 (Thu, 14 Mar 2013)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
Add the dataset to the resource_update activity_dict
Commit: eeb1c54b7883e82a2063b6b694a620d13e66cfdf
https://github.com/okfn/ckan/commit/eeb1c54b7883e82a2063b6b694a620d13e66cfdf
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-03-15 (Fri, 15 Mar 2013)
Changed paths:
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
Use the activity api for the tests
Commit: 76f15609506ace9b947efacdc2a9cbf5a0f94916
https://github.com/okfn/ckan/commit/76f15609506ace9b947efacdc2a9cbf5a0f94916
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-03-15 (Fri, 15 Mar 2013)
Changed paths:
M .travis.yml
A bin/travis-build
A ckan/common.py
M ckan/config/routing.py
M ckan/controllers/api.py
M ckan/controllers/feed.py
M ckan/controllers/group.py
M ckan/controllers/organization.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/app_globals.py
R ckan/lib/authztool.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/datapreview.py
M ckan/lib/dumper.py
M ckan/lib/field_types.py
M ckan/lib/helpers.py
M ckan/lib/jinja_extensions.py
M ckan/lib/jsonp.py
M ckan/lib/mailer.py
M ckan/lib/plugins.py
M ckan/lib/repoze_patch.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/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/migration/versions/022_add_group_extras.py
M ckan/migration/versions/027_adjust_harvester.py
M ckan/migration/versions/029_version_groups.py
M ckan/migration/versions/045_user_name_unique.py
M ckan/migration/versions/067_turn_extras_to_strings.py
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
R ckan/public/base/css/fuchsia.min.css
R ckan/public/base/css/green.min.css
M ckan/public/base/css/main.css
R ckan/public/base/css/main.min.css
R ckan/public/base/css/maroon.min.css
R ckan/public/base/css/red.min.css
R ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
R ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
R ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
R ckan/public/base/i18n/bg.min.js
R ckan/public/base/i18n/ca.min.js
R ckan/public/base/i18n/cs_CZ.min.js
R ckan/public/base/i18n/de.min.js
R ckan/public/base/i18n/el.min.js
R ckan/public/base/i18n/es.min.js
R ckan/public/base/i18n/fi.min.js
R ckan/public/base/i18n/fr.min.js
R ckan/public/base/i18n/hu.min.js
R ckan/public/base/i18n/it.min.js
R ckan/public/base/i18n/lt.min.js
R ckan/public/base/i18n/lv.min.js
R ckan/public/base/i18n/nl.min.js
R ckan/public/base/i18n/no.min.js
R ckan/public/base/i18n/pl.min.js
R ckan/public/base/i18n/pt_BR.min.js
R ckan/public/base/i18n/ro.min.js
R ckan/public/base/i18n/ru.min.js
R ckan/public/base/i18n/sk.min.js
R ckan/public/base/i18n/sl.min.js
R ckan/public/base/i18n/sq.min.js
R ckan/public/base/i18n/sr.min.js
R ckan/public/base/i18n/sr_Latn.min.js
R ckan/public/base/i18n/sv.min.js
R ckan/public/base/i18n/zh_TW.min.js
A ckan/public/base/images/table-seperator.png
M ckan/public/base/javascript/client.js
R ckan/public/base/javascript/client.min.js
R ckan/public/base/javascript/i18n.min.js
R ckan/public/base/javascript/main.min.js
R ckan/public/base/javascript/module.min.js
R ckan/public/base/javascript/modules/api-info.min.js
M ckan/public/base/javascript/modules/autocomplete.js
R ckan/public/base/javascript/modules/autocomplete.min.js
R ckan/public/base/javascript/modules/basic-form.min.js
R ckan/public/base/javascript/modules/confirm-action.min.js
R ckan/public/base/javascript/modules/custom-fields.min.js
R ckan/public/base/javascript/modules/dashboard.min.js
R ckan/public/base/javascript/modules/data-viewer.min.js
R ckan/public/base/javascript/modules/follow.min.js
R ckan/public/base/javascript/modules/related-item.min.js
R ckan/public/base/javascript/modules/resource-form.min.js
R ckan/public/base/javascript/modules/resource-upload-field.min.js
R ckan/public/base/javascript/modules/select-switch.min.js
R ckan/public/base/javascript/modules/slug-preview.min.js
A ckan/public/base/javascript/modules/table-selectable-rows.js
A ckan/public/base/javascript/modules/table-toggle-more.js
R ckan/public/base/javascript/notify.min.js
R ckan/public/base/javascript/plugins/jquery.date-helpers.min.js
R ckan/public/base/javascript/plugins/jquery.form-warning.min.js
R ckan/public/base/javascript/plugins/jquery.inherit.min.js
R ckan/public/base/javascript/plugins/jquery.proxy-all.min.js
R ckan/public/base/javascript/plugins/jquery.slug-preview.min.js
R ckan/public/base/javascript/plugins/jquery.slug.min.js
R ckan/public/base/javascript/plugins/jquery.truncator.min.js
R ckan/public/base/javascript/plugins/jquery.url-helpers.min.js
R ckan/public/base/javascript/pubsub.min.js
M ckan/public/base/javascript/resource.config
R ckan/public/base/javascript/sandbox.min.js
R ckan/public/base/javascript/tracking.min.js
M ckan/public/base/less/ckan.less
M ckan/public/base/less/dataset.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/homepage.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/mixins.less
M ckan/public/base/less/module.less
M ckan/public/base/less/nav.less
A ckan/public/base/less/tables.less
M ckan/public/base/less/variables.less
R ckan/public/base/test/spec/ckan.spec.min.js
R ckan/public/base/test/spec/client.spec.min.js
R ckan/public/base/test/spec/module.spec.min.js
R ckan/public/base/test/spec/modules/autocomplete.spec.min.js
R ckan/public/base/test/spec/modules/basic-form.spec.min.js
R ckan/public/base/test/spec/modules/confirm-action.spec.min.js
R ckan/public/base/test/spec/modules/custom-fields.spec.min.js
R ckan/public/base/test/spec/modules/related-item.spec.min.js
R ckan/public/base/test/spec/modules/resource-form.spec.min.js
R ckan/public/base/test/spec/modules/resource-upload-field.spec.min.js
R ckan/public/base/test/spec/notify.spec.min.js
R ckan/public/base/test/spec/plugins/jquery.date-helpers.spec.min.js
R ckan/public/base/test/spec/plugins/jquery.form-warning.spec.min.js
R ckan/public/base/test/spec/plugins/jquery.inherit.spec.min.js
R ckan/public/base/test/spec/plugins/jquery.proxy-all.spec.min.js
R ckan/public/base/test/spec/plugins/jquery.slug-preview.spec.min.js
R ckan/public/base/test/spec/plugins/jquery.slug.spec.min.js
R ckan/public/base/test/spec/plugins/jquery.url-helpers.spec.min.js
R ckan/public/base/test/spec/pubsub.spec.min.js
R ckan/public/base/test/spec/sandbox.spec.min.js
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/admin/index.html
M ckan/templates/ajax_snippets/api_info.html
M ckan/templates/dataviewer/snippets/no_preview.html
M ckan/templates/development/snippets/page_header.html
M ckan/templates/error_document_template.html
M ckan/templates/footer.html
M ckan/templates/group/index.html
M ckan/templates/group/read.html
M ckan/templates/group/read_base.html
M ckan/templates/group/snippets/group_item.html
M ckan/templates/home/about.html
M ckan/templates/home/index.html
M ckan/templates/home/snippets/about_text.html
A ckan/templates/organization/activity_stream.html
M ckan/templates/organization/base_form_page.html
A ckan/templates/organization/bulk_process.html
M ckan/templates/organization/edit.html
M ckan/templates/organization/edit_base.html
M ckan/templates/organization/index.html
M ckan/templates/organization/new.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
A ckan/templates/organization/snippets/help.html
M ckan/templates/organization/snippets/organization_item.html
M ckan/templates/package/base.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/resource_edit.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/data_api_button.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/search_form.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/related/snippets/related_form.html
M ckan/templates/snippets/datapreview_embed_dialog.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/facet_list.html
M ckan/templates/snippets/home_breadcrumb_item.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/package_item.html
R ckan/templates/snippets/page_header.html
M ckan/templates/snippets/popular.html
M ckan/templates/snippets/related.html
A ckan/templates/snippets/search_result_text.html
A ckan/templates/snippets/simple_search.html
M ckan/templates/snippets/social.html
M ckan/templates/snippets/subscribe.html
M ckan/templates/user/edit_base.html
M ckan/templates/user/logout_first.html
M ckan/templates/user/perform_reset.html
M ckan/templates/user/read_base.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/tests/__init__.py
M ckan/tests/functional/api/base.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
M ckan/tests/functional/api/test_util.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_preview_interface.py
M ckan/tests/functional/test_search.py
M ckan/tests/lib/test_cli.py
M ckan/tests/lib/test_datapreview.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_solr_search_index.py
M ckan/tests/logic/test_action.py
M ckan/tests/misc/test_sync.py
R ckan/tests/mock_publisher_auth.py
M ckan/tests/test_dumper.py
M ckanext/datastore/db.py
M ckanext/datastore/plugin.py
A ckanext/datastore/tests/test_configure.py
M ckanext/datastore/tests/test_search.py
M ckanext/datastore/tests/test_unit.py
R ckanext/jsonpreview/theme/public/css/json.min.css
R ckanext/jsonpreview/theme/public/preview_json.min.js
R ckanext/pdfpreview/theme/public/css/pdf.min.css
R ckanext/pdfpreview/theme/public/css/recline.min.css
R ckanext/pdfpreview/theme/public/preview_pdf.min.js
R ckanext/publisher_form/__init__.py
R ckanext/publisher_form/forms.py
R ckanext/publisher_form/templates/dataset_form.html
R ckanext/publisher_form/templates/publisher_form.html
R ckanext/publisher_form/templates/publisher_index.html
R ckanext/publisher_form/templates/publisher_layout.html
R ckanext/publisher_form/templates/publisher_new.html
R ckanext/publisher_form/templates/publisher_read.html
R ckanext/reclinepreview/theme/public/css/recline.min.css
R doc/api-tutorial.rst
R doc/api-util.rst
R doc/api-v2.rst
M doc/api.rst
R doc/apiv3.rst
M doc/architecture.rst
A doc/ckan.logic.action.create.rst
A doc/ckan.logic.action.delete.rst
A doc/ckan.logic.action.get.rst
A doc/ckan.logic.action.update.rst
M doc/conf.py
M doc/datastore-api.rst
A doc/filestore-api.rst
M doc/filestore.rst
M doc/index.rst
M doc/install-from-source.rst
A doc/legacy-api.rst
M doc/loading-data.rst
M doc/multilingual.rst
M doc/python-coding-standards.rst
M doc/tag-vocabularies.rst
M pip-requirements.txt
M setup.py
Log Message:
-----------
Merge branch 'master' into 283-activity-stream-fixes
Commit: 991488fc38521abfe3b175bca6ef80913a929579
https://github.com/okfn/ckan/commit/991488fc38521abfe3b175bca6ef80913a929579
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-03-25 (Mon, 25 Mar 2013)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/controllers/tag.py
M ckan/lib/activity_streams_session_extension.py
M ckan/lib/app_globals.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/action/create.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/new_authz.py
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
M ckan/public/base/css/main.css
M ckan/public/base/less/footer.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/module.less
M ckan/templates/footer.html
M ckan/templates/home/about.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/members.html
M ckan/templates/package/new_package_metadata.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/snippets/license.html
A ckan/templates/tag/index.html
M ckan/templates_legacy/group/layout.html
M ckan/templates_legacy/layout_base.html
M ckan/templates_legacy/package/layout.html
M ckan/templates_legacy/package/read_core.html
M ckan/templates_legacy/revision/layout.html
M ckan/templates_legacy/user/layout.html
M ckan/tests/functional/api/model/test_vocabulary.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_package.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/logic/test_auth.py
M ckan/tests/schema/test_schema.py
A ckanext/example_idatasetform/__init__.py
A ckanext/example_idatasetform/plugin.py
A ckanext/example_idatasetform/templates/package/read.html
A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
R ckanext/organizations/__init__.py
R ckanext/organizations/controllers.py
R ckanext/organizations/forms.py
R ckanext/organizations/templates/email/join_publisher_request.txt
R ckanext/organizations/templates/organization_edit.html
R ckanext/organizations/templates/organizations/form.html
R ckanext/organizations/templates/organizations/index.html
R ckanext/organizations/templates/organizations/new.html
R ckanext/organizations/templates/organizations/read.html
R ckanext/organizations/templates/organizations/users.html
R ckanext/organizations/templates/organizations/users_form.html
R ckanext/organizations/templates_legacy/organizations/apply.html
R ckanext/organizations/templates_legacy/organizations/apply_form.html
R ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
R ckanext/organizations/templates_legacy/organizations/form.html
R ckanext/organizations/templates_legacy/organizations/history.html
R ckanext/organizations/templates_legacy/organizations/index.html
R ckanext/organizations/templates_legacy/organizations/layout.html
R ckanext/organizations/templates_legacy/organizations/new.html
R ckanext/organizations/templates_legacy/organizations/package_form.html
R ckanext/organizations/templates_legacy/organizations/read.html
R ckanext/organizations/templates_legacy/organizations/users.html
R ckanext/organizations/templates_legacy/organizations/users_form.html
R ckanext/resourceproxy/tests/file_server.py
M ckanext/resourceproxy/tests/test_proxy.py
M ckanext/test_tag_vocab_plugin.py
R doc/administrative-dashboard.rst
M doc/conf.py
M doc/configuration.rst
R doc/forms.rst
M doc/index.rst
M doc/tag-vocabularies.rst
M pip-requirements-test.txt
M setup.py
Log Message:
-----------
Merge branch 'master' into 283-activity-stream-fixes
Commit: f6ed9b6b28f60145b17f19e8307b2212d637ddcd
https://github.com/okfn/ckan/commit/f6ed9b6b28f60145b17f19e8307b2212d637ddcd
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-03-25 (Mon, 25 Mar 2013)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
[#283] Check context has user in related_update
* Check that the context has user key.
* Check that a user object exists corresponding to
value of 'user' in context.
Commit: b0d671f11972e1fe6a0718990c47ca2d924bbd4e
https://github.com/okfn/ckan/commit/b0d671f11972e1fe6a0718990c47ca2d924bbd4e
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-03-25 (Mon, 25 Mar 2013)
Changed paths:
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
[#283] Assert more values in activity_response_dict
* Check that user_id matches user used to create related_item.
* Check that the related item matches the dataset created/modified/deleted.
* Check that the dataset key is set to none when creating/updating.
Commit: 603ac47679adfe3ec1c33bc70be4abaeececb620
https://github.com/okfn/ckan/commit/603ac47679adfe3ec1c33bc70be4abaeececb620
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-03-26 (Tue, 26 Mar 2013)
Changed paths:
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
Fix line width issues
Commit: 1fe28d260358e8eb7b63853d7ade498fad0c0af3
https://github.com/okfn/ckan/commit/1fe28d260358e8eb7b63853d7ade498fad0c0af3
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-15 (Wed, 15 May 2013)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/schema.py
Log Message:
-----------
[#283] Save validated data dicts in activity_create
activity_create() was validating the data dict passed to it, but then
passing the original, unvalidated data dict on to model save. Make it pass
the validated data dict instead.
Fixing this reveals another problem, a JSONDecodeError when pulling
activities out of the database. Invalid JSON is getting into the data
column of the activity table. default_create_activity_schema() runs
unicode() on the 'data' field of the activity dict. This has the effect of
turning a Python dict (the 'data' field's value) into a Python string. The
schema should not do this, because the data field uses SQLAlchemy's
JsonDictType at the model level, so the dict is turned into a string at
the model level, it doesn't need to be turned into a string at the schema
level first.
To fix the second problem, just remove the unicode from
default_create_activity_schema.
Commit: a51d49ed723afc51bfdcb116895b120f2ee4f945
https://github.com/okfn/ckan/commit/a51d49ed723afc51bfdcb116895b120f2ee4f945
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-15 (Wed, 15 May 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[#283] Accept user name or id in activity_create
The activity_create docstring claims that 'user_id' can be either name
or an id, but in fact only ids work. Change the schema to allow names or
ids.
Commit: 300f6bc9fc48dbd72d573d8798537b538317d740
https://github.com/okfn/ckan/commit/300f6bc9fc48dbd72d573d8798537b538317d740
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-15 (Wed, 15 May 2013)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
[#283] Don't raise NotAuthorized in related_update()
There's no need for related_update logic function to check whether 'user'
is in the context and raise NotAuthorised. 'user' is always in the
context, and if the user is not logged in or not authorised to edit the
related item, then the related_update authorization function will raise an
error.
Commit: 1ee1f71b29c2b5d7211e9eb7aed3f9dc9c267c08
https://github.com/okfn/ckan/commit/1ee1f71b29c2b5d7211e9eb7aed3f9dc9c267c08
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-05-15 (Wed, 15 May 2013)
Changed paths:
M CHANGELOG.txt
M CONTRIBUTING.rst
M README.rst
M bin/osx-postgres-mem.sh
M bin/travis-build
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
A ckan/config/install.py
M ckan/config/routing.py
M ckan/config/who.ini
M ckan/controllers/api.py
M ckan/controllers/error.py
M ckan/controllers/feed.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/organization.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/user.py
M ckan/i18n/check_po_files.py
M ckan/lib/activity_streams.py
M ckan/lib/alphabet_paginate.py
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/email_notifications.py
M ckan/lib/formatters.py
M ckan/lib/helpers.py
M ckan/lib/mailer.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/navl/validators.py
M ckan/lib/package_saver.py
M ckan/lib/render.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/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/migration/versions/067_turn_extras_to_strings.py
R ckan/misc.py
M ckan/model/__init__.py
M ckan/model/license.py
M ckan/model/package.py
M ckan/model/package_relationship.py
M ckan/model/tag.py
M ckan/model/tracking.py
M ckan/new_authz.py
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
M ckan/public/base/css/main.css
R ckan/public/base/images/flags.png
M ckan/public/base/javascript/modules/basic-form.js
M ckan/public/base/javascript/tracking.js
M ckan/public/base/less/footer.less
M ckan/public/base/less/group.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/mixins.less
M ckan/public/base/less/prose.less
M ckan/public/base/test/index.html
M ckan/public/base/test/spec/client.spec.js
M ckan/public/base/test/spec/modules/autocomplete.spec.js
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/development/primer.html
A ckan/templates/development/snippets/actions.html
A ckan/templates/development/snippets/context.html
M ckan/templates/development/snippets/facet.html
M ckan/templates/development/snippets/media_grid.html
M ckan/templates/development/snippets/nav.html
M ckan/templates/development/snippets/page_header.html
R ckan/templates/development/snippets/toolbar.html
M ckan/templates/group/about.html
M ckan/templates/group/activity_stream.html
M ckan/templates/group/admins.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
A ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/members.html
M ckan/templates/group/read.html
A ckan/templates/group/snippets/history_revisions.html
A ckan/templates/group/snippets/revisions_table.html
M ckan/templates/header.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/edit.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/new.html
M ckan/templates/organization/read.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
A ckan/templates/package/history.html
M ckan/templates/package/read.html
M 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/additional_info.html
M ckan/templates/package/snippets/data_api_button.html
A ckan/templates/package/snippets/history_revisions.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
A ckan/templates/package/snippets/revisions_table.html
M ckan/templates/package/snippets/search_form.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/dashboard.html
A ckan/templates/revision/__init__.py
A ckan/templates/revision/diff.html
A ckan/templates/revision/list.html
A ckan/templates/revision/read.html
A ckan/templates/revision/read_base.html
A ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/facet_list.html
M ckan/templates/snippets/sort_by.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout.html
M ckan/templates/user/new.html
M ckan/templates/user/perform_reset.html
M ckan/templates/user/read.html
M ckan/templates_legacy/package/read_core.html
M ckan/templates_legacy/package/resource_read.html
M ckan/tests/functional/api/test_dashboard.py
M ckan/tests/functional/test_home.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_pagination.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_solr_package_search.py
M ckan/tests/logic/test_action.py
A ckan/tests/logic/test_init.py
M ckan/tests/logic/test_member.py
M ckan/tests/misc/test_format_text.py
M ckan/tests/models/test_package.py
M ckanext/datastore/bin/set_permissions.sql
M ckanext/datastore/commands.py
M ckanext/datastore/db.py
M ckanext/datastore/plugin.py
M ckanext/datastore/tests/test_configure.py
M ckanext/datastore/tests/test_search.py
A ckanext/example_idatasetform/templates/package/snippets/package_basic_fields.html
M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
M ckanext/reclinepreview/theme/public/preview_recline.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.css
M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
M doc/_templates/footer.html
R doc/about.rst
M doc/apps-ideas.rst
M doc/architecture.rst
M doc/authorization.rst
M doc/background-tasks.rst
R doc/commenting.rst
M doc/common-error-messages.rst
M doc/conf.py
M doc/configuration.rst
R doc/contrib.rst
A doc/contributing.rst
M doc/css-coding-standards.rst
M doc/data-viewer.rst
M doc/database-dumps.rst
M doc/datastore-setup.rst
M doc/deployment.rst
M doc/email-notifications.rst
R doc/extension-templating.rst
M doc/extensions.rst
M doc/filestore.rst
M doc/form-integration.rst
M doc/frontend-development.rst
R doc/geospatial.rst
R doc/harvesting.rst
M doc/i18n.rst
R doc/images/1.png
R doc/images/2.png
R doc/images/3a.png
R doc/images/3b.png
R doc/images/4.png
R doc/images/5.png
R doc/images/6.png
R doc/images/7.png
R doc/images/8.png
R doc/images/8a.png
M doc/images/9.png
R doc/images/i1.png
R doc/images/i2.png
R doc/images/i3.png
R doc/images/i4.png
R doc/images/i5.png
R doc/images/i6.png
R doc/images/i7.png
R doc/images/i8.png
A doc/images/popular-dataset.png
A doc/images/popular-resource.png
A doc/images/sort-datasets-by-popularity.png
R doc/images/virtualbox1-package.png
R doc/images/virtualbox11-ubuntu.png
R doc/images/virtualbox4-newvm.png
R doc/images/virtualbox5-vmtype.png
R doc/images/virtualbox6-vmloc.png
R doc/images/virtualbox7-startvm.png
R doc/images/virtualbox8-firstrun.png
R doc/images/virtualbox9-iso.png
A doc/importing-datasets.rst
M doc/index.rst
R doc/install-from-package-amazon.rst
R doc/install-from-package-virtualbox.rst
M doc/install-from-package.rst
M doc/install-from-source.rst
M doc/javascript-coding-standards.rst
M doc/javascript-module-tutorial.rst
M doc/legacy-api.rst
R doc/loading-data.rst
M doc/multilingual.rst
R doc/organizations_and_groups.rst
M doc/paster.rst
M doc/post-installation.rst
R doc/publisher-profile.rst
M doc/publishing-datasets.rst
M doc/release-cycle.rst
A doc/release-process.rst
M doc/resources.rst
M doc/solr-setup.rst
A doc/stats.rst
M doc/tag-vocabularies.rst
M doc/templating.rst
M doc/test.rst
M doc/theming.rst
M doc/toolkit.rst
A doc/tracking.rst
R doc/user-stories-list.rst
R doc/user-stories.rst
R doc/writing-extensions.rst
M setup.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 283-activity-stream-fixes
Conflicts:
ckan/logic/action/update.py
Commit: a66c3c8e112425ad78a272d35cb28f943943947d
https://github.com/okfn/ckan/commit/a66c3c8e112425ad78a272d35cb28f943943947d
Author: tobes <toby.junk at gmail.com>
Date: 2013-05-15 (Wed, 15 May 2013)
Changed paths:
M ckan/lib/activity_streams.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
Merge branch '283-activity-stream-fixes'
Compare: https://github.com/okfn/ckan/compare/b171161de151...a66c3c8e1124
More information about the ckan-changes
mailing list