[ckan-changes] [okfn/ckan] b5c55e: [#1744, merge][s]: Merge (unfinished) branch 'featu...
GitHub
noreply at github.com
Tue Feb 21 21:52:54 UTC 2012
Branch: refs/heads/feature-1744-ux-dataset-edit-dec-2011
Home: https://github.com/okfn/ckan
Commit: b5c55e0bf5c5400a641e0fa8e0222efe8b2b2463
https://github.com/okfn/ckan/commit/b5c55e0bf5c5400a641e0fa8e0222efe8b2b2463
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-02-03 (Fri, 03 Feb 2012)
Changed paths:
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
Log Message:
-----------
[#1744,merge][s]: Merge (unfinished) branch 'feature-1744-ux-dataset-edit-dec-2011' to bring in (complete) enhancement for resource type drop-downs.
Commit: c0327297f72743ba8631bb062c553810219d2459
https://github.com/okfn/ckan/commit/c0327297f72743ba8631bb062c553810219d2459
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-02-03 (Fri, 03 Feb 2012)
Changed paths:
M ckan/public/css/style.css
M ckan/templates/user/read.html
Log Message:
-----------
[#1396][xs]: css fix for #1396.
Commit: f93a103cfc596f1f646c0c001485d893e30ae988
https://github.com/okfn/ckan/commit/f93a103cfc596f1f646c0c001485d893e30ae988
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-02-03 (Fri, 03 Feb 2012)
Changed paths:
M ckan/public/css/style.css
M ckan/templates/user/read.html
Log Message:
-----------
[#1396][xs]: further xs css/layout fix for #1396.
Commit: ba07896d8cb9444bfb24348003a8dbdbae82beaf
https://github.com/okfn/ckan/commit/ba07896d8cb9444bfb24348003a8dbdbae82beaf
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-02-05 (Sun, 05 Feb 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Limit activity streams to latest 15 activities
Commit: a7e49d0456e701873000bbf291615253e2784c72
https://github.com/okfn/ckan/commit/a7e49d0456e701873000bbf291615253e2784c72
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-02-05 (Sun, 05 Feb 2012)
Changed paths:
M ckan/public/css/style.css
M ckan/templates/_util.html
M ckan/templates/activity_streams/added_tag.html
M ckan/templates/activity_streams/changed_group.html
M ckan/templates/activity_streams/changed_package.html
M ckan/templates/activity_streams/changed_package_extra.html
M ckan/templates/activity_streams/changed_resource.html
M ckan/templates/activity_streams/changed_user.html
M ckan/templates/activity_streams/deleted_group.html
M ckan/templates/activity_streams/deleted_package.html
M ckan/templates/activity_streams/deleted_package_extra.html
M ckan/templates/activity_streams/deleted_resource.html
M ckan/templates/activity_streams/new_group.html
M ckan/templates/activity_streams/new_package.html
M ckan/templates/activity_streams/new_package_extra.html
M ckan/templates/activity_streams/new_resource.html
M ckan/templates/activity_streams/new_user.html
M ckan/templates/activity_streams/removed_tag.html
Log Message:
-----------
[#1639] Add some basic CSS to activity streams
Just so they look better than being completely unstyled, trying to make
them a little better to scan with the eyes: emphasise the actor, object
and (to a lesser extend) the verb, demphasise the date, and add some
vertical space in-between activities.
Also tidied up the HTML, the CSS classes, and the Genshi macro a little.
Commit: 2a58612fe19ddfbb85b93ad1453bc51245678013
https://github.com/okfn/ckan/commit/2a58612fe19ddfbb85b93ad1453bc51245678013
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-02-05 (Sun, 05 Feb 2012)
Changed paths:
M ckan/public/css/style.css
M ckan/templates/_util.html
M ckan/templates/activity_streams/added_tag.html
M ckan/templates/activity_streams/changed_package_extra.html
M ckan/templates/activity_streams/changed_resource.html
M ckan/templates/activity_streams/deleted_package_extra.html
M ckan/templates/activity_streams/deleted_resource.html
M ckan/templates/activity_streams/new_package_extra.html
M ckan/templates/activity_streams/new_resource.html
M ckan/templates/activity_streams/removed_tag.html
Log Message:
-----------
Add 'target' arg to activity streams Genshi macro
Brings it inline with the http://activitystrea.ms/ standard: actor,
verb, object, target.
Commit: 92792e11f42dda9c3c773022f24c312cb3501f3d
https://github.com/okfn/ckan/commit/92792e11f42dda9c3c773022f24c312cb3501f3d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-02-05 (Sun, 05 Feb 2012)
Changed paths:
M ckan/templates/activity_streams/deleted_package.html
Log Message:
-----------
Fix deleted_package.html activity streams template
Commit: ebab223b9ef15d423fcd688de0e4f9ecaabbbc05
https://github.com/okfn/ckan/commit/ebab223b9ef15d423fcd688de0e4f9ecaabbbc05
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-02-05 (Sun, 05 Feb 2012)
Changed paths:
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
Correct a typo in a comment
Commit: f398befac9365d656a9a76d7439e464e5f7b9bcb
https://github.com/okfn/ckan/commit/f398befac9365d656a9a76d7439e464e5f7b9bcb
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-02-05 (Sun, 05 Feb 2012)
Changed paths:
A ckan/tests/functional/test_activity.py
Log Message:
-----------
[#1694] Add functional tests for activity streams HTML rendering
Commit: 1c03f5ba41c1a9a567405c481f8d18d77b0f8b0a
https://github.com/okfn/ckan/commit/1c03f5ba41c1a9a567405c481f8d18d77b0f8b0a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-02-05 (Sun, 05 Feb 2012)
Changed paths:
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
Fix a test that was broken by commit a7e49d0
Commit: 7f0c3d9ef19d027ecd783f2a4864076a3e786861
https://github.com/okfn/ckan/commit/7f0c3d9ef19d027ecd783f2a4864076a3e786861
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-02-05 (Sun, 05 Feb 2012)
Changed paths:
M ckan/tests/functional/test_activity.py
Log Message:
-----------
Remove some unused imports
Commit: 622a2201fa66d2ea3eaf13a9bc22672a687c88f0
https://github.com/okfn/ckan/commit/622a2201fa66d2ea3eaf13a9bc22672a687c88f0
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-02-05 (Sun, 05 Feb 2012)
Changed paths:
M ckan/controllers/api.py
M ckan/controllers/authorization_group.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/base.py
M ckan/lib/helpers.py
M ckan/lib/search/index.py
M ckan/logic/__init__.py
M ckan/logic/action/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/model/authorization_group.py
M ckan/model/authz.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
M ckan/templates/_util.html
M ckan/templates/layout_base.html
M ckan/templates/user/read.html
M ckan/tests/functional/test_edit_authz.py
M ckan/tests/functional/test_package_edit_authz.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_helpers.py
M ckan/tests/logic/test_action.py
M doc/apiv3.rst
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into feature-1515-activity-streams
Conflicts:
ckan/controllers/user.py
ckan/logic/action/get.py
ckan/templates/user/read.html
Commit: 49552548101416b2633636c4c0b71b1a464669c2
https://github.com/okfn/ckan/commit/49552548101416b2633636c4c0b71b1a464669c2
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-02-05 (Sun, 05 Feb 2012)
Changed paths:
M ckan/templates/user/read.html
Log Message:
-----------
Fix several tests that were crashing since f93a103
Commit: bad9725a73d56d1bfccd20a3918a6aa6024441c2
https://github.com/okfn/ckan/commit/bad9725a73d56d1bfccd20a3918a6aa6024441c2
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-02-05 (Sun, 05 Feb 2012)
Changed paths:
M ckan/templates/user/read.html
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into feature-1515-activity-streams
Commit: b4f35885dba3cd630489246b2d21f74ec91bc460
https://github.com/okfn/ckan/commit/b4f35885dba3cd630489246b2d21f74ec91bc460
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-02-05 (Sun, 05 Feb 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/templates/user/read.html
Log Message:
-----------
Fix some templating bugs
Commit: 50f09461387cc5f2a171912205de48d692478498
https://github.com/okfn/ckan/commit/50f09461387cc5f2a171912205de48d692478498
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-02-05 (Sun, 05 Feb 2012)
Changed paths:
M ckan/lib/activity.py
M ckan/logic/action/create.py
M ckan/model/tag.py
Log Message:
-----------
Improve some comments and docstrings
Commit: 90c76b0b006cf505698834e833b548634cf10d17
https://github.com/okfn/ckan/commit/90c76b0b006cf505698834e833b548634cf10d17
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-02-06 (Mon, 06 Feb 2012)
Changed paths:
M ckan/lib/helpers.py
M ckan/public/css/style.css
M ckan/tests/lib/test_helpers.py
Log Message:
-----------
[#1719,helpers][xs]: fixes #1719 - broken link for users without a real gravatar.
* Problem: we were providing a default user icon to gravatar (see http://en.gravatar.com/site/implement/images/). However, we were not providing an *absolute* url just the relevative url on the CKAN instance (also weren't url-encoding the link ...). This led to the following 404 url: http://en.gravatar.com/images/icons/user.png
* Fix: use identicon default image from gravatar (no longer provide our own default image).
* Could have corrected this but felt simpler option from multiple persepectives (code, resource usage, ux) was to do this.
Commit: c8abe999511fb6b46279d3c4a5afd191ffc9c7c9
https://github.com/okfn/ckan/commit/c8abe999511fb6b46279d3c4a5afd191ffc9c7c9
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-02-06 (Mon, 06 Feb 2012)
Changed paths:
M doc/prepare-extensions.rst
Log Message:
-----------
[doc][xs]: change mercurial to git-core in instructions for additional software to install.
Commit: 9a3658ed4bf7946ee5d27f58850a287987f814e3
https://github.com/okfn/ckan/commit/9a3658ed4bf7946ee5d27f58850a287987f814e3
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-02-06 (Mon, 06 Feb 2012)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[master][nav] Generalised tag_string_convert()
Now multiple keys in the schema can contribute to the tag list.
Commit: d1886aeecff85a8c60059477f8c62dc3caa6ebdc
https://github.com/okfn/ckan/commit/d1886aeecff85a8c60059477f8c62dc3caa6ebdc
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-02-06 (Mon, 06 Feb 2012)
Changed paths:
M requires/lucid_missing.txt
Log Message:
-----------
[master][requires] Froze the required version of ofs.
Commit: 0c60e95af1a3e38e1fc08645202172fa63d1dcee
https://github.com/okfn/ckan/commit/0c60e95af1a3e38e1fc08645202172fa63d1dcee
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-02-07 (Tue, 07 Feb 2012)
Changed paths:
M ckan/templates/activity_streams/deleted_group.html
M ckan/templates/activity_streams/deleted_package.html
M ckan/templates/activity_streams/deleted_resource.html
Log Message:
-----------
[#1743] Don't link to the deleted objects in "deleted" activities
The link would either be broken or to a page for a deleted object.
Old activities of other types ("created", "updated"...) will still link
to the deleted object if it has since been deleted.
Commit: 495d94466a542d4daf2f3018ff311d2189b70b9a
https://github.com/okfn/ckan/commit/495d94466a542d4daf2f3018ff311d2189b70b9a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-02-07 (Tue, 07 Feb 2012)
Changed paths:
M ckan/templates/_util.html
Log Message:
-----------
Make activity date formats consistent
with date formats elsewhere on the site. Everyone should be using the
render_datetime() helper and if they really want a different date
format, still user render_datetime() but pass their own date_format arg.
Commit: 8f059edf279ec3d184c35bfc29f794a34c9e02fc
https://github.com/okfn/ckan/commit/8f059edf279ec3d184c35bfc29f794a34c9e02fc
Author: David Read <david.read at okfn.org>
Date: 2012-02-07 (Tue, 07 Feb 2012)
Changed paths:
M ckan/lib/hash.py
A ckan/tests/lib/test_hash.py
Log Message:
-----------
[master][1783][xs]: Avoid issue with foreign chars being passed into hash function as unicode.
Commit: 61c01e614514fa499884a21488aadbad7a41bca8
https://github.com/okfn/ckan/commit/61c01e614514fa499884a21488aadbad7a41bca8
Author: David Read <david.read at okfn.org>
Date: 2012-02-07 (Tue, 07 Feb 2012)
Changed paths:
M ckan/tests/functional/api/base.py
Log Message:
-----------
[master][noticket][xs]: Removed unused test code.
Commit: 072786c4095f54daa957ebdfaf87f1b9757ba162
https://github.com/okfn/ckan/commit/072786c4095f54daa957ebdfaf87f1b9757ba162
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-02-07 (Tue, 07 Feb 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/templates/user/read.html
Log Message:
-----------
[#1396,template][xs]: fix check for about being empty and switch to using h.render_datetime rather than our hand-crafted rendering.
Commit: 2acab36f3b643793306f2f078d52000931914688
https://github.com/okfn/ckan/commit/2acab36f3b643793306f2f078d52000931914688
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-02-07 (Tue, 07 Feb 2012)
Changed paths:
M ckan/public/css/style.css
M ckan/templates/_util.html
M ckan/templates/activity_streams/added_tag.html
M ckan/templates/activity_streams/changed_group.html
M ckan/templates/activity_streams/changed_package.html
M ckan/templates/activity_streams/changed_package_extra.html
M ckan/templates/activity_streams/changed_resource.html
M ckan/templates/activity_streams/changed_user.html
M ckan/templates/activity_streams/deleted_group.html
M ckan/templates/activity_streams/deleted_package.html
M ckan/templates/activity_streams/deleted_package_extra.html
M ckan/templates/activity_streams/deleted_resource.html
M ckan/templates/activity_streams/new_group.html
M ckan/templates/activity_streams/new_package.html
M ckan/templates/activity_streams/new_package_extra.html
M ckan/templates/activity_streams/new_resource.html
M ckan/templates/activity_streams/new_user.html
M ckan/templates/activity_streams/removed_tag.html
M ckan/templates/user/read.html
M ckan/tests/functional/test_activity.py
Log Message:
-----------
Tweak activity streams HTML and CSS
Commit: 60820877e2591c5d3fc116ff63967266e696a83e
https://github.com/okfn/ckan/commit/60820877e2591c5d3fc116ff63967266e696a83e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-02-07 (Tue, 07 Feb 2012)
Changed paths:
M ckan/lib/hash.py
M ckan/tests/functional/api/base.py
A ckan/tests/lib/test_hash.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: ad599eacb1fa8c62bc45afe73f130b1ab65f2d3e
https://github.com/okfn/ckan/commit/ad599eacb1fa8c62bc45afe73f130b1ab65f2d3e
Author: David Read <david.read at okfn.org>
Date: 2012-02-07 (Tue, 07 Feb 2012)
Changed paths:
M ckan/tests/lib/test_hash.py
Log Message:
-----------
[master][1783][xs]: Fix hash tests - obviously the hash is not universally determinable.
Commit: 3f03187c8b28247d8b97cc40b076d519016cce23
https://github.com/okfn/ckan/commit/3f03187c8b28247d8b97cc40b076d519016cce23
Author: David Read <david.read at okfn.org>
Date: 2012-02-07 (Tue, 07 Feb 2012)
Changed paths:
M ckan/public/css/style.css
M ckan/templates/_util.html
M ckan/templates/activity_streams/added_tag.html
M ckan/templates/activity_streams/changed_group.html
M ckan/templates/activity_streams/changed_package.html
M ckan/templates/activity_streams/changed_package_extra.html
M ckan/templates/activity_streams/changed_resource.html
M ckan/templates/activity_streams/changed_user.html
M ckan/templates/activity_streams/deleted_group.html
M ckan/templates/activity_streams/deleted_package.html
M ckan/templates/activity_streams/deleted_package_extra.html
M ckan/templates/activity_streams/deleted_resource.html
M ckan/templates/activity_streams/new_group.html
M ckan/templates/activity_streams/new_package.html
M ckan/templates/activity_streams/new_package_extra.html
M ckan/templates/activity_streams/new_resource.html
M ckan/templates/activity_streams/new_user.html
M ckan/templates/activity_streams/removed_tag.html
M ckan/templates/user/read.html
M ckan/tests/functional/test_activity.py
Log Message:
-----------
Merge branch 'master' of ssh://github.com/okfn/ckan
Commit: ed0d130c233fb56d163d12c688463f5507f0174a
https://github.com/okfn/ckan/commit/ed0d130c233fb56d163d12c688463f5507f0174a
Author: David Read <david.read at okfn.org>
Date: 2012-02-07 (Tue, 07 Feb 2012)
Changed paths:
M ckan/lib/base.py
Log Message:
-----------
[master][noticket][xs]: Docstring addded.
Commit: fe6829e163a0e4878c2c701b05c8f6bf2c1c2e4d
https://github.com/okfn/ckan/commit/fe6829e163a0e4878c2c701b05c8f6bf2c1c2e4d
Author: David Read <david.read at okfn.org>
Date: 2012-02-07 (Tue, 07 Feb 2012)
Changed paths:
M ckan/lib/dictization/model_save.py
M ckan/tests/functional/test_package.py
M doc/apiv3.rst
Log Message:
-----------
[master][#1786][lib/dictization]: Fix relationships getting lost when editing the package.
Commit: ed6ddf098293b20137db10f32972321adafcf27f
https://github.com/okfn/ckan/commit/ed6ddf098293b20137db10f32972321adafcf27f
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-02-08 (Wed, 08 Feb 2012)
Changed paths:
M ckan/lib/helpers.py
M ckan/templates/_util.html
M ckan/templates/package/history.html
M ckan/templates/package/read.html
M ckan/tests/functional/test_package.py
M ckan/tests/lib/test_helpers.py
Log Message:
-----------
[master,ux][s]: improve rendering of datetime in frontend by updating h.render_datetime (now like Feb 10, 2010).
* Also have generic option to add hours/mins (with_hours)
* Default is now without hours/min so had to update various templates to reflect this (and a few tests)
Commit: f9fc4f1c308f0e89b081de593d9a8725cc301b30
https://github.com/okfn/ckan/commit/f9fc4f1c308f0e89b081de593d9a8725cc301b30
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-02-08 (Wed, 08 Feb 2012)
Changed paths:
M ckan/lib/base.py
M ckan/lib/dictization/model_save.py
M ckan/lib/hash.py
M ckan/logic/validators.py
M ckan/public/css/style.css
M ckan/templates/_util.html
M ckan/templates/activity_streams/added_tag.html
M ckan/templates/activity_streams/changed_group.html
M ckan/templates/activity_streams/changed_package.html
M ckan/templates/activity_streams/changed_package_extra.html
M ckan/templates/activity_streams/changed_resource.html
M ckan/templates/activity_streams/changed_user.html
M ckan/templates/activity_streams/deleted_group.html
M ckan/templates/activity_streams/deleted_package.html
M ckan/templates/activity_streams/deleted_package_extra.html
M ckan/templates/activity_streams/deleted_resource.html
M ckan/templates/activity_streams/new_group.html
M ckan/templates/activity_streams/new_package.html
M ckan/templates/activity_streams/new_package_extra.html
M ckan/templates/activity_streams/new_resource.html
M ckan/templates/activity_streams/new_user.html
M ckan/templates/activity_streams/removed_tag.html
M ckan/templates/user/read.html
M ckan/tests/functional/api/base.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_package.py
A ckan/tests/lib/test_hash.py
M doc/apiv3.rst
M requires/lucid_missing.txt
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: 9844308e75259f98876c1d9afa5865b0be54c581
https://github.com/okfn/ckan/commit/9844308e75259f98876c1d9afa5865b0be54c581
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-02-08 (Wed, 08 Feb 2012)
Changed paths:
M doc/install-from-source.rst
Log Message:
-----------
[bugfix,doc/install-from-source.rst][s]: refactor and fix bug whereby we pointed to v1.5 for source install and that does not work because v1.5 requires vdm in bitbucket.
Commit: fdcec68e7ec4c8678717d308ef83b3a72ca654dc
https://github.com/okfn/ckan/commit/fdcec68e7ec4c8678717d308ef83b3a72ca654dc
Author: Tom Rees <zephod at gmail.com>
Date: 2012-02-10 (Fri, 10 Feb 2012)
Changed paths:
M ckan/templates/js_strings.html
Log Message:
-----------
[#1744][xs]: Typo fixed.
Commit: 0d5313a7b5bbd587c85d3704d11c8ac783f3b14d
https://github.com/okfn/ckan/commit/0d5313a7b5bbd587c85d3704d11c8ac783f3b14d
Author: Tom Rees <zephod at gmail.com>
Date: 2012-02-10 (Fri, 10 Feb 2012)
Changed paths:
M ckan/public/scripts/application.js
Log Message:
-----------
[#1744][s]: Force format field to be lowercase.
Compare: https://github.com/okfn/ckan/compare/1670430...0d5313a
More information about the ckan-changes
mailing list