[ckan-changes] [okfn/ckan] 8a0133: [#2536] refactor of activity stream output
GitHub
noreply at github.com
Wed Aug 15 16:32:01 UTC 2012
Branch: refs/heads/2618-nested-resources
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: a39bb4eafcd91c629690770c486c8fd4432eabbc
https://github.com/okfn/ckan/commit/a39bb4eafcd91c629690770c486c8fd4432eabbc
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M ckan/templates/snippets/facet_list.html
Log Message:
-----------
[#2375] Fix spacing issue with facet list
Commit: 84a41233cd53091b093954ce7c2edb1470cd98b6
https://github.com/okfn/ckan/commit/84a41233cd53091b093954ce7c2edb1470cd98b6
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M ckan/public/base/javascript/modules/api-info.js
M ckan/public/base/javascript/modules/confirm-delete.js
M ckan/public/base/test/spec/modules/confirm-delete.spec.js
Log Message:
-----------
[#2809] Fix a couple of bad translation calls
Commit: f30de7d206716708cd8f272a827517caff2c402a
https://github.com/okfn/ckan/commit/f30de7d206716708cd8f272a827517caff2c402a
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M ckan/public/base/less/footer.less
Log Message:
-----------
[#2375] Fix the display of the language flags
Commit: e962619ea102246367a111509e0e1947b14fc192
https://github.com/okfn/ckan/commit/e962619ea102246367a111509e0e1947b14fc192
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M setup.cfg
Log Message:
-----------
[#2774] Add isPlural as a translation keyword
Commit: d4d63067b022aa280d69ae484385f3f40f7bdf2d
https://github.com/okfn/ckan/commit/d4d63067b022aa280d69ae484385f3f40f7bdf2d
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2375] Show markdown as lioteral in package list snippet
Commit: 8ec841eb449eb6952f056164dbff00bdb165931a
https://github.com/okfn/ckan/commit/8ec841eb449eb6952f056164dbff00bdb165931a
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2722] fix group dataset sort
Commit: 3a0f6a8fafb87834a5e91f73304e46c441b42ece
https://github.com/okfn/ckan/commit/3a0f6a8fafb87834a5e91f73304e46c441b42ece
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2375] Fix bug in format_resource_items
Commit: 5f8b62d809db6df40e03278d3c4475d41bf3bc4c
https://github.com/okfn/ckan/commit/5f8b62d809db6df40e03278d3c4475d41bf3bc4c
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2375] Improve fi of format_resource_items
Commit: 25147b18a499d47a699a9db125c43b3b9c58fc4b
https://github.com/okfn/ckan/commit/25147b18a499d47a699a9db125c43b3b9c58fc4b
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-08 (Wed, 08 Aug 2012)
Changed paths:
A ckan/public/base/javascript/config.ini
Log Message:
-----------
[#2618] Add config.ini
Commit: 4b9e6d9f0b17d7feb0ef40dc0a237947f5079dad
https://github.com/okfn/ckan/commit/4b9e6d9f0b17d7feb0ef40dc0a237947f5079dad
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
[#2375] Lower logging priority of config loading in app_global INFO -> DEBUG
Commit: f49437c4d5ef704de87560d1fe8509db0b5d9b58
https://github.com/okfn/ckan/commit/f49437c4d5ef704de87560d1fe8509db0b5d9b58
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
A ckan/lib/formatters.py
M ckan/lib/helpers.py
Log Message:
-----------
[#2707] More Resource item listing improvements i18n etc
Commit: d47a278c4371d7487f549d4d3915f5800691ae38
https://github.com/okfn/ckan/commit/d47a278c4371d7487f549d4d3915f5800691ae38
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/public/base/javascript/client.js
M ckan/public/base/test/spec/client.spec.js
Log Message:
-----------
[#2375] Fix inconsistency with Firefox date parsing
Commit: 216ac52859558c8fc84c33af4d2efe27e33dbeed
https://github.com/okfn/ckan/commit/216ac52859558c8fc84c33af4d2efe27e33dbeed
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/images/flags.png
M ckan/public/base/less/footer.less
Log Message:
-----------
[#2700] Update language box with new flags
Commit: 5c65383ddc7e2022ad1a17a2d30a9f3335b9eac9
https://github.com/okfn/ckan/commit/5c65383ddc7e2022ad1a17a2d30a9f3335b9eac9
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/templates/snippets/facet_list.html
Log Message:
-----------
[#2375] Facet list bugfix format param missing
Commit: bf2324203e3514db54d4aed73169fe5913bc67bb
https://github.com/okfn/ckan/commit/bf2324203e3514db54d4aed73169fe5913bc67bb
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/public/base/less/footer.less
M ckan/templates/snippets/language_selector.html
Log Message:
-----------
[#2375] Fix the position of the language picker on Firefox
Commit: 7309f372ad31db46a67dc50b2b4b98f9c8f9f216
https://github.com/okfn/ckan/commit/7309f372ad31db46a67dc50b2b4b98f9c8f9f216
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/model/__init__.py
M ckan/model/domain_object.py
Log Message:
-----------
[#2816] Re-add some items to model.__init__
Conflicts:
ckan/model/__init__.py
new stuff added in both trivial
Commit: 7586fba5fd90c7754103c1230299d5f9fbaf3329
https://github.com/okfn/ckan/commit/7586fba5fd90c7754103c1230299d5f9fbaf3329
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/templates/group/index.html
Log Message:
-----------
[#2812] Change What is Group text
Commit: 3f6f3fd3581c20da73afc25b9a450307360877b9
https://github.com/okfn/ckan/commit/3f6f3fd3581c20da73afc25b9a450307360877b9
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/templates/snippets/sort_by.html
Log Message:
-----------
[#2722] Add documentation to sort by snippet
Commit: 1aa96dec59715da9a7edad57d1cfda742c320dd7
https://github.com/okfn/ckan/commit/1aa96dec59715da9a7edad57d1cfda742c320dd7
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/templates/package/snippets/search_form.html
Log Message:
-----------
[#2722] Re implement the sort by field on the group form
Commit: 876923329995652aa289c93f3437da86709dc43a
https://github.com/okfn/ckan/commit/876923329995652aa289c93f3437da86709dc43a
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2722] Add c.sort_by_selected to group read template
Commit: 7c86e31ad775cedf1b8192d5cc05ceb321bf0aec
https://github.com/okfn/ckan/commit/7c86e31ad775cedf1b8192d5cc05ceb321bf0aec
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/media.less
M ckan/templates/home/index.html
Log Message:
-----------
[#2781] Fix display of homepage when image fails to load
Commit: b754828b6cd92ce1badec9c35018f113105afc2d
https://github.com/okfn/ckan/commit/b754828b6cd92ce1badec9c35018f113105afc2d
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/templates/snippets/group_item.html
Log Message:
-----------
[#2375] Group images now use url_for_static
Commit: c886f02118d1d0499e861cb1e1829e0c8e50d576
https://github.com/okfn/ckan/commit/c886f02118d1d0499e861cb1e1829e0c8e50d576
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/lib/formatters.py
Log Message:
-----------
[#2375] Fix wrong month in locale date formatting
Commit: ac8e2a013b6a0fb9cff869ec8684f83836659be9
https://github.com/okfn/ckan/commit/ac8e2a013b6a0fb9cff869ec8684f83836659be9
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/templates/package/read.html
A ckan/templates/package/snippets/resources_list.html
M ckan/templates/related/snippets/related_item.html
Log Message:
-----------
[#2375] Add blocks around package elements
This should help with extensibility allowing theme developers to
add content in between existing elements.
Commit: 54271f613bb1d0bb0106f1d356622723a31ffa60
https://github.com/okfn/ckan/commit/54271f613bb1d0bb0106f1d356622723a31ffa60
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/config/environment.py
M ckan/lib/jinja_extensions.py
Log Message:
-----------
[#2375] Recursive ckan_extends tags supported ///\\\OO///\\\
Commit: 380ce93158e963d0e531d70504b78a0ae1e763f4
https://github.com/okfn/ckan/commit/380ce93158e963d0e531d70504b78a0ae1e763f4
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/__init__.py
Log Message:
-----------
[#2375] Demo version 2.0a needed for extensions
Commit: 54498dc28d8ec0f924d02e3dc6c1cf220fb67e2c
https://github.com/okfn/ckan/commit/54498dc28d8ec0f924d02e3dc6c1cf220fb67e2c
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/templates/package/snippets/resource_item.html
Log Message:
-----------
[#2375] Hook block for resource title
Commit: c6429cc033ebad1eb97b991bf3b2134d15dbb3ad
https://github.com/okfn/ckan/commit/c6429cc033ebad1eb97b991bf3b2134d15dbb3ad
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/templates/snippets/group.html
Log Message:
-----------
[#2826] Static url for group image
Commit: ea10c78f611fb43f23de80fdf560e8426328b833
https://github.com/okfn/ckan/commit/ea10c78f611fb43f23de80fdf560e8426328b833
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/lib/jinja_extensions.py
Log Message:
-----------
[#2375] Make {% ckan_extends %} assume same temp[late name
Commit: 4c176ff8d8c9671396d649a52341c2479ebde007
https://github.com/okfn/ckan/commit/4c176ff8d8c9671396d649a52341c2479ebde007
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/templates/related/snippets/related_item.html
M ckan/templates/related/snippets/related_list.html
Log Message:
-----------
[#2801] Documented the related item snippets
Also updated an instance of {% include %} to use snippets
Commit: 17e477ed9227c7fc1590ab091c0500014a3e3e09
https://github.com/okfn/ckan/commit/17e477ed9227c7fc1590ab091c0500014a3e3e09
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
A ckan/public/base/javascript/plugins/jquery.truncator.js
Log Message:
-----------
[#2801] Add a patched version of jQuery.fn.truncate()
This was patched to add more functionality than the original
provides.
Commit: baca89a1f0774de40978adeae51eb4b4f20b4e3e
https://github.com/okfn/ckan/commit/baca89a1f0774de40978adeae51eb4b4f20b4e3e
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
A ckan/templates/ajax_snippets/related-item.html
Log Message:
-----------
[#2801] Add an ajax snippet for loading a related item
Commit: e83df46332760916f346e6ba88a257883c6946fc
https://github.com/okfn/ckan/commit/e83df46332760916f346e6ba88a257883c6946fc
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
A ckan/public/base/javascript/modules/related-item.js
M ckan/public/base/less/media.less
M ckan/public/base/less/variables.less
M ckan/public/base/test/index.html
A ckan/public/base/test/spec/modules/related-item.spec.js
M ckan/templates/snippets/scripts.html
Log Message:
-----------
[#2801] Add a related-item module
This handles toggling between truncated description text and the
full text. Updated the CSS and added some unit tests.
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: 704ad386439346c0b9a4d9840cb1f021b636d6ce
https://github.com/okfn/ckan/commit/704ad386439346c0b9a4d9840cb1f021b636d6ce
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/templates/admin/index.html
Log Message:
-----------
[#2375] Fix admin index template
Commit: f7c68be3097d8bb538cc72e66775eef91d744f1a
https://github.com/okfn/ckan/commit/f7c68be3097d8bb538cc72e66775eef91d744f1a
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/config/middleware.py
M ckan/templates/snippets/language_selector.html
Log Message:
-----------
[#2825] Fix language change issue with querystring params
Commit: f04c85af9cad63777031126dc0aedddfec04bc94
https://github.com/okfn/ckan/commit/f04c85af9cad63777031126dc0aedddfec04bc94
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/config/middleware.py
Log Message:
-----------
[#2825] Bugfix for Language changing querystring issue
Commit: f3602376027a2758ac5d501cf408bc1bb87c9bc2
https://github.com/okfn/ckan/commit/f3602376027a2758ac5d501cf408bc1bb87c9bc2
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/lib/formatters.py
Log Message:
-----------
[#2375] Fix translation strings for friendly dates
Commit: 1b39c41f179adc9cd9c8062c65b709be422e4bde
https://github.com/okfn/ckan/commit/1b39c41f179adc9cd9c8062c65b709be422e4bde
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[#2375] Move url for primer etc so they don't get eaten
Commit: 9285ecd27da4960e488ae05e6c8565157a69610a
https://github.com/okfn/ckan/commit/9285ecd27da4960e488ae05e6c8565157a69610a
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/templates/development/snippets/form.html
Log Message:
-----------
[#2375] Add textarea to primer
Commit: c531c692034daf4f466d32ae1a82dd20bb910ddb
https://github.com/okfn/ckan/commit/c531c692034daf4f466d32ae1a82dd20bb910ddb
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#2375] Add extra hook block in resource read template
Commit: 0e7fd02d80bd822c85a5d754dec1f10010273cbe
https://github.com/okfn/ckan/commit/0e7fd02d80bd822c85a5d754dec1f10010273cbe
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/config/middleware.py
M ckan/templates/snippets/language_selector.html
Log Message:
-----------
[#2375] Cleanup of CKAN_CURRENT_URL as issue also affects legacy templates
Commit: 84711c6bdb2f8f7fe56ba3c5ea1c58752ebff2ed
https://github.com/okfn/ckan/commit/84711c6bdb2f8f7fe56ba3c5ea1c58752ebff2ed
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/lib/formatters.py
Log Message:
-----------
[#2375] Cleanup formatters to be more private
Commit: 3384ad91fc8c64d80f4a2218320a04a34eb4c551
https://github.com/okfn/ckan/commit/3384ad91fc8c64d80f4a2218320a04a34eb4c551
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/lib/formatters.py
Log Message:
-----------
[#2375] Cleanup formatters private MONTH_FUNCTIONS
Commit: 3d78e31f12ab743e9b057b4f3ea7bdc9566a2081
https://github.com/okfn/ckan/commit/3d78e31f12ab743e9b057b4f3ea7bdc9566a2081
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/lib/jinja_extensions.py
Log Message:
-----------
[#2375] No longer use template path in ckan_extends tag
Commit: b53c8c85e38c0cc3007736f28f6ee947d3e6acb1
https://github.com/okfn/ckan/commit/b53c8c85e38c0cc3007736f28f6ee947d3e6acb1
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/config/environment.py
M ckan/lib/app_globals.py
Log Message:
-----------
[#2375] fix app globals initialisation issue
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: 5d983a7dc36b5ee7a5c1632c6d6fd4d82591ed19
https://github.com/okfn/ckan/commit/5d983a7dc36b5ee7a5c1632c6d6fd4d82591ed19
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2375] Allow facet title set in config
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
Commit: abf6adb3fbd537f509ac690ca06c345281ba09a1
https://github.com/okfn/ckan/commit/abf6adb3fbd537f509ac690ca06c345281ba09a1
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/lib/activity_streams.py
M ckan/lib/helpers.py
Log Message:
-----------
Minor bugfix
Commit: d88ca4d56dd8befd5dde7f608bba8d1cb46373ec
https://github.com/okfn/ckan/commit/d88ca4d56dd8befd5dde7f608bba8d1cb46373ec
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/lib/activity_streams.py
M ckan/lib/helpers.py
Log Message:
-----------
Merge branch 'master' into 2375-demo-theme-development
Commit: c547903d7904a44fbeddc57317b145b0c49a2897
https://github.com/okfn/ckan/commit/c547903d7904a44fbeddc57317b145b0c49a2897
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/controllers/home.py
Log Message:
-----------
[#2375] show group dataset description on home page
Commit: 58381ffa36f1da939522eb58617d17d7688e0d74
https://github.com/okfn/ckan/commit/58381ffa36f1da939522eb58617d17d7688e0d74
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2375] nicer user link formatting
Commit: a6fa5a0f743342ae6b24585abb4fdb64e86bd495
https://github.com/okfn/ckan/commit/a6fa5a0f743342ae6b24585abb4fdb64e86bd495
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/forms.less
Log Message:
-----------
[#2837] Try and normalize the styling of checkboxes
Now have the same vertical alignment on FF/Webkit on Ubuntu and Firefox
on the Mac. Webkit on the Mac is slightly too high.
Commit: f7bc1c92059a36c85824f3e77f66297dfde9b6d3
https://github.com/okfn/ckan/commit/f7bc1c92059a36c85824f3e77f66297dfde9b6d3
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/masthead.less
Log Message:
-----------
[#2840] Align the tagline to the left
This can be switched back to the right by adding a class of
.tagline-right to the hgroup element if required.
Commit: 42b38160b4ddc27be36ceec7b1a7c4c618425d2d
https://github.com/okfn/ckan/commit/42b38160b4ddc27be36ceec7b1a7c4c618425d2d
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/public/base/javascript/pubsub.js
M ckan/public/base/test/index.html
Log Message:
-----------
[#2834] Add ability to defer publish() calls until later
Commit: 092d25723f3e8f911b184ec10d50a37cc65be735
https://github.com/okfn/ckan/commit/092d25723f3e8f911b184ec10d50a37cc65be735
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/public/base/javascript/module.js
M ckan/public/base/test/spec/module.spec.js
A ckan/public/base/test/spec/pubsub.spec.js
Log Message:
-----------
[#2834] module.initialize() now defers publish calls
It will now wait until all modules have loaded before publishing
the events to ensure that all modules have a chance of receiving
them regardless of order.
Commit: a317fb90f0c3142e1cefe7ad76aaa30457b2d5da
https://github.com/okfn/ckan/commit/a317fb90f0c3142e1cefe7ad76aaa30457b2d5da
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/templates/snippets/scripts.html
Log Message:
-----------
[#2841] Add missing form warning script
Commit: 70c3d22b32e64f30abd55a4e0b594dffb4c8766a
https://github.com/okfn/ckan/commit/70c3d22b32e64f30abd55a4e0b594dffb4c8766a
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/public/base/javascript/client.js
M ckan/public/base/test/spec/client.spec.js
Log Message:
-----------
[#2835] Added Client#getTemplate() method
Commit: e53417f9976d6df7dc6c64a03dbf0f775aee0987
https://github.com/okfn/ckan/commit/e53417f9976d6df7dc6c64a03dbf0f775aee0987
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/public/base/test/index.html
Log Message:
-----------
[#2835] Updated loadFixture() to use Client#getTemplate()
Commit: 5654b6a0dc95ad444d60a0deda7310e14d9ce5a2
https://github.com/okfn/ckan/commit/5654b6a0dc95ad444d60a0deda7310e14d9ce5a2
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2375] Update coding standards with missing todo's
Commit: b31316c068260fdd12fc215230a25932b2f767fd
https://github.com/okfn/ckan/commit/b31316c068260fdd12fc215230a25932b2f767fd
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
A ckan/public/base/javascript/modules/confirm-action.js
R ckan/public/base/javascript/modules/confirm-delete.js
M ckan/public/base/test/index.html
A ckan/public/base/test/spec/modules/confirm-action.spec.js
R ckan/public/base/test/spec/modules/confirm-delete.spec.js
M ckan/templates/group/snippets/group_form.html
M ckan/templates/package/snippets/package_form.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/related/snippets/related_form.html
M ckan/templates/snippets/scripts.html
Log Message:
-----------
[#2375] Rename confirm-delete module to confirm-action
Commit: c045d2c113311ce37e88cc7325614332b5060502
https://github.com/okfn/ckan/commit/c045d2c113311ce37e88cc7325614332b5060502
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M doc/frontend-development.rst
Log Message:
-----------
[#2375] Update front end docs
* Add links to the other pages
* Update testing section with more examples
Commit: a4780ad9a5b53d7837bfbe15f5fcaf908e55ba90
https://github.com/okfn/ckan/commit/a4780ad9a5b53d7837bfbe15f5fcaf908e55ba90
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M doc/extension-templating.rst
M doc/templating.rst
Log Message:
-----------
[#2375] Update documentation for {% ckan_extends %}
Commit: f939f99cf2078c00eea297afb36d94a86b03b811
https://github.com/okfn/ckan/commit/f939f99cf2078c00eea297afb36d94a86b03b811
Author: kindly <kindly at gmail.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/controllers/home.py
Log Message:
-----------
[#2375] get featured groups from search facets
Commit: 865d72764867502e1290df87f7416992f60f2875
https://github.com/okfn/ckan/commit/865d72764867502e1290df87f7416992f60f2875
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M doc/frontend-development.rst
A doc/template-tutorial.rst
Log Message:
-----------
[#2375] Add a quick template tutorial
Commit: 6055b064143353a68fd1ebb2684903e6e4c24093
https://github.com/okfn/ckan/commit/6055b064143353a68fd1ebb2684903e6e4c24093
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/public/base/less/module.less
M ckan/templates/snippets/package_grid.html
A ckan/templates/snippets/package_item.html
M ckan/templates/snippets/package_list.html
Log Message:
-----------
[#2375] Fix the display of the package_grid.html
Floated items were getting caught on the previous row if the heights
varied too much.
Commit: 2fdd2beccbf396497e255ffb803675f3c492ff2d
https://github.com/okfn/ckan/commit/2fdd2beccbf396497e255ffb803675f3c492ff2d
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/public/base/javascript/main.js
Log Message:
-----------
[#2375] Remove old jQuery.when() in ckan.initialize()
Good old IE8 for picking this one up.
Commit: 129352c3751336681c490c0d532814d56ce26138
https://github.com/okfn/ckan/commit/129352c3751336681c490c0d532814d56ce26138
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/public/base/less/module.less
M ckan/templates/home/index.html
Log Message:
-----------
[#2375] Fix up homepage display in IE8
Commit: 848bb75481536ce4d0a79aeb8271e6e39cbca619
https://github.com/okfn/ckan/commit/848bb75481536ce4d0a79aeb8271e6e39cbca619
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/controllers/home.py
Log Message:
-----------
[#2375] Fix up group selection for home page to use various methods including config option
Commit: 97d92bacdf64847772b2e0b6c70e58508dfbeb2a
https://github.com/okfn/ckan/commit/97d92bacdf64847772b2e0b6c70e58508dfbeb2a
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/public/base/javascript/modules/confirm-action.js
Log Message:
-----------
[#2808] Centre the confirm action dialog vertically
Commit: 9ee4b309eac35c4657ffbea26657bb467dca0a2f
https://github.com/okfn/ckan/commit/9ee4b309eac35c4657ffbea26657bb467dca0a2f
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
Log Message:
-----------
[#2375] Update CSS with IE8 fixes
Commit: 0ac6b3db2ca78aa4719347b0e5321acd9911ebe2
https://github.com/okfn/ckan/commit/0ac6b3db2ca78aa4719347b0e5321acd9911ebe2
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#2375] Add hooks to the resource_read template
Commit: ddc98cc5eec70c328733642c66c4205d7885bfd4
https://github.com/okfn/ckan/commit/ddc98cc5eec70c328733642c66c4205d7885bfd4
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/templates/ajax_snippets/api_info.html
Log Message:
-----------
[#2375] Add missing links to the api_info template
Commit: e4b164ff8eac1d8f5b4e02bc5012dcada8bd14bb
https://github.com/okfn/ckan/commit/e4b164ff8eac1d8f5b4e02bc5012dcada8bd14bb
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/forms.less
M ckan/public/base/less/module.less
Log Message:
-----------
[#2375] Update styles
Commit: 532a6b07c2780a0fa31aef8ec231f714334d12d6
https://github.com/okfn/ckan/commit/532a6b07c2780a0fa31aef8ec231f714334d12d6
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/forms.less
Log Message:
-----------
[#2375] Style info text for full width inputs
Commit: 8adcc5a106d897c29d44ff3fe589521b024c11f6
https://github.com/okfn/ckan/commit/8adcc5a106d897c29d44ff3fe589521b024c11f6
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/templates/macros/form.html
Log Message:
-----------
[#2375] Add a form.info() macro to create help text
Commit: c710e3f12db47716de6d7d000ae859e69e803b77
https://github.com/okfn/ckan/commit/c710e3f12db47716de6d7d000ae859e69e803b77
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
A ckan/templates/macros/autoform.html
M ckan/templates/macros/form.html
Log Message:
-----------
[#2375] Move autoform macro into it's own file
This allows us to dynamically pick the form macro to use and cleans
up the template nicely.
Commit: f687fafb33fda32a0da8f678528e8bb92af257c9
https://github.com/okfn/ckan/commit/f687fafb33fda32a0da8f678528e8bb92af257c9
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/forms.less
Log Message:
-----------
[#2375] Update the info box css
Commit: 1a3839a6d951d57783e9f1e11e4485f721fb28e6
https://github.com/okfn/ckan/commit/1a3839a6d951d57783e9f1e11e4485f721fb28e6
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/templates/admin/config.html
Log Message:
-----------
[#2375] Update config to use new auto form
Commit: 9d097d21a863b27592fffc27ee8c47882a4f6113
https://github.com/okfn/ckan/commit/9d097d21a863b27592fffc27ee8c47882a4f6113
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/public/base/less/forms.less
M ckan/templates/macros/autoform.html
Log Message:
-----------
[#2375] Add support for error summaries to autoform macro
Commit: 7f181de66b234730db2a0659e81c9a4a8aa2c4e9
https://github.com/okfn/ckan/commit/7f181de66b234730db2a0659e81c9a4a8aa2c4e9
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/forms.less
M ckan/templates/macros/form.html
M ckan/templates/package/snippets/package_basic_fields.html
Log Message:
-----------
[#2375] Update all info blocks to sit below inputs
To make info sit inline add a class of .info-inline to the info
element.
Commit: 634b57b74ecc4556c1497d4d0a747a42be23e89b
https://github.com/okfn/ckan/commit/634b57b74ecc4556c1497d4d0a747a42be23e89b
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/templates/macros/form.html
Log Message:
-----------
[#2375] Update form.info() to allow inline info boxes
Commit: 36bd991cee2a79299dff061103f931523d420c64
https://github.com/okfn/ckan/commit/36bd991cee2a79299dff061103f931523d420c64
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/templates/macros/form.html
Log Message:
-----------
[#2375] Pass extra_html string into input_block macro
This prevents the info appearing before the errors.
Commit: abfd030629661d3e4f179ebbb107acd470075ea7
https://github.com/okfn/ckan/commit/abfd030629661d3e4f179ebbb107acd470075ea7
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-15 (Wed, 15 Aug 2012)
Changed paths:
M ckan/__init__.py
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/home.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/app_globals.py
M ckan/lib/dictization/model_dictize.py
A ckan/lib/formatters.py
M ckan/lib/helpers.py
M ckan/lib/jinja_extensions.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/__init__.py
M ckan/model/domain_object.py
M ckan/model/meta.py
M ckan/public/base/css/main.css
M ckan/public/base/images/flags.png
M ckan/public/base/javascript/client.js
A ckan/public/base/javascript/config.ini
M ckan/public/base/javascript/main.js
M ckan/public/base/javascript/module.js
M ckan/public/base/javascript/modules/api-info.js
A ckan/public/base/javascript/modules/confirm-action.js
R ckan/public/base/javascript/modules/confirm-delete.js
A ckan/public/base/javascript/modules/related-item.js
A ckan/public/base/javascript/plugins/jquery.truncator.js
M ckan/public/base/javascript/pubsub.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/footer.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/masthead.less
M ckan/public/base/less/media.less
M ckan/public/base/less/module.less
M ckan/public/base/less/variables.less
M ckan/public/base/test/index.html
M ckan/public/base/test/spec/client.spec.js
M ckan/public/base/test/spec/module.spec.js
A ckan/public/base/test/spec/modules/confirm-action.spec.js
R ckan/public/base/test/spec/modules/confirm-delete.spec.js
A ckan/public/base/test/spec/modules/related-item.spec.js
A ckan/public/base/test/spec/pubsub.spec.js
A ckan/templates/activity_streams/activity_stream_items.html
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
M ckan/templates/admin/config.html
M ckan/templates/admin/index.html
M ckan/templates/ajax_snippets/api_info.html
A ckan/templates/ajax_snippets/related-item.html
M ckan/templates/development/snippets/form.html
M ckan/templates/group/index.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/home/index.html
A ckan/templates/macros/autoform.html
M ckan/templates/macros/form.html
M ckan/templates/package/read.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_form.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resource_item.html
A ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/search_form.html
M ckan/templates/related/snippets/related_form.html
M ckan/templates/related/snippets/related_item.html
M ckan/templates/related/snippets/related_list.html
M ckan/templates/snippets/facet_list.html
M ckan/templates/snippets/group.html
M ckan/templates/snippets/group_item.html
M ckan/templates/snippets/language_selector.html
M ckan/templates/snippets/package_grid.html
A ckan/templates/snippets/package_item.html
M ckan/templates/snippets/package_list.html
M ckan/templates/snippets/scripts.html
M ckan/templates/snippets/sort_by.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
M doc/coding-standards.rst
M doc/extension-templating.rst
M doc/frontend-development.rst
A doc/template-tutorial.rst
M doc/templating.rst
M setup.cfg
Log Message:
-----------
Merge branch '2375-demo-theme-development' into 2618-nested-resources
Conflicts:
ckan/controllers/home.py
trivial merge
ckan/templates/snippets/scripts.html
extra module added
Commit: 3daacbea6712b448f47fe4342a85e077ad74466f
https://github.com/okfn/ckan/commit/3daacbea6712b448f47fe4342a85e077ad74466f
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-15 (Wed, 15 Aug 2012)
Changed paths:
M ckan/html_resources/__init__.py
Log Message:
-----------
[#2618] Prints to logging in html_resources
Commit: 861c24a28d20ba36a5774a8a946452ceba70b86d
https://github.com/okfn/ckan/commit/861c24a28d20ba36a5774a8a946452ceba70b86d
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-15 (Wed, 15 Aug 2012)
Changed paths:
M ckan/html_resources/__init__.py
Log Message:
-----------
[#2618] Add IE conditionals via config
Commit: 405ab3fa3348d8291f18140a0a305c9344974050
https://github.com/okfn/ckan/commit/405ab3fa3348d8291f18140a0a305c9344974050
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-15 (Wed, 15 Aug 2012)
Changed paths:
M ckan/html_resources/__init__.py
Log Message:
-----------
[#2618] dependencies for groups
Commit: 1c62a1e591f821d9fb3c450a60d4f695ce6cc754
https://github.com/okfn/ckan/commit/1c62a1e591f821d9fb3c450a60d4f695ce6cc754
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-15 (Wed, 15 Aug 2012)
Changed paths:
M ckan/html_resources/__init__.py
M ckan/templates/package/resource_read.html
M ckan/templates/snippets/scripts.html
Log Message:
-----------
[#2618] Upgrade templates
Commit: 36667990f3255ce9f8da73e43ea2abbfa817e0ee
https://github.com/okfn/ckan/commit/36667990f3255ce9f8da73e43ea2abbfa817e0ee
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-15 (Wed, 15 Aug 2012)
Changed paths:
A ckan/public/base/datapreview/resource.config
M ckan/public/base/javascript/resource.config
A ckan/public/base/vendor/resource.config
Log Message:
-----------
[#2618] Update/add config files for resources
Commit: d43d88cd5060e126541fee48515b715a2e3406ae
https://github.com/okfn/ckan/commit/d43d88cd5060e126541fee48515b715a2e3406ae
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-15 (Wed, 15 Aug 2012)
Changed paths:
A ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.js
A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.js
Log Message:
-----------
[#2618] Add "unminified" js files
Commit: a75cc9d35c710d9841e7c12cc054bd6f85d5629c
https://github.com/okfn/ckan/commit/a75cc9d35c710d9841e7c12cc054bd6f85d5629c
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-15 (Wed, 15 Aug 2012)
Changed paths:
M ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.js
M ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
M ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
M ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.js
Log Message:
-----------
[#2618] Ckan minify js files
Compare: https://github.com/okfn/ckan/compare/987dde50d52a...a75cc9d35c71
More information about the ckan-changes
mailing list