[ckan-changes] [okfn/ckan] 8a0133: [#2536] refactor of activity stream output
GitHub
noreply at github.com
Fri Aug 10 12:37:24 UTC 2012
Branch: refs/heads/2375-demo-theme-development
Home: https://github.com/okfn/ckan
Commit: 8a0133ec90038bcf36217b74b4375a77b37040f2
https://github.com/okfn/ckan/commit/8a0133ec90038bcf36217b74b4375a77b37040f2
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths:
M ckan/logic/action/get.py
R ckan/templates/activity_streams/added_tag.html
R ckan/templates/activity_streams/changed_group.html
R ckan/templates/activity_streams/changed_package.html
R ckan/templates/activity_streams/changed_package_extra.html
R ckan/templates/activity_streams/changed_resource.html
R ckan/templates/activity_streams/changed_user.html
R ckan/templates/activity_streams/deleted_group.html
R ckan/templates/activity_streams/deleted_package.html
R ckan/templates/activity_streams/deleted_package_extra.html
R ckan/templates/activity_streams/deleted_resource.html
A ckan/templates/activity_streams/general.html
R ckan/templates/activity_streams/new_group.html
R ckan/templates/activity_streams/new_package.html
R ckan/templates/activity_streams/new_package_extra.html
R ckan/templates/activity_streams/new_resource.html
R ckan/templates/activity_streams/new_user.html
R ckan/templates/activity_streams/removed_tag.html
Log Message:
-----------
[#2536] refactor of activity stream output
Commit: adad2af1989d1f7b13f083dee9424b6a849fac2b
https://github.com/okfn/ckan/commit/adad2af1989d1f7b13f083dee9424b6a849fac2b
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#2536] fix test fail due to refactor
Commit: d120e14894c00cd7d71f28ea53250a873f13ef91
https://github.com/okfn/ckan/commit/d120e14894c00cd7d71f28ea53250a873f13ef91
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/templates/activity_streams/general.html
M ckan/tests/functional/test_activity.py
Log Message:
-----------
[#2536] general code cleanup
Commit: b13f6bc9c45621391eff2903015c16b8fe7e92b9
https://github.com/okfn/ckan/commit/b13f6bc9c45621391eff2903015c16b8fe7e92b9
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths:
M ckan/tests/functional/test_activity.py
Log Message:
-----------
[#2536] remove some debugging code added in error
Commit: f262ac7e9b653f76ab471bf6024c900339689a74
https://github.com/okfn/ckan/commit/f262ac7e9b653f76ab471bf6024c900339689a74
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
move activity_info to the correct place so that locale is correctly used
Commit: 6d92712cf9338ddd7d93eb3e3348f8440faf1b7f
https://github.com/okfn/ckan/commit/6d92712cf9338ddd7d93eb3e3348f8440faf1b7f
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M CHANGELOG.txt
M LICENSE.txt
M ckan/__init__.py
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/schema-1.4.xml
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/authorization_group.py
M ckan/controllers/datastore.py
M ckan/controllers/error.py
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/storage.py
M ckan/controllers/tag.py
M ckan/controllers/template.py
M ckan/controllers/user.py
M ckan/lib/accept.py
M ckan/lib/authenticator.py
M ckan/lib/base.py
M ckan/lib/celery_app.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/lib/i18n.py
M ckan/lib/maintain.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/plugins.py
M ckan/lib/search/__init__.py
M ckan/lib/search/common.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/publisher/create.py
M ckan/logic/auth/publisher/delete.py
M ckan/logic/auth/publisher/get.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/059_add_related_count_and_flag.py
M ckan/model/authz.py
M ckan/model/follower.py
M ckan/model/group.py
M ckan/model/license.py
M ckan/model/meta.py
M ckan/model/package.py
M ckan/model/related.py
M ckan/model/resource.py
M ckan/new_authz.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
A ckan/public/scripts/vendor/flot/0.7/excanvas.js
M ckan/public/scripts/vendor/html5shiv/html5.js
A ckan/public/scripts/vendor/moment/1.6.2/moment.js
A ckan/public/scripts/vendor/mustache/0.5.0-dev/mustache.js
R ckan/public/scripts/vendor/recline/css/data-explorer.css
R ckan/public/scripts/vendor/recline/css/graph.css
R ckan/public/scripts/vendor/recline/css/grid.css
R ckan/public/scripts/vendor/recline/css/images/edit-map.png
R ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
R ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
R ckan/public/scripts/vendor/recline/css/map.css
A ckan/public/scripts/vendor/recline/css/recline.css
M ckan/public/scripts/vendor/recline/recline.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
A ckan/public/scripts/vendor/slickgrid/2.0.1/README.txt
A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-asc.gif
A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-desc.gif
A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.css
A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js
R ckan/public/scripts/vendor/slickgrid/images/actions.gif
R ckan/public/scripts/vendor/slickgrid/images/ajax-loader-small.gif
R ckan/public/scripts/vendor/slickgrid/images/arrow_redo.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_right_peppermint.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_right_spearmint.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_undo.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_blue.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_star.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_minus.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_plus.png
R ckan/public/scripts/vendor/slickgrid/images/calendar.gif
R ckan/public/scripts/vendor/slickgrid/images/collapse.gif
R ckan/public/scripts/vendor/slickgrid/images/comment_yellow.gif
R ckan/public/scripts/vendor/slickgrid/images/down.gif
R ckan/public/scripts/vendor/slickgrid/images/drag-handle.png
R ckan/public/scripts/vendor/slickgrid/images/editor-helper-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/expand.gif
R ckan/public/scripts/vendor/slickgrid/images/header-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/header-columns-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/header-columns-over-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/help.png
R ckan/public/scripts/vendor/slickgrid/images/info.gif
R ckan/public/scripts/vendor/slickgrid/images/listview.gif
R ckan/public/scripts/vendor/slickgrid/images/pencil.gif
R ckan/public/scripts/vendor/slickgrid/images/row-over-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-asc.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-asc.png
R ckan/public/scripts/vendor/slickgrid/images/sort-desc.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-desc.png
R ckan/public/scripts/vendor/slickgrid/images/stripes.png
R ckan/public/scripts/vendor/slickgrid/images/tag_red.png
R ckan/public/scripts/vendor/slickgrid/images/tick.png
R ckan/public/scripts/vendor/slickgrid/images/user_identity.gif
R ckan/public/scripts/vendor/slickgrid/images/user_identity_plus.gif
R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.css
R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.js
R ckan/public/scripts/vendor/slickgrid/slick.grid.css
R ckan/public/scripts/vendor/slickgrid/slick.grid.js
R ckan/templates/_snippet/add-related.html
M ckan/templates/_util.html
A ckan/templates/activity_streams/deleted_related_item.html
A ckan/templates/activity_streams/follow_dataset.html
A ckan/templates/activity_streams/follow_user.html
A ckan/templates/activity_streams/new_related_item.html
M ckan/templates/facets.html
M ckan/templates/group/read.html
M ckan/templates/js_strings.html
M ckan/templates/layout_base.html
M ckan/templates/package/layout.html
M ckan/templates/package/read.html
R ckan/templates/package/related_list.html
M ckan/templates/package/resource_embedded_dataviewer.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
A ckan/templates/related/add-related.html
A ckan/templates/related/dashboard.html
A ckan/templates/related/related_list.html
A ckan/templates/snippets/follow_button.html
A ckan/templates/snippets/internal-tracking.html
A ckan/templates/snippets/recline-extra-footer.html
A ckan/templates/snippets/recline-extra-header.html
A ckan/templates/user/dashboard.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/layout.html
M ckan/templates/user/read.html
M ckan/tests/forms/test_authz.py
M ckan/tests/forms/test_package.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_admin.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_home.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_package_edit_authz.py
M ckan/tests/functional/test_publisher_auth.py
M ckan/tests/functional/test_related.py
M ckan/tests/functional/test_revision.py
M ckan/tests/functional/test_search.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_upload.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_tag_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_tag.py
M ckan/tests/logic/test_tag_vocab.py
M ckan/tests/models/test_authz.py
M ckan/tests/models/test_package.py
M ckan/tests/models/test_repo.py
M ckan/tests/models/test_resource.py
M ckan/tests/models/test_user.py
M ckan/tests/schema/test_schema.py
M ckan/tests/test_plugins.py
M ckan/tests/test_versions.py
M ckanext/multilingual/tests/test_multilingual_plugin.py
M ckanext/organizations/controllers.py
M ckanext/organizations/forms.py
M ckanext/organizations/templates/organization_layout.html
M ckanext/organizations/templates/organization_package_form.html
M ckanext/publisher_form/forms.py
M ckanext/publisher_form/templates/publisher_read.html
M ckanext/stats/controller.py
M ckanext/stats/templates/ckanext/stats/index.html
M ckanext/test_tag_vocab_plugin.py
M doc/apiv3.rst
A doc/apps-ideas.rst
M doc/coding-standards.rst
M doc/configuration.rst
M doc/datastore.rst
M doc/index.rst
M doc/install-from-package.rst
M doc/install-from-source.rst
M doc/paster.rst
A doc/release-cycle.rst
M doc/solr-setup.rst
M doc/test.rst
A doc/toolkit.rst
M doc/writing-extensions.rst
M pip-requirements-test.txt
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
M setup.py
Log Message:
-----------
Merge branch 'master' into feature-2536-clean-activity-stream
Conflicts:
ckan/logic/action/get.py
Commit: af3df9262613df992d4c18297804b460ba07f0ff
https://github.com/okfn/ckan/commit/af3df9262613df992d4c18297804b460ba07f0ff
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/templates/activity_streams/follow_dataset.html
Log Message:
-----------
[2536] use consistent naming in activity streams
Commit: 23ab84eca01d4792f35f03258e609b41d235b7ca
https://github.com/okfn/ckan/commit/23ab84eca01d4792f35f03258e609b41d235b7ca
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
M ckan/logic/action/get.py
R ckan/templates/activity_streams/deleted_related_item.html
R ckan/templates/activity_streams/follow_dataset.html
R ckan/templates/activity_streams/follow_user.html
R ckan/templates/activity_streams/new_related_item.html
Log Message:
-----------
[2536] move new activity streams to new model
Commit: 2e127514fc4c80d816364e1550daa145892f1593
https://github.com/okfn/ckan/commit/2e127514fc4c80d816364e1550daa145892f1593
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
Revert "[2536] use consistent naming in activity streams"
This reverts commit af3df9262613df992d4c18297804b460ba07f0ff.
Conflicts:
ckan/templates/activity_streams/follow_dataset.html
Commit: 31beffeb64a8ade68d8a02841511f808895cca1f
https://github.com/okfn/ckan/commit/31beffeb64a8ade68d8a02841511f808895cca1f
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2536] fix dataset snippet for follow_dataset
Commit: d62120843ca7777feb2a5046450dfb74a2d10390
https://github.com/okfn/ckan/commit/d62120843ca7777feb2a5046450dfb74a2d10390
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
A ckan/lib/activity_streams.py
M ckan/logic/action/get.py
Log Message:
-----------
[#2536] move snippets into separate lib
Commit: be28a2475e728d44ffd68e2ca9f666798955d5bb
https://github.com/okfn/ckan/commit/be28a2475e728d44ffd68e2ca9f666798955d5bb
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/activity_streams.py
M ckan/logic/action/get.py
Log Message:
-----------
[#2536] Move activity stream stings into lib.activity_streams
Commit: 0659029942a0ffbfc9c89a36027052ebbb5d1b80
https://github.com/okfn/ckan/commit/0659029942a0ffbfc9c89a36027052ebbb5d1b80
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/activity_streams.py
Log Message:
-----------
[#2536] fix long line
Commit: 8799b16a5eccd3d359e0206bf1dc4b0b7d71a214
https://github.com/okfn/ckan/commit/8799b16a5eccd3d359e0206bf1dc4b0b7d71a214
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/activity_streams.py
Log Message:
-----------
[#2536] rename some functions and slight refactoring
Commit: 89498827274fda959a6b2ef0e24f01c02a32b679
https://github.com/okfn/ckan/commit/89498827274fda959a6b2ef0e24f01c02a32b679
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/activity_streams.py
M ckan/lib/helpers.py
Log Message:
-----------
[#2536] fixups
Commit: 548de8ee761a49f6e4753a23c6c930be9e0ff113
https://github.com/okfn/ckan/commit/548de8ee761a49f6e4753a23c6c930be9e0ff113
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/activity_streams.py
Log Message:
-----------
[#2536] fix some errors
Commit: 613322a3cbb0041815fb9118b372cd9404c2e1a4
https://github.com/okfn/ckan/commit/613322a3cbb0041815fb9118b372cd9404c2e1a4
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2777] Use user_list_dictize
Commit: fbefe8cb730e24edd47a5454bdcdd53473b221f5
https://github.com/okfn/ckan/commit/fbefe8cb730e24edd47a5454bdcdd53473b221f5
Author: amercader <amercadero at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Merge branch '2777-defect-user-show'
Commit: 6a48063b971a5f6813c5034eace85e479b5308df
https://github.com/okfn/ckan/commit/6a48063b971a5f6813c5034eace85e479b5308df
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2750] Fix group controller using wrong schema
Fix group controller calling form_to_db_schema() from IGroupForm plugin
when it should be using db_to_form_schema()
Commit: 3ed510b2da164e566fc2c23eee84a495f6800cb3
https://github.com/okfn/ckan/commit/3ed510b2da164e566fc2c23eee84a495f6800cb3
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/lib/plugins.py
Log Message:
-----------
Refactor DefaultGroupForm's form_to_db_schema_options()
The form_to_db_schema() methods of IGroupForm plugins were not being
called if those plugins inherited from DefaultGroupForm. Refactor it in
the same way as DefaultDatasetForm's form_to_db_schema_options() method
was recently refactored. Make it call self.form_to_db_schema so that
the form_to_db_schema() methods of IGroupForm extensions get called.
Also make it call new form_to_db_schema_api_create() and
form_to_db_schema_api_update() methods which could potentially be
overridden by extensions also.
Commit: 5c63f301ae22f6f54a62afa0d0211be3cee628cb
https://github.com/okfn/ckan/commit/5c63f301ae22f6f54a62afa0d0211be3cee628cb
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/update.py
Log Message:
-----------
[#2570] Fix IGroupForm check_data_dict not being called
Make group_create() and group_update() call the check_data_dict()
methods of IGroupForm plugins, like package_create() and
package_update() do with IDatasetForm plugins.
Commit: e2073a37ac16acb1233a19f42d6473e0a2065b75
https://github.com/okfn/ckan/commit/e2073a37ac16acb1233a19f42d6473e0a2065b75
Author: amercader <amercadero at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/controllers/storage.py
Log Message:
-----------
Be more careful when prepending site_url
Commit: bd860dc58758356f36518586d1b70e1079700ba2
https://github.com/okfn/ckan/commit/bd860dc58758356f36518586d1b70e1079700ba2
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
[#2784] Hand control of user's sensitive data to user_dictize.
Only a sysadmin or the owner of the account may view a user's apikey
or reset_key.
This does not change behaviour of the actions; just moves the logic
form the actions to the model dictize layer.
Commit: 7fe6c76a5408e41c5693c7ab4b4217e1547f9da4
https://github.com/okfn/ckan/commit/7fe6c76a5408e41c5693c7ab4b4217e1547f9da4
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/create.py
M ckan/tests/functional/api/test_user.py
Log Message:
-----------
[#2784] Allow users to see their apikey when creating or updating themselves.
Commit: 99adf3dddb4ef78b34d128e3a5f9031643e8b0e9
https://github.com/okfn/ckan/commit/99adf3dddb4ef78b34d128e3a5f9031643e8b0e9
Author: amercader <amercadero at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/lib/plugins.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: 21ca66c77e9a618cec24709430e73c4409c1ac2c
https://github.com/okfn/ckan/commit/21ca66c77e9a618cec24709430e73c4409c1ac2c
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/lib/dictization/model_dictize.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
[#2784] User email is treated as sensitive data
Commit: d7408ff17d167d753b08acd62747d661d664e833
https://github.com/okfn/ckan/commit/d7408ff17d167d753b08acd62747d661d664e833
Author: amercader <amercadero at gmail.com>
Date: 2012-08-03 (Fri, 03 Aug 2012)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#2784] Set user domain object in 'user_obj' in context instead of 'user'
Commit: b04aa652d235bd88e37e07c9652a08c144c41176
https://github.com/okfn/ckan/commit/b04aa652d235bd88e37e07c9652a08c144c41176
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-03 (Fri, 03 Aug 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Fix a db_to_form_package_schema() crash
When db_to_form_package_schema() was in use (e.g. when an IDatasetForm
plugin with a db_to_form_schema() method based on
db_to_form_package_schema() was active) then try to edit a package that
has some resources would crash with a 400 Bad Request.
Extremely difficult to debug.
This seems to fix it.
Commit: 1593e75f8702d1152460a21ec2b6e5082fd78ec4
https://github.com/okfn/ckan/commit/1593e75f8702d1152460a21ec2b6e5082fd78ec4
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-05 (Sun, 05 Aug 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/storage.py
M ckan/lib/plugins.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/schema.py
M ckan/public/scripts/templates.js
M ckan/templates/js_strings.html
Log Message:
-----------
Merge branch 'master' into feature-2536-clean-activity-stream
Commit: 1fd98fc3e4fac2a559b8b50499829ed8da3844b7
https://github.com/okfn/ckan/commit/1fd98fc3e4fac2a559b8b50499829ed8da3844b7
Author: amercader <amercadero at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
Merge branch '2784-model-dictize-sensitive-data'
Commit: f67c571be2c0653a9ae3d67a9a35e61a7329541e
https://github.com/okfn/ckan/commit/f67c571be2c0653a9ae3d67a9a35e61a7329541e
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#2755] Don't call user_show twice
Commit: 57b308e54268456ff375d4dd7bdc404bbad9a901
https://github.com/okfn/ckan/commit/57b308e54268456ff375d4dd7bdc404bbad9a901
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/lib/activity_streams.py
A ckan/templates/activity_streams/activity_stream_item.html
R ckan/templates/activity_streams/general.html
Log Message:
-----------
[#2536] Minor activity streams tidying
For any activity with one activity detail the detail will be
rendered instead of the activity, not just changed packages.
Some comments and PEP8 tidy up.
Rename general.html to activity_stream_item.html
Commit: 1763a8363f27924ee0f389a395c8102587a9b589
https://github.com/okfn/ckan/commit/1763a8363f27924ee0f389a395c8102587a9b589
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
R ckan/lib/activity.py
A ckan/lib/activity_streams_session_extension.py
M ckan/model/meta.py
Log Message:
-----------
Rename activity.py -> activity_streams_session_extension.py
To make it clear what the difference is between lib/activity_streams.py
and lib/activity_streams_session_extension.py (previously
lib/activity.py)
Commit: 1ae2c22c3caebe9c282157b602f1f92153e268d9
https://github.com/okfn/ckan/commit/1ae2c22c3caebe9c282157b602f1f92153e268d9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into feature-2536-clean-activity-stream
Commit: 3aa964db2218ad4a55c591fe78ab6b5a3f06d477
https://github.com/okfn/ckan/commit/3aa964db2218ad4a55c591fe78ab6b5a3f06d477
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/lib/activity_streams.py
R ckan/templates/activity_streams/activity_stream_item.html
A ckan/templates/activity_streams/activity_stream_items.html
Log Message:
-----------
[#2536] rename activity stream template
Commit: e491daf8a50b08783a5d7813edd66277ebb15913
https://github.com/okfn/ckan/commit/e491daf8a50b08783a5d7813edd66277ebb15913
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/lib/activity_streams.py
Log Message:
-----------
[#2536] Only check for details if certain activity type
Commit: 7ce6570df171ab544fab7af28987d5c64a6d3ca6
https://github.com/okfn/ckan/commit/7ce6570df171ab544fab7af28987d5c64a6d3ca6
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/storage.py
M ckan/controllers/user.py
R ckan/lib/activity.py
A ckan/lib/activity_streams.py
A ckan/lib/activity_streams_session_extension.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/plugins.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/meta.py
R ckan/templates/activity_streams/deleted_related_item.html
R ckan/templates/activity_streams/follow_dataset.html
R ckan/templates/activity_streams/follow_user.html
R ckan/templates/activity_streams/new_related_item.html
A ckan/templates_legacy/activity_streams/activity_stream_items.html
R ckan/templates_legacy/activity_streams/added_tag.html
R ckan/templates_legacy/activity_streams/changed_group.html
R ckan/templates_legacy/activity_streams/changed_package.html
R ckan/templates_legacy/activity_streams/changed_package_extra.html
R ckan/templates_legacy/activity_streams/changed_resource.html
R ckan/templates_legacy/activity_streams/changed_user.html
R ckan/templates_legacy/activity_streams/deleted_group.html
R ckan/templates_legacy/activity_streams/deleted_package.html
R ckan/templates_legacy/activity_streams/deleted_package_extra.html
R ckan/templates_legacy/activity_streams/deleted_related_item.html
R ckan/templates_legacy/activity_streams/deleted_resource.html
R ckan/templates_legacy/activity_streams/follow_dataset.html
R ckan/templates_legacy/activity_streams/follow_user.html
R ckan/templates_legacy/activity_streams/new_group.html
R ckan/templates_legacy/activity_streams/new_package.html
R ckan/templates_legacy/activity_streams/new_package_extra.html
R ckan/templates_legacy/activity_streams/new_related_item.html
R ckan/templates_legacy/activity_streams/new_resource.html
R ckan/templates_legacy/activity_streams/new_user.html
R ckan/templates_legacy/activity_streams/removed_tag.html
M ckan/tests/functional/api/test_user.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
Merge branch 'master' into 2375-demo-theme-development
Conflicts:
ckan/templates_legacy/activity_streams/added_tag.html
ckan/templates_legacy/activity_streams/changed_group.html
ckan/templates_legacy/activity_streams/changed_package.html
ckan/templates_legacy/activity_streams/changed_package_extra.html
ckan/templates_legacy/activity_streams/changed_resource.html
ckan/templates_legacy/activity_streams/changed_user.html
ckan/templates_legacy/activity_streams/deleted_group.html
ckan/templates_legacy/activity_streams/deleted_package.html
ckan/templates_legacy/activity_streams/deleted_package_extra.html
ckan/templates_legacy/activity_streams/deleted_resource.html
ckan/templates_legacy/activity_streams/new_group.html
ckan/templates_legacy/activity_streams/new_package.html
ckan/templates_legacy/activity_streams/new_package_extra.html
ckan/templates_legacy/activity_streams/new_resource.html
ckan/templates_legacy/activity_streams/new_user.html
ckan/templates_legacy/activity_streams/removed_tag.html
all deleted
Commit: a40a369be6695a3c112f866b3bf1491c23485ecc
https://github.com/okfn/ckan/commit/a40a369be6695a3c112f866b3bf1491c23485ecc
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
A ckan/templates/activity_streams/activity_stream_items.html
Log Message:
-----------
[#2375] Convert activity stream items template
Compare: https://github.com/okfn/ckan/compare/5d983a7dc36b...a40a369be669
More information about the ckan-changes
mailing list