[ckan-changes] [okfn/ckan] bcbd37: Merge branch 'master' of https://github.com/okfn/c...
GitHub
noreply at github.com
Wed Feb 1 13:52:56 UTC 2012
Branch: refs/heads/feature-1608-move-storage-to-core
Home: https://github.com/okfn/ckan
Commit: bcbd37bb13ba170ad7a9e034c8f1abf4e7197263
https://github.com/okfn/ckan/commit/bcbd37bb13ba170ad7a9e034c8f1abf4e7197263
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-01-19 (Thu, 19 Jan 2012)
Changed paths:
M ckan/lib/search/query.py
M ckan/tests/functional/test_pagination.py
M ckan/tests/lib/test_cli.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: e9e68d6d99d44afbdff859a379ba65922c9e95ca
https://github.com/okfn/ckan/commit/e9e68d6d99d44afbdff859a379ba65922c9e95ca
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-19 (Thu, 19 Jan 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/public/css/style.css
M ckan/templates/group/read.html
Log Message:
-----------
[#1521][m]: First pass at search-within-groups: Simple title-matching search implementation.
Commit: 887af33197c2711e234d424412f585b772e54992
https://github.com/okfn/ckan/commit/887af33197c2711e234d424412f585b772e54992
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-19 (Thu, 19 Jan 2012)
Changed paths:
M ckan/public/css/style.css
M ckan/templates/group/read.html
M ckan/templates/package/read_core.html
Log Message:
-----------
[#1521][m]: Styling group search results to look like the contents of a dataset.
Commit: 24d5f3b7835cd1c62353deedabc21e479b1c36ec
https://github.com/okfn/ckan/commit/24d5f3b7835cd1c62353deedabc21e479b1c36ec
Author: David Read <david.read at okfn.org>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
M ckan/authz.py
M ckan/config/routing.py
A ckan/controllers/storage.py
M ckan/logic/action/update.py
M ckan/logic/auth/update.py
M ckan/model/authz.py
M ckan/templates/package/new_package_form.html
A ckan/templates/storage/index.html
A ckan/templates/storage/success.html
A ckan/tests/functional/test_storage.py
A ckan/tests/functional/test_upload.py
M ckan/tests/models/test_repo.py
M ckan/tests/test_plugins.py
M doc/configuration.rst
A doc/file-upload.rst
M doc/index.rst
M requires/lucid_missing.txt
Log Message:
-----------
Merge branch 'master' of ssh://github.com/okfn/ckan
Commit: ebbdcff8db31855f4868bfc71dcd3e27a3268c0d
https://github.com/okfn/ckan/commit/ebbdcff8db31855f4868bfc71dcd3e27a3268c0d
Author: David Read <david.read at okfn.org>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
M ckan/ckan_nose_plugin.py
Log Message:
-----------
[master][noticket][nose plugin][xs]: Change Nose default so that it does not print docstring when test fails. Otherwise, use --docstrings option.
Commit: 8cc0dc22692088cb534af5d35e108a5bd115ebde
https://github.com/okfn/ckan/commit/8cc0dc22692088cb534af5d35e108a5bd115ebde
Author: David Read <david.read at okfn.org>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
M doc/common-error-messages.rst
M doc/install-from-package.rst
Log Message:
-----------
[master][noticket][doc]: Install tips improved.
Commit: 6e01ee522f7ac2e95e05a6165aae19c606d02869
https://github.com/okfn/ckan/commit/6e01ee522f7ac2e95e05a6165aae19c606d02869
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
A .gitattributes
M .tx/config
M CHANGELOG.txt
M MANIFEST.in
A README.rst
R README.txt
A bin/canada.py
A bin/status.py
M build.sh
M ckan/__init__.py
M ckan/authz.py
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
R ckan/config/schema.xml
A ckan/config/solr/CHANGELOG.txt
A ckan/config/solr/README.txt
A ckan/config/solr/schema-1.2.xml
A ckan/config/solr/schema-1.3.xml
M ckan/controllers/admin.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/revision.py
A ckan/controllers/storage.py
M ckan/controllers/user.py
M ckan/i18n/ca/LC_MESSAGES/ckan.po
M ckan/i18n/ckan.pot
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
M ckan/i18n/es/LC_MESSAGES/ckan.po
M ckan/i18n/fr/LC_MESSAGES/ckan.po
M ckan/i18n/it/LC_MESSAGES/ckan.po
M ckan/i18n/no/LC_MESSAGES/ckan.po
M ckan/i18n/pl/LC_MESSAGES/ckan.po
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
M ckan/i18n/sq/LC_MESSAGES/ckan.po
M ckan/i18n/sr/LC_MESSAGES/ckan.po
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
M ckan/lib/app_globals.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/i18n.py
M ckan/lib/navl/dictization_functions.py
A ckan/lib/repoze_patch.py
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
R ckan/lib/stats.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/authz.py
M ckan/model/group.py
M ckan/model/package.py
M ckan/plugins/interfaces.py
M ckan/public/css/style.css
R ckan/public/images/ckan-features.png
A ckan/public/images/icons/ckan.ico
M ckan/public/scripts/templates.js
M ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
M ckan/templates/group/read.html
M ckan/templates/home/about.html
M ckan/templates/layout_base.html
M ckan/templates/package/edit.html
M ckan/templates/package/layout.html
M ckan/templates/package/new_package_form.html
M ckan/templates/package/read_core.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search_form.html
A ckan/templates/storage/index.html
A ckan/templates/storage/success.html
M ckan/templates/user/login.html
M ckan/tests/__init__.py
M ckan/tests/functional/api/base.py
M ckan/tests/functional/api/model/test_group.py
M ckan/tests/functional/api/model/test_licenses.py
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/functional/api/model/test_ratings.py
M ckan/tests/functional/api/model/test_relationships.py
M ckan/tests/functional/api/model/test_revisions.py
M ckan/tests/functional/api/model/test_tag.py
M ckan/tests/functional/api/test_action.py
M ckan/tests/functional/api/test_package_search.py
M ckan/tests/functional/api/test_util.py
M ckan/tests/functional/test_cors.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_pagination.py
A ckan/tests/functional/test_storage.py
A ckan/tests/functional/test_upload.py
M ckan/tests/functional/test_user.py
A ckan/tests/lib/solr/schema-no-version.xml
A ckan/tests/lib/solr/schema-wrong-version.xml
A ckan/tests/lib/test_cli.py
M ckan/tests/lib/test_dictization.py
A ckan/tests/lib/test_solr_schema_version.py
M ckan/tests/lib/test_solr_search_index.py
R ckan/tests/misc/test_stats.py
M ckan/tests/models/test_package.py
M ckan/tests/models/test_repo.py
M ckan_deb/usr/bin/ckan-create-instance
M ckan_deb/usr/bin/ckan-setup-solr
M ckan_deb/usr/lib/ckan/common.sh
A ckanext/__init__.py
A ckanext/stats/__init__.py
A ckanext/stats/controller.py
A ckanext/stats/plugin.py
A ckanext/stats/public/ckanext/stats/app.js
A ckanext/stats/public/ckanext/stats/demo.html
A ckanext/stats/public/ckanext/stats/style.css
A ckanext/stats/stats.py
A ckanext/stats/templates/ckanext/stats/index.html
A ckanext/stats/templates/ckanext/stats/leaderboard.html
A ckanext/stats/tests/__init__.py
A ckanext/stats/tests/test_stats_lib.py
A ckanext/stats/tests/test_stats_plugin.py
M doc/apiv3.rst
M doc/common-error-messages.rst
M doc/configuration.rst
M doc/extensions.rst
A doc/file-upload.rst
M doc/i18n.rst
M doc/index.rst
M doc/install-from-package.rst
M doc/install-from-source.rst
M doc/loading_data.rst
A doc/solr-setup.rst
M doc/test.rst
R doc/upgrade.rst
M pip-requirements-test.txt
M requires/lucid_missing.txt
M setup.py
M test-core.ini
M test.ini
Log Message:
-----------
Merge branch 'master' into feature-1485-package-and-group-custom-forms
Conflicts:
ckan/lib/dictization/model_dictize.py
ckan/logic/schema.py
ckan/tests/functional/test_cors.py
Commit: cbf2243a5a631024710f586130a4cac9bede0c17
https://github.com/okfn/ckan/commit/cbf2243a5a631024710f586130a4cac9bede0c17
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/tests/lib/test_dictization_schema.py
Log Message:
-----------
Fixing up tests after merge conflicts
Commit: 57bdf0eefdd61347503e06b747b23c52ea8af0cf
https://github.com/okfn/ckan/commit/57bdf0eefdd61347503e06b747b23c52ea8af0cf
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
M ckan/logic/schema.py
M ckan/migration/versions/047_rename_package_group_member.py
R notes.txt
Log Message:
-----------
Updated migration to update old data
Commit: 42be122bfd1e1411837da266e160bc5a9f7450f7
https://github.com/okfn/ckan/commit/42be122bfd1e1411837da266e160bc5a9f7450f7
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
M ckan/migration/versions/047_rename_package_group_member.py
Log Message:
-----------
[xs] change to the migration for existing data
Commit: 627382e6ff575146da221efc50321a41152d8b0f
https://github.com/okfn/ckan/commit/627382e6ff575146da221efc50321a41152d8b0f
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
M ckan/ckan_nose_plugin.py
M ckan/model/__init__.py
M doc/common-error-messages.rst
M doc/install-from-package.rst
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 2983d249b46b3bb9beec89fab23710827b9dd4a7
https://github.com/okfn/ckan/commit/2983d249b46b3bb9beec89fab23710827b9dd4a7
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
M ckan/tests/functional/test_storage.py
Log Message:
-----------
[xs] Small fix to the storage test
Commit: 7bcadaf1761466fcb1ecf2d59e22ddb807dff37e
https://github.com/okfn/ckan/commit/7bcadaf1761466fcb1ecf2d59e22ddb807dff37e
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
M ckan/controllers/storage.py
M ckan/tests/functional/test_storage.py
M doc/configuration.rst
M doc/file-upload.rst
Log Message:
-----------
[1690] Fixed the naming of the storage settings
Commit: bda3142f5ba2e23bf787f04dba6f7d993388a3df
https://github.com/okfn/ckan/commit/bda3142f5ba2e23bf787f04dba6f7d993388a3df
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
M ckan/tests/functional/test_upload.py
Log Message:
-----------
[xs] Minor change to upload test
Commit: 1c2739488c6d99516d2afec013cf61bba48e7d9c
https://github.com/okfn/ckan/commit/1c2739488c6d99516d2afec013cf61bba48e7d9c
Author: David Read <david.read at okfn.org>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[master][noticket][xs]: Suppress vdm warning for all paster commands: "No handlers could be found for logger "vdm".
Commit: 8518d094e823616da9dfdacd161ca93bda672384
https://github.com/okfn/ckan/commit/8518d094e823616da9dfdacd161ca93bda672384
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/templates/group/read.html
Log Message:
-----------
[#1521][s]: Group search box matches main search box. Fixed tiny js bug.
Commit: b7db6b4e5acdbb8f29bee178e27835378bf8be66
https://github.com/okfn/ckan/commit/b7db6b4e5acdbb8f29bee178e27835378bf8be66
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/templates/group/read.html
Log Message:
-----------
[#1521][s]: Remove what looks like erroneous repetitive code.
Commit: 63608baf969f775235f899648f0e0bc25c96f460
https://github.com/okfn/ckan/commit/63608baf969f775235f899648f0e0bc25c96f460
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
M ckan/controllers/group.py
A ckan/templates/facets.html
M ckan/templates/group/read.html
R ckan/templates/package/facets.html
M ckan/templates/package/search.html
Log Message:
-----------
[#1521][l]: Pulled Solr searching algorithm into group read, to replace action 'group_package_show'. Can search & facet from groups page.
Commit: cd74cda24c6219b69c12f2113ed76ba16bad8ddf
https://github.com/okfn/ckan/commit/cd74cda24c6219b69c12f2113ed76ba16bad8ddf
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
M ckan/public/scripts/application.js
M ckan/templates/layout_base.html
Log Message:
-----------
[#1401,js][s]: use ckan.site_url in JS when making API calls.
Commit: 7088b1fcae685e56a280ec7b396b0f9803a477d9
https://github.com/okfn/ckan/commit/7088b1fcae685e56a280ec7b396b0f9803a477d9
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-01-20 (Fri, 20 Jan 2012)
Changed paths:
M ckan/lib/helpers.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/templates/_util.html
M ckan/templates/group/new_group_form.html
M ckan/templates/layout_base.html
M ckan/templates/package/layout.html
M ckan/templates/package/new_package_form.html
M ckan/templates/package/resource_read.html
M ckan/templates/user/login.html
M ckanext/stats/templates/ckanext/stats/leaderboard.html
M doc/theming.rst
Log Message:
-----------
Merge branch 'defect-1401-mount-non-root'
Conflicts:
ckan/templates/layout_base.html
[merge,from-branch][m]: fixes #1401 - merge 1401 branch thereby closing issue.
Commit: 64cf29e83129ab631678d1ed435fd48bb2ba5342
https://github.com/okfn/ckan/commit/64cf29e83129ab631678d1ed435fd48bb2ba5342
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-23 (Mon, 23 Jan 2012)
Changed paths:
M ckan/templates/group/layout.html
M ckan/templates/group/read.html
Log Message:
-----------
[#1521][s]: Checking permissions; redirected a link; facetted search is visible.
Commit: 0e77502f65237a5474a0c4852f913f8f33477d22
https://github.com/okfn/ckan/commit/0e77502f65237a5474a0c4852f913f8f33477d22
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-23 (Mon, 23 Jan 2012)
Changed paths:
M ckan/authz.py
M ckan/ckan_nose_plugin.py
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/package.py
A ckan/controllers/storage.py
M ckan/lib/app_globals.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/search/query.py
M ckan/logic/action/update.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/migration/versions/047_rename_package_group_member.py
M ckan/model/__init__.py
M ckan/model/authz.py
M ckan/model/package.py
M ckan/plugins/interfaces.py
M ckan/public/css/style.css
A ckan/public/images/icons/ckan.ico
M ckan/public/scripts/application.js
M ckan/templates/_util.html
M ckan/templates/group/layout.html
M ckan/templates/group/new_group_form.html
M ckan/templates/layout_base.html
M ckan/templates/package/layout.html
M ckan/templates/package/new_package_form.html
M ckan/templates/package/resource_read.html
A ckan/templates/storage/index.html
A ckan/templates/storage/success.html
M ckan/templates/user/login.html
M ckan/tests/functional/api/test_action.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_pagination.py
A ckan/tests/functional/test_storage.py
A ckan/tests/functional/test_upload.py
A ckan/tests/lib/test_cli.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/models/test_repo.py
M ckan/tests/test_plugins.py
M ckanext/stats/templates/ckanext/stats/leaderboard.html
M doc/common-error-messages.rst
M doc/configuration.rst
A doc/file-upload.rst
M doc/index.rst
M doc/install-from-package.rst
M doc/theming.rst
M requires/lucid_missing.txt
Log Message:
-----------
[#1521][s]: Merging master in.
Commit: 214792d409f0802bfbdf81e7a9e6c9df790ca392
https://github.com/okfn/ckan/commit/214792d409f0802bfbdf81e7a9e6c9df790ca392
Author: John Glover <john.c.glover at nuim.ie>
Date: 2012-01-23 (Mon, 23 Jan 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
[1696][controllers] Bug fix: maintain backwards compatibility with old way of creating custom forms
Commit: 4faa6b285cfe77de00bda25a57c9a6aaf717a6c4
https://github.com/okfn/ckan/commit/4faa6b285cfe77de00bda25a57c9a6aaf717a6c4
Author: John Glover <john.c.glover at nuim.ie>
Date: 2012-01-23 (Mon, 23 Jan 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
[1696][controllers] Fix typo
Commit: faa8b2964b37da0a23872cc95f9be133f2a7b6af
https://github.com/okfn/ckan/commit/faa8b2964b37da0a23872cc95f9be133f2a7b6af
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-24 (Tue, 24 Jan 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/tests/functional/test_group.py
Log Message:
-----------
[#1521][s]: Tests passing (except those broken on master)
Commit: 2337424dd4ebe3b81b6da454f2305031922d3d5c
https://github.com/okfn/ckan/commit/2337424dd4ebe3b81b6da454f2305031922d3d5c
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-24 (Tue, 24 Jan 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
A ckan/templates/facets.html
M ckan/templates/group/layout.html
M ckan/templates/group/read.html
R ckan/templates/package/facets.html
M ckan/templates/package/new_package_form.html
M ckan/templates/package/read_core.html
M ckan/templates/package/search.html
M ckan/tests/functional/test_group.py
Log Message:
-----------
Merge branch 'feature-1521-groups-ux'
Commit: 69f0bd1aa91fbf91836e88ef397b842de816df1c
https://github.com/okfn/ckan/commit/69f0bd1aa91fbf91836e88ef397b842de816df1c
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-24 (Tue, 24 Jan 2012)
Changed paths:
M ckan/lib/helpers.py
M ckan/public/css/style.css
A ckan/public/images/icons/star.png
M ckan/public/scripts/application.js
M ckan/templates/package/read_core.html
Log Message:
-----------
[#1583][m]: Integrated star ratings into frontend. Needs hooking up to backend.
Commit: aded32148c00f121c7ad846787a7e37739dcf139
https://github.com/okfn/ckan/commit/aded32148c00f121c7ad846787a7e37739dcf139
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-24 (Tue, 24 Jan 2012)
Changed paths:
M ckan/lib/helpers.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
Log Message:
-----------
[#1583][s]: Tweaking hover-for-help mechanism.
Commit: a7a01c36eb414342b46dcaeef59acfb032fdd898
https://github.com/okfn/ckan/commit/a7a01c36eb414342b46dcaeef59acfb032fdd898
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-24 (Tue, 24 Jan 2012)
Changed paths:
M ckan/lib/helpers.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
Log Message:
-----------
[#1583][s]: Tweaking mouseovers some more.
Commit: 274dd050269427d4a15dc7870150ed8bbfc1a805
https://github.com/okfn/ckan/commit/274dd050269427d4a15dc7870150ed8bbfc1a805
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-24 (Tue, 24 Jan 2012)
Changed paths:
M ckan/lib/helpers.py
M ckan/public/css/style.css
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#1583][s]: Unintrusively including info on resource viewer.
Commit: f16450c1c34cac09046a098273f66d2b75aa87dd
https://github.com/okfn/ckan/commit/f16450c1c34cac09046a098273f66d2b75aa87dd
Author: David Read <david.read at okfn.org>
Date: 2012-01-24 (Tue, 24 Jan 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/api.py
M ckan/lib/search/index.py
M ckan/logic/action/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/delete.py
M ckan/logic/schema.py
M ckan/model/package.py
M ckan/tests/functional/api/base.py
M ckan/tests/functional/api/model/test_relationships.py
M doc/api.rst
M doc/common-error-messages.rst
M doc/file-upload.rst
M doc/index.rst
Log Message:
-----------
[#1695][logic,doc,config]: Added way to create relationship by POST to the Register (instead of Entity). Correct API docs for creating relationship and recovered lost Model Methods section.
Commit: 631faa872aa7af5f64c0e1ededfd09ee6a0f64e7
https://github.com/okfn/ckan/commit/631faa872aa7af5f64c0e1ededfd09ee6a0f64e7
Author: David Read <david.read at okfn.org>
Date: 2012-01-24 (Tue, 24 Jan 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/lib/helpers.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
M ckan/templates/_util.html
A ckan/templates/facets.html
M ckan/templates/group/layout.html
M ckan/templates/group/new_group_form.html
M ckan/templates/group/read.html
M ckan/templates/layout_base.html
R ckan/templates/package/facets.html
M ckan/templates/package/layout.html
M ckan/templates/package/new_package_form.html
M ckan/templates/package/read_core.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/user/login.html
M ckan/tests/functional/test_group.py
M ckanext/stats/templates/ckanext/stats/leaderboard.html
M doc/theming.rst
Log Message:
-----------
Merge branch 'master' of ssh://github.com/okfn/ckan
Commit: ef6675ddf450543df9cdd0aac64de3530e34fe35
https://github.com/okfn/ckan/commit/ef6675ddf450543df9cdd0aac64de3530e34fe35
Author: David Read <david.read at okfn.org>
Date: 2012-01-24 (Tue, 24 Jan 2012)
Changed paths:
M ckan/tests/test_plugins.py
Log Message:
-----------
Revert "Fixed the test_mapper_plugin_fired test so that it runs with the version of pyutillib that"
This reverts commit a267347d4fdd6a0d1cc0a69917e860a5c5c15a91.
Ross was inadvertantly getting the test working with pyutilib 4.4, but we use 4.1 (trunk at 1972).
Commit: 1b64e9ad5c05fa07072d45e359eb5e313e33d41d
https://github.com/okfn/ckan/commit/1b64e9ad5c05fa07072d45e359eb5e313e33d41d
Author: John Glover <j at johnglover.net>
Date: 2012-01-25 (Wed, 25 Jan 2012)
Changed paths:
M doc/paster.rst
Log Message:
-----------
[docs] Fix mistake in paster command
Commit: 54f0711e5a14c8402fe3501a099984004bde265b
https://github.com/okfn/ckan/commit/54f0711e5a14c8402fe3501a099984004bde265b
Author: David Read <david.read at okfn.org>
Date: 2012-01-25 (Wed, 25 Jan 2012)
Changed paths:
M doc/solr-setup.rst
Log Message:
-----------
[master][doc]: Improve detail of SOLR multi-core docs.
Commit: 46018fba736fab7713593b3b28df4ac72cc75e3b
https://github.com/okfn/ckan/commit/46018fba736fab7713593b3b28df4ac72cc75e3b
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-25 (Wed, 25 Jan 2012)
Changed paths:
M ckan/lib/helpers.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/templates/package/read_core.html
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#1583][l]: Moving template changes into ckanext-qa. Keeping core functionality (eg. hover-help).
Commit: 87a724c2f280e726b927024bae1bbbf4bf357657
https://github.com/okfn/ckan/commit/87a724c2f280e726b927024bae1bbbf4bf357657
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-25 (Wed, 25 Jan 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/api.py
M ckan/lib/search/index.py
M ckan/logic/action/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/delete.py
M ckan/logic/schema.py
M ckan/model/package.py
M ckan/tests/functional/api/base.py
M ckan/tests/functional/api/model/test_relationships.py
M ckan/tests/test_plugins.py
M doc/api.rst
M doc/common-error-messages.rst
M doc/file-upload.rst
M doc/index.rst
M doc/paster.rst
Log Message:
-----------
Merge branch 'master' into feature-1583-qa
Commit: 8f3c70c3f3008acf9e3bfcc813f40df07c6ee4c5
https://github.com/okfn/ckan/commit/8f3c70c3f3008acf9e3bfcc813f40df07c6ee4c5
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-25 (Wed, 25 Jan 2012)
Changed paths:
M ckan/public/css/style.css
A ckan/public/images/icons/star.png
M ckan/templates/package/read_core.html
M ckan/templates/package/resource_read.html
Log Message:
-----------
Merge branch 'feature-1583-qa'
Commit: 3f7d4a5ed32fade49c4dae3e9bc8d2b28f85b29c
https://github.com/okfn/ckan/commit/3f7d4a5ed32fade49c4dae3e9bc8d2b28f85b29c
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-25 (Wed, 25 Jan 2012)
Changed paths:
M ckan/forms/group.py
Log Message:
-----------
[#1530][s]: Realigning help text. Affects datacatalogs.org. Committed to master; closes #1530
Commit: f878ffea5683c15ee3aa8b1da20fc66e20089d21
https://github.com/okfn/ckan/commit/f878ffea5683c15ee3aa8b1da20fc66e20089d21
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-01-25 (Wed, 25 Jan 2012)
Changed paths:
M ckan/templates/facets.html
Log Message:
-----------
[master][html] Altered facet_sidebar function to have use a custom title for the facet header
Commit: 0d3543cd8cb6212786925bfa89f3922b030d9040
https://github.com/okfn/ckan/commit/0d3543cd8cb6212786925bfa89f3922b030d9040
Author: David Read <david.read at okfn.org>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
M ckan/config/environment.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/lib/hash.py
M ckan/lib/search/__init__.py
M ckan/lib/search/common.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_pagination.py
M ckan/tests/lib/test_solr_search_index.py
M doc/configuration.rst
Log Message:
-----------
[master][#1708][config,controllers,lib]: Fix bug causing SOLR settings being lost.
Commit: bc8b1edabb58a45101698131af895713d081d25b
https://github.com/okfn/ckan/commit/bc8b1edabb58a45101698131af895713d081d25b
Author: David Read <david.read at okfn.org>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
M ckan/forms/group.py
M ckan/public/css/style.css
A ckan/public/images/icons/star.png
M ckan/templates/facets.html
M ckan/templates/package/read_core.html
M ckan/templates/package/resource_read.html
M doc/paster.rst
Log Message:
-----------
Merge branch 'master' of ssh://github.com/okfn/ckan
Commit: 6939a35fbd44386577bacd0db21aa940e1900265
https://github.com/okfn/ckan/commit/6939a35fbd44386577bacd0db21aa940e1900265
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
M ckan/public/css/style.css
M ckan/templates/group/read.html
Log Message:
-----------
[#1583][s]: Aesthetic fixes. Closes #1583.
Commit: 048f58748b052ecd9efaa0b6940d3c1659990494
https://github.com/okfn/ckan/commit/048f58748b052ecd9efaa0b6940d3c1659990494
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
M ckan/public/css/style.css
M ckan/templates/group/read.html
Log Message:
-----------
Merge branch 'feature-1583-qa'
Commit: aec525e931dae303567c828cb77894273c62c2bb
https://github.com/okfn/ckan/commit/aec525e931dae303567c828cb77894273c62c2bb
Author: David Read <david.read at okfn.org>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_pagination.py
Log Message:
-----------
[master][tests]: Fix tests broken in #1521 branch.
Commit: 7a51a16c16007e9e0d1d62dec26e3b1c7dbcf282
https://github.com/okfn/ckan/commit/7a51a16c16007e9e0d1d62dec26e3b1c7dbcf282
Author: David Read <david.read at okfn.org>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
M doc/solr-setup.rst
Log Message:
-----------
[master][doc][xs]: I got permissions errors with multicore SOLR which were fixed by using jetty user to create the data dirs.
Commit: 804b5497bcf448b9aa4cb087696a11579d96731b
https://github.com/okfn/ckan/commit/804b5497bcf448b9aa4cb087696a11579d96731b
Author: David Read <david.read at okfn.org>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
M ckan/lib/cli.py
M ckan/lib/dumper.py
Log Message:
-----------
[master][#1710][cli]: Dumper for user info - to create "announce" email list.
Commit: 6c9705d87cebaaca7adbbed71917ee5a46715d86
https://github.com/okfn/ckan/commit/6c9705d87cebaaca7adbbed71917ee5a46715d86
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
M ckan/templates/group/layout.html
Log Message:
-----------
[bugfix][xs]: Bad merge had duplicated a navlink.
Commit: 95606b51ed7eb37a9f5453105b5f1259fcf5af3d
https://github.com/okfn/ckan/commit/95606b51ed7eb37a9f5453105b5f1259fcf5af3d
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
M ckan/public/scripts/application.js
M ckan/templates/js_strings.html
M ckan/templates/package/new_package_form.html
Log Message:
-----------
[#1716][m]: Moved the unsaved changes warning to the bottom of the page to save nav-links from jumping out of the way of the mouse.
Commit: 2bd50d92f48ca67edb69e51a7bcfc5009d77a785
https://github.com/okfn/ckan/commit/2bd50d92f48ca67edb69e51a7bcfc5009d77a785
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
M ckan/public/scripts/application.js
M ckan/templates/js_strings.html
M ckan/templates/package/new_package_form.html
Log Message:
-----------
Merge branch 'feature-1716-ux-tweak'
Commit: eda8cbac06dfe750c2b48eb55e57ed25d2dcd3ac
https://github.com/okfn/ckan/commit/eda8cbac06dfe750c2b48eb55e57ed25d2dcd3ac
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
M ckan/templates/js_strings.html
Log Message:
-----------
[#1716][xs]: Hotfix to string content. Closes #1716.
Commit: a348b36d1093e91deaa4e27541e6444e8ea81d6b
https://github.com/okfn/ckan/commit/a348b36d1093e91deaa4e27541e6444e8ea81d6b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
M ckan/lib/navl/dictization_functions.py
Log Message:
-----------
Fix a couple of typos
Commit: f4d991282b850a2c8fa8ccccdbe5e3d5abda5fcc
https://github.com/okfn/ckan/commit/f4d991282b850a2c8fa8ccccdbe5e3d5abda5fcc
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Fix a typo in default_resource_schema()
Commit: 68a15ec3f3d1f4f1e396dd27c8564895f4d05490
https://github.com/okfn/ckan/commit/68a15ec3f3d1f4f1e396dd27c8564895f4d05490
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
M ckan/migration/versions/034_resource_group_table.py
Log Message:
-----------
Fix a typo in a comment
Commit: 5616bc2053c8773147acfbf68a48c867656d49e6
https://github.com/okfn/ckan/commit/5616bc2053c8773147acfbf68a48c867656d49e6
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/templates/package/edit.html
M ckan/templates/package/new_package_form.html
Log Message:
-----------
[#1425][m]: Redesigned front-end for dataset deletion. Closes #1425.
Commit: f3a4c3de70da08d396da4e65a5d286b253be0e0b
https://github.com/okfn/ckan/commit/f3a4c3de70da08d396da4e65a5d286b253be0e0b
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/templates/package/edit.html
M ckan/templates/package/new_package_form.html
Log Message:
-----------
[#1425][m]: Redesigned front-end for dataset deletion. Closes #1425.
Commit: 810317ce3c9c2f35ea792345ac65bda925d2a079
https://github.com/okfn/ckan/commit/810317ce3c9c2f35ea792345ac65bda925d2a079
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Log Message:
-----------
Merge branch 'feature-1425-dataset-delete'
Commit: 9cee66a878b0b3fb7733730b0ebc942217bc94ba
https://github.com/okfn/ckan/commit/9cee66a878b0b3fb7733730b0ebc942217bc94ba
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
A ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
Log Message:
-----------
[#1602,js/vendor][s]: add jquery.mustache.
Commit: 92504e7f9b8ac74d29f4a31b14d99b273deba68c
https://github.com/okfn/ckan/commit/92504e7f9b8ac74d29f4a31b14d99b273deba68c
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
A ckan/public/scripts/vendor/recline/css/data-explorer.css
A ckan/public/scripts/vendor/recline/css/graph-flot.css
A ckan/public/scripts/vendor/recline/css/images/edit-map.png
A ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
A ckan/public/scripts/vendor/recline/recline.js
Log Message:
-----------
[#1602,js/vendor][m]: add in recline data explorer library.
* Recline is (non-minified) consolidated as of https://github.com/okfn/recline/commit/8fa93dcbe9d076774bd04b14cc128ab634f6e800.
Commit: 7c782212dc66f915ee3f5deaad72cb948abe3eb8
https://github.com/okfn/ckan/commit/7c782212dc66f915ee3f5deaad72cb948abe3eb8
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
M ckan/public/scripts/application.js
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#1602,js][m]: replace old Data Explorer with new Recline Data Explorer.
* Everything working (as far as I can tell using my demo resource data).
Commit: 211c8006fe28106f532db5f09ca47e02f065f454
https://github.com/okfn/ckan/commit/211c8006fe28106f532db5f09ca47e02f065f454
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
M ckan/public/scripts/application.js
A ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
A ckan/public/scripts/vendor/recline/css/data-explorer.css
A ckan/public/scripts/vendor/recline/css/graph-flot.css
A ckan/public/scripts/vendor/recline/css/images/edit-map.png
A ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
A ckan/public/scripts/vendor/recline/recline.js
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#1602,merge][s]: Merge branch 'feature-1602-data-viewer-v2' - fixes #1602.
Commit: fda5bbb8927f1220598cf2225954c7f3f4443321
https://github.com/okfn/ckan/commit/fda5bbb8927f1220598cf2225954c7f3f4443321
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-01-26 (Thu, 26 Jan 2012)
Changed paths:
M ckan/lib/search/sql.py
Log Message:
-----------
[#1709][xs]: correct sql search so it correctly does unfiltered search when passed '*:*' as query.
* commiting this fix in master because so tiny (plus had it in #1602 branch but thought better to commit here than there).
Commit: 7297e0b6db2eb3c1c4975cf9603030f5bab75a6e
https://github.com/okfn/ckan/commit/7297e0b6db2eb3c1c4975cf9603030f5bab75a6e
Author: David Read <david.read at okfn.org>
Date: 2012-01-27 (Fri, 27 Jan 2012)
Changed paths:
M ckan/lib/cli.py
M ckan/lib/dumper.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/search/sql.py
M ckan/logic/schema.py
M ckan/migration/versions/034_resource_group_table.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
A ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
A ckan/public/scripts/vendor/recline/css/data-explorer.css
A ckan/public/scripts/vendor/recline/css/graph-flot.css
A ckan/public/scripts/vendor/recline/css/images/edit-map.png
A ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
A ckan/public/scripts/vendor/recline/recline.js
M ckan/templates/group/layout.html
M ckan/templates/group/read.html
M ckan/templates/js_strings.html
M ckan/templates/package/edit.html
M ckan/templates/package/new_package_form.html
M ckan/templates/package/resource_read.html
Log Message:
-----------
Merge branch 'master' of ssh://github.com/okfn/ckan
Commit: 37b8a0b742ed21c9ec415f77d1f7b62052ae9464
https://github.com/okfn/ckan/commit/37b8a0b742ed21c9ec415f77d1f7b62052ae9464
Author: David Read <david.read at okfn.org>
Date: 2012-01-27 (Fri, 27 Jan 2012)
Changed paths:
M ckan/lib/search/sql.py
A ckan/tests/lib/test_simple_search.py
Log Message:
-----------
[master][#1709]: Fix for simple_search broken on home page and added simple tests.
Commit: 4325830ab0aa50cb2e27f3a691b5265ca7148271
https://github.com/okfn/ckan/commit/4325830ab0aa50cb2e27f3a691b5265ca7148271
Author: David Read <david.read at okfn.org>
Date: 2012-01-27 (Fri, 27 Jan 2012)
Changed paths:
M ckan/lib/navl/dictization_functions.py
M ckan/logic/schema.py
M ckan/migration/versions/034_resource_group_table.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
A ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
A ckan/public/scripts/vendor/recline/css/data-explorer.css
A ckan/public/scripts/vendor/recline/css/graph-flot.css
A ckan/public/scripts/vendor/recline/css/images/edit-map.png
A ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
A ckan/public/scripts/vendor/recline/recline.js
M ckan/templates/group/layout.html
M ckan/templates/js_strings.html
M ckan/templates/package/edit.html
M ckan/templates/package/new_package_form.html
M ckan/templates/package/resource_read.html
Log Message:
-----------
Merge branch 'master' of ssh://github.com/okfn/ckan
Conflicts:
ckan/lib/search/sql.py
Commit: 02788e7339c69fddba1e6b70c14762872b8f27b0
https://github.com/okfn/ckan/commit/02788e7339c69fddba1e6b70c14762872b8f27b0
Author: David Read <david.read at okfn.org>
Date: 2012-01-27 (Fri, 27 Jan 2012)
Changed paths:
M ckan/lib/search/sql.py
A ckan/tests/lib/test_simple_search.py
Log Message:
-----------
Merge branch 'master' of ssh://github.com/okfn/ckan
Commit: cb5bba788a8fe0aaab1f88cb673962214e3d7faa
https://github.com/okfn/ckan/commit/cb5bba788a8fe0aaab1f88cb673962214e3d7faa
Author: David Read <david.read at okfn.org>
Date: 2012-01-27 (Fri, 27 Jan 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[master][#1708][xs]: Protect against import of controller/search code before config initialisation.
Commit: e2ea171fe3728c106ca898075ee7e1a8d0404189
https://github.com/okfn/ckan/commit/e2ea171fe3728c106ca898075ee7e1a8d0404189
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-01-27 (Fri, 27 Jan 2012)
Changed paths:
M ckan/templates/user/edit.html
Log Message:
-----------
[bugfix,user/edit][xs]: correct template so that we show user name of person being edited not user doing the editing.
Commit: 7602134e2908cb1f6100349daac39a61b23f572e
https://github.com/okfn/ckan/commit/7602134e2908cb1f6100349daac39a61b23f572e
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-01-27 (Fri, 27 Jan 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[bugfix,routing][xs]: ensure /user/ redirects to /user rather than displaying current user's home page.
Commit: 344ff3e28e451eb7c2f6a669c97e4c489de33d80
https://github.com/okfn/ckan/commit/344ff3e28e451eb7c2f6a669c97e4c489de33d80
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-01-28 (Sat, 28 Jan 2012)
Changed paths:
M ckan/public/scripts/vendor/recline/css/data-explorer.css
M ckan/public/scripts/vendor/recline/recline.js
Log Message:
-----------
[#1602,vendor/recline][xs]: integrate some very minor improvements from recline upstream.
Commit: ec733cd1f7c8c11c0b7e889e4b719ba2275be077
https://github.com/okfn/ckan/commit/ec733cd1f7c8c11c0b7e889e4b719ba2275be077
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-30 (Mon, 30 Jan 2012)
Changed paths:
M ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
Log Message:
-----------
[#1574][xs]: Experimental hotfix for test.ckan.net uploader
Commit: b21f4cc3992ef8b091fdf3ac9088d7e29653b465
https://github.com/okfn/ckan/commit/b21f4cc3992ef8b091fdf3ac9088d7e29653b465
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-30 (Mon, 30 Jan 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/storage.py
Log Message:
-----------
[#1574][s]: Hotfix #2 for text.ckan.net. Can be reverted.
Commit: 71c7d79637a544903ea233b48d60f60ee22e4a54
https://github.com/okfn/ckan/commit/71c7d79637a544903ea233b48d60f60ee22e4a54
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-30 (Mon, 30 Jan 2012)
Changed paths:
M ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
Log Message:
-----------
Revert "[#1574][xs]: Experimental hotfix for test.ckan.net uploader"
This reverts commit ec733cd1f7c8c11c0b7e889e4b719ba2275be077.
Commit: e7e5c05a0f92725a74d9209ab42b0ec54e952332
https://github.com/okfn/ckan/commit/e7e5c05a0f92725a74d9209ab42b0ec54e952332
Author: Tom Rees <zephod at gmail.com>
Date: 2012-01-30 (Mon, 30 Jan 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/storage.py
Log Message:
-----------
Revert "[#1574][s]: Hotfix #2 for text.ckan.net. Can be reverted."
This reverts commit b21f4cc3992ef8b091fdf3ac9088d7e29653b465.
Commit: c826b53e7479dd96c6bf4ad0fffad09426d336cf
https://github.com/okfn/ckan/commit/c826b53e7479dd96c6bf4ad0fffad09426d336cf
Author: David Read <david.read at okfn.org>
Date: 2012-01-30 (Mon, 30 Jan 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/package.py
Log Message:
-----------
[master][noticket][controllers][xs]: Fix for group search failure - logging caused exception as it was not imported.
Commit: 5d5d88433e89608bb73dab1b328a960d9e26eb70
https://github.com/okfn/ckan/commit/5d5d88433e89608bb73dab1b328a960d9e26eb70
Author: David Read <david.read at okfn.org>
Date: 2012-01-30 (Mon, 30 Jan 2012)
Changed paths:
M ckan/tests/functional/api/model/test_relationships.py
Log Message:
-----------
[master][noticket][tests][xs]: Refactored test to be more reliable - 123 was appearing in UUIDs in the page elsewhere.
Commit: 76d9bce80e4c243e44962d52c321ce6432e12e9e
https://github.com/okfn/ckan/commit/76d9bce80e4c243e44962d52c321ce6432e12e9e
Author: David Read <david.read at okfn.org>
Date: 2012-01-30 (Mon, 30 Jan 2012)
Changed paths:
M ckan/config/routing.py
M ckan/public/scripts/vendor/recline/css/data-explorer.css
M ckan/public/scripts/vendor/recline/recline.js
M ckan/templates/user/edit.html
Log Message:
-----------
Merge branch 'master' of ssh://github.com/okfn/ckan
Commit: c6172731365666241692dc54fd3eb37c283d8aec
https://github.com/okfn/ckan/commit/c6172731365666241692dc54fd3eb37c283d8aec
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-01-30 (Mon, 30 Jan 2012)
Changed paths:
A bin/canada.py
A bin/status.py
M ckan/authz.py
M ckan/ckan_nose_plugin.py
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/controllers/api.py
M ckan/controllers/group.py
M ckan/controllers/package.py
A ckan/controllers/storage.py
M ckan/forms/group.py
M ckan/lib/app_globals.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dumper.py
M ckan/lib/hash.py
M ckan/lib/helpers.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/repoze_patch.py
M ckan/lib/search/__init__.py
M ckan/lib/search/common.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/lib/search/sql.py
M ckan/logic/action/__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/update.py
M ckan/logic/schema.py
M ckan/migration/versions/034_resource_group_table.py
M ckan/migration/versions/047_rename_package_group_member.py
M ckan/model/__init__.py
M ckan/model/authz.py
M ckan/model/package.py
M ckan/plugins/interfaces.py
M ckan/public/css/style.css
A ckan/public/images/icons/ckan.ico
A ckan/public/images/icons/star.png
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
A ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
A ckan/public/scripts/vendor/recline/css/data-explorer.css
A ckan/public/scripts/vendor/recline/css/graph-flot.css
A ckan/public/scripts/vendor/recline/css/images/edit-map.png
A ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
A ckan/public/scripts/vendor/recline/recline.js
A ckan/templates/facets.html
M ckan/templates/group/layout.html
M ckan/templates/group/read.html
M ckan/templates/js_strings.html
M ckan/templates/layout_base.html
M ckan/templates/package/edit.html
R ckan/templates/package/facets.html
M ckan/templates/package/new_package_form.html
M ckan/templates/package/read_core.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/package/search_form.html
A ckan/templates/storage/index.html
A ckan/templates/storage/success.html
M ckan/templates/user/edit.html
M ckan/tests/functional/api/base.py
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/functional/api/model/test_relationships.py
M ckan/tests/functional/api/test_action.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_pagination.py
A ckan/tests/functional/test_storage.py
A ckan/tests/functional/test_upload.py
A ckan/tests/lib/test_cli.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
A ckan/tests/lib/test_simple_search.py
M ckan/tests/lib/test_solr_search_index.py
M ckan/tests/models/test_repo.py
M ckan_deb/usr/bin/ckan-create-instance
M ckan_deb/usr/lib/ckan/common.sh
M doc/api.rst
M doc/common-error-messages.rst
M doc/configuration.rst
A doc/file-upload.rst
M doc/index.rst
M doc/install-from-package.rst
M doc/paster.rst
M doc/solr-setup.rst
M requires/lucid_missing.txt
Log Message:
-----------
Merge branch 'master' into defect-1401-mount-non-root
Commit: 42e8efc53d68032cfa847b36b4f82d3a54b000d0
https://github.com/okfn/ckan/commit/42e8efc53d68032cfa847b36b4f82d3a54b000d0
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-01-31 (Tue, 31 Jan 2012)
Changed paths:
M ckan/public/css/style.css
Log Message:
-----------
[#1401,css][xs]: correct non relative links to images in css (which caused problems with non-root mounting of the app).
Commit: 5f120a8fc8e9fbfc29cd5c5c0ab2d19b96c4920c
https://github.com/okfn/ckan/commit/5f120a8fc8e9fbfc29cd5c5c0ab2d19b96c4920c
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-01-31 (Tue, 31 Jan 2012)
Changed paths:
M ckan/templates/layout_base.html
Log Message:
-----------
[#1401,templates][xs]: set js global CKAN.SITE_URL with h.url('/') rather than g.site_url.
Commit: abb99cae9972d45f4b3acfbf8ea711da398d8a4a
https://github.com/okfn/ckan/commit/abb99cae9972d45f4b3acfbf8ea711da398d8a4a
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-01-31 (Tue, 31 Jan 2012)
Changed paths:
M ckan/public/css/style.css
M ckan/templates/layout_base.html
Log Message:
-----------
Merge branch 'defect-1401-mount-non-root'
Commit: 6fecbd9fb08f5a22e9dd2dd2745c287a38f44a30
https://github.com/okfn/ckan/commit/6fecbd9fb08f5a22e9dd2dd2745c287a38f44a30
Author: David Read <david.read at okfn.org>
Date: 2012-01-31 (Tue, 31 Jan 2012)
Changed paths:
M ckan/logic/validators.py
A ckan/tests/logic/test_validators.py
Log Message:
-----------
[master][#1725][logic/validators]: Ignore trailing commas in tag list (created by tag autocomplete).
Commit: eb52431797a3f0fb5957e536cf29ab9f0b9a48bb
https://github.com/okfn/ckan/commit/eb52431797a3f0fb5957e536cf29ab9f0b9a48bb
Author: David Read <david.read at okfn.org>
Date: 2012-01-31 (Tue, 31 Jan 2012)
Changed paths:
R ckan/tests/functional/api/test_action.py
A ckan/tests/logic/test_action.py
Log Message:
-----------
[master][noticket][tests][xs]: Move logic layer tests to its own directory - see ckan-dev announcement.
Commit: dd2c0c677117f06a52aa22b3b2717bb605263570
https://github.com/okfn/ckan/commit/dd2c0c677117f06a52aa22b3b2717bb605263570
Author: kindly <kindly at gmail.com>
Date: 2012-01-31 (Tue, 31 Jan 2012)
Changed paths:
M ckan/lib/search/index.py
M ckan/logic/action/create.py
M ckan/plugins/interfaces.py
M ckan/tests/functional/test_package.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
[#1738] before indes extension made
Commit: 117dce4d64de731e7b0a3c55175a1d093f2bf540
https://github.com/okfn/ckan/commit/117dce4d64de731e7b0a3c55175a1d093f2bf540
Author: kindly <kindly at gmail.com>
Date: 2012-01-31 (Tue, 31 Jan 2012)
Changed paths:
M ckan/templates/package/new_package_form.html
M ckan/tests/functional/test_user.py
Log Message:
-----------
[#1739] fix errors due to tests not being run
Commit: 64abd2ff19ac331d15af038339ef19410e02f419
https://github.com/okfn/ckan/commit/64abd2ff19ac331d15af038339ef19410e02f419
Author: kindly <kindly at gmail.com>
Date: 2012-01-31 (Tue, 31 Jan 2012)
Changed paths:
M ckan/lib/search/index.py
M ckan/logic/action/create.py
M ckan/plugins/interfaces.py
M ckan/tests/functional/test_package.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
Merge branch 'feature-1738-add-before-index-extension'
Commit: 94f10371666bf2ca976fe26ce06344b9ed2191b9
https://github.com/okfn/ckan/commit/94f10371666bf2ca976fe26ce06344b9ed2191b9
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-02-01 (Wed, 01 Feb 2012)
Changed paths:
M ckan/ckan_nose_plugin.py
M ckan/config/environment.py
M ckan/config/routing.py
M ckan/controllers/api.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/controllers/storage.py
M ckan/forms/group.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dumper.py
M ckan/lib/hash.py
M ckan/lib/helpers.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/search/__init__.py
M ckan/lib/search/common.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/lib/search/sql.py
M ckan/logic/action/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/delete.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/migration/versions/034_resource_group_table.py
M ckan/migration/versions/047_rename_package_group_member.py
M ckan/model/__init__.py
M ckan/model/package.py
M ckan/plugins/interfaces.py
M ckan/public/css/style.css
A ckan/public/images/icons/star.png
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
A ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
A ckan/public/scripts/vendor/recline/css/data-explorer.css
A ckan/public/scripts/vendor/recline/css/graph-flot.css
A ckan/public/scripts/vendor/recline/css/images/edit-map.png
A ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
A ckan/public/scripts/vendor/recline/recline.js
M ckan/templates/_util.html
A ckan/templates/facets.html
M ckan/templates/group/layout.html
M ckan/templates/group/new_group_form.html
M ckan/templates/group/read.html
M ckan/templates/js_strings.html
M ckan/templates/layout_base.html
M ckan/templates/package/edit.html
R ckan/templates/package/facets.html
M ckan/templates/package/layout.html
M ckan/templates/package/new_package_form.html
M ckan/templates/package/read_core.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/user/edit.html
M ckan/templates/user/login.html
M ckan/tests/functional/api/base.py
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/functional/api/model/test_relationships.py
R ckan/tests/functional/api/test_action.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_pagination.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_upload.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_cli.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
A ckan/tests/lib/test_simple_search.py
M ckan/tests/lib/test_solr_search_index.py
A ckan/tests/logic/test_action.py
A ckan/tests/logic/test_validators.py
M ckan/tests/test_plugins.py
M ckanext/stats/templates/ckanext/stats/leaderboard.html
M doc/api.rst
M doc/common-error-messages.rst
M doc/configuration.rst
M doc/file-upload.rst
M doc/index.rst
M doc/install-from-package.rst
M doc/paster.rst
M doc/solr-setup.rst
M doc/theming.rst
Log Message:
-----------
Merge branch 'master' into feature-1608-move-storage-to-core
Commit: a80f50a1e55d464b50aa6686df4d01c093798cbd
https://github.com/okfn/ckan/commit/a80f50a1e55d464b50aa6686df4d01c093798cbd
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-02-01 (Wed, 01 Feb 2012)
Changed paths:
M ckan/controllers/storage.py
M ckan/tests/functional/test_storage.py
M doc/file-upload.rst
Log Message:
-----------
[#1608,storage][m]: reinstate direct upload to cloud storage.
* Reinstate cloud storage tests
* Also greatly extend docs with existing material from ckanext-storage
Commit: 3c9ddd31d741eb8ec8c145063ce967e781947a88
https://github.com/okfn/ckan/commit/3c9ddd31d741eb8ec8c145063ce967e781947a88
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-02-01 (Wed, 01 Feb 2012)
Changed paths:
M ckan/tests/functional/test_storage.py
Log Message:
-----------
[#1608,tests][xs]: disable remote storage (GS) test as reqires GS access codes (not generally available).
Compare: https://github.com/okfn/ckan/compare/5009db9...3c9ddd3
More information about the ckan-changes
mailing list