No subject
Thu Oct 25 19:26:07 UTC 2012
Commit: b9178f6d68204af931d52069126b7abc3240bf7c
https://github.com/okfn/ckan/commit/b9178f6d68204af931d52069126b7abc3240bf7c
Author: John Martin <me at johnmart.in>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/templates/base.html
Log Message:
-----------
Fixed typo in template. I suspect this never worked.
Commit: 1daea396bccb3ca57725aa90267ee72bce0726fd
https://github.com/okfn/ckan/commit/1daea396bccb3ca57725aa90267ee72bce0726fd
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/controllers/home.py
M ckan/lib/helpers.py
Log Message:
-----------
Make recently_changed_packages_activity_stream a helper
recently_changed_packages_activity_stream was an @property of the
HomeController, but it wasn't working, accessing the property just
returned a property object e.g. <property object at 0x7f7210087e68> not
the HTML string as desired.
I think this is because the @property was declared inside a method, and
properties only work at class-level.
The @property cannot simply be moved to class level because it uses
`context`, a param of the index() function it was defined in.
Instead move recently_changed_packages_activity_stream into helpers.py,
where any template (not just the front page) can access it like this:
{{ h.recently_changed_packages_activity_stream() }}
dashboard_activity_stream is already done the same way (but other
activity streams are not).
This means any existing home/index.html templates that were accessing
recently_changed_packages_activity_stream as an attribute of the
template context itself, will no longer work. However, apparently they
weren't working anyway.
Commit: 60d638414b54a2126dd0346189ac78337c62c697
https://github.com/okfn/ckan/commit/60d638414b54a2126dd0346189ac78337c62c697
Author: John Martin <me at johnmart.in>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/templates/activity_streams/activity_stream_items.html
Log Message:
-----------
[#3018] Added type cast to config item in template
After feedback from @tobes at https://github.com/okfn/ckan/pull/171#commitcomment-2287166
Commit: 09059f6198922a1b1175f0811520328c7e93e527
https://github.com/okfn/ckan/commit/09059f6198922a1b1175f0811520328c7e93e527
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/plugins/interfaces.py
Log Message:
-----------
Added ISearchFacets plugin interface
Commit: 1636f4b8277d1974241f8434ede8cdf8f554a6e6
https://github.com/okfn/ckan/commit/1636f4b8277d1974241f8434ede8cdf8f554a6e6
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/plugins/interfaces.py
Log Message:
-----------
Moved update_facet_titles to IPackageController
Commit: 798004fb5c449005e82f0c81df30a93a9061c9b0
https://github.com/okfn/ckan/commit/798004fb5c449005e82f0c81df30a93a9061c9b0
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/plugins/interfaces.py
Log Message:
-----------
Clean whitespace errors
Commit: 0c7d76c225299adef206f7cd7e603d0d692ac541
https://github.com/okfn/ckan/commit/0c7d76c225299adef206f7cd7e603d0d692ac541
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/lib/helpers.py
M ckan/plugins/interfaces.py
Log Message:
-----------
Merge branch 'master' into 3018-activity-streams-load-more
Commit: c127fa642dd8bd8e1cbe25217d19a39b3c00bfcf
https://github.com/okfn/ckan/commit/c127fa642dd8bd8e1cbe25217d19a39b3c00bfcf
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/tests/functional/test_package.py
Log Message:
-----------
Fix tests
Commit: 67a6121e8c597a157e6b0064764b0da62f17b488
https://github.com/okfn/ckan/commit/67a6121e8c597a157e6b0064764b0da62f17b488
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/user.py
M ckan/lib/activity_streams.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/model/activity.py
A ckan/public/base/javascript/modules/activity-stream.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/forms.less
M ckan/templates/activity_streams/activity_stream_items.html
A ckan/templates/package/activity_stream.html
M test-core.ini
Log Message:
-----------
Merge branch '3018-activity-streams-load-more'
Commit: 15eb468c2a5faee61608c482c98c04e57e84c85a
https://github.com/okfn/ckan/commit/15eb468c2a5faee61608c482c98c04e57e84c85a
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/activity_streams.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/model/activity.py
M ckan/plugins/interfaces.py
A ckan/public/base/javascript/modules/activity-stream.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/forms.less
M ckan/templates/activity_streams/activity_stream_items.html
A ckan/templates/package/activity_stream.html
M ckan/tests/functional/test_package.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' into 2939-orgs
Conflicts:
ckan/lib/helpers.py
trivial merge new functions in org branch and
dashboard_activity_stream() has offset param added
Commit: 072ba8152c1d46c0b483b57fbd9df6eaa4740e60
https://github.com/okfn/ckan/commit/072ba8152c1d46c0b483b57fbd9df6eaa4740e60
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
[#2939] Sean's dashboard test shim - Thanks sean
Commit: 88e8532145d521a449d040d8171a5160c49181dc
https://github.com/okfn/ckan/commit/88e8532145d521a449d040d8171a5160c49181dc
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/model/group.py
Log Message:
-----------
[#2939] Fix group pending package test
Commit: a2958bc0bacd239a18c3d7bb49ef7f573419b83f
https://github.com/okfn/ckan/commit/a2958bc0bacd239a18c3d7bb49ef7f573419b83f
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Sysadmins have all the permissions
Commit: a7c593473e4b63d9be19c46be7acf03e2e2ec207
https://github.com/okfn/ckan/commit/a7c593473e4b63d9be19c46be7acf03e2e2ec207
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
[#2939] Fix couple of dashboard tests
Commit: 06f79973ff219daeb5c32a1d927addde95c1ea36
https://github.com/okfn/ckan/commit/06f79973ff219daeb5c32a1d927addde95c1ea36
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/activity_streams.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/model/activity.py
M ckan/plugins/interfaces.py
A ckan/public/base/javascript/modules/activity-stream.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/forms.less
M ckan/templates/activity_streams/activity_stream_items.html
A ckan/templates/package/activity_stream.html
M ckan/tests/functional/test_package.py
M ckan_deb/usr/lib/ckan/common.sh
M test-core.ini
Log Message:
-----------
Merge branch 'master' into 3016-template-tweaks
Conflicts:
ckan/config/routing.py
some extra offset routes added
Commit: 0e760f9b92c2b8af8d80b9212eb80f25bfa11542
https://github.com/okfn/ckan/commit/0e760f9b92c2b8af8d80b9212eb80f25bfa11542
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[#3016] Imporve docstring and comment
Commit: b21831c3b02e03783b4c6c6d13fa12c60962fc2a
https://github.com/okfn/ckan/commit/b21831c3b02e03783b4c6c6d13fa12c60962fc2a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/activity_streams.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/model/activity.py
M ckan/plugins/interfaces.py
A ckan/public/base/javascript/modules/activity-stream.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/forms.less
M ckan/templates/activity_streams/activity_stream_items.html
A ckan/templates/package/activity_stream.html
M ckan/tests/functional/test_package.py
M test-core.ini
Log Message:
-----------
Merge branch '3016-template-tweaks' of github.com:okfn/ckan into 3016-template-tweaks
Commit: 624e2a29a1eca93850f6e2f6a94bcb1df835fcfc
https://github.com/okfn/ckan/commit/624e2a29a1eca93850f6e2f6a94bcb1df835fcfc
Author: Stefan Wehrmeyer <mail at stefanwehrmeyer.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/i18n/check_po_files.py
Log Message:
-----------
[3004][s] Move polib import into paster command method
Moving from module level in order to not require polib
for paster commands.
Commit: ca58fd6b30af7d71d93563bc4995d6e748855608
https://github.com/okfn/ckan/commit/ca58fd6b30af7d71d93563bc4995d6e748855608
Author: John Glover <glover.john at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/templates/base.html
M ckan/templates/footer.html
M ckan/templates/header.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/page.html
Log Message:
-----------
Merge pull request #180 from okfn/clean-config-from-jinja-templates
Clean config from jinja templates
Commit: 6aa1dc2726a8eb596d55b03897ef74d51c3545ab
https://github.com/okfn/ckan/commit/6aa1dc2726a8eb596d55b03897ef74d51c3545ab
Author: John Glover <glover.john at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/i18n/check_po_files.py
Log Message:
-----------
Merge pull request #203 from okfn/3004-move-polib-import
[3004][s] Move polib import into paster command method
Commit: de13b37ae56aa8a70f0e89b913d79f754f86d2fd
https://github.com/okfn/ckan/commit/de13b37ae56aa8a70f0e89b913d79f754f86d2fd
Author: John Glover <j at johnglover.net>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
M ckan/config/solr/CHANGELOG.txt
A ckan/config/solr/schema-2.0.xml
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/i18n/check_po_files.py
M ckan/lib/activity_streams.py
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/helpers.py
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/logic/action/get.py
M ckan/model/activity.py
M ckan/plugins/interfaces.py
A ckan/public/base/javascript/modules/activity-stream.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/forms.less
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/base.html
M ckan/templates/footer.html
M ckan/templates/header.html
A ckan/templates/package/activity_stream.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/page.html
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_search.py
M ckan/tests/lib/test_solr_package_search.py
M ckan/tests/lib/test_solr_package_search_synchronous_update.py
M ckan_deb/usr/lib/ckan/common.sh
M ckanext/multilingual/solr/schema.xml
M doc/configuration.rst
M test-core.ini
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature-paster-user-add-uses-action-layer
Commit: e9682e66421feef1edde567a33ec646e9f162d3b
https://github.com/okfn/ckan/commit/e9682e66421feef1edde567a33ec646e9f162d3b
Author: John Glover <j at johnglover.net>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[#196] Update usage for user command.
User add will fail with new logic layer validation
if email address is not supplised. Updated usage
string to note that email can be supplied via the
command line.
Commit: 6e7560bdd9d665b6ff53c29403f5ed8a0d54a68f
https://github.com/okfn/ckan/commit/6e7560bdd9d665b6ff53c29403f5ed8a0d54a68f
Author: John Glover <glover.john at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Merge pull request #196 from okfn/feature-paster-user-add-uses-action-layer
[ec] Paster command, "user add", uses defers to action layer.
Commit: f019ca4d93def31f833265aeabeab875e671d37d
https://github.com/okfn/ckan/commit/f019ca4d93def31f833265aeabeab875e671d37d
Author: John Glover <j at johnglover.net>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[#195] Small whitespace changes
Commit: 058ace89bfc8bcf7daa16feffc1cf98400c5a849
https://github.com/okfn/ckan/commit/058ace89bfc8bcf7daa16feffc1cf98400c5a849
Author: John Glover <glover.john at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Merge pull request #195 from okfn/feature-improved-tracking-command
[ec] A very simple tracking stats export.
Commit: 463d18420b736dba135ac1f1dd5b26d52aefcc5d
https://github.com/okfn/ckan/commit/463d18420b736dba135ac1f1dd5b26d52aefcc5d
Author: kindly <kindly at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/templates/package/snippets/package_basic_fields.html
Log Message:
-----------
[2939] fix organization availible helper so can take permission as argument. This was in order to give an org editor the ability to create a dataset
Commit: d6b761e4f6a068f11d05d9ea1e5a9f68f4666da1
https://github.com/okfn/ckan/commit/d6b761e4f6a068f11d05d9ea1e5a9f68f4666da1
Author: kindly <kindly at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/templates/package/snippets/package_basic_fields.html
Log Message:
-----------
[2939] let the new dataset form^Cefault to first org the user belongs to
Commit: 9ef5dab2c2ff332cb2f6eccb6311194c6e7bdc91
https://github.com/okfn/ckan/commit/9ef5dab2c2ff332cb2f6eccb6311194c6e7bdc91
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[#3016] Docstring improvement - Sean is the docstring king :)
Commit: c0ce7e2f2e6aec7cc6066594bf07adf17a3895cb
https://github.com/okfn/ckan/commit/c0ce7e2f2e6aec7cc6066594bf07adf17a3895cb
Author: kindly <kindly at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[2939] show datasets is search to member of the org
Commit: f629913bda36db054ac5b2c7732da519534673ac
https://github.com/okfn/ckan/commit/f629913bda36db054ac5b2c7732da519534673ac
Author: kindly <kindly at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M test-core.ini
Log Message:
-----------
[2939] add extra params to test-core.ini
Commit: 4c57d8074c49b572dccf19b66a0610c9c4daeadf
https://github.com/okfn/ckan/commit/4c57d8074c49b572dccf19b66a0610c9c4daeadf
Author: kindly <kindly at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[2939] fix error in permission
Commit: 34abccc9cd3d06d8884548cc9be687d0ca030624
https://github.com/okfn/ckan/commit/34abccc9cd3d06d8884548cc9be687d0ca030624
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
Merge branch '3016-template-tweaks' of github.com:okfn/ckan into 3016-template-tweaks
Commit: 3ee993f612022b9ae4af5cc0a5d4c8ba37ee7693
https://github.com/okfn/ckan/commit/3ee993f612022b9ae4af5cc0a5d4c8ba37ee7693
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/i18n/check_po_files.py
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/templates/base.html
M ckan/templates/footer.html
M ckan/templates/header.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/page.html
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 3016-template-tweaks
Commit: b6dae85e54ccb7e64f32bcacf1507fb9b2c53e34
https://github.com/okfn/ckan/commit/b6dae85e54ccb7e64f32bcacf1507fb9b2c53e34
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/config/environment.py
M ckan/config/routing.py
M ckan/controllers/related.py
M ckan/lib/helpers.py
M ckan/public/base/javascript/modules/popover-context.js
M ckan/public/base/less/masthead.less
R ckan/templates/ajax_snippets/popover-context-dataset.html
R ckan/templates/ajax_snippets/popover-context-group.html
R ckan/templates/ajax_snippets/popover-context-user.html
A ckan/templates/ajax_snippets/popover_context_dataset.html
A ckan/templates/ajax_snippets/popover_context_group.html
A ckan/templates/ajax_snippets/popover_context_user.html
M ckan/templates/development/primer.html
A ckan/templates/development/snippets/page_header.html
M ckan/templates/group/read.html
A ckan/templates/group/read_base.html
M ckan/templates/header.html
M ckan/templates/package/activity.html
M ckan/templates/package/followers.html
M ckan/templates/package/read.html
A ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
A ckan/templates/snippets/page_header.html
M ckan/templates/user/read.html
A ckan/templates/user/read_base.html
Log Message:
-----------
Merge branch '3016-template-tweaks'
Commit: 61c5d2b23dd4684d2fbb3e0596caae554c177c7f
https://github.com/okfn/ckan/commit/61c5d2b23dd4684d2fbb3e0596caae554c177c7f
Author: John Martin <me at johnmart.in>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/config/environment.py
M ckan/config/routing.py
M ckan/controllers/related.py
M ckan/i18n/check_po_files.py
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/helpers.py
M ckan/public/base/javascript/modules/popover-context.js
M ckan/public/base/less/masthead.less
R ckan/templates/ajax_snippets/popover-context-dataset.html
R ckan/templates/ajax_snippets/popover-context-group.html
R ckan/templates/ajax_snippets/popover-context-user.html
A ckan/templates/ajax_snippets/popover_context_dataset.html
A ckan/templates/ajax_snippets/popover_context_group.html
A ckan/templates/ajax_snippets/popover_context_user.html
M ckan/templates/base.html
M ckan/templates/development/primer.html
A ckan/templates/development/snippets/page_header.html
M ckan/templates/footer.html
M ckan/templates/group/read.html
A ckan/templates/group/read_base.html
M ckan/templates/header.html
M ckan/templates/organization/new.html
M ckan/templates/package/activity.html
M ckan/templates/package/followers.html
M ckan/templates/package/read.html
A ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/page.html
A ckan/templates/snippets/page_header.html
M ckan/templates/user/read.html
A ckan/templates/user/read_base.html
Log Message:
-----------
[#2939] Merged master
Commit: b70ad3d9e43e1b358d6f8dde847fd56d6de5f3ca
https://github.com/okfn/ckan/commit/b70ad3d9e43e1b358d6f8dde847fd56d6de5f3ca
Author: John Martin <me at johnmart.in>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/lib/app_globals.py
M ckan/templates/activity_streams/activity_stream_items.html
Log Message:
-----------
[#2939] Fix for undefined global within activity stream templates
Commit: c7508658c848ee4c231a755e19ca3286797e13f9
https://github.com/okfn/ckan/commit/c7508658c848ee4c231a755e19ca3286797e13f9
Author: kindly <kindly at gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/authz.py
M ckan/config/routing.py
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/group.py
R ckan/controllers/group_formalchemy.py
A ckan/controllers/organization.py
M ckan/controllers/package.py
R ckan/controllers/package_formalchemy.py
M ckan/controllers/storage.py
M ckan/controllers/user.py
R ckan/forms/__init__.py
R ckan/forms/authorization_group.py
R ckan/forms/authz.py
R ckan/forms/builder.py
R ckan/forms/common.py
R ckan/forms/group.py
R ckan/forms/package.py
R ckan/forms/package_dict.py
R ckan/forms/registry.py
M ckan/lib/activity_streams.py
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/formatters.py
M ckan/lib/helpers.py
M ckan/lib/jinja_extensions.py
M ckan/lib/plugins.py
M ckan/lib/search/index.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/delete.py
M ckan/logic/auth/get.py
R ckan/logic/auth/publisher/__init__.py
R ckan/logic/auth/publisher/create.py
R ckan/logic/auth/publisher/delete.py
R ckan/logic/auth/publisher/get.py
R ckan/logic/auth/publisher/update.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/063_org_changes.py
M ckan/model/__init__.py
M ckan/model/group.py
M ckan/model/package.py
M ckan/model/user.py
M ckan/new_authz.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/fuchsia.min.css
M ckan/public/base/css/green.css
M ckan/public/base/css/green.min.css
M ckan/public/base/css/main.css
M ckan/public/base/css/main.min.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/maroon.min.css
M ckan/public/base/css/red.css
M ckan/public/base/css/red.min.css
M ckan/public/base/datapreview/css/recline.min.css
M ckan/public/base/datapreview/preview_recline.min.js
A ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
A ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
M ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css
M ckan/public/base/datapreview/vendor/leaflet/leaflet.min.js
M ckan/public/base/datapreview/vendor/pdfjs/pdf.min.js
M ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.css
M ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.js
M ckan/public/base/datapreview/vendor/recline/css/recline.min.css
M ckan/public/base/datapreview/vendor/recline/recline.min.js
A ckan/public/base/images/editing.png
A ckan/public/base/images/placeholder-organization.png
M ckan/public/base/javascript/client.js
M ckan/public/base/javascript/client.min.js
M ckan/public/base/javascript/module.min.js
A ckan/public/base/javascript/modules/dashboard.min.js
M ckan/public/base/javascript/modules/data-viewer.min.js
A ckan/public/base/javascript/modules/follow.min.js
A ckan/public/base/javascript/modules/popover-context.min.js
M ckan/public/base/less/activity.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/group.less
M ckan/public/base/less/profile.less
M ckan/public/base/less/variables.less
A ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
M ckan/templates/activity_streams/activity_stream_items.html
A ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/index.html
A ckan/templates/group/member_new.html
A ckan/templates/group/members.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/header.html
A ckan/templates/organization/about.html
A ckan/templates/organization/admins.html
A ckan/templates/organization/base_form_page.html
A ckan/templates/organization/confirm_delete.html
A ckan/templates/organization/confirm_delete_member.html
A ckan/templates/organization/edit.html
A ckan/templates/organization/edit_base.html
A ckan/templates/organization/index.html
A ckan/templates/organization/member_new.html
A ckan/templates/organization/members.html
A ckan/templates/organization/new.html
A ckan/templates/organization/new_organization_form.html
A ckan/templates/organization/read.html
A ckan/templates/organization/read_base.html
A ckan/templates/organization/snippets/feeds.html
A ckan/templates/organization/snippets/info.html
A ckan/templates/organization/snippets/organization_form.html
A ckan/templates/organization/snippets/organization_item.html
A ckan/templates/organization/snippets/organization_list.html
M ckan/templates/package/read.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/snippets/facet_list.html
M ckan/templates/snippets/group.html
M ckan/templates/snippets/group_item.html
A ckan/templates/snippets/organization.html
A ckan/templates/snippets/organization_item.html
A ckan/templates/snippets/private.html
M ckan/templates/user/snippets/followers.html
M ckan/templates_legacy/admin/index.html
M ckan/templates_legacy/admin/layout.html
M ckan/templates_legacy/group/layout.html
M ckan/templates_legacy/package/layout.html
M ckan/templates_legacy/package/new_package_form.html
M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
R ckan/tests/forms/__init__.py
R ckan/tests/forms/test_authz.py
R ckan/tests/forms/test_group.py
R ckan/tests/forms/test_package.py
M ckan/tests/functional/api/base.py
M ckan/tests/functional/api/model/test_group.py
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/functional/api/model/test_vocabulary.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_dashboard.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_admin.py
R ckan/tests/functional/test_authz.py
R ckan/tests/functional/test_edit_authz.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
R ckan/tests/functional/test_package_edit_authz.py
R ckan/tests/functional/test_publisher_auth.py
M ckan/tests/functional/test_tag_vocab.py
M ckan/tests/functional/test_upload.py
R ckan/tests/lib/test_authztool.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_solr_search_index.py
M ckan/tests/logic/test_action.py
A ckan/tests/logic/test_auth.py
R ckan/tests/misc/test_auth_profiles.py
R ckan/tests/misc/test_package_saver.py
R ckan/tests/models/test_authz.py
R ckan/tests/models/test_repo.py
R ckan/tests/test_authz.py
A doc/organizations_and_groups.rst
M test-core.ini
Log Message:
-----------
Merge branch '2939-orgs'
Commit: c8af251922225f8cf2057d1a946e66d4ca898305
https://github.com/okfn/ckan/commit/c8af251922225f8cf2057d1a946e66d4ca898305
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
Remove some lines of code that have somehow crept back in during some merges
Commit: 586e131d488c8bd662befdf82e4ad8db2bc747dc
https://github.com/okfn/ckan/commit/586e131d488c8bd662befdf82e4ad8db2bc747dc
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M doc/organizations_and_groups.rst
Log Message:
-----------
Update the org/group doc to be more acurate
Commit: 331d0586fd0f58abfac65fe3d8fa5778fa0f4a65
https://github.com/okfn/ckan/commit/331d0586fd0f58abfac65fe3d8fa5778fa0f4a65
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M doc/organizations_and_groups.rst
Log Message:
-----------
Further update the org/group docs
Commit: 36fab6afba8a0980e7a18cb76861303ddeadb004
https://github.com/okfn/ckan/commit/36fab6afba8a0980e7a18cb76861303ddeadb004
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
Remove SubMapper in config.routes as we now have a compatable routes version
Commit: dc2ca3fe7185126cd455a7b96c7c72ca958411da
https://github.com/okfn/ckan/commit/dc2ca3fe7185126cd455a7b96c7c72ca958411da
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
R ckan/authz.py
M ckan/controllers/admin.py
M ckan/controllers/package.py
M ckan/controllers/revision.py
M ckan/lib/base.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/__init__.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/model/authz.py
M ckan/tests/functional/api/base.py
Log Message:
-----------
Remove last traces of authz.py
Commit: 9483817641341262582fd9ce22df309e3973294f
https://github.com/okfn/ckan/commit/9483817641341262582fd9ce22df309e3973294f
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
Minor cleanup of model_dictize.py
Commit: fc5ec257232bf9f61e0016ecfd463e343bfe579d
https://github.com/okfn/ckan/commit/fc5ec257232bf9f61e0016ecfd463e343bfe579d
Author: kindly <kindly at gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
Merge pull request #211 from okfn/clean-model-dictize
[Trivial] Minor cleanup of model_dictize.py
Commit: fe54ab091331894ff38a584e3a9597e78d119439
https://github.com/okfn/ckan/commit/fe54ab091331894ff38a584e3a9597e78d119439
Author: kindly <kindly at gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M doc/organizations_and_groups.rst
Log Message:
-----------
Merge pull request #208 from okfn/orgs-doc-fix
Orgs doc fix
Commit: b83207b005c2a54dcb477fc32f8bce0eb10a12f1
https://github.com/okfn/ckan/commit/b83207b005c2a54dcb477fc32f8bce0eb10a12f1
Author: kindly <kindly at gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
Merge pull request #207 from okfn/merge-fix
[Trivial] Remove some lines of code that have somehow crept back in during some merges
Commit: 008077701caa5a7f4952f4b57076b55d52f493d5
https://github.com/okfn/ckan/commit/008077701caa5a7f4952f4b57076b55d52f493d5
Author: Aleksi Suomalainen <aleksi.suomalainen at nomovok.com>
Date: 2012-12-14 (Fri, 14 Dec 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
Have groups per page as 21 or as 7x3 grid.
Commit: 1b650f4e9e68563035fa1bf6015cf0d5994ad2d9
https://github.com/okfn/ckan/commit/1b650f4e9e68563035fa1bf6015cf0d5994ad2d9
Author: kindly <kindly at gmail.com>
Date: 2012-12-16 (Sun, 16 Dec 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/update.py
M ckan/tests/functional/api/model/test_vocabulary.py
Log Message:
-----------
remove all _context calls and session.removes
Commit: 94bf606561cdb4a09fb6e0d82068d500064b07f6
https://github.com/okfn/ckan/commit/94bf606561cdb4a09fb6e0d82068d500064b07f6
Author: amercader <amercadero at gmail.com>
Date: 2012-12-17 (Mon, 17 Dec 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/update.py
M ckan/tests/functional/api/model/test_vocabulary.py
Log Message:
-----------
Merge branch 'fix-context-hacks'
Commit: 4851d2ddac76507c47173b1bbae255c22ce88712
https://github.com/okfn/ckan/commit/4851d2ddac76507c47173b1bbae255c22ce88712
Author: John Martin <me at johnmart.in>
Date: 2012-12-18 (Tue, 18 Dec 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
Merge pull request #212 from kata-csc/kata-csc-fix-group-numbers
Have groups per page as 21 or as 7x3 grid.
Commit: bbff265b3b296b866202f0d53eda1ba2a4278de6
https://github.com/okfn/ckan/commit/bbff265b3b296b866202f0d53eda1ba2a4278de6
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-18 (Tue, 18 Dec 2012)
Changed paths:
M ckan/lib/app_globals.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/update.py
M ckan/tests/functional/api/model/test_vocabulary.py
M doc/organizations_and_groups.rst
Log Message:
-----------
Merge branch 'master' into remove-authz
Conflicts:
ckan/lib/dictization/model_dictize.py
imports
Commit: 62b33b163527ab282e4afe1782fe89eca9aee863
https://github.com/okfn/ckan/commit/62b33b163527ab282e4afe1782fe89eca9aee863
Author: amercader <amercadero at gmail.com>
Date: 2012-12-18 (Tue, 18 Dec 2012)
Changed paths:
M ckan/tests/functional/test_pagination.py
Log Message:
-----------
Fix broken tests because of 4851d
Commit: 1ea027f3228cdd3fa1d53438653f390ebae9b141
https://github.com/okfn/ckan/commit/1ea027f3228cdd3fa1d53438653f390ebae9b141
Author: amercader <amercadero at gmail.com>
Date: 2012-12-18 (Tue, 18 Dec 2012)
Changed paths:
M ckan/controllers/api.py
M ckan/lib/search/query.py
M ckan/tests/lib/test_solr_package_search.py
Log Message:
-----------
[#3002] Escape API v1/2 legacy search parameters
Thanks @tauberer for the initial patch.
This is a slightly better patch that takes into account quoting and unicode
characters and adds some tests.
Commit: eb1034cbc7850982527c979520515bbaa32f5994
https://github.com/okfn/ckan/commit/eb1034cbc7850982527c979520515bbaa32f5994
Author: kindly <kindly at gmail.com>
Date: 2012-12-18 (Tue, 18 Dec 2012)
Changed paths:
R ckan/authz.py
M ckan/controllers/admin.py
M ckan/controllers/package.py
M ckan/controllers/revision.py
M ckan/lib/base.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/__init__.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/model/authz.py
M ckan/tests/functional/api/base.py
Log Message:
-----------
Merge pull request #210 from okfn/remove-authz
[Trivial] Remove last traces of authz.py
Commit: e28cd002970b32c4aae5006e1dbf9b94f0cc46cb
https://github.com/okfn/ckan/commit/e28cd002970b32c4aae5006e1dbf9b94f0cc46cb
Author: amercader <amercadero at gmail.com>
Date: 2012-12-18 (Tue, 18 Dec 2012)
Changed paths:
R ckan/authz.py
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/routing.py
M ckan/config/solr/CHANGELOG.txt
A ckan/config/solr/schema-2.0.xml
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/group.py
R ckan/controllers/group_formalchemy.py
M ckan/controllers/home.py
A ckan/controllers/organization.py
M ckan/controllers/package.py
R ckan/controllers/package_formalchemy.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/user.py
R ckan/forms/__init__.py
R ckan/forms/authorization_group.py
R ckan/forms/authz.py
R ckan/forms/builder.py
R ckan/forms/common.py
R ckan/forms/group.py
R ckan/forms/package.py
R ckan/forms/package_dict.py
R ckan/forms/registry.py
M ckan/i18n/check_po_files.py
M ckan/lib/activity_streams.py
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/formatters.py
M ckan/lib/helpers.py
M ckan/lib/jinja_extensions.py
M ckan/lib/plugins.py
M ckan/lib/search/__init__.py
M ckan/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/delete.py
M ckan/logic/auth/get.py
R ckan/logic/auth/publisher/__init__.py
R ckan/logic/auth/publisher/create.py
R ckan/logic/auth/publisher/delete.py
R ckan/logic/auth/publisher/get.py
R ckan/logic/auth/publisher/update.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/063_org_changes.py
M ckan/model/__init__.py
M ckan/model/activity.py
M ckan/model/authz.py
M ckan/model/group.py
M ckan/model/package.py
M ckan/model/user.py
M ckan/new_authz.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/fuchsia.min.css
M ckan/public/base/css/green.css
M ckan/public/base/css/green.min.css
M ckan/public/base/css/main.css
M ckan/public/base/css/main.min.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/maroon.min.css
M ckan/public/base/css/red.css
M ckan/public/base/css/red.min.css
A ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
A ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
A ckan/public/base/images/editing.png
A ckan/public/base/images/placeholder-organization.png
M ckan/public/base/javascript/client.js
M ckan/public/base/javascript/client.min.js
M ckan/public/base/javascript/module.min.js
A ckan/public/base/javascript/modules/activity-stream.js
A ckan/public/base/javascript/modules/dashboard.min.js
M ckan/public/base/javascript/modules/data-viewer.min.js
A ckan/public/base/javascript/modules/follow.min.js
M ckan/public/base/javascript/modules/popover-context.js
A ckan/public/base/javascript/modules/popover-context.min.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/group.less
M ckan/public/base/less/masthead.less
M ckan/public/base/less/profile.less
M ckan/public/base/less/variables.less
A ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
M ckan/templates/activity_streams/activity_stream_items.html
R ckan/templates/ajax_snippets/popover-context-dataset.html
R ckan/templates/ajax_snippets/popover-context-group.html
R ckan/templates/ajax_snippets/popover-context-user.html
A ckan/templates/ajax_snippets/popover_context_dataset.html
A ckan/templates/ajax_snippets/popover_context_group.html
A ckan/templates/ajax_snippets/popover_context_user.html
M ckan/templates/base.html
M ckan/templates/development/primer.html
A ckan/templates/development/snippets/page_header.html
M ckan/templates/footer.html
A ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/index.html
A ckan/templates/group/member_new.html
A ckan/templates/group/members.html
M ckan/templates/group/read.html
A ckan/templates/group/read_base.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/header.html
A ckan/templates/organization/about.html
A ckan/templates/organization/admins.html
A ckan/templates/organization/base_form_page.html
A ckan/templates/organization/confirm_delete.html
A ckan/templates/organization/confirm_delete_member.html
A ckan/templates/organization/edit.html
A ckan/templates/organization/edit_base.html
A ckan/templates/organization/index.html
A ckan/templates/organization/member_new.html
A ckan/templates/organization/members.html
A ckan/templates/organization/new.html
A ckan/templates/organization/new_organization_form.html
A ckan/templates/organization/read.html
A ckan/templates/organization/read_base.html
A ckan/templates/organization/snippets/feeds.html
A ckan/templates/organization/snippets/info.html
A ckan/templates/organization/snippets/organization_form.html
A ckan/templates/organization/snippets/organization_item.html
A ckan/templates/organization/snippets/organization_list.html
M ckan/templates/package/activity.html
A ckan/templates/package/activity_stream.html
M ckan/templates/package/followers.html
M ckan/templates/package/read.html
A ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/page.html
M ckan/templates/snippets/facet_list.html
M ckan/templates/snippets/group.html
M ckan/templates/snippets/group_item.html
A ckan/templates/snippets/organization.html
A ckan/templates/snippets/organization_item.html
A ckan/templates/snippets/page_header.html
A ckan/templates/snippets/private.html
M ckan/templates/user/read.html
A ckan/templates/user/read_base.html
M ckan/templates/user/snippets/followers.html
M ckan/templates_legacy/admin/index.html
M ckan/templates_legacy/admin/layout.html
M ckan/templates_legacy/group/layout.html
M ckan/templates_legacy/package/layout.html
M ckan/templates_legacy/package/new_package_form.html
M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
R ckan/tests/forms/__init__.py
R ckan/tests/forms/test_authz.py
R ckan/tests/forms/test_group.py
R ckan/tests/forms/test_package.py
M ckan/tests/functional/api/base.py
M ckan/tests/functional/api/model/test_group.py
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/functional/api/model/test_vocabulary.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_dashboard.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_admin.py
R ckan/tests/functional/test_authz.py
R ckan/tests/functional/test_edit_authz.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
R ckan/tests/functional/test_package_edit_authz.py
M ckan/tests/functional/test_pagination.py
R ckan/tests/functional/test_publisher_auth.py
M ckan/tests/functional/test_search.py
M ckan/tests/functional/test_tag_vocab.py
M ckan/tests/functional/test_upload.py
R ckan/tests/lib/test_authztool.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_solr_package_search.py
M ckan/tests/lib/test_solr_package_search_synchronous_update.py
M ckan/tests/lib/test_solr_search_index.py
M ckan/tests/logic/test_action.py
A ckan/tests/logic/test_auth.py
R ckan/tests/misc/test_auth_profiles.py
R ckan/tests/misc/test_package_saver.py
R ckan/tests/models/test_authz.py
R ckan/tests/models/test_repo.py
R ckan/tests/test_authz.py
M ckan_deb/usr/lib/ckan/common.sh
M ckanext/multilingual/solr/schema.xml
M doc/configuration.rst
A doc/organizations_and_groups.rst
M test-core.ini
Log Message:
-----------
Merge branch 'master' into 2961-pluggable-previews
Conflicts:
ckan/controllers/package.py
ckan/public/base/datapreview/css/recline.min.css
ckan/public/base/datapreview/preview_recline.min.js
ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css
ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.css
ckan/public/base/datapreview/vendor/recline/css/recline.min.css
Commit: 5837ee7dfe07c0d3d85f4a1a77837ad2d00eac3d
https://github.com/okfn/ckan/commit/5837ee7dfe07c0d3d85f4a1a77837ad2d00eac3d
Author: amercader <amercadero at gmail.com>
Date: 2012-12-19 (Wed, 19 Dec 2012)
Changed paths:
M ckan/plugins/toolkit.py
M ckanext/jsonpreview/tests/test_preview.py
M ckanext/resourceproxy/plugin.py
M doc/toolkit.rst
Log Message:
-----------
[#2691] Revert adding url_for to plugins.toolkit
Commit: d09eadb2e91eec6015102464e6c5a47a8a13583a
https://github.com/okfn/ckan/commit/d09eadb2e91eec6015102464e6c5a47a8a13583a
Author: kindly <kindly at gmail.com>
Date: 2012-12-19 (Wed, 19 Dec 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
[#210] tivial fix import
Commit: 40f59975d77c3d1c82537f50476413b3bfd31b6c
https://github.com/okfn/ckan/commit/40f59975d77c3d1c82537f50476413b3bfd31b6c
Author: amercader <amercadero at gmail.com>
Date: 2012-12-19 (Wed, 19 Dec 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/lib/datapreview.py
M ckan/lib/helpers.py
M doc/configuration.rst
Log Message:
-----------
[#2691] Fixes regarding previewing config options
* Moved to the helpers function, as on the module root config options
weren't yet set.
* Define default values, otherwise instances using old ini files won't
get any format preview
* Namespace config options ("ckan.preview...")
* Add documentation about the config options
Commit: 92aeb84f25b5070850182ffc9dfaec74258456f0
https://github.com/okfn/ckan/commit/92aeb84f25b5070850182ffc9dfaec74258456f0
Author: amercader <amercadero at gmail.com>
Date: 2012-12-19 (Wed, 19 Dec 2012)
Changed paths:
M ckan/lib/datapreview.py
M doc/configuration.rst
Log Message:
-----------
[#2961] Remove json and csv from loadable formats
They should be loaded with their own extensions. They were just on this
list because of old code and they are not rendered nicely when directly
laoded on an iframe.
XML based formats are kept, but they also should be shown with a
particular extension (See #226)
Commit: 8df7a6c99e84d8c339ac2c663eb732bff7775a80
https://github.com/okfn/ckan/commit/8df7a6c99e84d8c339ac2c663eb732bff7775a80
Author: amercader <amercadero at gmail.com>
Date: 2012-12-19 (Wed, 19 Dec 2012)
Changed paths:
A ckanext/pdfpreview/tests/__init__.py
A ckanext/pdfpreview/tests/test_preview.py
A ckanext/reclinepreview/tests/__init__.py
A ckanext/reclinepreview/tests/test_preview.py
Log Message:
-----------
[#2961] Add basic tests for pdf and recline extensions
Commit: 4f3de60653184f78f3c386f4ba84483bff7be747
https://github.com/okfn/ckan/commit/4f3de60653184f78f3c386f4ba84483bff7be747
Author: amercader <amercadero at gmail.com>
Date: 2012-12-19 (Wed, 19 Dec 2012)
Changed paths:
M ckan/templates/dataviewer/snippets/no_preview.html
Log Message:
-----------
[#2961] Minor tweaks on the no preview template
Commit: d305a9229d2045b0010c2f3a47469b4efad8af46
https://github.com/okfn/ckan/commit/d305a9229d2045b0010c2f3a47469b4efad8af46
Author: amercader <amercadero at gmail.com>
Date: 2012-12-19 (Wed, 19 Dec 2012)
Changed paths:
A ckan/tests/lib/test_datapreview.py
M ckan/tests/lib/test_helpers.py
Log Message:
-----------
[#2961] Fix broken data preview test and move to own file
Compare: https://github.com/okfn/ckan/compare/8d9e230d2a01...d305a9229d20
----==_mimepart_50d1cd0e6ce3a_662313d9af47761f--
More information about the ckan-changes
mailing list