[ckan-changes] [okfn/ckan] fca35e: [#1387] fix resource urls with no protocols
GitHub
noreply at github.com
Mon Jul 23 14:17:57 UTC 2012
Branch: refs/heads/2313-deprecate-old-facet-data-structures-and-related-functions
Home: https://github.com/okfn/ckan
Commit: fca35e5f6929e3008640be1d1c2460dbc2a2ba32
https://github.com/okfn/ckan/commit/fca35e5f6929e3008640be1d1c2460dbc2a2ba32
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
[#1387] fix resource urls with no protocols
Commit: 85d88059e921deb93025d9d8ef55dc551f1f788d
https://github.com/okfn/ckan/commit/85d88059e921deb93025d9d8ef55dc551f1f788d
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
[#1387] fix tests with bad urls
Commit: 528d27bf699b8df85edf8c55f7cb91b8fcf64c7c
https://github.com/okfn/ckan/commit/528d27bf699b8df85edf8c55f7cb91b8fcf64c7c
Author: amercader <amercadero at gmail.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M doc/configuration.rst
Log Message:
-----------
[#1678] Make synchronous search the default behaviour
Unless already loaded or explicitly disabled via the
`ckan.search.automatic_index` configuration option, the synchronous
search plugin will be loaded during startup time.
Commit: 67d7135ed8c2494279dbe00b67cfea20ed2bfc6c
https://github.com/okfn/ckan/commit/67d7135ed8c2494279dbe00b67cfea20ed2bfc6c
Author: amercader <amercadero at gmail.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
PEP8 environment.py
Commit: 10f8cdee61d6dd72330b0f68be1824796c0b064a
https://github.com/okfn/ckan/commit/10f8cdee61d6dd72330b0f68be1824796c0b064a
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/controllers/user.py
M ckan/lib/i18n.py
M doc/configuration.rst
Log Message:
-----------
Merge branch '1678-sync-search-by-default' of https://github.com/okfn/ckan
Commit: 428c9ff756739e4eddc5b5e9e9e794df3726cdc3
https://github.com/okfn/ckan/commit/428c9ff756739e4eddc5b5e9e9e794df3726cdc3
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/controllers/datastore.py
M ckan/lib/search/query.py
M ckan/logic/action/get.py
M ckan/logic/auth/publisher/create.py
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
M ckan/public/scripts/vendor/recline/recline.js
M ckan/templates/group/read.html
M ckan/templates/js_strings.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
A ckan/templates/snippets/recline-extra-footer.html
A ckan/templates/snippets/recline-extra-header.html
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_package.py
M ckan/tests/lib/test_tag_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_tag.py
M ckanext/organizations/controllers.py
M ckanext/organizations/forms.py
M ckanext/organizations/templates/organization_package_form.html
M doc/apiv3.rst
M doc/datastore.rst
M setup.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: b094c4eda6e61cacd3da3e638573803457f014d4
https://github.com/okfn/ckan/commit/b094c4eda6e61cacd3da3e638573803457f014d4
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M doc/index.rst
A doc/toolkit.rst
Log Message:
-----------
[#2362] toolkit docs
Commit: 9b72e88919fcdd25c0156a430f00968c9ec76ec3
https://github.com/okfn/ckan/commit/9b72e88919fcdd25c0156a430f00968c9ec76ec3
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/lib/plugins.py
Log Message:
-----------
[#2627] Refactor form_to_db_schema_options
Make it call self.form_to_db_schema so that the form_to_db_schema()
methods of IDatasetForm 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: d93cb58049bf79a1983f3b96759361c0627684a1
https://github.com/okfn/ckan/commit/d93cb58049bf79a1983f3b96759361c0627684a1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/templates/package/read.html
Log Message:
-----------
Fix a crasher in package/read.html template
Sometimes c.pkg_dict has no member named groups (e.g. when there is an
active IDatasetForm plugin with a db_to_form_schema() method).
Commit: 6f91aa595b74e3ff4af2128cef11f76786f8ef20
https://github.com/okfn/ckan/commit/6f91aa595b74e3ff4af2128cef11f76786f8ef20
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Add db_to_form_schema method
For IDatasetForm plugins to base their db_to_form_schema() dicts on
Commit: 126c94b730b9c399dc2ba9c1a5c8858d7d97b802
https://github.com/okfn/ckan/commit/126c94b730b9c399dc2ba9c1a5c8858d7d97b802
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Rename db_to_form_schema -> db_to_form_package_schema()
Commit: 786479e8e6eea392fc4a4312c7c8a534a08083a8
https://github.com/okfn/ckan/commit/786479e8e6eea392fc4a4312c7c8a534a08083a8
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/lib/plugins.py
M ckan/logic/schema.py
M ckan/tests/schema/test_schema.py
M ckanext/publisher_form/forms.py
M ckanext/test_tag_vocab_plugin.py
Log Message:
-----------
Rename package_form_schema() -> form_to_db_package_schema()
The only purpose of this schema is to be used as a base schema by
IDatasetForm plugins for their form_to_db_schema() methods, hopefully
the new name makes that clearer
Commit: 74b346ee9a2bbbc48021ffb2e3ead6fbd5923654
https://github.com/okfn/ckan/commit/74b346ee9a2bbbc48021ffb2e3ead6fbd5923654
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Add back in deprectated package_form_schema() for backwards compatibility
Commit: a1e392f9a3fb89e54afafa339c12bb97134ca26e
https://github.com/okfn/ckan/commit/a1e392f9a3fb89e54afafa339c12bb97134ca26e
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/lib/plugins.py
M ckan/logic/schema.py
M ckan/templates/package/read.html
M ckan/tests/schema/test_schema.py
M ckanext/publisher_form/forms.py
M ckanext/test_tag_vocab_plugin.py
M doc/coding-standards.rst
A doc/release-cycle.rst
M doc/writing-extensions.rst
M pip-requirements.txt
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 3a518547e18a1b9d2177db9243620272c58f3ba9
https://github.com/okfn/ckan/commit/3a518547e18a1b9d2177db9243620272c58f3ba9
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckanext/organizations/forms.py
Log Message:
-----------
Fixes 2624, where tags were not saved with organization_dataset
Added tag_convert_string to the validators for the form_to_db_schema
so that it correctly converted the string to tags in the DB.
Commit: 4f32c46e50d2c9767faf6768ac013248d83d8d82
https://github.com/okfn/ckan/commit/4f32c46e50d2c9767faf6768ac013248d83d8d82
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckanext/organizations/forms.py
Log Message:
-----------
[#2624] Base organizations form_to_db_schema() off form_to_db_package_schema()
Commit: 5d13781be3f7834a178698ae53deaa3ff56bc071
https://github.com/okfn/ckan/commit/5d13781be3f7834a178698ae53deaa3ff56bc071
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckanext/organizations/forms.py
Log Message:
-----------
Merge branch '2624-organization-tags'
Commit: 3bae84bd1352d4a2b9fe37579f7cfcf87fef49ab
https://github.com/okfn/ckan/commit/3bae84bd1352d4a2b9fe37579f7cfcf87fef49ab
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
[#2634] add restricted template vars to change log
Commit: b41b57c5fb686c76a6a1a1dd20df5a358b3c7a93
https://github.com/okfn/ckan/commit/b41b57c5fb686c76a6a1a1dd20df5a358b3c7a93
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
[#2632] check allowed helper functions exist
Commit: f6da5124e79d5aad6c14b5e4451e5eae07fdac9e
https://github.com/okfn/ckan/commit/f6da5124e79d5aad6c14b5e4451e5eae07fdac9e
Author: amercader <amercadero at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/model/authz.py
Log Message:
-----------
Change default authorization settings
These are the new default authotization behaviours:
* Only logged in users are able to create datasets and upload files
* Only the user that created the dataset can edit it by default
NB: this will break a large number of test. They will be fixed on
following commits.
Commit: 2b0932a105d9c1292814b2afac4bf237a8db3008
https://github.com/okfn/ckan/commit/2b0932a105d9c1292814b2afac4bf237a8db3008
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2638] get_request_param() helper function
Commit: b55c85e4fbc975c4e46dad1c15151ede3f0a6b06
https://github.com/okfn/ckan/commit/b55c85e4fbc975c4e46dad1c15151ede3f0a6b06
Author: amercader <amercadero at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/tests/forms/test_authz.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_admin.py
M ckan/tests/functional/test_authz.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_search.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_upload.py
M ckan/tests/logic/test_action.py
M ckan/tests/models/test_authz.py
M ckan/tests/models/test_repo.py
Log Message:
-----------
Fix broken tests after default auth settings change
All tests involving non logged-in editing were failing, as this is no
longer allowed. The changes on auth settings basically mean than
everytime some editing is tested, a valid user with permissions on the
dataset must be provided, e.g.:
offset = url_for(controller='package', action='edit', id=myid)
self.app.get(offset,extra_environ={'REMOTE_USER': 'russianfan'})
or:
res = self.app.post('/api/action/resource_create', params=postparams,
extra_environ={'Authorization': api_key })
Commit: 870f980c35792d0510de649c8db416795edd9008
https://github.com/okfn/ckan/commit/870f980c35792d0510de649c8db416795edd9008
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/templates/package/resource_read.html
Log Message:
-----------
Fixed missing markdown on the resource read page.
Changed the read_resource method in package controller to generate the
notes from the dictionary and use the dataset notes if no resource
description is available
Commit: f07c75b3c0d0f0ed0909acf0482051cdfb8e5c3f
https://github.com/okfn/ckan/commit/f07c75b3c0d0f0ed0909acf0482051cdfb8e5c3f
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckanext/organizations/forms.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: d57be835330f6dd2b1be27099148e0e3e7c83902
https://github.com/okfn/ckan/commit/d57be835330f6dd2b1be27099148e0e3e7c83902
Author: John Glover <glover.john at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/templates/package/resource_read.html
Log Message:
-----------
Merge pull request #58 from okfn/2650-markdown-resource-description
Fixed missing markdown on the resource read page.
Commit: 737d8234ed654fd53e8422205bd23cd824961a0f
https://github.com/okfn/ckan/commit/737d8234ed654fd53e8422205bd23cd824961a0f
Author: John Glover <j at johnglover.net>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/templates/package/resource_read.html
Log Message:
-----------
Whitespace cleanup.
Commit: f417be9d35a2d3bd17da654a2c9f04f5cbba89d2
https://github.com/okfn/ckan/commit/f417be9d35a2d3bd17da654a2c9f04f5cbba89d2
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/public/scripts/application.js
Log Message:
-----------
Add support for TSV files on dataproxy
Commit: 6d4452391e7fb8d9f728f8e9e0f21fef802d7c0f
https://github.com/okfn/ckan/commit/6d4452391e7fb8d9f728f8e9e0f21fef802d7c0f
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/templates/package/resource_read.html
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 096a414efd3ef4fb6fc8c48635be12d0f4ee7e73
https://github.com/okfn/ckan/commit/096a414efd3ef4fb6fc8c48635be12d0f4ee7e73
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
Merge branch '1387-fix-resource-urls'
Commit: fea646fc610c96ae9ff34d38a6dc4f8aa153f4e9
https://github.com/okfn/ckan/commit/fea646fc610c96ae9ff34d38a6dc4f8aa153f4e9
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/lib/helpers.py
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#2651] rival patch to keep controller clean
Commit: 16a689555807cd37a66c11340a0201de47ea8e07
https://github.com/okfn/ckan/commit/16a689555807cd37a66c11340a0201de47ea8e07
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/lib/helpers.py
M ckan/templates/package/resource_read.html
Log Message:
-----------
Merge branch '2651-rival-patch'
Commit: f19278e68e8d3148421e97a4a5f034f1b8f94a3b
https://github.com/okfn/ckan/commit/f19278e68e8d3148421e97a4a5f034f1b8f94a3b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-11 (Wed, 11 Jul 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Stop the package controller from crashing when used at the root URL
If the root URL '/' was connected to the package controller (e.g. by an
IRoutes plugin) _guess_package_type() would crash. Add a special case to
avoid the crash.
Commit: 8dfbf0d02b070a5a99f75e039eab6a3bf03b006f
https://github.com/okfn/ckan/commit/8dfbf0d02b070a5a99f75e039eab6a3bf03b006f
Author: kindly <kindly at gmail.com>
Date: 2012-07-11 (Wed, 11 Jul 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Merge pull request #63 from okfn/feature-allow-package-controller-at-root-url
Stop the package controller from crashing when used at the root URL
Commit: 316f6615a0ee5e4da2e2341c98955d7e99da042c
https://github.com/okfn/ckan/commit/316f6615a0ee5e4da2e2341c98955d7e99da042c
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 506f5a11a76c37c3461a1a505648c9d1db6ec55b
https://github.com/okfn/ckan/commit/506f5a11a76c37c3461a1a505648c9d1db6ec55b
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M doc/index.rst
A doc/toolkit.rst
Log Message:
-----------
Merge pull request #49 from okfn/2362-toolkit-doc-part1
Docs generate fine.
Commit: 6419864302da0107859d161125fc0535d50c4898
https://github.com/okfn/ckan/commit/6419864302da0107859d161125fc0535d50c4898
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M doc/index.rst
A doc/toolkit.rst
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 255c5b62dfb26e41f90208a705d9bb5bccc733da
https://github.com/okfn/ckan/commit/255c5b62dfb26e41f90208a705d9bb5bccc733da
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
Merge pull request #52 from okfn/2634-changelog-update
[#2634] add restricted template vars to change log
Commit: 26c7265dbb840a8e9bb5e0772049b375475df5e7
https://github.com/okfn/ckan/commit/26c7265dbb840a8e9bb5e0772049b375475df5e7
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: d3056214fbc7e62e0c0e51a907403f86af75491e
https://github.com/okfn/ckan/commit/d3056214fbc7e62e0c0e51a907403f86af75491e
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
[2632] Fix for missing list item with remove
Commit: f2725f39a1b08e53a0310b8c69ed7d5296484764
https://github.com/okfn/ckan/commit/f2725f39a1b08e53a0310b8c69ed7d5296484764
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
Merge pull request #53 from okfn/2632-check-allowed-helper-functions-exist
[#2632] check allowed helper functions exist
Small fix to check presence before list removal
Commit: 60a3194574cfb5c7200958890e24c24354579e33
https://github.com/okfn/ckan/commit/60a3194574cfb5c7200958890e24c24354579e33
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: b7d224dec412bc4bba7a2c300051a3e7293ae9ce
https://github.com/okfn/ckan/commit/b7d224dec412bc4bba7a2c300051a3e7293ae9ce
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/controllers/package.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/plugins.py
M ckan/lib/search/query.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
M ckan/public/scripts/application.js
M ckan/templates/group/read.html
M ckan/templates/package/read.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/tests/lib/test_dictization.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/schema/test_schema.py
M ckanext/organizations/controllers.py
M ckanext/organizations/forms.py
M ckanext/publisher_form/forms.py
M ckanext/test_tag_vocab_plugin.py
M doc/apiv3.rst
M doc/coding-standards.rst
M doc/configuration.rst
M doc/index.rst
A doc/release-cycle.rst
A doc/toolkit.rst
M doc/writing-extensions.rst
M pip-requirements.txt
M setup.py
Log Message:
-----------
Merge
Commit: ddda213155cb01d97a85758e467302f4c11a4593
https://github.com/okfn/ckan/commit/ddda213155cb01d97a85758e467302f4c11a4593
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/model/authz.py
M ckan/tests/forms/test_authz.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_admin.py
M ckan/tests/functional/test_authz.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_search.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_upload.py
M ckan/tests/logic/test_action.py
M ckan/tests/models/test_authz.py
M ckan/tests/models/test_repo.py
Log Message:
-----------
Merge branch '2388-out-of-the-box-auth-settings'
Commit: a1820d72c356af916b5deabdcc5ac12901e5e9dc
https://github.com/okfn/ckan/commit/a1820d72c356af916b5deabdcc5ac12901e5e9dc
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Log Message:
-----------
Merge from branch
Commit: d051006817f7ff73b51cf0ea797adb9d767da0b5
https://github.com/okfn/ckan/commit/d051006817f7ff73b51cf0ea797adb9d767da0b5
Author: amercader <amercadero at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
[#1678] Fix check when ckan.plugins line is missing in ini file
Commit: 6daf3bfe100470b383b95a4b1e23b9d292e3ef3c
https://github.com/okfn/ckan/commit/6daf3bfe100470b383b95a4b1e23b9d292e3ef3c
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
Merge branch '1678-sync-search-by-default' of https://github.com/okfn/ckan into 1678-sync-search-by-default
Commit: cf36baf0be788fd8f366ffeb6e086737f14e2f20
https://github.com/okfn/ckan/commit/cf36baf0be788fd8f366ffeb6e086737f14e2f20
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
Merge branch '1678-sync-search-by-default'
Commit: 7338fcecca41c1f0ac2ce39bacd53377e0847657
https://github.com/okfn/ckan/commit/7338fcecca41c1f0ac2ce39bacd53377e0847657
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/controllers/package.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/model/authz.py
M ckan/public/scripts/application.js
M ckan/templates/package/resource_read.html
M ckan/tests/forms/test_authz.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_admin.py
M ckan/tests/functional/test_authz.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_search.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_upload.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
M ckan/tests/models/test_authz.py
M ckan/tests/models/test_repo.py
M doc/index.rst
A doc/toolkit.rst
Log Message:
-----------
Merge from master
Commit: d64de51eceef62f2f742ca260996b5648f3dd4ea
https://github.com/okfn/ckan/commit/d64de51eceef62f2f742ca260996b5648f3dd4ea
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
Merge branch '2368-get-request-param-helper'
Commit: 44377670b65b613551ef5219f3aba06cd93e89ba
https://github.com/okfn/ckan/commit/44377670b65b613551ef5219f3aba06cd93e89ba
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
Fix a typo in a helper function
Commit: b66f54032a0f02fe3f80de9b60b87e3623347785
https://github.com/okfn/ckan/commit/b66f54032a0f02fe3f80de9b60b87e3623347785
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-13 (Fri, 13 Jul 2012)
Changed paths:
M ckan/templates/layout_base.html
A ckan/templates/snippets/internal-tracking.html
Log Message:
-----------
[misc] move internal tracking code into a snippet
Commit: d09d24dc519ab792d2bfa3879db4b45ca421ed63
https://github.com/okfn/ckan/commit/d09d24dc519ab792d2bfa3879db4b45ca421ed63
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-13 (Fri, 13 Jul 2012)
Changed paths:
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_save.py
M ckan/model/meta.py
Log Message:
-----------
[#2672] Pass in passive=True to Session.is_modified()
See [1] for details.
[1] http://docs.sqlalchemy.org/en/rel_0_7/orm/session.html?highlight=is_modified#sqlalchemy.orm.session.Session.is_modified
Commit: 5310639f20dd369caa4f809f54a536856528822e
https://github.com/okfn/ckan/commit/5310639f20dd369caa4f809f54a536856528822e
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 62842b71dd4f34145f4057569bae3643ad800a44
https://github.com/okfn/ckan/commit/62842b71dd4f34145f4057569bae3643ad800a44
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/model/group.py
M ckan/tests/functional/test_group.py
Log Message:
-----------
Update to fix the group.get_children_groups call which was returning
deleted items.
Commit: 46c514ea18ef74f84ddf71bb0676d77e12059c00
https://github.com/okfn/ckan/commit/46c514ea18ef74f84ddf71bb0676d77e12059c00
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/model/group.py
Log Message:
-----------
PEP8
Commit: 5739818a528bb16748f67b6d57a16f575ae78144
https://github.com/okfn/ckan/commit/5739818a528bb16748f67b6d57a16f575ae78144
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Fix tracking of dataset views
It was counting each view twice, this fixes it to count each view once
Commit: 3cbe0682151ed1da613b30c0d45cb4bdfa5dabac
https://github.com/okfn/ckan/commit/3cbe0682151ed1da613b30c0d45cb4bdfa5dabac
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into internal-tracking-cleanup
Commit: 2d4cb0bebb8474e7d6706f4b6247780cdc7afb91
https://github.com/okfn/ckan/commit/2d4cb0bebb8474e7d6706f4b6247780cdc7afb91
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/model/group.py
M ckan/tests/functional/test_group.py
Log Message:
-----------
Merge pull request #69 from okfn/2670-get-children-groups-defect
2670 get children groups defect
Commit: 8d27f7219f674af37112691c7d0fca783f161e63
https://github.com/okfn/ckan/commit/8d27f7219f674af37112691c7d0fca783f161e63
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/model/group.py
M ckan/tests/functional/test_group.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: a7c9d3ceca0650ca84fe643861ffdcba11b9dd8c
https://github.com/okfn/ckan/commit/a7c9d3ceca0650ca84fe643861ffdcba11b9dd8c
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/model/group.py
M ckan/tests/functional/test_group.py
Log Message:
-----------
Merge branch 'master' into internal-tracking-cleanup
Commit: d144fce26505402d20a443e3a083bf980719026b
https://github.com/okfn/ckan/commit/d144fce26505402d20a443e3a083bf980719026b
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/cli.py
M ckan/templates/layout_base.html
A ckan/templates/snippets/internal-tracking.html
Log Message:
-----------
Merge branch 'internal-tracking-cleanup'
Commit: 0f2d99de74201717bb77d6542c4b7da56aa5a373
https://github.com/okfn/ckan/commit/0f2d99de74201717bb77d6542c4b7da56aa5a373
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/base.py
M ckan/templates/user/edit_user_form.html
Log Message:
-----------
Don't leave user in limbo if they change their username
Commit: 0f785050ee39200f090b1ea3e3f00841ab7f79a8
https://github.com/okfn/ckan/commit/0f785050ee39200f090b1ea3e3f00841ab7f79a8
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/base.py
Log Message:
-----------
PEP8ification
Commit: 0a321150b372ec5620cf8de69d18bb1e6e56a5cb
https://github.com/okfn/ckan/commit/0a321150b372ec5620cf8de69d18bb1e6e56a5cb
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/base.py
Log Message:
-----------
Fix for tests failing in admin due to not loading repoze in test
Commit: e4fec4ce1dd8eb2abd25c9235a29ff33cb825be6
https://github.com/okfn/ckan/commit/e4fec4ce1dd8eb2abd25c9235a29ff33cb825be6
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/search/query.py
Log Message:
-----------
Fix exception when querying and a SolrException occurs, due to not importing it in correct place.
Commit: cd10dc43c4b26637e514aabfc4802f8dd75c5640
https://github.com/okfn/ckan/commit/cd10dc43c4b26637e514aabfc4802f8dd75c5640
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/cli.py
M ckan/tests/models/test_user.py
Log Message:
-----------
Add cli param to allow options to be passed to celery daemon (e.g. concurrency limit).
Commit: 08f14618fa4b06597e3bb6cd1b2746d532e2e6c8
https://github.com/okfn/ckan/commit/08f14618fa4b06597e3bb6cd1b2746d532e2e6c8
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Merge conflict
Commit: c69b08ae548aa957c898db54dd1bd9ed4bfe41e9
https://github.com/okfn/ckan/commit/c69b08ae548aa957c898db54dd1bd9ed4bfe41e9
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/controllers/revision.py
Log Message:
-----------
Cope with bad revisions being created. To find the problem at source too, but in the mean-time cope.
Commit: 4009298f680ece66a5d8c6f784a35e63cc11d1ab
https://github.com/okfn/ckan/commit/4009298f680ece66a5d8c6f784a35e63cc11d1ab
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/dictization/model_save.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
M ckan/new_authz.py
Log Message:
-----------
Merge conflicts with cherry-pick
Commit: 5644ddd24b2d5d9a170a518a7b9cac2915d419d5
https://github.com/okfn/ckan/commit/5644ddd24b2d5d9a170a518a7b9cac2915d419d5
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/navl/dictization_functions.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
Log Message:
-----------
Changed debug to show post validation version of the data - more useful.
Commit: 9568c7794957b40021eb8636b47f06c0094b1586
https://github.com/okfn/ckan/commit/9568c7794957b40021eb8636b47f06c0094b1586
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Added some useful feedback from these CLI functions.
Commit: 3c313968a098413bcf7c92f848693a4149b5280f
https://github.com/okfn/ckan/commit/3c313968a098413bcf7c92f848693a4149b5280f
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/tests/functional/test_group.py
Log Message:
-----------
Merge conflict
Commit: 0ec482d2b41e30f91ed136d0ef48c797e746d260
https://github.com/okfn/ckan/commit/0ec482d2b41e30f91ed136d0ef48c797e746d260
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/logic/auth/publisher/get.py
M ckan/tests/functional/test_publisher_auth.py
Log Message:
-----------
[#2668] Sysadmin gets permission to view a deleted publisher.
Commit: 70dfc9f7fc0a70a525551659034b9eb8959f547a
https://github.com/okfn/ckan/commit/70dfc9f7fc0a70a525551659034b9eb8959f547a
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/update.py
Log Message:
-----------
Fixes from broken merge
Commit: a17c5f496a5ae915de8b51b8ff4eeb0847fca947
https://github.com/okfn/ckan/commit/a17c5f496a5ae915de8b51b8ff4eeb0847fca947
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Fixed bare excepts
Commit: 72321fbc0859692b3af920bebca54d012233f33e
https://github.com/okfn/ckan/commit/72321fbc0859692b3af920bebca54d012233f33e
Author: kindly <kindly at gmail.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_save.py
M ckan/model/meta.py
Log Message:
-----------
Merge pull request #66 from okfn/2672-is_modifed-passive-should-be-true
[#2672] Pass in passive=True to Session.is_modified()
Commit: 171e20f5a74951c3452941168d3605bc8e1d92cc
https://github.com/okfn/ckan/commit/171e20f5a74951c3452941168d3605bc8e1d92cc
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
Fix IGroupForm's setup_template_variables() not being called
Call setup_template_variables() methods of IGroupForm plugins when
creating new groups.
Commit: 2e84da4caa626091863d561d960309de0ac163e1
https://github.com/okfn/ckan/commit/2e84da4caa626091863d561d960309de0ac163e1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
Fix for IGroupForm's form_to_db_schema() not being used when creating datasets
The schemas from form_to_db_schema() methods of IGroupForm plugins were
not being used when creating groups, fix the code so that they are used.
Commit: e9b4f65c4014ce40029f60d643c02e7d6cf832c2
https://github.com/okfn/ckan/commit/e9b4f65c4014ce40029f60d643c02e7d6cf832c2
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Fix data dicts not being validated by group_show
group_show() was validating data_dicts but then returning the
unvalidated dict not the validated one. Looks like a copy-paste mistake.
Fix so that the validated dict is returned.
Commit: 8ed099b25ff529639d85d8de9e76815285b98e06
https://github.com/okfn/ckan/commit/8ed099b25ff529639d85d8de9e76815285b98e06
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/lib/base.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_save.py
M ckan/model/meta.py
M ckan/templates/user/edit_user_form.html
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: 952f28b659aa297cdeaf12d4512da6532cf1c591
https://github.com/okfn/ckan/commit/952f28b659aa297cdeaf12d4512da6532cf1c591
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Fix 500 error on viewing a group with a custom group schema
display_name was missing from group_form_schema() so if an IGroupForm
plugin with a custom db_to_form_schema() for groups was in use, the
group read template would crash with a 500. Add display_name to the
schema so that the template renders successfully.
Commit: 2893c0ca570bd33849dbc5332e5cbf4ebf8f91c2
https://github.com/okfn/ckan/commit/2893c0ca570bd33849dbc5332e5cbf4ebf8f91c2
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M ckan/logic/__init__.py
M ckan/templates/package/new_package_form.html
Log Message:
-----------
auto summary in validationError
Commit: a948489e1c832c72ebed240bcb2cbe8abb420581
https://github.com/okfn/ckan/commit/a948489e1c832c72ebed240bcb2cbe8abb420581
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M ckan/logic/__init__.py
Log Message:
-----------
ValidationError more cleanups
Commit: 54179fd0bd54a446df62db0a403dd4c31562ef11
https://github.com/okfn/ckan/commit/54179fd0bd54a446df62db0a403dd4c31562ef11
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M ckan/templates/package/new_package_form.html
Log Message:
-----------
remove idiotic commit
Commit: 76891f4d22073a994301d76ec27e31b224b03aad
https://github.com/okfn/ckan/commit/76891f4d22073a994301d76ec27e31b224b03aad
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M ckan/logic/__init__.py
Log Message:
-----------
fix some other silly lines
Commit: 599083ed2b3856b7e9471c7fb62827fd7c9d17c7
https://github.com/okfn/ckan/commit/599083ed2b3856b7e9471c7fb62827fd7c9d17c7
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
Log Message:
-----------
clean the validation errors in logic action
Commit: e2be9b1f2170723208142882eb9ed7106d1051be
https://github.com/okfn/ckan/commit/e2be9b1f2170723208142882eb9ed7106d1051be
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-19 (Thu, 19 Jul 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/lib/base.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_save.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
M ckan/model/meta.py
M ckan/templates/user/edit_user_form.html
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 5f07038a6cb47f979b56faf87857504064780e06
https://github.com/okfn/ckan/commit/5f07038a6cb47f979b56faf87857504064780e06
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)
Log Message:
-----------
Merge branch 'master' into nicer-validation-errors
Commit: e7db091942c085d51765dbbdf4a85b785df7174d
https://github.com/okfn/ckan/commit/e7db091942c085d51765dbbdf4a85b785df7174d
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths:
M ckan/logic/__init__.py
Log Message:
-----------
fix for failing tests
Commit: d7b8c63ec4e0b8aa3001c3dbdb2f86a655460268
https://github.com/okfn/ckan/commit/d7b8c63ec4e0b8aa3001c3dbdb2f86a655460268
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths:
M ckan/logic/__init__.py
Log Message:
-----------
Merge branch 'nicer-validation-errors' of https://github.com/okfn/ckan into nicer-validation-errors
Commit: bd76c51a9b37104b43f5fb8de83bce3055d54e9c
https://github.com/okfn/ckan/commit/bd76c51a9b37104b43f5fb8de83bce3055d54e9c
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths:
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
Log Message:
-----------
Merge branch 'nicer-validation-errors'
Commit: 7c8d45062b60d72bdbc3522341ea109abdbcee39
https://github.com/okfn/ckan/commit/7c8d45062b60d72bdbc3522341ea109abdbcee39
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
clean up the concurrency option too stop passing other args
Commit: 7e28eed0fdb951645454990b794dac1b117b1403
https://github.com/okfn/ckan/commit/7e28eed0fdb951645454990b794dac1b117b1403
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
remove unused import
Commit: 46b652c69464c932cac6f677a4ba5d3775bd99c9
https://github.com/okfn/ckan/commit/46b652c69464c932cac6f677a4ba5d3775bd99c9
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
pep8 fixes for from dgu branch cli changes
Commit: 3a4231dd73a3de34ff9cd01b403a9010c31502ba
https://github.com/okfn/ckan/commit/3a4231dd73a3de34ff9cd01b403a9010c31502ba
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/controllers/revision.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_save.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/search/query.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
M ckan/logic/auth/publisher/get.py
M ckan/new_authz.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_publisher_auth.py
M ckan/tests/models/test_user.py
Log Message:
-----------
Merge pull request #70 from okfn/defects-from-dgu
Defects from dgu
Commit: 5f810ca0236a52b12607621346f40495b0cc607f
https://github.com/okfn/ckan/commit/5f810ca0236a52b12607621346f40495b0cc607f
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/controllers/revision.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_save.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/search/query.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
M ckan/logic/auth/publisher/get.py
M ckan/new_authz.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_publisher_auth.py
M ckan/tests/models/test_user.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 7fdc13f62ebea806ea14473d5d0e822ffe8fa757
https://github.com/okfn/ckan/commit/7fdc13f62ebea806ea14473d5d0e822ffe8fa757
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/controllers/revision.py
M ckan/lib/base.py
M ckan/lib/cli.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/navl/dictization_functions.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/publisher/get.py
M ckan/logic/schema.py
M ckan/model/authz.py
M ckan/model/group.py
M ckan/model/meta.py
M ckan/new_authz.py
M ckan/public/scripts/application.js
M ckan/templates/layout_base.html
M ckan/templates/package/resource_read.html
A ckan/templates/snippets/internal-tracking.html
M ckan/templates/user/edit_user_form.html
M ckan/tests/forms/test_authz.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_admin.py
M ckan/tests/functional/test_authz.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_search.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_upload.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
M ckan/tests/models/test_authz.py
M ckan/tests/models/test_repo.py
M ckan/tests/models/test_user.py
M ckanext/organizations/forms.py
M doc/index.rst
A doc/toolkit.rst
Log Message:
-----------
Merge branch 'master' into 2313-deprecate-old-facet-data-structures-and-related-functions
Compare: https://github.com/okfn/ckan/compare/6d257fc5298e...7fdc13f62ebe
More information about the ckan-changes
mailing list