[ckan-changes] [ckan/ckan] 35fc3e: [xs] Helpful SOLR hint.
GitHub
noreply at github.com
Thu Jan 30 19:19:24 UTC 2014
Branch: refs/heads/1377-javascript-tutorial
Home: https://github.com/ckan/ckan
Commit: 35fc3ed37b600570b5a294cf9621c1400bd48bf1
https://github.com/ckan/ckan/commit/35fc3ed37b600570b5a294cf9621c1400bd48bf1
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-05-25 (Fri, 25 May 2012)
Changed paths:
M doc/solr-setup.rst
Log Message:
-----------
[xs] Helpful SOLR hint.
Commit: f8dbc69974031b09a48948f8ed6ebc75e9da611e
https://github.com/ckan/ckan/commit/f8dbc69974031b09a48948f8ed6ebc75e9da611e
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths:
R Coding_Standards.rst
M ckan/config/deployment.ini_tmpl
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/user.py
A ckan/i18n/check_po_files.py
M ckan/lib/helpers.py
M ckan/lib/repoze_patch.py
M ckan/lib/search/__init__.py
M ckan/model/tag.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/templates/layout_base.html
M ckan/tests/lib/test_helpers.py
M ckanext/multilingual/plugin.py
M ckanext/multilingual/tests/test_multilingual_plugin.py
M ckanext/organizations/templates/organization_read.html
A doc/coding-standards.rst
M doc/configuration.rst
M doc/geospatial.rst
A doc/harvesting.rst
M doc/index.rst
A doc/install-from-package-amazon.rst
A doc/install-from-package-virtualbox.rst
M doc/install-from-package.rst
M doc/install-from-source.rst
M doc/post-installation.rst
M doc/solr-setup.rst
M doc/test.rst
M requires/lucid_missing.txt
M requires/lucid_present.txt
M setup.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' of ssh://github.com/okfn/ckan
Commit: 04ca4191673010e86ac0d77991cb7967fe6c58ae
https://github.com/ckan/ckan/commit/04ca4191673010e86ac0d77991cb7967fe6c58ae
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths:
M ckan/lib/create_test_data.py
Log Message:
-----------
Fix minor bug that caused create_users to not commit changes.
Commit: 6780e91351915bf0a020c93cae67d597c406c348
https://github.com/ckan/ckan/commit/6780e91351915bf0a020c93cae67d597c406c348
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/lib/authenticator.py
M ckan/lib/base.py
M ckan/lib/search/__init__.py
Log Message:
-----------
Improve logging in useful places.
Commit: 75ba31027650b1ff3af3c8dc16cc11663f515350
https://github.com/ckan/ckan/commit/75ba31027650b1ff3af3c8dc16cc11663f515350
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M ckan/lib/create_test_data.py
Log Message:
-----------
Comment required, else Toby would just delete the method out of hand.
Commit: 98888d2b5a46945a96b1d4719718c836a6a15e60
https://github.com/ckan/ckan/commit/98888d2b5a46945a96b1d4719718c836a6a15e60
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M ckan/config/environment.py
M ckan/lib/plugins.py
Log Message:
-----------
[#1038] Correct copyright sign for UTF8 file and cut/paste error.
Commit: 21cd0ac33023d13127a1e66094334de9d53b8b24
https://github.com/ckan/ckan/commit/21cd0ac33023d13127a1e66094334de9d53b8b24
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
[#1038] Fix to allow sqlite testing - for until the tests are overhaulled.
Commit: 96f0a3e775e14207cd1eec3b82f0e05a1f5a48ed
https://github.com/ckan/ckan/commit/96f0a3e775e14207cd1eec3b82f0e05a1f5a48ed
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
Log Message:
-----------
[#1038] Test fixtures for organization hierarchy.
Commit: fde50fa47123c714e8098e8f7dbf88085da67ddc
https://github.com/ckan/ckan/commit/fde50fa47123c714e8098e8f7dbf88085da67ddc
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M ckan/model/group.py
M ckan/tests/models/test_group.py
Log Message:
-----------
[#1038] Model methods for organization hierarchy.
Commit: 2c0bbafc509fc340dbdaa50c73e5ca712dc6b57a
https://github.com/ckan/ckan/commit/2c0bbafc509fc340dbdaa50c73e5ca712dc6b57a
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-07-23 (Tue, 23 Jul 2013)
Changed paths:
M ckan/lib/create_test_data.py
M ckan/tests/models/test_group.py
Log Message:
-----------
[#1038] Test data is now organizations rather than groups.
Commit: 1229ff24d506a57f56ca4d030ab9228ff1d647c9
https://github.com/ckan/ckan/commit/1229ff24d506a57f56ca4d030ab9228ff1d647c9
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-07-23 (Tue, 23 Jul 2013)
Changed paths:
M ckan/model/group.py
Log Message:
-----------
[#1038] Docs for Member and its capacities is most handy. Explained the sort ordering for some of the group functions.
Commit: 854015ad13218b7d9a8df4566006a87e52774327
https://github.com/ckan/ckan/commit/854015ad13218b7d9a8df4566006a87e52774327
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-07-23 (Tue, 23 Jul 2013)
Changed paths:
M doc/solr-setup.rst
Log Message:
-----------
Merge branch 'master' of github.com:datagovuk/ckan
Conflicts:
ckan/lib/base.py
ckan/lib/search/__init__.py
doc/solr-setup.rst
Commit: a7a2714ee3b0a0436a6e6092bf8280c1246110ce
https://github.com/ckan/ckan/commit/a7a2714ee3b0a0436a6e6092bf8280c1246110ce
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-07-23 (Tue, 23 Jul 2013)
Changed paths:
M .tx/config
M CHANGELOG.rst
M CONTRIBUTING.rst
M bin/ckan_spam.py
M bin/travis-build
R build.sh
M ckan/__init__.py
M ckan/config/routing.py
M ckan/controllers/admin.py
M ckan/controllers/group.py
M ckan/controllers/organization.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/base.py
M ckan/lib/celery_app.py
M ckan/lib/datapreview.py
M ckan/lib/dictization/model_save.py
M ckan/lib/formatters.py
M ckan/lib/helpers.py
M ckan/lib/navl/__init__.py
M ckan/lib/package_saver.py
M ckan/lib/repoze_patch.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/delete.py
M ckan/logic/auth/get.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/migration/versions/066_default_package_type.py
M ckan/model/package_relationship.py
M ckan/model/resource.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/javascript/main.js
M ckan/public/base/javascript/modules/custom-fields.js
A ckan/public/base/javascript/modules/dataset-visibility.js
M ckan/public/base/javascript/modules/slug-preview.js
M ckan/public/base/javascript/plugins/jquery.slug-preview.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/ckan.less
M ckan/public/base/less/dashboard.less
R ckan/public/base/less/font-awesome.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/icons.less
M ckan/public/base/less/media.less
M ckan/public/base/less/module.less
M ckan/public/base/less/nav.less
M ckan/public/base/less/toolbar.less
M ckan/public/base/test/index.html
M ckan/public/base/test/spec/modules/custom-fields.spec.js
M ckan/public/base/test/spec/modules/resource-upload-field.spec.js
M ckan/public/base/test/vendor/mocha.css
M ckan/public/base/test/vendor/mocha.js
A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
R ckan/public/base/vendor/bootstrap/js/.jshintrc
M ckan/public/base/vendor/bootstrap/js/bootstrap.js
M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
M ckan/public/base/vendor/bootstrap/less/bootstrap.less
M ckan/public/base/vendor/bootstrap/less/dropdowns.less
M ckan/public/base/vendor/bootstrap/less/responsive.less
M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
M ckan/public/base/vendor/font-awesome/css/font-awesome.css
A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
A ckan/public/base/vendor/font-awesome/less/bootstrap.less
A ckan/public/base/vendor/font-awesome/less/core.less
A ckan/public/base/vendor/font-awesome/less/extras.less
M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
M ckan/public/base/vendor/font-awesome/less/font-awesome.less
A ckan/public/base/vendor/font-awesome/less/icons.less
A ckan/public/base/vendor/font-awesome/less/mixins.less
A ckan/public/base/vendor/font-awesome/less/path.less
A ckan/public/base/vendor/font-awesome/less/variables.less
M ckan/public/base/vendor/jquery.js
M ckan/public/base/vendor/resource.config
M ckan/templates/admin/config.html
M ckan/templates/admin/index.html
M ckan/templates/ajax_snippets/related-item.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/edit.html
A ckan/templates/group/edit_base.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/members.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/group/read_base.html
M ckan/templates/group/snippets/group_form.html
A ckan/templates/group/snippets/helper.html
A ckan/templates/group/snippets/info.html
M ckan/templates/header.html
M ckan/templates/macros/autoform.html
M ckan/templates/macros/form.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/index.html
M ckan/templates/organization/new.html
M ckan/templates/organization/read.html
A ckan/templates/organization/snippets/helper.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/package/base.html
M ckan/templates/package/read_base.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resource_item.html
M ckan/templates/package/snippets/stages.html
M ckan/templates/snippets/organization.html
M ckan/templates/user/dashboard.html
A ckan/templates/user/dashboard_datasets.html
A ckan/templates/user/dashboard_groups.html
A ckan/templates/user/dashboard_organizations.html
M ckan/templates/user/edit.html
M ckan/templates/user/edit_base.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/read_base.html
M ckan/templates_legacy/package/resource_read.html
A ckan/tests/functional/api/model/test_group_and_organization_purge.py
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_revision_search.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_pagination.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_helpers.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/models/test_package_relationships.py
M ckan/tests/test_coding_standards.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/plugin.py
M ckanext/datastore/tests/test_create.py
M ckanext/datastore/tests/test_delete.py
M ckanext/datastore/tests/test_search.py
M ckanext/pdfpreview/plugin.py
M ckanext/pdfpreview/tests/test_preview.py
M ckanext/resourceproxy/controller.py
M ckanext/stats/stats.py
M ckanext/textpreview/plugin.py
M ckanext/textpreview/tests/test_preview.py
M dev-requirements.txt
A doc/changelog.rst
M doc/templating.rst
R fabfile.py
R jshint.json
R test_sync.ini
R test_sync2.ini
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: c0983098c9d32ed653507481e373170304358a08
https://github.com/ckan/ckan/commit/c0983098c9d32ed653507481e373170304358a08
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-07-23 (Tue, 23 Jul 2013)
Changed paths:
M .tx/config
M CHANGELOG.rst
M CONTRIBUTING.rst
M bin/ckan_spam.py
M bin/travis-build
R build.sh
M ckan/__init__.py
M ckan/config/routing.py
M ckan/controllers/admin.py
M ckan/controllers/group.py
M ckan/controllers/organization.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/base.py
M ckan/lib/celery_app.py
M ckan/lib/datapreview.py
M ckan/lib/dictization/model_save.py
M ckan/lib/formatters.py
M ckan/lib/helpers.py
M ckan/lib/navl/__init__.py
M ckan/lib/package_saver.py
M ckan/lib/repoze_patch.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/delete.py
M ckan/logic/auth/get.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/migration/versions/066_default_package_type.py
M ckan/model/package_relationship.py
M ckan/model/resource.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/javascript/main.js
M ckan/public/base/javascript/modules/custom-fields.js
A ckan/public/base/javascript/modules/dataset-visibility.js
M ckan/public/base/javascript/modules/slug-preview.js
M ckan/public/base/javascript/plugins/jquery.slug-preview.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/ckan.less
M ckan/public/base/less/dashboard.less
R ckan/public/base/less/font-awesome.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/icons.less
M ckan/public/base/less/media.less
M ckan/public/base/less/module.less
M ckan/public/base/less/nav.less
M ckan/public/base/less/toolbar.less
M ckan/public/base/test/index.html
M ckan/public/base/test/spec/modules/custom-fields.spec.js
M ckan/public/base/test/spec/modules/resource-upload-field.spec.js
M ckan/public/base/test/vendor/mocha.css
M ckan/public/base/test/vendor/mocha.js
A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
R ckan/public/base/vendor/bootstrap/js/.jshintrc
M ckan/public/base/vendor/bootstrap/js/bootstrap.js
M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
M ckan/public/base/vendor/bootstrap/less/bootstrap.less
M ckan/public/base/vendor/bootstrap/less/dropdowns.less
M ckan/public/base/vendor/bootstrap/less/responsive.less
M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
M ckan/public/base/vendor/font-awesome/css/font-awesome.css
A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
A ckan/public/base/vendor/font-awesome/less/bootstrap.less
A ckan/public/base/vendor/font-awesome/less/core.less
A ckan/public/base/vendor/font-awesome/less/extras.less
M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
M ckan/public/base/vendor/font-awesome/less/font-awesome.less
A ckan/public/base/vendor/font-awesome/less/icons.less
A ckan/public/base/vendor/font-awesome/less/mixins.less
A ckan/public/base/vendor/font-awesome/less/path.less
A ckan/public/base/vendor/font-awesome/less/variables.less
M ckan/public/base/vendor/jquery.js
M ckan/public/base/vendor/resource.config
M ckan/templates/admin/config.html
M ckan/templates/admin/index.html
M ckan/templates/ajax_snippets/related-item.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/edit.html
A ckan/templates/group/edit_base.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/members.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/group/read_base.html
M ckan/templates/group/snippets/group_form.html
A ckan/templates/group/snippets/helper.html
A ckan/templates/group/snippets/info.html
M ckan/templates/header.html
M ckan/templates/macros/autoform.html
M ckan/templates/macros/form.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/index.html
M ckan/templates/organization/new.html
M ckan/templates/organization/read.html
A ckan/templates/organization/snippets/helper.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/package/base.html
M ckan/templates/package/read_base.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resource_item.html
M ckan/templates/package/snippets/stages.html
M ckan/templates/snippets/organization.html
M ckan/templates/user/dashboard.html
A ckan/templates/user/dashboard_datasets.html
A ckan/templates/user/dashboard_groups.html
A ckan/templates/user/dashboard_organizations.html
M ckan/templates/user/edit.html
M ckan/templates/user/edit_base.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/read_base.html
M ckan/templates_legacy/package/resource_read.html
A ckan/tests/functional/api/model/test_group_and_organization_purge.py
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_revision_search.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_pagination.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_helpers.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/models/test_package_relationships.py
M ckan/tests/test_coding_standards.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/plugin.py
M ckanext/datastore/tests/test_create.py
M ckanext/datastore/tests/test_delete.py
M ckanext/datastore/tests/test_search.py
M ckanext/pdfpreview/plugin.py
M ckanext/pdfpreview/tests/test_preview.py
M ckanext/resourceproxy/controller.py
M ckanext/stats/stats.py
M ckanext/textpreview/plugin.py
M ckanext/textpreview/tests/test_preview.py
M dev-requirements.txt
A doc/changelog.rst
M doc/solr-setup.rst
M doc/templating.rst
R fabfile.py
R jshint.json
R test_sync.ini
R test_sync2.ini
Log Message:
-----------
Merge branch 'master' into 1038-organization-hierarchy
Commit: 68bfd7aefc272bcd94cff226ce97067ec44a91a4
https://github.com/ckan/ckan/commit/68bfd7aefc272bcd94cff226ce97067ec44a91a4
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M ckan/lib/create_test_data.py
M ckan/logic/auth/update.py
M ckan/logic/validators.py
M ckan/new_authz.py
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#1038] Permission cascading code with tests.
Commit: 4db2d24908fc382a7548fbbcc7dc5133dcdd29ad
https://github.com/ckan/ckan/commit/4db2d24908fc382a7548fbbcc7dc5133dcdd29ad
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M ckan/logic/auth/create.py
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#1038] Fix permission checking for organizations. Corrected bad test.
Commit: 6d97199ca314f5130f5318d23fc6a2f04e6d7ab5
https://github.com/ckan/ckan/commit/6d97199ca314f5130f5318d23fc6a2f04e6d7ab5
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M ckan/model/group.py
Log Message:
-----------
[#1038] Fix unreliable ordering of upward CTE.
Commit: 66c9dff1a663274a4376eff0dc22b48568637b44
https://github.com/ckan/ckan/commit/66c9dff1a663274a4376eff0dc22b48568637b44
Author: vagrant <vagrant at precise64.(none)>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M .tx/config
M CHANGELOG.rst
M bin/travis-build
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/config/solr/schema-2.0.xml
M ckan/controllers/feed.py
M ckan/controllers/package.py
A ckan/i18n/ar/LC_MESSAGES/ckan.mo
A ckan/i18n/ar/LC_MESSAGES/ckan.po
M ckan/i18n/bg/LC_MESSAGES/ckan.mo
M ckan/i18n/bg/LC_MESSAGES/ckan.po
M ckan/i18n/ca/LC_MESSAGES/ckan.mo
M ckan/i18n/ca/LC_MESSAGES/ckan.po
M ckan/i18n/ckan.pot
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
A ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
A ckan/i18n/da_DK/LC_MESSAGES/ckan.po
M ckan/i18n/de/LC_MESSAGES/ckan.mo
M ckan/i18n/de/LC_MESSAGES/ckan.po
M ckan/i18n/dv/LC_MESSAGES/ckan.mo
M ckan/i18n/dv/LC_MESSAGES/ckan.po
M ckan/i18n/el/LC_MESSAGES/ckan.mo
M ckan/i18n/el/LC_MESSAGES/ckan.po
A ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
A ckan/i18n/en_AU/LC_MESSAGES/ckan.po
M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
M ckan/i18n/es/LC_MESSAGES/ckan.mo
M ckan/i18n/es/LC_MESSAGES/ckan.po
M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
M ckan/i18n/fi/LC_MESSAGES/ckan.mo
M ckan/i18n/fi/LC_MESSAGES/ckan.po
M ckan/i18n/fr/LC_MESSAGES/ckan.mo
M ckan/i18n/fr/LC_MESSAGES/ckan.po
M ckan/i18n/hu/LC_MESSAGES/ckan.mo
M ckan/i18n/hu/LC_MESSAGES/ckan.po
M ckan/i18n/id/LC_MESSAGES/ckan.mo
M ckan/i18n/id/LC_MESSAGES/ckan.po
M ckan/i18n/is/LC_MESSAGES/ckan.mo
M ckan/i18n/is/LC_MESSAGES/ckan.po
M ckan/i18n/it/LC_MESSAGES/ckan.mo
M ckan/i18n/it/LC_MESSAGES/ckan.po
M ckan/i18n/ja/LC_MESSAGES/ckan.mo
M ckan/i18n/ja/LC_MESSAGES/ckan.po
A ckan/i18n/km/LC_MESSAGES/ckan.mo
A ckan/i18n/km/LC_MESSAGES/ckan.po
M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
M ckan/i18n/lt/LC_MESSAGES/ckan.mo
M ckan/i18n/lt/LC_MESSAGES/ckan.po
M ckan/i18n/lv/LC_MESSAGES/ckan.mo
M ckan/i18n/lv/LC_MESSAGES/ckan.po
M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
M ckan/i18n/nl/LC_MESSAGES/ckan.mo
M ckan/i18n/nl/LC_MESSAGES/ckan.po
M ckan/i18n/no/LC_MESSAGES/ckan.mo
M ckan/i18n/no/LC_MESSAGES/ckan.po
M ckan/i18n/pl/LC_MESSAGES/ckan.mo
M ckan/i18n/pl/LC_MESSAGES/ckan.po
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
M ckan/i18n/ro/LC_MESSAGES/ckan.mo
M ckan/i18n/ro/LC_MESSAGES/ckan.po
M ckan/i18n/ru/LC_MESSAGES/ckan.mo
M ckan/i18n/ru/LC_MESSAGES/ckan.po
M ckan/i18n/sk/LC_MESSAGES/ckan.mo
M ckan/i18n/sk/LC_MESSAGES/ckan.po
M ckan/i18n/sl/LC_MESSAGES/ckan.mo
M ckan/i18n/sl/LC_MESSAGES/ckan.po
M ckan/i18n/sq/LC_MESSAGES/ckan.mo
M ckan/i18n/sq/LC_MESSAGES/ckan.po
M ckan/i18n/sr/LC_MESSAGES/ckan.mo
M ckan/i18n/sr/LC_MESSAGES/ckan.po
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
M ckan/i18n/sv/LC_MESSAGES/ckan.mo
M ckan/i18n/sv/LC_MESSAGES/ckan.po
M ckan/i18n/tr/LC_MESSAGES/ckan.mo
M ckan/i18n/tr/LC_MESSAGES/ckan.po
M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
M ckan/lib/base.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/formatters.py
M ckan/lib/helpers.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/plugins.py
M ckan/lib/render.py
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/get.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
A ckan/migration/versions/069_resource_url_and_metadata_modified.py
A ckan/migration/versions/070_add_activity_and_resource_indexes.py
M ckan/model/activity.py
M ckan/model/extension.py
M ckan/model/modification.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/new_authz.py
M ckan/plugins/core.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/main.css
M ckan/public/base/less/iehacks.less
M ckan/templates/group/snippets/group_form.html
M ckan/templates/header.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/snippets/activity_item.html
M ckan/tests/__init__.py
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/PKG-INFO
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/SOURCES.txt
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/dependency_links.txt
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/not-zip-safe
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/top_level.txt
R ckan/tests/ckantestplugin/ckantestplugin/__init__.py
R ckan/tests/ckantestplugin/setup.cfg
R ckan/tests/ckantestplugin/setup.py
A ckan/tests/ckantestplugins.py
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_util.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_preview_interface.py
M ckan/tests/functional/test_tag_vocab.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
M ckan/tests/mock_plugin.py
A ckan/tests/models/test_activity.py
M ckan/tests/models/test_package.py
M ckan/tests/test_coding_standards.py
M ckan/tests/test_plugins.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/logic/schema.py
M ckanext/datastore/plugin.py
M ckanext/datastore/tests/test_configure.py
M ckanext/datastore/tests/test_create.py
M ckanext/datastore/tests/test_dump.py
M ckanext/datastore/tests/test_search.py
M ckanext/datastore/tests/test_upsert.py
M ckanext/multilingual/solr/schema.xml
M ckanext/multilingual/tests/test_multilingual_plugin.py
M ckanext/pdfpreview/tests/test_preview.py
M ckanext/reclinepreview/tests/test_preview.py
M ckanext/reclinepreview/theme/public/resource.config
M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
M ckanext/resourceproxy/controller.py
M ckanext/resourceproxy/tests/test_proxy.py
M ckanext/test_tag_vocab_plugin.py
M ckanext/textpreview/tests/test_preview.py
M dev-requirements.txt
M doc/conf.py
M doc/configuration.rst
M doc/documentation-guidelines.rst
M doc/install-from-source.rst
M doc/test.rst
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-package-to-patch-release.rst
M doc/upgrade-source.rst
M doc/upgrading.rst
A pip-requirements-docs.txt
A requirements.in
M requirements.txt
M setup.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1038-organization-hierarchy
Commit: 7ce1555ca3dc65adbb882a2373d4f99ce65fbf8c
https://github.com/ckan/ckan/commit/7ce1555ca3dc65adbb882a2373d4f99ce65fbf8c
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-09-06 (Fri, 06 Sep 2013)
Changed paths:
M ckan/logic/auth/create.py
M ckan/model/group.py
M ckan/new_authz.py
M ckan/tests/functional/test_group.py
Log Message:
-----------
[#1038] Fix up authz config error and deleted groups
* Fix - CONFIG_PERMISSIONS were not read properly following my prev changes
* Fix deleted child groups being visible.
* Fix up a couple of tests
Commit: f7f5049b0ab0a7220210722461bf56768d33df89
https://github.com/ckan/ckan/commit/f7f5049b0ab0a7220210722461bf56768d33df89
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-09-06 (Fri, 06 Sep 2013)
Changed paths:
M ckan/lib/create_test_data.py
M ckan/logic/validators.py
M ckan/model/group.py
M ckan/new_authz.py
M ckan/tests/functional/test_group.py
M ckan/tests/test_coding_standards.py
Log Message:
-----------
[#1038] PEP8 fixes only.
Commit: af6c039c778a78f471cb6112175aae46dfda6729
https://github.com/ckan/ckan/commit/af6c039c778a78f471cb6112175aae46dfda6729
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M ckan/lib/create_test_data.py
M ckan/model/group.py
M ckan/new_authz.py
M ckan/tests/functional/test_group.py
M ckan/tests/logic/test_member.py
Log Message:
-----------
[#1038] Reverse the meaning of group member of group.
Now member.table_id is the *parent* of member.group_id (not the child). This means the permissions work - a user needs permissions for the member.group_id to change its members, and it makes more sense for a group to choose its parents than its children. This is because a user with rights higher up the tree often gets given automatic rights to groups lower down. If he can also make any other group a child, then he would give himself rights over it.
Added test for the group permissions to check it made sense
Fixed bug in get_top_level_groups - the 'and' was ignored before. The existing test picked this up.
group.get_groups meaning is expanded. Seems to only get used in
_group_or_org_update and treats the result as parents. Needs further
examination when doing the form work on this ticket.
Commit: 34b3fb7d882afbf024c2929dbba80e5385f2d7f6
https://github.com/ckan/ckan/commit/34b3fb7d882afbf024c2929dbba80e5385f2d7f6
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[noticket] Fix paster commands that fail due to
The synchronous_search plugin is enabled automatically in ckan/plugins/core.py so a few paster commands failed trying to load it again.
Looks like this was broken since 2371c05c 2013-04-05.
Affected: create-test-data, dataset delete, dataset purge.
Commit: 527f3e9fba7831290be6f8ac8d67b78504a051b6
https://github.com/ckan/ckan/commit/527f3e9fba7831290be6f8ac8d67b78504a051b6
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M ckan/model/group.py
M ckan/tests/models/test_group.py
Log Message:
-----------
[#1038] Fix display of tree hierarchy, broken in reversal af6c039.
Commit: 8babc4f90f6f053c1c509476d183aa61f383ba8f
https://github.com/ckan/ckan/commit/8babc4f90f6f053c1c509476d183aa61f383ba8f
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-09-17 (Tue, 17 Sep 2013)
Changed paths:
M ckan/controllers/organization.py
M ckan/lib/dictization/model_save.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/group.py
M ckan/tests/models/test_group.py
Log Message:
-----------
[#1038] Setting of parent group in the form is now done via group['groups'] rather than custom 'parent'
Removed explicit creation of Members in the create/update logic functions - these were a hangover. Instead, the form just needs to ensure the parent group gets added to the group['groups'] and it will get set in the model_save as normal.
Group.get_group no longer used anywhere (and the caching looked ropey anyway) now that the previous bit is removed.
Added schema validator to ensure that no loops form in the hierarchy.
Downwards CTE needed ordering as found it also couldn't be relied upon to be in order it recursed, probably due to the join.
Removed duplicate 'groups' key in the group schema.
Commit: 407cf91a69b2bb8ae9e6763048aa6241b2001e8e
https://github.com/ckan/ckan/commit/407cf91a69b2bb8ae9e6763048aa6241b2001e8e
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-09-17 (Tue, 17 Sep 2013)
Changed paths:
M ckan/logic/action/delete.py
Log Message:
-----------
[#1038] Fix group deletion mid-hierarchy.
Commit: df890fc12c9ce68959898337e48d89fdbc4b5b68
https://github.com/ckan/ckan/commit/df890fc12c9ce68959898337e48d89fdbc4b5b68
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-09-17 (Tue, 17 Sep 2013)
Changed paths:
M ckan/new_authz.py
M ckan/tests/logic/test_auth.py
M ckan/tests/logic/test_member.py
M doc/configuration.rst
Log Message:
-----------
[#1038] Config option fixed and documented.
And tidy typos etc.
Commit: e023b44abe2d1fa502ba8f7cd746d9a87e0500ab
https://github.com/ckan/ckan/commit/e023b44abe2d1fa502ba8f7cd746d9a87e0500ab
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-09-17 (Tue, 17 Sep 2013)
Changed paths:
M doc/solr-setup.rst
Log Message:
-----------
[#1038] Fix an apparently botched merge.
Commit: 4290821c16217fedf652efb9187f43e29a28b269
https://github.com/ckan/ckan/commit/4290821c16217fedf652efb9187f43e29a28b269
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-09-17 (Tue, 17 Sep 2013)
Changed paths:
M doc/solr-setup.rst
Log Message:
-----------
[#1038] Fix an apparently botched merge (cont).
Commit: 24548c0a401f3dd4d4f16a087278065173e60a68
https://github.com/ckan/ckan/commit/24548c0a401f3dd4d4f16a087278065173e60a68
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-09-17 (Tue, 17 Sep 2013)
Changed paths:
M doc/solr-setup.rst
Log Message:
-----------
[#1038] Fix an apparently botched merge (cont).
Commit: e0bc49022210d4e7e44701bf9f4fd46ed63eca86
https://github.com/ckan/ckan/commit/e0bc49022210d4e7e44701bf9f4fd46ed63eca86
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-09-17 (Tue, 17 Sep 2013)
Changed paths:
M CONTRIBUTING.rst
M ckan/config/deployment.ini_tmpl
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/feed.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/user.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/helpers.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/plugins.py
M ckan/logic/__init__.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/update.py
M ckan/logic/validators.py
M ckan/new_authz.py
M ckan/pastertemplates/template/setup.py_tmpl
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
A ckan/plugins/toolkit_sphinx_extension.py
M ckan/public/base/vendor/select2/README.md
A ckan/public/base/vendor/select2/select2-spinner.gif
M ckan/public/base/vendor/select2/select2.css
M ckan/public/base/vendor/select2/select2.js
R ckan/public/base/vendor/select2/select2.min.css
M ckan/public/base/vendor/select2/select2.min.js
M ckan/public/base/vendor/select2/select2.png
A ckan/public/base/vendor/select2/select2x2.png
R ckan/public/base/vendor/select2/spinner.gif
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/user/request_reset.html
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_init.py
M ckan/tests/logic/test_member.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
A ckanext/example_iauthfunctions/__init__.py
A ckanext/example_iauthfunctions/plugin.py
A ckanext/example_iauthfunctions/plugin_v1.py
A ckanext/example_iauthfunctions/plugin_v2.py
A ckanext/example_iauthfunctions/plugin_v3.py
A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
R ckanext/textpreview/theme/public/highlight.pack.js
M ckanext/textpreview/theme/public/resource.config
A ckanext/textpreview/theme/public/vendor/highlight.pack.js
M doc/api.rst
M doc/authorization.rst
M doc/background-tasks.rst
M doc/ckan-coding-standards.rst
M doc/conf.py
M doc/configuration.rst
M doc/data-viewer.rst
M doc/datastore.rst
M doc/documentation-guidelines.rst
A doc/extensions/best-practices.rst
A doc/extensions/converters.rst
A doc/extensions/index.rst
A doc/extensions/plugin-interfaces.rst
A doc/extensions/plugins-toolkit.rst
A doc/extensions/testing-extensions.rst
A doc/extensions/tutorial.rst
A doc/extensions/validators.rst
M doc/index.rst
M doc/python-coding-standards.rst
M doc/solr-setup.rst
M doc/tag-vocabularies.rst
R doc/toolkit.rst
R doc/writing-extensions.rst
M setup.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1038-organization-hierarchy
Conflicts:
ckan/logic/validators.py
Commit: fafd9f9f32a4795bca8c2eed61001b70fdcf770a
https://github.com/ckan/ckan/commit/fafd9f9f32a4795bca8c2eed61001b70fdcf770a
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-09-17 (Tue, 17 Sep 2013)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/new_authz.py
Log Message:
-----------
[#1038] Fix reading config.
Commit: b7136b8beccf3817294ce6951209e26b389a4293
https://github.com/ckan/ckan/commit/b7136b8beccf3817294ce6951209e26b389a4293
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M ckan/model/group.py
Log Message:
-----------
[#1038] Fix top level groups including deleted ones.
Commit: 1be9681cf67d5d0990aa22673d32b5d7abaa24f7
https://github.com/ckan/ckan/commit/1be9681cf67d5d0990aa22673d32b5d7abaa24f7
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[noticket] Fix displaying About page for organizations.
Commit: ed78fc9ed5448685413597e3871f30e69e9bc751
https://github.com/ckan/ckan/commit/ed78fc9ed5448685413597e3871f30e69e9bc751
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M ckan/model/group.py
M ckan/tests/models/test_group.py
Log Message:
-----------
[#1038] Improve performance of viewing hierarchy, avoiding groups as SQLAlchemy objects.
Commit: 218f73bdbdb06ef9a192dd07816e87ac6486dfcb
https://github.com/ckan/ckan/commit/218f73bdbdb06ef9a192dd07816e87ac6486dfcb
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M ckan/model/group.py
M ckan/tests/models/test_group.py
Log Message:
-----------
[#1038] get_parent_groups added
* get_parent_groups is used by DGU and no doubt others that use hierarchy.
* get_children_groups changed to return objects as that is more convenient
for DGU.
Conflicts:
ckan/tests/models/test_group.py
Commit: 18d3c8b4a27e789f3e0b5ad00e954ee53cde5129
https://github.com/ckan/ckan/commit/18d3c8b4a27e789f3e0b5ad00e954ee53cde5129
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-09-30 (Mon, 30 Sep 2013)
Changed paths:
M ckan/logic/auth/create.py
M ckan/templates/organization/read.html
Log Message:
-----------
[noticket] Fix organization template that checked package_create auth incorrectly.
Commit: 399a6a4ee274c102250035b7be363fbe37881f29
https://github.com/ckan/ckan/commit/399a6a4ee274c102250035b7be363fbe37881f29
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/model/group.py
Log Message:
-----------
[#1038] Add a hard limit to recursion - just in case.
Conflicts:
ckan/model/group.py
Commit: 75a96e9300a655d7a8f3123a29a66bd9d52b70cb
https://github.com/ckan/ckan/commit/75a96e9300a655d7a8f3123a29a66bd9d52b70cb
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-18 (Fri, 18 Oct 2013)
Changed paths:
M requirements.txt
Log Message:
-----------
Upgrade dependencies
Commit: 3ac326584ec6c38e446193bdc226784dede35cad
https://github.com/ckan/ckan/commit/3ac326584ec6c38e446193bdc226784dede35cad
Author: John Martin <me at johnmart.in>
Date: 2013-10-24 (Thu, 24 Oct 2013)
Changed paths:
A ckan/public/base/vendor/jquery.ui.core.js
A ckan/public/base/vendor/jquery.ui.mouse.js
A ckan/public/base/vendor/jquery.ui.sortable.js
M ckan/public/base/vendor/jquery.ui.widget.js
M ckan/public/base/vendor/resource.config
Log Message:
-----------
[#1277] Update to jQuery UI libs
Commit: 1b6a04b64408096922a6a8e165f82287787f8854
https://github.com/ckan/ckan/commit/1b6a04b64408096922a6a8e165f82287787f8854
Author: John Martin <me at johnmart.in>
Date: 2013-10-24 (Thu, 24 Oct 2013)
Changed paths:
A ckan/public/base/javascript/modules/resource-reorder.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/dataset.less
M ckan/templates/package/resources.html
M ckan/templates/package/snippets/resource_item.html
Log Message:
-----------
[#1277] First semi working front end for re-ordering resources
Commit: 91c829dc4e5e1b049c11be7b80fcae0d267b650c
https://github.com/ckan/ckan/commit/91c829dc4e5e1b049c11be7b80fcae0d267b650c
Author: Ian Ward <ian at excess.org>
Date: 2013-10-30 (Wed, 30 Oct 2013)
Changed paths:
M ckan/lib/accept.py
Log Message:
-----------
fix for 500 error on HTTP-ACCEPT: text/plain
Commit: 8e1a94ea36a0702b70fc8922cc9b5ee8a8fb085c
https://github.com/ckan/ckan/commit/8e1a94ea36a0702b70fc8922cc9b5ee8a8fb085c
Author: Ian Ward <ian at excess.org>
Date: 2013-10-30 (Wed, 30 Oct 2013)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
fix for 500 error on non-int int query parameters
Commit: 86dea6cbcad3bd9bfc7ccd1254be453cda0a4433
https://github.com/ckan/ckan/commit/86dea6cbcad3bd9bfc7ccd1254be453cda0a4433
Author: Ian Ward <ian at excess.org>
Date: 2013-10-30 (Wed, 30 Oct 2013)
Changed paths:
M ckanext/datastore/db.py
Log Message:
-----------
fix for local use of datastore api
Commit: 129aec805528f1cba3c6ac73c7363421d35e38d2
https://github.com/ckan/ckan/commit/129aec805528f1cba3c6ac73c7363421d35e38d2
Author: Ian Ward <ian at excess.org>
Date: 2013-10-31 (Thu, 31 Oct 2013)
Changed paths:
M ckanext/datastore/db.py
Log Message:
-----------
fix local use of datastore api without try, except
Commit: e98ee16683f9974a2f8516b1f79123b832a2ad76
https://github.com/ckan/ckan/commit/e98ee16683f9974a2f8516b1f79123b832a2ad76
Author: Ian Ward <ian at excess.org>
Date: 2013-10-31 (Thu, 31 Oct 2013)
Changed paths:
M ckan/tests/lib/test_accept.py
Log Message:
-----------
no longer sending text/plain versions of datasets
Commit: b95ef59832043246374dfa0f4bbed044154a46c7
https://github.com/ckan/ckan/commit/b95ef59832043246374dfa0f4bbed044154a46c7
Author: kindly <kindly at gmail.com>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Changed paths:
A .coveragerc
M .travis.yml
M CHANGELOG.rst
M CONTRIBUTING.rst
M README.rst
M bin/travis-build
M ckan/ckan_nose_plugin.py
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/organization.py
M ckan/controllers/package.py
M ckan/controllers/template.py
M ckan/controllers/user.py
M ckan/lib/app_globals.py
M ckan/lib/authenticator.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/mailer.py
M ckan/lib/navl/validators.py
M ckan/lib/plugins.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/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/071_add_state_column_to_user_table.py
M ckan/model/follower.py
M ckan/model/group.py
M ckan/model/meta.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/model/user.py
M ckan/new_authz.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M ckan/plugins/core.py
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/javascript/main.js
M ckan/public/base/javascript/modules/autocomplete.js
M ckan/public/base/less/activity.less
M ckan/public/base/less/ckan.less
A ckan/public/base/less/datapusher.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/homepage.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/less/module.less
M ckan/public/base/test/spec/modules/autocomplete.spec.js
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/dataviewer/base.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/development/snippets/facet.html
M ckan/templates/development/snippets/module.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/group/snippets/helper.html
M ckan/templates/header.html
M ckan/templates/home/index.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
M ckan/templates/macros/autoform.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/organization/snippets/helper.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/base_form_page.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/edit.html
A ckan/templates/package/edit_base.html
M ckan/templates/package/followers.html
M ckan/templates/package/history.html
M ckan/templates/package/new_resource.html
A ckan/templates/package/new_resource_not_draft.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
A ckan/templates/package/resource_data.html
M ckan/templates/package/resource_edit.html
A ckan/templates/package/resource_edit_base.html
A ckan/templates/package/resources.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
A ckan/templates/package/snippets/resource_help.html
A ckan/templates/package/snippets/resource_info.html
M ckan/templates/package/snippets/resource_item.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/revisions_table.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/edit_form.html
M ckan/templates/revision/read.html
M ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
A ckan/templates/snippets/datapusher_status.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/facet_list.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/private.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout_first.html
M ckan/templates/user/new_user_form.html
M ckan/templates/user/read_base.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
A ckan/templates/user/snippets/recaptcha.html
M ckan/tests/functional/api/model/test_group_and_organization_purge.py
M ckan/tests/functional/api/model/test_vocabulary.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_related.py
A ckan/tests/functional/test_tracking.py
M ckan/tests/functional/test_user.py
A ckan/tests/lib/test_authenticator.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_mailer.py
M ckan/tests/lib/test_navl.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_auth.py
M ckan/tests/logic/test_tag.py
A ckan/tests/models/test_follower.py
M ckan/tests/models/test_user.py
M ckan/tests/test_coding_standards.py
A ckanext/datapusher/__init__.py
A ckanext/datapusher/helpers.py
A ckanext/datapusher/logic/__init__.py
A ckanext/datapusher/logic/action.py
A ckanext/datapusher/logic/auth.py
A ckanext/datapusher/logic/schema.py
A ckanext/datapusher/plugin.py
A ckanext/datapusher/tests/__init__.py
A ckanext/datapusher/tests/test.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/logic/schema.py
M ckanext/datastore/plugin.py
M ckanext/datastore/tests/helpers.py
M ckanext/datastore/tests/test_create.py
M ckanext/datastore/tests/test_delete.py
M ckanext/datastore/tests/test_dump.py
M ckanext/datastore/tests/test_search.py
M ckanext/datastore/tests/test_upsert.py
M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
M ckanext/multilingual/plugin.py
M ckanext/multilingual/tests/test_multilingual_plugin.py
M dev-requirements.txt
M doc/configuration.rst
M doc/extensions/best-practices.rst
M doc/i18n.rst
M doc/multilingual.rst
M doc/test.rst
A doc/testing-coding-standards.rst
M doc/upgrade-source.rst
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
M setup.py
M test-core.ini
Log Message:
-----------
[#1038] merge confilcts
Commit: 9672aa359667f7aea96734cb314319f3a9c371d2
https://github.com/ckan/ckan/commit/9672aa359667f7aea96734cb314319f3a9c371d2
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Changed paths:
M ckan/logic/__init__.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
A ckan/new_tests/logic/action/test_get.py
Log Message:
-----------
[#1258] add validator decorator to user_activity_list
* Add decorator that validates against a given schema
* Add default_activity_list_schema
* Refactor user_activity list to use validator decorator
Commit: e1194397efc6793617f4870ddf940775134c9eec
https://github.com/ckan/ckan/commit/e1194397efc6793617f4870ddf940775134c9eec
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-11-05 (Tue, 05 Nov 2013)
Changed paths:
M ckan/logic/action/get.py
M ckan/new_tests/logic/action/test_get.py
Log Message:
-----------
[#1258] fix 500 errors on activity list action functions
change tests, no need to hit the database we only need to test that the
vaildators raise a ValidationError
Commit: 8b62a87a05afd5d95b5321449c90e39858f83fd5
https://github.com/ckan/ckan/commit/8b62a87a05afd5d95b5321449c90e39858f83fd5
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-11-05 (Tue, 05 Nov 2013)
Changed paths:
M ckan/logic/__init__.py
Log Message:
-----------
[#1258] Allow context['schema'] and skip validate in validate decorator
Commit: 2307e831fa85a8000034f58e980b08b45b8b46af
https://github.com/ckan/ckan/commit/2307e831fa85a8000034f58e980b08b45b8b46af
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-11-05 (Tue, 05 Nov 2013)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#1258] change related_changed_activity_list validation schema
Commit: 39a526b4f7daf12e0dba048b664bbb3b4f4adbb0
https://github.com/ckan/ckan/commit/39a526b4f7daf12e0dba048b664bbb3b4f4adbb0
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-11-05 (Tue, 05 Nov 2013)
Changed paths:
M ckan/logic/__init__.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
M ckan/logic/validators.py
Log Message:
-----------
[#1258] refactor action function validators
Commit: 8c0e6341e45ac40c488b5cecb3807073091a5447
https://github.com/ckan/ckan/commit/8c0e6341e45ac40c488b5cecb3807073091a5447
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-11-15 (Fri, 15 Nov 2013)
Changed paths:
M CONTRIBUTING.rst
M ckan/plugins/interfaces.py
R doc/ckan-coding-standards.rst
M doc/configuration.rst
R doc/contributing.rst
A doc/contributing/coding-standards/ckan-code-architecture.rst
A doc/contributing/coding-standards/css-coding-standards.rst
A doc/contributing/coding-standards/database-migrations.rst
A doc/contributing/coding-standards/html-coding-standards.rst
A doc/contributing/coding-standards/index.rst
A doc/contributing/coding-standards/javascript-coding-standards.rst
A doc/contributing/coding-standards/python-coding-standards.rst
A doc/contributing/coding-standards/testing-coding-standards.rst
A doc/contributing/coding-standards/upgrading-dependencies.rst
A doc/contributing/documentation-guidelines.rst
A doc/contributing/frontend/index.rst
A doc/contributing/frontend/javascript-module-tutorial.rst
A doc/contributing/frontend/resources.rst
A doc/contributing/frontend/template-blocks.rst
A doc/contributing/frontend/template-tutorial.rst
A doc/contributing/frontend/templating.rst
A doc/contributing/i18n.rst
A doc/contributing/index.rst
A doc/contributing/issues.rst
A doc/contributing/pull-requests.rst
R doc/css-coding-standards.rst
R doc/documentation-guidelines.rst
M doc/extensions/best-practices.rst
R doc/frontend-development.rst
R doc/html-coding-standards.rst
R doc/i18n.rst
M doc/index.rst
R doc/javascript-coding-standards.rst
R doc/javascript-module-tutorial.rst
R doc/migration.rst
M doc/multilingual.rst
R doc/python-coding-standards.rst
R doc/resources.rst
R doc/template-blocks.rst
R doc/template-tutorial.rst
R doc/templating.rst
R doc/testing-coding-standards.rst
R doc/upgrading-dependencies.rst
Log Message:
-----------
Reorganize the contributing docs
Commit: d9873cd68339f72304ee97fffcb6694bc2942fc6
https://github.com/ckan/ckan/commit/d9873cd68339f72304ee97fffcb6694bc2942fc6
Author: Ian Ward <ian at excess.org>
Date: 2013-11-18 (Mon, 18 Nov 2013)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#1255] make package_search results match package_show
Commit: 563c0e7286ed1dd2a163ea84c7e1a118c3c7ae37
https://github.com/ckan/ckan/commit/563c0e7286ed1dd2a163ea84c7e1a118c3c7ae37
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-11-20 (Wed, 20 Nov 2013)
Changed paths:
M .travis.yml
M CHANGELOG.rst
M CONTRIBUTING.rst
R bin/travis-build
A bin/travis-install-dependencies
A bin/travis-run-tests
M ckan/ckan_nose_plugin.py
M ckan/config/deployment.ini_tmpl
M ckan/config/middleware.py
M ckan/controllers/group.py
M ckan/controllers/user.py
M ckan/lib/app_globals.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/munge.py
A ckan/lib/uploader.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/schema.py
M ckan/new_authz.py
M ckan/new_tests/helpers.py
M ckan/public/base/css/main.css
M ckan/public/base/javascript/client.js
M ckan/public/base/javascript/main.js
A ckan/public/base/javascript/modules/image-upload.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/forms.less
M ckan/templates/base.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/group/snippets/group_item.html
M ckan/templates/group/snippets/info.html
M ckan/templates/header.html
M ckan/templates/macros/form.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/organization/snippets/organization_item.html
M ckan/templates/related/snippets/related_item.html
M ckan/templates/snippets/group.html
M ckan/templates/snippets/group_item.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/organization_item.html
M ckan/templates/user/login.html
M ckan/tests/functional/api/test_user.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/logic/test_auth.py
A doc/_static/ckanlogo.png
M doc/_themes/sphinx-theme-okfn
M doc/authorization.rst
M doc/conf.py
M doc/configuration.rst
R doc/images/ckan_logo_box.png
M doc/index.rst
M doc/legacy-api.rst
M doc/test.rst
A doc/upgrading-dependencies.rst
M test-core.ini
Log Message:
-----------
Merge branch 'master' into 1258-validator-decorators
Commit: 95a3d0b2ffb11359ef12c5eb3eff00e75aa09c56
https://github.com/ckan/ckan/commit/95a3d0b2ffb11359ef12c5eb3eff00e75aa09c56
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-11-20 (Wed, 20 Nov 2013)
Changed paths:
M ckan/logic/__init__.py
M ckan/new_tests/logic/action/test_get.py
Log Message:
-----------
[1258] remove kwargs from validator decorator, PEP8
remove kwargs, otherwise the resulting action functions have the
incorrect function signature
Commit: 0086f1b30aaae22a6da58a2bb3cbfa1ec03e7032
https://github.com/ckan/ckan/commit/0086f1b30aaae22a6da58a2bb3cbfa1ec03e7032
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-11-20 (Wed, 20 Nov 2013)
Changed paths:
M ckan/logic/action/get.py
M ckan/logic/converters.py
M ckan/logic/schema.py
M ckan/new_tests/logic/action/test_get.py
Log Message:
-----------
[#1258] json validation for facet.field param in package_search
move validation out of action function and into the schema to prevent
500 errors
Commit: 77f62a8e311eded5901382e80de24a7ce87a7f3a
https://github.com/ckan/ckan/commit/77f62a8e311eded5901382e80de24a7ce87a7f3a
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-11-20 (Wed, 20 Nov 2013)
Changed paths:
M ckan/new_tests/logic/action/test_get.py
Log Message:
-----------
[#1258] PEP8
Commit: 9c4387e187384a53952e5a2deecd49b9b9a79d9f
https://github.com/ckan/ckan/commit/9c4387e187384a53952e5a2deecd49b9b9a79d9f
Author: Ian Ward <ian at excess.org>
Date: 2013-11-20 (Wed, 20 Nov 2013)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#1255] package_search: add use_default_schema parameter
Commit: ecc19d5667cc6fd806ae5063d69bba491c44d1e7
https://github.com/ckan/ckan/commit/ecc19d5667cc6fd806ae5063d69bba491c44d1e7
Author: John Martin <me at johnmart.in>
Date: 2013-11-21 (Thu, 21 Nov 2013)
Changed paths:
M ckan/public/base/javascript/modules/resource-reorder.js
Log Message:
-----------
[#1277] Removed changed event as it doesn't fire
Commit: 596caaa23f70e851682b328c3df91d753f4cddb8
https://github.com/ckan/ckan/commit/596caaa23f70e851682b328c3df91d753f4cddb8
Author: kindly <kindly at gmail.com>
Date: 2013-11-21 (Thu, 21 Nov 2013)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
[#1277] add logic function
Commit: 9004bac5880f5aac1c44b2de33351890bc2aa10a
https://github.com/ckan/ckan/commit/9004bac5880f5aac1c44b2de33351890bc2aa10a
Author: Ian Ward <ian at excess.org>
Date: 2013-11-21 (Thu, 21 Nov 2013)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
fix access of organizations through /group url
Commit: 6da32416be0c10e3959ec6ed759b08945c55e9fb
https://github.com/ckan/ckan/commit/6da32416be0c10e3959ec6ed759b08945c55e9fb
Author: Ian Ward <ian at excess.org>
Date: 2013-11-25 (Mon, 25 Nov 2013)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#1255] package_show: add use_default_schema parameter
Commit: d12617fa9f5eda4d5c7c9eba8a339f7930d74b6b
https://github.com/ckan/ckan/commit/d12617fa9f5eda4d5c7c9eba8a339f7930d74b6b
Author: Ian Ward <ian at excess.org>
Date: 2013-11-25 (Mon, 25 Nov 2013)
Changed paths:
M CHANGELOG.rst
Log Message:
-----------
[#1255] add changelog entry
Commit: 4938ac99082687713eb9aad8b63913540ba869e7
https://github.com/ckan/ckan/commit/4938ac99082687713eb9aad8b63913540ba869e7
Author: John Martin <me at johnmart.in>
Date: 2013-11-26 (Tue, 26 Nov 2013)
Changed paths:
M ckan/public/base/javascript/modules/resource-reorder.js
M ckan/public/base/less/dataset.less
M ckan/templates/package/resources.html
Log Message:
-----------
[#1277] Added javascript call the package_resource_reorder api call to handle actual reordering
Commit: 73b1c2dca006692bc62b7fffcf21b4f78f47e45c
https://github.com/ckan/ckan/commit/73b1c2dca006692bc62b7fffcf21b4f78f47e45c
Author: John Martin <me at johnmart.in>
Date: 2013-11-26 (Tue, 26 Nov 2013)
Changed paths:
M ckan/public/base/javascript/modules/resource-reorder.js
Log Message:
-----------
[#1277] Added saving state for feedback to user
Commit: 7a09be891120f60da181fef9e79796c732491ce5
https://github.com/ckan/ckan/commit/7a09be891120f60da181fef9e79796c732491ce5
Author: kindly <kindly at gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M ckan/logic/action/update.py
M ckan/logic/auth/update.py
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1277] Add test and auth function
Commit: f366ba684340adbb903b78bc5beb871069a6a0c2
https://github.com/ckan/ckan/commit/f366ba684340adbb903b78bc5beb871069a6a0c2
Author: amercader <amercadero at gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M ckan/templates/package/snippets/package_basic_fields.html
Log Message:
-----------
[#1188] Allow organization dropdown to be displayed
The current logic was unclear. If a user belongs to at least one
organization, the dropdown will be displayed, both on the created and
edit forms. Same for the visibility one.
Commit: 62fba1241be09e7ff6bd197a79e0c8258a00b357
https://github.com/ckan/ckan/commit/62fba1241be09e7ff6bd197a79e0c8258a00b357
Author: amercader <amercadero at gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#1188] Allow empty orgs if datasets can be unowned
If the "create_unowned_dataset" is set to True and you are not a
sysadmin and select the "No organization" option on the dataset form,
you get a validation error.
Commit: fac853a2621bd1513e689f66583bc02fa148ca6a
https://github.com/ckan/ckan/commit/fac853a2621bd1513e689f66583bc02fa148ca6a
Author: kindly <kindly at gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1277] fix formatting
Commit: 5ef1ac6117b7aea46e7502ecd5ab3bef82b216e9
https://github.com/ckan/ckan/commit/5ef1ac6117b7aea46e7502ecd5ab3bef82b216e9
Author: amercader <amercadero at gmail.com>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Changed paths:
M ckanext/datapusher/logic/action.py
M ckanext/datapusher/tests/test.py
Log Message:
-----------
[#1358] Fix auth error on datapusher_hook
When logged in as a non-sysadmin user, you always got an error like:
Process completed but unable to post to result_url
This was caused by calling task_status_update, which is sysadmin only on
datapusher_hook without ignore_auth in the context. We can safely add it
at this point because access has been already checked.
Added some tests.
Commit: 7f7d3ddded575646bcf43985f45c4c52b9fed658
https://github.com/ckan/ckan/commit/7f7d3ddded575646bcf43985f45c4c52b9fed658
Author: amercader <amercadero at gmail.com>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Changed paths:
M ckan/templates/package/resource_data.html
M doc/_themes/sphinx-theme-okfn
Log Message:
-----------
[#1358] Show actual timestamp, translate string
Commit: e7bc7ad89212b696b9a4be78414fde50eb46f291
https://github.com/ckan/ckan/commit/e7bc7ad89212b696b9a4be78414fde50eb46f291
Author: amercader <amercadero at gmail.com>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Changed paths:
M ckan/templates/package/resource_data.html
M ckanext/datapusher/helpers.py
M ckanext/datapusher/plugin.py
Log Message:
-----------
[#1358] Make DataPusher statuses translatable
Commit: bf11648726659b4b1e5e3a760663ee8c91b96031
https://github.com/ckan/ckan/commit/bf11648726659b4b1e5e3a760663ee8c91b96031
Author: amercader <amercadero at gmail.com>
Date: 2013-12-04 (Wed, 04 Dec 2013)
Changed paths:
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_form.html
Log Message:
-----------
[#607] Allow to reactivate deleted datasets
Currently if a dataset is deleted and users navigate to the edit form,
there is no state field and the delete button is still shown.
After this change, the state dropdown is shown if the dataset state is
not active, and the delete button is not shown.
Commit: b3ad6bd8c75eefd9d4b0d70516198d4952128031
https://github.com/ckan/ckan/commit/b3ad6bd8c75eefd9d4b0d70516198d4952128031
Author: amercader <amercadero at gmail.com>
Date: 2013-12-05 (Thu, 05 Dec 2013)
Changed paths:
M CHANGELOG.rst
M bin/travis-run-tests
R ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/README.txt
M ckan/config/solr/schema-1.2.xml
M ckan/config/solr/schema-1.3.xml
M ckan/config/solr/schema-1.4.xml
M ckan/config/solr/schema-2.0.xml
A ckan/config/solr/schema.xml
M ckan/plugins/interfaces.py
M ckan/tests/lib/test_solr_schema_version.py
M doc/appendices/solr-multicore.rst
M doc/contents.rst
M doc/install-from-source.rst
M doc/release-process.rst
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-source.rst
Log Message:
-----------
Merge branch 'master' into 1358-datastore-ui
Commit: b3f6c1b63c01b32a36c8a2350c5b1d7efd671fc0
https://github.com/ckan/ckan/commit/b3f6c1b63c01b32a36c8a2350c5b1d7efd671fc0
Author: amercader <amercadero at gmail.com>
Date: 2013-12-05 (Thu, 05 Dec 2013)
Changed paths:
M ckan/templates/package/resource_data.html
M ckan/templates/package/resource_edit_base.html
Log Message:
-----------
[#1358] Tweak captions to make them clearer for users
Commit: e973268cb7caa58b63cecade1c607c769a9b26e4
https://github.com/ckan/ckan/commit/e973268cb7caa58b63cecade1c607c769a9b26e4
Author: amercader <amercadero at gmail.com>
Date: 2013-12-05 (Thu, 05 Dec 2013)
Changed paths:
M ckan/templates/package/resource_edit_base.html
Log Message:
-----------
[#1358] Change tab name
Commit: 97ecce24b9a2d170b9899d01a391f7ebb030f587
https://github.com/ckan/ckan/commit/97ecce24b9a2d170b9899d01a391f7ebb030f587
Author: amercader <amercadero at gmail.com>
Date: 2013-12-05 (Thu, 05 Dec 2013)
Changed paths:
M ckanext/datapusher/helpers.py
M ckanext/datapusher/plugin.py
Log Message:
-----------
[#1358] The joys of PEP8
Commit: 07420aef7a210ef09b93e4584e283abacc7a08a9
https://github.com/ckan/ckan/commit/07420aef7a210ef09b93e4584e283abacc7a08a9
Author: amercader <amercadero at gmail.com>
Date: 2013-12-06 (Fri, 06 Dec 2013)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/get.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
[#1208] Use search to get datasets on group_show
Use the search rather than query the db.
Instead of returning the whole package dict, pick the fields to match
the ones currently returned by the API.
Commit: 53a9ff21b2f3f93dc44b3ec8ef38b94768d84f5d
https://github.com/ckan/ckan/commit/53a9ff21b2f3f93dc44b3ec8ef38b94768d84f5d
Author: Samuele Santi <redshadow at hackzine.org>
Date: 2013-12-06 (Fri, 06 Dec 2013)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Prevent failure in case no record is found (empty database) (fixes #1363)
Commit: f6e5aa773cda8960788301ec051364479142a192
https://github.com/ckan/ckan/commit/f6e5aa773cda8960788301ec051364479142a192
Author: amercader <amercadero at gmail.com>
Date: 2013-12-06 (Fri, 06 Dec 2013)
Changed paths:
M ckan/controllers/group.py
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
[#1208] Do not query datasets on group_show from the controller
When dictizing the group as requested from the controller, don't query
Solr for datasets as they will be ignored and get requested on the
controller later on anyway
Commit: 6e8859a156e0b5993db8d28b51e7c6f3c4a0c2a9
https://github.com/ckan/ckan/commit/6e8859a156e0b5993db8d28b51e7c6f3c4a0c2a9
Author: kindly <kindly at gmail.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/plugin.py
Log Message:
-----------
[#1373] Give datastore_search_sql own auth function. Before it was going though normal datastore_search auth function which made no sense as their was no resource to check. It was picking a random resource to check agaist! This patch also fixes a very minor unicode bug.
Commit: acd7976f67f769483d615d0a77422e59007a086d
https://github.com/ckan/ckan/commit/acd7976f67f769483d615d0a77422e59007a086d
Author: Samuele Santi <redshadow at hackzine.org>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Removed limit of number of arguments passed to ``user add`` command.
This is needed as the ``user add`` command is supposed to accept a variable number
of arguments.
Commit: 933209852836e7ed1174cd91395f7020c5361ee0
https://github.com/ckan/ckan/commit/933209852836e7ed1174cd91395f7020c5361ee0
Author: kindly <kindly at gmail.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckanext/datastore/logic/auth.py
Log Message:
-----------
[#1373] fix pep-8 issues
Commit: 22a3432edc3dc330da87c468a539402b234469c3
https://github.com/ckan/ckan/commit/22a3432edc3dc330da87c468a539402b234469c3
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckan/tests/models/test_group.py
Log Message:
-----------
[#1038] Fix for python 2.6.
Commit: eeb6e65eef7133261b92954dfcf8974d94d2ac24
https://github.com/ckan/ckan/commit/eeb6e65eef7133261b92954dfcf8974d94d2ac24
Author: amercader <amercadero at gmail.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
[#1208] Return whole dicts on package listing for group_show
The reason is that this is consistent with other package listings
(tag_show, package_search) and at the same time is backwards compatible
as it keeps all the existing fields.
Users would be able to choose not to return the packages list.
Commit: 75394f84c0410e146b9cda434dfad0687689480d
https://github.com/ckan/ckan/commit/75394f84c0410e146b9cda434dfad0687689480d
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckan/new_authz.py
M ckan/tests/test_coding_standards.py
Log Message:
-----------
[#1038] Simplify code that reads ckan.auth config.
Commit: 804b0f9296ff36117c6b966a0969d026c709e503
https://github.com/ckan/ckan/commit/804b0f9296ff36117c6b966a0969d026c709e503
Author: amercader <amercadero at gmail.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckan/controllers/group.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/get.py
Log Message:
-----------
[#1208] Allow users to not request the dataset listing on group_show
Commit: 4de48399092c8644f5a2d1e234a0c263ee6a9157
https://github.com/ckan/ckan/commit/4de48399092c8644f5a2d1e234a0c263ee6a9157
Author: amercader <amercadero at gmail.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/plugin.py
Log Message:
-----------
Merge branch '1373-anon-user-datastore-search-sql'
Commit: f3c65852ca4be6e0675e81aaa8515c189adf2016
https://github.com/ckan/ckan/commit/f3c65852ca4be6e0675e81aaa8515c189adf2016
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckan/logic/action/update.py
M ckan/logic/auth/update.py
M ckan/new_tests/logic/action/test_update.py
A ckan/public/base/javascript/modules/resource-reorder.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/dataset.less
A ckan/public/base/vendor/jquery.ui.core.js
A ckan/public/base/vendor/jquery.ui.mouse.js
A ckan/public/base/vendor/jquery.ui.sortable.js
M ckan/public/base/vendor/jquery.ui.widget.js
M ckan/public/base/vendor/resource.config
M ckan/templates/package/resources.html
M ckan/templates/package/snippets/resource_item.html
Log Message:
-----------
Merge branch '1277-resource-reordering'
Commit: 8dffa31ab286c3b2939c88b9a40f2834ff6531a4
https://github.com/ckan/ckan/commit/8dffa31ab286c3b2939c88b9a40f2834ff6531a4
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M .travis.yml
M CHANGELOG.rst
M CONTRIBUTING.rst
M MANIFEST.in
R bin/travis-build
A bin/travis-install-dependencies
A bin/travis-run-tests
M ckan/ckan_nose_plugin.py
M ckan/config/deployment.ini_tmpl
M ckan/config/middleware.py
M ckan/config/routing.py
R ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/README.txt
M ckan/config/solr/schema-1.2.xml
M ckan/config/solr/schema-1.3.xml
M ckan/config/solr/schema-1.4.xml
M ckan/config/solr/schema-2.0.xml
A ckan/config/solr/schema.xml
M ckan/controllers/api.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/app_globals.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/email_notifications.py
M ckan/lib/helpers.py
M ckan/lib/munge.py
A ckan/lib/uploader.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/get.py
M ckan/logic/schema.py
M ckan/new_authz.py
M ckan/new_tests/helpers.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/javascript/client.js
M ckan/public/base/javascript/main.js
A ckan/public/base/javascript/modules/image-upload.js
M ckan/public/base/javascript/modules/slug-preview.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/dataset.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/search.less
M ckan/templates/admin/config.html
M ckan/templates/base.html
M ckan/templates/group/about.html
M ckan/templates/group/activity_stream.html
M ckan/templates/group/edit.html
M ckan/templates/group/edit_base.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/members.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/group/read_base.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/group/snippets/group_item.html
M ckan/templates/group/snippets/info.html
M ckan/templates/header.html
M ckan/templates/macros/form.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/edit.html
M ckan/templates/organization/edit_base.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read_base.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/organization/snippets/organization_item.html
M ckan/templates/package/activity.html
R ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/base_form_page.html
A ckan/templates/package/group_list.html
M ckan/templates/package/new.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_form.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/related/snippets/related_item.html
M ckan/templates/snippets/group.html
M ckan/templates/snippets/group_item.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/organization_item.html
M ckan/templates/snippets/package_list.html
M ckan/templates/snippets/search_form.html
M ckan/templates/snippets/search_result_text.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/edit_base.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/login.html
M ckan/templates/user/read.html
M ckan/templates/user/read_base.html
R ckan/templates/user/snippets/back_to_user_action.html
M ckan/templates/user/snippets/login_form.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/functional/test_package.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_solr_schema_version.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_auth.py
M ckan/tests/test_coding_standards.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/plugin.py
A doc/_static/ckanlogo.png
M doc/_themes/sphinx-theme-okfn
M doc/api.rst
A doc/appendices/index.rst
A doc/appendices/solr-multicore.rst
M doc/authorization.rst
M doc/background-tasks.rst
M doc/conf.py
M doc/configuration.rst
A doc/contents.rst
M doc/css-coding-standards.rst
M doc/data-viewer.rst
M doc/datastore.rst
M doc/deployment.rst
M doc/documentation-guidelines.rst
M doc/email-notifications.rst
M doc/filestore.rst
M doc/getting-started.rst
A doc/images/add_dataset_1.jpg
A doc/images/add_dataset_2.jpg
A doc/images/add_dataset_3.jpg
R doc/images/admin-page.png
R doc/images/ckan_logo_box.png
A doc/images/create_organization.jpg
A doc/images/customize_look_and_feel.jpg
A doc/images/edit_dataset.jpg
A doc/images/exploring_datasets.jpg
A doc/images/manage_news_feed.jpg
A doc/images/manage_organization.jpg
A doc/images/manage_user_profile.jpg
A doc/images/manage_users.jpg
A doc/images/move_dataset_between_organizations.jpg
A doc/images/register_account.jpg
A doc/images/search_the_site.jpg
M doc/index.rst
M doc/install-from-package.rst
M doc/install-from-source.rst
M doc/legacy-api.rst
M doc/release-process.rst
R doc/solr-setup.rst
A doc/sysadmin-guide.rst
M doc/test.rst
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-source.rst
A doc/upgrading-dependencies.rst
A doc/user-guide.rst
M test-core.ini
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1038-organization-hierarchy
Conflicts:
ckan/config/deployment.ini_tmpl
ckan/new_authz.py
ckan/templates/organization/read.html
ckan/tests/logic/test_auth.py
doc/configuration.rst
doc/solr-setup.rst
Commit: efdfc03bc2347acbad672486115bb384f6243ee5
https://github.com/ckan/ckan/commit/efdfc03bc2347acbad672486115bb384f6243ee5
Author: amercader <amercadero at gmail.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[#1208] Ignore __junk field in group schema
It surfaced on the tests due to the new list fields (resources, tags...)
in the group's datasets
Commit: 1de51c637aa750872d9d8a72b176a009f84df229
https://github.com/ckan/ckan/commit/1de51c637aa750872d9d8a72b176a009f84df229
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckan/templates/organization/read.html
Log Message:
-----------
[#1038] Fix a bug introduced on this branch, for pre-filling the group in the new-package form.
Commit: fde70209da7006acc95b73935a576d249196e93a
https://github.com/ckan/ckan/commit/fde70209da7006acc95b73935a576d249196e93a
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckan/controllers/group.py
M ckan/lib/accept.py
M ckan/lib/helpers.py
M ckan/tests/lib/test_accept.py
M ckanext/datastore/db.py
Log Message:
-----------
Merge branch 'small-fixes'
Commit: a691bd308199209eced83428fb3f177108f7ee1e
https://github.com/ckan/ckan/commit/a691bd308199209eced83428fb3f177108f7ee1e
Author: amercader <amercadero at gmail.com>
Date: 2013-12-10 (Tue, 10 Dec 2013)
Changed paths:
M doc/_themes/sphinx-theme-okfn
Log Message:
-----------
[#1358] Revert docs theme to the version on master
Commit: 5ad5b582a9f4126d9f485163c581d4d668dee861
https://github.com/ckan/ckan/commit/5ad5b582a9f4126d9f485163c581d4d668dee861
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-10 (Tue, 10 Dec 2013)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
Log Message:
-----------
[#1022] Fix cross-references in API docstrings
Use :py:func:, :py:class: etc to do proper hyperlinked cross-references.
Also a few other minor docstrings formatting fixes.
Commit: 210ecaec40301587cdf3e5928640746005e0256c
https://github.com/ckan/ckan/commit/210ecaec40301587cdf3e5928640746005e0256c
Author: John Martin <me at johnmart.in>
Date: 2013-12-10 (Tue, 10 Dec 2013)
Changed paths:
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_form.html
Log Message:
-----------
Merge pull request #607 from okfn/607-allow-reactivating-datasets
Can not reactivate a deleted dataset from the UI
Commit: 5426295987549f3fe0dc61f19aeaa23f14bed8a6
https://github.com/ckan/ckan/commit/5426295987549f3fe0dc61f19aeaa23f14bed8a6
Author: John Martin <me at johnmart.in>
Date: 2013-12-10 (Tue, 10 Dec 2013)
Changed paths:
M ckan/templates/package/resource_data.html
M ckan/templates/package/resource_edit_base.html
M ckanext/datapusher/helpers.py
M ckanext/datapusher/logic/action.py
M ckanext/datapusher/plugin.py
M ckanext/datapusher/tests/test.py
Log Message:
-----------
Merge pull request #1358 from okfn/1358-datastore-ui
New DataStore UI fixes and tweaks
Commit: 2d23040c0a727f1a0bcceb6e9ea38601292387b8
https://github.com/ckan/ckan/commit/2d23040c0a727f1a0bcceb6e9ea38601292387b8
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-10 (Tue, 10 Dec 2013)
Changed paths:
A doc/.gitignore
M doc/conf.py
M doc/install-from-package.rst
M doc/install-from-source.rst
Log Message:
-----------
[#1380] Encourage installing latest release in source install docs
Needed an automated way to get the latest version number, so I added
functions to doc/conf.py for this, and then used them in the source and
package install docs.
Commit: 79a218f0818031567b6ce1903a73ae98e27ddb5b
https://github.com/ckan/ckan/commit/79a218f0818031567b6ce1903a73ae98e27ddb5b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-10 (Tue, 10 Dec 2013)
Changed paths:
M doc/conf.py
Log Message:
-----------
[#1380] Remove hardcoded filename
Commit: 814745a236068908335183d9368bf7de63d1b85d
https://github.com/ckan/ckan/commit/814745a236068908335183d9368bf7de63d1b85d
Author: kindly <kindly at gmail.com>
Date: 2013-12-10 (Tue, 10 Dec 2013)
Changed paths:
M ckan/logic/__init__.py
M ckan/logic/action/get.py
M ckan/logic/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/new_tests/logic/action/test_get.py
Log Message:
-----------
Merge pull request #1258 from okfn/1258-validator-decorators
ValueError for non-int limit and offset query params
Commit: 27b903b37c7e6fb209ad54116a1addbe92367545
https://github.com/ckan/ckan/commit/27b903b37c7e6fb209ad54116a1addbe92367545
Author: kindly <kindly at gmail.com>
Date: 2013-12-10 (Tue, 10 Dec 2013)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/model_save.py
M ckan/lib/plugins.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/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/group.py
M ckan/new_authz.py
M ckan/tests/functional/test_group.py
M ckan/tests/logic/test_auth.py
M ckan/tests/logic/test_member.py
M ckan/tests/models/test_group.py
M ckan/tests/test_coding_standards.py
M doc/configuration.rst
Log Message:
-----------
Merge pull request #1247 from datagovuk/1038-organization-hierarchy
1038 organization hierarchy
Commit: 05c5c2cb260aa6b518bbd5ee2612f45780780cb1
https://github.com/ckan/ckan/commit/05c5c2cb260aa6b518bbd5ee2612f45780780cb1
Author: amercader <amercadero at gmail.com>
Date: 2013-12-11 (Wed, 11 Dec 2013)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/accept.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/email_notifications.py
M ckan/lib/helpers.py
M ckan/lib/plugins.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/get.py
M ckan/logic/auth/update.py
M ckan/logic/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/group.py
M ckan/new_authz.py
A ckan/new_tests/logic/action/test_get.py
M ckan/new_tests/logic/action/test_update.py
A ckan/public/base/javascript/modules/resource-reorder.js
M ckan/public/base/javascript/modules/slug-preview.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/dataset.less
A ckan/public/base/vendor/jquery.ui.core.js
A ckan/public/base/vendor/jquery.ui.mouse.js
A ckan/public/base/vendor/jquery.ui.sortable.js
M ckan/public/base/vendor/jquery.ui.widget.js
M ckan/public/base/vendor/resource.config
M ckan/templates/group/member_new.html
M ckan/templates/group/read.html
M ckan/templates/group/snippets/group_item.html
M ckan/templates/organization/read.html
A ckan/templates/package/group_list.html
M ckan/templates/package/read_base.html
M ckan/templates/package/resource_data.html
M ckan/templates/package/resource_edit_base.html
M ckan/templates/package/resources.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_form.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_item.html
M ckan/templates/snippets/package_list.html
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/lib/test_accept.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_auth.py
M ckan/tests/logic/test_member.py
M ckan/tests/models/test_group.py
M ckan/tests/test_coding_standards.py
M ckanext/datapusher/helpers.py
M ckanext/datapusher/logic/action.py
M ckanext/datapusher/plugin.py
M ckanext/datapusher/tests/test.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/plugin.py
M doc/configuration.rst
M doc/documentation-guidelines.rst
M doc/filestore.rst
Log Message:
-----------
Merge branch 'master' into 1208-dictize-changes-2
Commit: c68bd378f8b654ad7100d6a213175310f9ee45d1
https://github.com/ckan/ckan/commit/c68bd378f8b654ad7100d6a213175310f9ee45d1
Author: amercader <amercadero at gmail.com>
Date: 2013-12-11 (Wed, 11 Dec 2013)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
[#1208] Fix wrong logic for search params
Commit: 2028066b605ce9e64ca97447088d1b5872dc2ab3
https://github.com/ckan/ckan/commit/2028066b605ce9e64ca97447088d1b5872dc2ab3
Author: amercader <amercadero at gmail.com>
Date: 2013-12-11 (Wed, 11 Dec 2013)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#1208] More robust boolean param handling
Commit: aab84d1a006da797576cf9182cd53b9084c72304
https://github.com/ckan/ckan/commit/aab84d1a006da797576cf9182cd53b9084c72304
Author: amercader <amercadero at gmail.com>
Date: 2013-12-11 (Wed, 11 Dec 2013)
Changed paths:
M ckan/new_tests/factories.py
M ckan/new_tests/logic/action/test_get.py
Log Message:
-----------
[#1208] Add new tests for group/org list/show
Added a couple of factories for groups and orgs. Not clear about the
user that should be creating them.
Commit: 589079351943eec54a011c6865072d36257e7255
https://github.com/ckan/ckan/commit/589079351943eec54a011c6865072d36257e7255
Author: amercader <amercadero at gmail.com>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M ckan/new_tests/factories.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
[#1208] Fix tests Pep8 and horrible and unmaintaineble dictization tests
Commit: cf3a97e3f04696b74773d651a83d2888fb12d755
https://github.com/ckan/ckan/commit/cf3a97e3f04696b74773d651a83d2888fb12d755
Author: amercader <amercadero at gmail.com>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M ckan/templates/package/snippets/resource_form.html
Log Message:
-----------
[#1350] Remove misleading resource format notice
Commit: 25926d9c909175661bea7cb82ebdb2505014bf42
https://github.com/ckan/ckan/commit/25926d9c909175661bea7cb82ebdb2505014bf42
Author: amercader <amercadero at gmail.com>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M requirements.txt
Log Message:
-----------
Merge branch 'upgrade-dependencies'
Commit: e552048dba78f44edd9589c0400eb0561cc0b4b0
https://github.com/ckan/ckan/commit/e552048dba78f44edd9589c0400eb0561cc0b4b0
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#1384] Make the database query in related_list
* We didn't actually do the database query in related_list if we
didn't pass a dataset. This commit fixes that.
* Share the dictize function for both cases.
Commit: 19496cef71a785ef9296538d88c8406656652cc5
https://github.com/ckan/ckan/commit/19496cef71a785ef9296538d88c8406656652cc5
Author: kindly <kindly at gmail.com>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M ckan/templates/package/snippets/resource_form.html
Log Message:
-----------
Merge pull request #1383 from okfn/1350-resource-format-remove-text
[#1350] Remove misleading resource format notice
Commit: 589bb75084a6c85de4fbb04f2f99bcbd51cf966a
https://github.com/ckan/ckan/commit/589bb75084a6c85de4fbb04f2f99bcbd51cf966a
Author: John Martin <me at johnmart.in>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M ckan/public/base/javascript/modules/image-upload.js
M ckan/templates/package/snippets/resource_form.html
Log Message:
-----------
[#1382] Changes labels on resource upload form
Commit: 6e9f114e17565a71a35bacec7136291516bcc477
https://github.com/ckan/ckan/commit/6e9f114e17565a71a35bacec7136291516bcc477
Author: John Martin <me at johnmart.in>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M ckan/public/base/javascript/modules/image-upload.js
M ckan/templates/macros/form.html
Log Message:
-----------
[#1382] Adds tooltips to button
Commit: a5118cc19791ffa01ea9e48a7e778544c375bd5d
https://github.com/ckan/ckan/commit/a5118cc19791ffa01ea9e48a7e778544c375bd5d
Author: John Martin <me at johnmart.in>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M ckan/templates/package/snippets/resource_form.html
Log Message:
-----------
[#1382] Removes uneeded requiredmessage call
Commit: 9dfef5fdc370d3692cdf183f056cb05ab756b422
https://github.com/ckan/ckan/commit/9dfef5fdc370d3692cdf183f056cb05ab756b422
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M ckan/controllers/group.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
M ckan/new_tests/factories.py
M ckan/new_tests/logic/action/test_get.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
Merge branch '1208-dictize-changes-2'
Commit: a21d109ba0340fed93433ffd1e138afe8f430a7f
https://github.com/ckan/ckan/commit/a21d109ba0340fed93433ffd1e138afe8f430a7f
Author: amercader <amercadero at gmail.com>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M ckan/public/base/javascript/modules/image-upload.js
Log Message:
-----------
[#1382] Minor typo
Commit: 6fbd43bb3187f00be2f84559dcba7d359e4aefbe
https://github.com/ckan/ckan/commit/6fbd43bb3187f00be2f84559dcba7d359e4aefbe
Author: amercader <amercadero at gmail.com>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M ckan/public/base/javascript/modules/image-upload.js
M ckan/templates/macros/form.html
M ckan/templates/package/snippets/resource_form.html
Log Message:
-----------
Merge branch '1382-upload-labelling-tweaks'
Commit: fc20a45ffff312061b13ebaf00ba71c455ad69d5
https://github.com/ckan/ckan/commit/fc20a45ffff312061b13ebaf00ba71c455ad69d5
Author: amercader <amercadero at gmail.com>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M CHANGELOG.rst
M MANIFEST.in
M bin/travis-run-tests
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/routing.py
R ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/README.txt
M ckan/config/solr/schema-1.2.xml
M ckan/config/solr/schema-1.3.xml
M ckan/config/solr/schema-1.4.xml
M ckan/config/solr/schema-2.0.xml
A ckan/config/solr/schema.xml
M ckan/controllers/api.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/accept.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/email_notifications.py
M ckan/lib/helpers.py
M ckan/lib/plugins.py
M ckan/lib/uploader.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/get.py
M ckan/logic/auth/update.py
M ckan/logic/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/group.py
M ckan/new_authz.py
M ckan/new_tests/factories.py
A ckan/new_tests/logic/action/test_get.py
M ckan/new_tests/logic/action/test_update.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/javascript/modules/image-upload.js
A ckan/public/base/javascript/modules/resource-reorder.js
M ckan/public/base/javascript/modules/slug-preview.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/dataset.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/search.less
A ckan/public/base/vendor/jquery.ui.core.js
A ckan/public/base/vendor/jquery.ui.mouse.js
A ckan/public/base/vendor/jquery.ui.sortable.js
M ckan/public/base/vendor/jquery.ui.widget.js
M ckan/public/base/vendor/resource.config
M ckan/templates/admin/config.html
M ckan/templates/base.html
M ckan/templates/group/about.html
M ckan/templates/group/activity_stream.html
M ckan/templates/group/edit.html
M ckan/templates/group/edit_base.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/members.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/group/read_base.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/group/snippets/group_item.html
M ckan/templates/header.html
M ckan/templates/macros/form.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/edit.html
M ckan/templates/organization/edit_base.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/package/activity.html
R ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/base_form_page.html
A ckan/templates/package/group_list.html
M ckan/templates/package/new.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/resource_data.html
M ckan/templates/package/resource_edit_base.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/resources.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_form.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resource_item.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/package_list.html
M ckan/templates/snippets/search_form.html
M ckan/templates/snippets/search_result_text.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/edit_base.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/read.html
M ckan/templates/user/read_base.html
R ckan/templates/user/snippets/back_to_user_action.html
M ckan/templates/user/snippets/login_form.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/lib/test_accept.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_solr_schema_version.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_auth.py
M ckan/tests/logic/test_member.py
M ckan/tests/models/test_group.py
M ckan/tests/test_coding_standards.py
M ckanext/datapusher/helpers.py
M ckanext/datapusher/logic/action.py
M ckanext/datapusher/plugin.py
M ckanext/datapusher/tests/test.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/plugin.py
M doc/appendices/solr-multicore.rst
M doc/conf.py
M doc/configuration.rst
M doc/contents.rst
M doc/documentation-guidelines.rst
M doc/filestore.rst
M doc/install-from-source.rst
M doc/release-process.rst
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-source.rst
M requirements.txt
Log Message:
-----------
Merge branch 'master' into 1188-fix-org-list-dataset-form
Commit: 10a379881fb6784014265c6e7371de434c3c8898
https://github.com/ckan/ckan/commit/10a379881fb6784014265c6e7371de434c3c8898
Author: amercader <amercadero at gmail.com>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M ckan/templates/package/snippets/package_basic_fields.html
Log Message:
-----------
Revert "[#1188] Allow organization dropdown to be displayed"
There is certain logic, albeit a bit flacky, in hiding the organization
dropwdown, in that if shown, any user belonging to an organization could
take ownership of any unowned dataset in the instance. We need to
properly define the auth rules and enforce them at the validator level
as well. For the time being, showing the dropdown only to sysadmins
makes sense (and of course fixing the original bug on the visibility
field validator, which is done on the next commit)
This reverts commit f366ba684340adbb903b78bc5beb871069a6a0c2.
Commit: a8643383e8c19cf42438f1813d2d040e999d36fd
https://github.com/ckan/ckan/commit/a8643383e8c19cf42438f1813d2d040e999d36fd
Author: kindly <kindly at gmail.com>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M CHANGELOG.rst
M CONTRIBUTING.rst
M MANIFEST.in
M bin/travis-install-dependencies
M bin/travis-run-tests
M ckan/ckan_nose_plugin.py
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
R ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/README.txt
M ckan/config/solr/schema-1.2.xml
M ckan/config/solr/schema-1.3.xml
M ckan/config/solr/schema-1.4.xml
M ckan/config/solr/schema-2.0.xml
A ckan/config/solr/schema.xml
M ckan/controllers/api.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/accept.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/email_notifications.py
M ckan/lib/helpers.py
M ckan/lib/uploader.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/get.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/new_authz.py
M ckan/new_tests/helpers.py
M ckan/new_tests/logic/action/test_update.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/javascript/main.js
M ckan/public/base/javascript/modules/image-upload.js
A ckan/public/base/javascript/modules/resource-reorder.js
M ckan/public/base/javascript/modules/slug-preview.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/dataset.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/search.less
A ckan/public/base/vendor/jquery.ui.core.js
A ckan/public/base/vendor/jquery.ui.mouse.js
A ckan/public/base/vendor/jquery.ui.sortable.js
M ckan/public/base/vendor/jquery.ui.widget.js
M ckan/public/base/vendor/resource.config
M ckan/templates/admin/config.html
M ckan/templates/base.html
M ckan/templates/group/about.html
M ckan/templates/group/activity_stream.html
M ckan/templates/group/edit.html
M ckan/templates/group/edit_base.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/members.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/group/read_base.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/group/snippets/group_item.html
M ckan/templates/header.html
M ckan/templates/macros/form.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/edit.html
M ckan/templates/organization/edit_base.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/package/activity.html
R ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/base_form_page.html
A ckan/templates/package/group_list.html
M ckan/templates/package/new.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/resource_data.html
M ckan/templates/package/resource_edit_base.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/resources.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_form.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resource_item.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/package_list.html
M ckan/templates/snippets/search_form.html
M ckan/templates/snippets/search_result_text.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/edit_base.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/read.html
M ckan/templates/user/read_base.html
R ckan/templates/user/snippets/back_to_user_action.html
M ckan/templates/user/snippets/login_form.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_package.py
M ckan/tests/lib/test_accept.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_solr_schema_version.py
M ckan/tests/logic/test_action.py
M ckan/tests/test_coding_standards.py
M ckanext/datapusher/helpers.py
M ckanext/datapusher/logic/action.py
M ckanext/datapusher/plugin.py
M ckanext/datapusher/tests/test.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/plugin.py
M doc/api.rst
A doc/appendices/index.rst
A doc/appendices/solr-multicore.rst
M doc/background-tasks.rst
M doc/conf.py
M doc/configuration.rst
A doc/contents.rst
M doc/css-coding-standards.rst
M doc/data-viewer.rst
M doc/datastore.rst
M doc/deployment.rst
M doc/documentation-guidelines.rst
M doc/email-notifications.rst
M doc/filestore.rst
M doc/getting-started.rst
A doc/images/add_dataset_1.jpg
A doc/images/add_dataset_2.jpg
A doc/images/add_dataset_3.jpg
R doc/images/admin-page.png
A doc/images/create_organization.jpg
A doc/images/customize_look_and_feel.jpg
A doc/images/edit_dataset.jpg
A doc/images/exploring_datasets.jpg
A doc/images/manage_news_feed.jpg
A doc/images/manage_organization.jpg
A doc/images/manage_user_profile.jpg
A doc/images/manage_users.jpg
A doc/images/move_dataset_between_organizations.jpg
A doc/images/register_account.jpg
A doc/images/search_the_site.jpg
M doc/index.rst
M doc/install-from-package.rst
M doc/install-from-source.rst
M doc/release-process.rst
R doc/solr-setup.rst
A doc/sysadmin-guide.rst
M doc/test.rst
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-source.rst
A doc/user-guide.rst
Log Message:
-----------
Merge branch 'master' into 1255-better-search-results
Commit: fb37fc06b5c47ea7e72d87584a6b0a0dd7a94c92
https://github.com/ckan/ckan/commit/fb37fc06b5c47ea7e72d87584a6b0a0dd7a94c92
Author: kindly <kindly at gmail.com>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/controllers/group.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/plugins.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/update.py
M ckan/logic/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/group.py
M ckan/new_authz.py
M ckan/new_tests/factories.py
A ckan/new_tests/logic/action/test_get.py
M ckan/public/base/javascript/modules/image-upload.js
M ckan/templates/macros/form.html
M ckan/templates/package/snippets/resource_form.html
M ckan/tests/functional/test_group.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_auth.py
M ckan/tests/logic/test_member.py
M ckan/tests/models/test_group.py
M ckan/tests/test_coding_standards.py
M doc/configuration.rst
M requirements.txt
Log Message:
-----------
Merge branch 'master' into 1255-better-search-results
Commit: 864e1a68c8183b35cb2e7fcb0db43b51d1f6cc58
https://github.com/ckan/ckan/commit/864e1a68c8183b35cb2e7fcb0db43b51d1f6cc58
Author: amercader <amercadero at gmail.com>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M ckan/logic/validators.py
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1188] Fix visibility validator
To not rely on owner_org being present, when the validator gets a value
of private and there is no owner_org, we request the dataset anyway and
check if it actually has an owner_org.
Added new validation tests
Commit: 52d1c1d8086e4c3888ddc936cb109368d77c09e3
https://github.com/ckan/ckan/commit/52d1c1d8086e4c3888ddc936cb109368d77c09e3
Author: kindly <kindly at gmail.com>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
[#1255] fix dictization tests
Commit: dceaf6f992cce3e708e3c19ca14b5ab0dda3d398
https://github.com/ckan/ckan/commit/dceaf6f992cce3e708e3c19ca14b5ab0dda3d398
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M CHANGELOG.rst
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/accept.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/email_notifications.py
M ckan/lib/helpers.py
M ckan/lib/plugins.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/get.py
M ckan/logic/auth/update.py
M ckan/logic/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/group.py
M ckan/new_authz.py
M ckan/new_tests/factories.py
A ckan/new_tests/logic/action/test_get.py
M ckan/new_tests/logic/action/test_update.py
M ckan/public/base/javascript/modules/image-upload.js
A ckan/public/base/javascript/modules/resource-reorder.js
M ckan/public/base/javascript/modules/slug-preview.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/dataset.less
A ckan/public/base/vendor/jquery.ui.core.js
A ckan/public/base/vendor/jquery.ui.mouse.js
A ckan/public/base/vendor/jquery.ui.sortable.js
M ckan/public/base/vendor/jquery.ui.widget.js
M ckan/public/base/vendor/resource.config
M ckan/templates/group/member_new.html
M ckan/templates/group/read.html
M ckan/templates/group/snippets/group_item.html
M ckan/templates/macros/form.html
M ckan/templates/organization/read.html
A ckan/templates/package/group_list.html
M ckan/templates/package/read_base.html
M ckan/templates/package/resource_data.html
M ckan/templates/package/resource_edit_base.html
M ckan/templates/package/resources.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_form.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resource_item.html
M ckan/templates/snippets/package_list.html
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/lib/test_accept.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_auth.py
M ckan/tests/logic/test_member.py
M ckan/tests/models/test_group.py
M ckan/tests/test_coding_standards.py
M ckanext/datapusher/helpers.py
M ckanext/datapusher/logic/action.py
M ckanext/datapusher/plugin.py
M ckanext/datapusher/tests/test.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/plugin.py
M doc/configuration.rst
M doc/documentation-guidelines.rst
M doc/filestore.rst
M requirements.txt
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into bug-1363-error-500-api-empty-database
Commit: 6213f0d5c5243baf6626af7649174d1963eb823a
https://github.com/ckan/ckan/commit/6213f0d5c5243baf6626af7649174d1963eb823a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Merge branch 'bug-1363-error-500-api-empty-database'
Commit: 42e17b5edd5799f0b876e848ec44b7aae816a4c1
https://github.com/ckan/ckan/commit/42e17b5edd5799f0b876e848ec44b7aae816a4c1
Author: amercader <amercadero at gmail.com>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#1188] Remove debugger call
Commit: 7bd7062ac6b494f221e4157c339a4990b8afb344
https://github.com/ckan/ckan/commit/7bd7062ac6b494f221e4157c339a4990b8afb344
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-12 (Thu, 12 Dec 2013)
Changed paths:
M doc/conf.py
Log Message:
-----------
[#1380] Fix some broken hyperlinks in the docs
Stop Sphinx from hyperlinking part of the URL in pip install commands.
Commit: 9a75c9f9940198d5aec79cd62dea15de7fd2c34a
https://github.com/ckan/ckan/commit/9a75c9f9940198d5aec79cd62dea15de7fd2c34a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M ckanext/example_theme/v02_empty_template/plugin.py
Log Message:
-----------
[#847] Add template path explanation
Commit: 66c79c462c12f356859f483921a3e7cc94ba2c8b
https://github.com/ckan/ckan/commit/66c79c462c12f356859f483921a3e7cc94ba2c8b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M ckanext/example_theme/v10_custom_snippet/templates/home/layout1.html
M ckanext/example_theme/v10_custom_snippet/templates/snippets/example_theme_most_popular_groups.html
M doc/theming/best-practices.rst
M doc/theming/templates.rst
Log Message:
-----------
[#847] Refactor a snippet from the theming docs
Also add snippets docstrings to best practices
Commit: 751db719dd0014b107fcdea63e50a8cb01d3bd8d
https://github.com/ckan/ckan/commit/751db719dd0014b107fcdea63e50a8cb01d3bd8d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M doc/theming/templates.rst
Log Message:
-----------
[#847] Add note that g is an alias for app_globals
Commit: 1b4d639c0bb27f78700fb140b5012bb227f291fd
https://github.com/ckan/ckan/commit/1b4d639c0bb27f78700fb140b5012bb227f291fd
Author: amercader <amercadero at gmail.com>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M doc/release-process.rst
Log Message:
-----------
[#1389] Tweak release process docs
Commit: b65e7066abd5c6a6752fa8d6f3f7cd8be9736a04
https://github.com/ckan/ckan/commit/b65e7066abd5c6a6752fa8d6f3f7cd8be9736a04
Author: amercader <amercadero at gmail.com>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
[#1390] Move context definition to prevent exception
Commit: 839b5c8d4fc35f05dfa85639df05703375fa2ce9
https://github.com/ckan/ckan/commit/839b5c8d4fc35f05dfa85639df05703375fa2ce9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
A ckanext/example_theme/custom_config_setting/__init__.py
A ckanext/example_theme/custom_config_setting/plugin.py
A ckanext/example_theme/custom_config_setting/templates/home/layout1.html
A ckanext/example_theme/custom_config_setting/templates/snippets
M doc/extensions/best-practices.rst
M doc/extensions/tutorial.rst
M doc/theming/templates.rst
M setup.py
Log Message:
-----------
[#847] Add theming custom config setting example
Commit: 3e1847b429e2ddc4044274b37df2c3e19f3c5e89
https://github.com/ckan/ckan/commit/3e1847b429e2ddc4044274b37df2c3e19f3c5e89
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M CHANGELOG.rst
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/controllers/group.py
M ckan/lib/accept.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/lib/plugins.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/update.py
M ckan/logic/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/group.py
M ckan/new_authz.py
M ckan/new_tests/factories.py
A ckan/new_tests/logic/action/test_get.py
M ckan/new_tests/logic/action/test_update.py
M ckan/public/base/javascript/modules/image-upload.js
A ckan/public/base/javascript/modules/resource-reorder.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/dataset.less
A ckan/public/base/vendor/jquery.ui.core.js
A ckan/public/base/vendor/jquery.ui.mouse.js
A ckan/public/base/vendor/jquery.ui.sortable.js
M ckan/public/base/vendor/jquery.ui.widget.js
M ckan/public/base/vendor/resource.config
M ckan/templates/macros/form.html
M ckan/templates/package/resource_data.html
M ckan/templates/package/resource_edit_base.html
M ckan/templates/package/resources.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_form.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resource_item.html
M ckan/tests/functional/test_group.py
M ckan/tests/lib/test_accept.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_auth.py
M ckan/tests/logic/test_member.py
M ckan/tests/models/test_group.py
M ckan/tests/test_coding_standards.py
M ckanext/datapusher/helpers.py
M ckanext/datapusher/logic/action.py
M ckanext/datapusher/plugin.py
M ckanext/datapusher/tests/test.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/plugin.py
M doc/configuration.rst
M requirements.txt
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 847-new-theming-docs
Commit: dcf11d992a370f6d4a2d5d1fe74ceeb7f55b3bcd
https://github.com/ckan/ckan/commit/dcf11d992a370f6d4a2d5d1fe74ceeb7f55b3bcd
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M ckanext/example_iauthfunctions/plugin.py
Log Message:
-----------
[#847] Delete a set_trace()
Commit: 86d90ee175f254ed8b374c627fd9e8778c5aa911
https://github.com/ckan/ckan/commit/86d90ee175f254ed8b374c627fd9e8778c5aa911
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
R ckanext/example_iauthfunctions/plugin.py
A ckanext/example_iauthfunctions/plugin_v4.py
A ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
A doc/extensions/custom-config-settings.rst
M doc/extensions/index.rst
M doc/extensions/tutorial.rst
M doc/theming/templates.rst
M setup.py
Log Message:
-----------
[#847] Add docs for extensions custom config settings
And example with tests
Commit: 146568aff928d9b090dc4ce8d9a4bf64e95a2aea
https://github.com/ckan/ckan/commit/146568aff928d9b090dc4ce8d9a4bf64e95a2aea
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
[#1393] user_dictize: return apikey correctly
Was returning email instead of apikey. Fixes #1393
Commit: c341f68c3575890945cdcf5f2d2a8ed334c34e54
https://github.com/ckan/ckan/commit/c341f68c3575890945cdcf5f2d2a8ed334c34e54
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
[#1393] user_dictize: return apikey correctly
Was returning email instead of apikey. Fixes #1393
Commit: 2570f454b9dcd30af80ef627557874dbf1c43e46
https://github.com/ckan/ckan/commit/2570f454b9dcd30af80ef627557874dbf1c43e46
Author: amercader <amercadero at gmail.com>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1188] PEP8 fixes
Commit: f4a24aeacf8e396f80305278d5198651912a9706
https://github.com/ckan/ckan/commit/f4a24aeacf8e396f80305278d5198651912a9706
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M ckan/new_tests/factories.py
M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
Log Message:
-----------
[#847] Add a factoriy for creating test sysadmins
..and use it in the example_iauthfunctions tests. Also use the normal
user factory in the tests.
Commit: a9d62f07ef9c3e0ba916bda9f11b06aef1adbb8e
https://github.com/ckan/ckan/commit/a9d62f07ef9c3e0ba916bda9f11b06aef1adbb8e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M doc/theming/best-practices.rst
M doc/theming/css.rst
M doc/theming/fanstatic.rst
M doc/theming/javascript.rst
M doc/theming/static-files.rst
M doc/theming/templates.rst
Log Message:
-----------
[#847] Add syntax highlighting to literal includes
Commit: e3764371f8862f49d497e548d4235fb11d87da68
https://github.com/ckan/ckan/commit/e3764371f8862f49d497e548d4235fb11d87da68
Author: kindly <kindly at gmail.com>
Date: 2013-12-13 (Fri, 13 Dec 2013)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/new_tests/logic/action/test_get.py
Log Message:
-----------
[#1392] more fixes from awful commit + tests
Commit: 9a2840b78ee292841147e96a6bdaa6b9a693002f
https://github.com/ckan/ckan/commit/9a2840b78ee292841147e96a6bdaa6b9a693002f
Author: kindly <kindly at gmail.com>
Date: 2013-12-15 (Sun, 15 Dec 2013)
Changed paths:
M ckan/new_tests/logic/action/test_get.py
Log Message:
-----------
[#1392] pep8 fix
Commit: 4a89b781c838a86b98a637d09700a3a0f4388afc
https://github.com/ckan/ckan/commit/4a89b781c838a86b98a637d09700a3a0f4388afc
Author: amercader <amercadero at gmail.com>
Date: 2013-12-16 (Mon, 16 Dec 2013)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/new_tests/logic/action/test_get.py
Log Message:
-----------
Merge branch '1393-bug-user-create-returns-email-for-api-key'
Commit: 8af7420dcfc5037836e9b0f127a9c257428c6d7a
https://github.com/ckan/ckan/commit/8af7420dcfc5037836e9b0f127a9c257428c6d7a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-16 (Mon, 16 Dec 2013)
Changed paths:
M CHANGELOG.rst
M MANIFEST.in
M bin/travis-install-dependencies
M bin/travis-run-tests
M ckan/ckan_nose_plugin.py
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/routing.py
R ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/README.txt
M ckan/config/solr/schema-1.2.xml
M ckan/config/solr/schema-1.3.xml
M ckan/config/solr/schema-1.4.xml
M ckan/config/solr/schema-2.0.xml
A ckan/config/solr/schema.xml
M ckan/controllers/api.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/accept.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/email_notifications.py
M ckan/lib/helpers.py
M ckan/lib/plugins.py
M ckan/lib/uploader.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/get.py
M ckan/logic/auth/update.py
M ckan/logic/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/group.py
M ckan/new_authz.py
M ckan/new_tests/factories.py
M ckan/new_tests/helpers.py
A ckan/new_tests/logic/action/test_get.py
M ckan/new_tests/logic/action/test_update.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/javascript/main.js
M ckan/public/base/javascript/modules/image-upload.js
A ckan/public/base/javascript/modules/resource-reorder.js
M ckan/public/base/javascript/modules/slug-preview.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/dataset.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/search.less
A ckan/public/base/vendor/jquery.ui.core.js
A ckan/public/base/vendor/jquery.ui.mouse.js
A ckan/public/base/vendor/jquery.ui.sortable.js
M ckan/public/base/vendor/jquery.ui.widget.js
M ckan/public/base/vendor/resource.config
M ckan/templates/admin/config.html
M ckan/templates/base.html
M ckan/templates/group/about.html
M ckan/templates/group/activity_stream.html
M ckan/templates/group/edit.html
M ckan/templates/group/edit_base.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/members.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/group/read_base.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/group/snippets/group_item.html
M ckan/templates/header.html
M ckan/templates/macros/form.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/edit.html
M ckan/templates/organization/edit_base.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/package/activity.html
R ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/base_form_page.html
A ckan/templates/package/group_list.html
M ckan/templates/package/new.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/resource_data.html
M ckan/templates/package/resource_edit_base.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/resources.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_form.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resource_item.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/package_list.html
M ckan/templates/snippets/search_form.html
M ckan/templates/snippets/search_result_text.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/edit_base.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/read.html
M ckan/templates/user/read_base.html
R ckan/templates/user/snippets/back_to_user_action.html
M ckan/templates/user/snippets/login_form.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/lib/test_accept.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_solr_schema_version.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_auth.py
M ckan/tests/logic/test_member.py
M ckan/tests/models/test_group.py
M ckan/tests/test_coding_standards.py
M ckanext/datapusher/helpers.py
M ckanext/datapusher/logic/action.py
M ckanext/datapusher/plugin.py
M ckanext/datapusher/tests/test.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/plugin.py
M doc/api.rst
A doc/appendices/index.rst
A doc/appendices/solr-multicore.rst
M doc/background-tasks.rst
M doc/conf.py
M doc/configuration.rst
A doc/contents.rst
M doc/contributing/coding-standards/testing-coding-standards.rst
M doc/contributing/documentation-guidelines.rst
M doc/data-viewer.rst
M doc/datastore.rst
M doc/deployment.rst
M doc/email-notifications.rst
M doc/filestore.rst
M doc/getting-started.rst
A doc/images/add_dataset_1.jpg
A doc/images/add_dataset_2.jpg
A doc/images/add_dataset_3.jpg
R doc/images/admin-page.png
A doc/images/create_organization.jpg
A doc/images/customize_look_and_feel.jpg
A doc/images/edit_dataset.jpg
A doc/images/exploring_datasets.jpg
A doc/images/manage_news_feed.jpg
A doc/images/manage_organization.jpg
A doc/images/manage_user_profile.jpg
A doc/images/manage_users.jpg
A doc/images/move_dataset_between_organizations.jpg
A doc/images/register_account.jpg
A doc/images/search_the_site.jpg
M doc/index.rst
M doc/install-from-package.rst
M doc/install-from-source.rst
M doc/release-process.rst
R doc/solr-setup.rst
A doc/sysadmin-guide.rst
M doc/test.rst
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-source.rst
A doc/user-guide.rst
M requirements.txt
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into contributing-docs-reorg
Conflicts:
CONTRIBUTING.rst
doc/contributing/coding-standards/css-coding-standards.rst
doc/index.rst
Commit: b3dff01892fd6e0fc8add0b5ffc53f9cb3a677a5
https://github.com/ckan/ckan/commit/b3dff01892fd6e0fc8add0b5ffc53f9cb3a677a5
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-16 (Mon, 16 Dec 2013)
Changed paths:
M doc/contributing/pull-requests.rst
Log Message:
-----------
Replace example good commit message in docs
The example was not actually a very good example, replace it with a
better one from recent git logs.
Commit: 84fc1b8bebd81f1712e03849edaf4440e6ad7d76
https://github.com/ckan/ckan/commit/84fc1b8bebd81f1712e03849edaf4440e6ad7d76
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-16 (Mon, 16 Dec 2013)
Changed paths:
M doc/conf.py
A doc/contributing/architecture.rst
R doc/contributing/coding-standards/ckan-code-architecture.rst
R doc/contributing/coding-standards/css-coding-standards.rst
R doc/contributing/coding-standards/database-migrations.rst
R doc/contributing/coding-standards/html-coding-standards.rst
R doc/contributing/coding-standards/index.rst
R doc/contributing/coding-standards/javascript-coding-standards.rst
R doc/contributing/coding-standards/python-coding-standards.rst
R doc/contributing/coding-standards/testing-coding-standards.rst
R doc/contributing/coding-standards/upgrading-dependencies.rst
A doc/contributing/commit-messages.rst
A doc/contributing/css.rst
A doc/contributing/database-migrations.rst
R doc/contributing/documentation-guidelines.rst
A doc/contributing/documentation.rst
M doc/contributing/frontend/index.rst
A doc/contributing/html.rst
M doc/contributing/i18n.rst
M doc/contributing/index.rst
M doc/contributing/issues.rst
A doc/contributing/javascript.rst
M doc/contributing/pull-requests.rst
A doc/contributing/python.rst
A doc/contributing/reviewing.rst
A doc/contributing/testing.rst
A doc/contributing/upgrading-dependencies.rst
M doc/extensions/best-practices.rst
Log Message:
-----------
Another contributing docs reorganization
Redorder it all into a single docs/contributing/ subdirectory with one table
of contents and no sub-sub-directories (except for the frontend guidelines one,
which still needs sorting out). This makes it much easier to see what's there
(one main table of contents for all of contributing) and navigate.
Add _CKAN issue tracker hyperlink target to conf.py.
Move commit messages guidelines to their own page.
Move reviewing a pull request guidelines to their own page.
Fix title style of various titles.
A few other small changes
Commit: fd53401864661b479c1e4d041e935ee1c240048b
https://github.com/ckan/ckan/commit/fd53401864661b479c1e4d041e935ee1c240048b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-16 (Mon, 16 Dec 2013)
Changed paths:
M doc/contributing/documentation.rst
Log Message:
-----------
Fix a Sphinx cross-reference
Commit: 1522c4c3c67a052dc1e1d0a0ada0a86314224599
https://github.com/ckan/ckan/commit/1522c4c3c67a052dc1e1d0a0ada0a86314224599
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-16 (Mon, 16 Dec 2013)
Changed paths:
M doc/contributing/documentation.rst
Log Message:
-----------
Add a couple of notes to the documentation guidelines
Commit: d6ab05be812aca3a52ae56a07f2f9ddb3bfefda1
https://github.com/ckan/ckan/commit/d6ab05be812aca3a52ae56a07f2f9ddb3bfefda1
Author: kindly <kindly at gmail.com>
Date: 2013-12-16 (Mon, 16 Dec 2013)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
Merge pull request #1390 from okfn/1390-group_dictize-exception
Exception on group dictize due to 'with_capacity' on context
Commit: d2693b834af3516d279827181bb6f0d88d005ad1
https://github.com/ckan/ckan/commit/d2693b834af3516d279827181bb6f0d88d005ad1
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-12-16 (Mon, 16 Dec 2013)
Changed paths:
M ckan/controllers/related.py
Log Message:
-----------
[#1384] Update related controller to use a list
The controller relied on the output of related_list being a
Query object. Updated them to use the list.
Commit: f32277034a326867df84082a69fd3d2452a82d3a
https://github.com/ckan/ckan/commit/f32277034a326867df84082a69fd3d2452a82d3a
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-12-16 (Mon, 16 Dec 2013)
Changed paths:
M ckan/tests/functional/test_related.py
Log Message:
-----------
[#1384] Update tests to deal with list
The tests also relied on related_list being a Query instead of
a list. Updated them and added new asserts.
Commit: 546caa71b66df2cbcab34bbb50b6ebabab66cdfc
https://github.com/ckan/ckan/commit/546caa71b66df2cbcab34bbb50b6ebabab66cdfc
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-12-16 (Mon, 16 Dec 2013)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#1384] Update documentation for related_list
The related_list function should not need an id or dataset
parameter. We use it ourselves in the related dashboard
without an id or dataset parameter.
Commit: d621b8b2e7c8064779401343ff1460dfdb36facc
https://github.com/ckan/ckan/commit/d621b8b2e7c8064779401343ff1460dfdb36facc
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-12-16 (Mon, 16 Dec 2013)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
[#1384] Remove sorted from model_dictize
related_items is already sorted from the database query.
Adding another sorting at the model_dictize level looks
unnecessary and overrides the one from the query.
Commit: 27831b326959706f8b91b43bff4405ea9171981c
https://github.com/ckan/ckan/commit/27831b326959706f8b91b43bff4405ea9171981c
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-12-16 (Mon, 16 Dec 2013)
Changed paths:
M ckan/controllers/related.py
M ckan/tests/functional/test_related.py
Log Message:
-----------
[#1384] Fix test broken due to sorted change
* Fix the test broken because it expects results from sorted.
* Correct the PEP8 change in related controller.
Commit: 5b30653d0376f3c6c5043fbdb2d151a8c7c170b9
https://github.com/ckan/ckan/commit/5b30653d0376f3c6c5043fbdb2d151a8c7c170b9
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-12-17 (Tue, 17 Dec 2013)
Changed paths:
M CONTRIBUTING.rst
R doc/ckan-coding-standards.rst
M doc/conf.py
M doc/configuration.rst
M doc/contents.rst
R doc/contributing.rst
A doc/contributing/architecture.rst
A doc/contributing/commit-messages.rst
A doc/contributing/css.rst
A doc/contributing/database-migrations.rst
A doc/contributing/documentation.rst
A doc/contributing/frontend/index.rst
A doc/contributing/frontend/javascript-module-tutorial.rst
A doc/contributing/frontend/resources.rst
A doc/contributing/frontend/template-blocks.rst
A doc/contributing/frontend/template-tutorial.rst
A doc/contributing/frontend/templating.rst
A doc/contributing/html.rst
A doc/contributing/i18n.rst
A doc/contributing/index.rst
A doc/contributing/issues.rst
A doc/contributing/javascript.rst
A doc/contributing/pull-requests.rst
A doc/contributing/python.rst
A doc/contributing/reviewing.rst
A doc/contributing/testing.rst
A doc/contributing/upgrading-dependencies.rst
R doc/css-coding-standards.rst
R doc/documentation-guidelines.rst
M doc/extensions/best-practices.rst
R doc/frontend-development.rst
R doc/html-coding-standards.rst
R doc/i18n.rst
M doc/index.rst
R doc/javascript-coding-standards.rst
R doc/javascript-module-tutorial.rst
R doc/migration.rst
M doc/multilingual.rst
R doc/python-coding-standards.rst
R doc/resources.rst
R doc/template-blocks.rst
R doc/template-tutorial.rst
R doc/templating.rst
R doc/testing-coding-standards.rst
R doc/upgrading-dependencies.rst
Log Message:
-----------
Merge pull request #1324 from okfn/contributing-docs-reorg
Reorganize the contributing docs
Commit: 9207cafd4ed91d8c232a58d08e8f3284c6909c89
https://github.com/ckan/ckan/commit/9207cafd4ed91d8c232a58d08e8f3284c6909c89
Author: John Martin <me at johnmart.in>
Date: 2013-12-17 (Tue, 17 Dec 2013)
Changed paths:
M ckan/templates/group/member_new.html
M ckan/templates/group/members.html
Log Message:
-----------
[#1392] Fixes member add page within groups
Commit: e3d5da801e74e775dcf5ed42d9510788bc1895d5
https://github.com/ckan/ckan/commit/e3d5da801e74e775dcf5ed42d9510788bc1895d5
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-17 (Tue, 17 Dec 2013)
Changed paths:
R ckan_deb/DEBIAN/control.template
R ckan_deb/usr/bin/ckan-create-instance
R ckan_deb/usr/bin/ckan-instance-maintenance
R ckan_deb/usr/bin/ckan-setup-solr
R ckan_deb/usr/lib/ckan/common.sh
Log Message:
-----------
[#1401] Delete the ckan_deb dir
It just contains a bunch of old scripts that don't work anymore
Commit: ec8e5a03b10e4b00a49b291b76f96d85c8c2ed6a
https://github.com/ckan/ckan/commit/ec8e5a03b10e4b00a49b291b76f96d85c8c2ed6a
Author: amercader <amercadero at gmail.com>
Date: 2013-12-17 (Tue, 17 Dec 2013)
Changed paths:
M ckan/controllers/related.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/get.py
M ckan/tests/functional/test_related.py
Log Message:
-----------
Merge branch '1384-related-list-503'
Commit: d065a5733fe8abfb9839636ee6af59bab07afd50
https://github.com/ckan/ckan/commit/d065a5733fe8abfb9839636ee6af59bab07afd50
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-17 (Tue, 17 Dec 2013)
Changed paths:
M doc/theming/css.rst
Log Message:
-----------
[#847] Add some links to some CSS tools
Commit: 73ec9170ab50ef6adbac50dd61bf6aca3d58d82d
https://github.com/ckan/ckan/commit/73ec9170ab50ef6adbac50dd61bf6aca3d58d82d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-17 (Tue, 17 Dec 2013)
Changed paths:
M doc/theming/css.rst
Log Message:
-----------
[#847] Remove a todo from the docs
Commit: 057a40fbbffbaf49f0d9eeda875ece5cd085b05c
https://github.com/ckan/ckan/commit/057a40fbbffbaf49f0d9eeda875ece5cd085b05c
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-17 (Tue, 17 Dec 2013)
Changed paths:
M CONTRIBUTING.rst
M ckan/controllers/related.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/get.py
M ckan/new_tests/logic/action/test_get.py
M ckan/tests/functional/test_related.py
R doc/ckan-coding-standards.rst
M doc/conf.py
M doc/configuration.rst
M doc/contents.rst
R doc/contributing.rst
A doc/contributing/architecture.rst
A doc/contributing/commit-messages.rst
A doc/contributing/css.rst
A doc/contributing/database-migrations.rst
A doc/contributing/documentation.rst
A doc/contributing/frontend/index.rst
A doc/contributing/frontend/javascript-module-tutorial.rst
A doc/contributing/frontend/resources.rst
A doc/contributing/frontend/template-blocks.rst
A doc/contributing/frontend/template-tutorial.rst
A doc/contributing/frontend/templating.rst
A doc/contributing/html.rst
A doc/contributing/i18n.rst
A doc/contributing/index.rst
A doc/contributing/issues.rst
A doc/contributing/javascript.rst
A doc/contributing/pull-requests.rst
A doc/contributing/python.rst
A doc/contributing/reviewing.rst
A doc/contributing/testing.rst
A doc/contributing/upgrading-dependencies.rst
R doc/css-coding-standards.rst
R doc/documentation-guidelines.rst
M doc/extensions/best-practices.rst
R doc/frontend-development.rst
R doc/html-coding-standards.rst
R doc/i18n.rst
M doc/index.rst
R doc/javascript-coding-standards.rst
R doc/javascript-module-tutorial.rst
R doc/migration.rst
M doc/multilingual.rst
R doc/python-coding-standards.rst
R doc/resources.rst
R doc/template-blocks.rst
R doc/template-tutorial.rst
R doc/templating.rst
R doc/testing-coding-standards.rst
R doc/upgrading-dependencies.rst
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 847-new-theming-docs
Conflicts:
doc/conf.py
Commit: 6905280aa2d9500d9ef3513040a918cbd4df978d
https://github.com/ckan/ckan/commit/6905280aa2d9500d9ef3513040a918cbd4df978d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-18 (Wed, 18 Dec 2013)
Changed paths:
M ckan/new_tests/factories.py
M ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
M ckanext/example_theme/custom_config_setting/plugin.py
Log Message:
-----------
[#847] PEP8
Commit: 6e4c9103bb2a940c13c7d4c68cb7c1d7d4d0dbf8
https://github.com/ckan/ckan/commit/6e4c9103bb2a940c13c7d4c68cb7c1d7d4d0dbf8
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-12-18 (Wed, 18 Dec 2013)
Changed paths:
M ckan/lib/mailer.py
Log Message:
-----------
[#1409] Fix the e-mail bodies' translation strings
We ended up creating a string with extra whitespace before the paragraphs,
like "...to be reset\n\n Please click the following...".
But the i18n message key doesn't have these whitespaces, so we always send
that in English. To solve it, we could either fix the message key in all .po
files, or change how we construct the string in mailer.py. I prefer the
latter.
Commit: b90d2810eeb6acfea39aeaec2215bb12afb7f74a
https://github.com/ckan/ckan/commit/b90d2810eeb6acfea39aeaec2215bb12afb7f74a
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-12-19 (Thu, 19 Dec 2013)
Changed paths:
M ckan/lib/mailer.py
Log Message:
-----------
[#1409] Remove pdb breakpoint
Commit: a236ba294f508f154f79e37f36f4129da0fdb4a3
https://github.com/ckan/ckan/commit/a236ba294f508f154f79e37f36f4129da0fdb4a3
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-19 (Thu, 19 Dec 2013)
Changed paths:
M CHANGELOG.rst
M CONTRIBUTING.rst
M ckan/controllers/home.py
M ckan/controllers/related.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/new_tests/factories.py
M ckan/new_tests/logic/action/test_get.py
M ckan/plugins/toolkit.py
M ckan/templates/home/layout1.html
M ckan/templates/home/layout2.html
M ckan/templates/home/layout3.html
M ckan/templates/home/snippets/promoted.html
M ckan/tests/functional/test_related.py
R ckanext/example_iauthfunctions/plugin.py
A ckanext/example_iauthfunctions/plugin_v4.py
A ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
A ckanext/example_theme/__init__.py
A ckanext/example_theme/custom_config_setting/__init__.py
A ckanext/example_theme/custom_config_setting/plugin.py
A ckanext/example_theme/custom_config_setting/templates/home/layout1.html
A ckanext/example_theme/custom_config_setting/templates/snippets
A ckanext/example_theme/v01_empty_extension/__init__.py
A ckanext/example_theme/v01_empty_extension/plugin.py
A ckanext/example_theme/v02_empty_template/__init__.py
A ckanext/example_theme/v02_empty_template/plugin.py
A ckanext/example_theme/v02_empty_template/templates/home/index.html
A ckanext/example_theme/v03_jinja/__init__.py
A ckanext/example_theme/v03_jinja/plugin.py
A ckanext/example_theme/v03_jinja/templates/home/index.html
A ckanext/example_theme/v04_ckan_extends/__init__.py
A ckanext/example_theme/v04_ckan_extends/plugin.py
A ckanext/example_theme/v04_ckan_extends/templates/home/index.html
A ckanext/example_theme/v05_block/__init__.py
A ckanext/example_theme/v05_block/plugin.py
A ckanext/example_theme/v05_block/templates/home/layout1.html
A ckanext/example_theme/v06_super/__init__.py
A ckanext/example_theme/v06_super/plugin.py
A ckanext/example_theme/v06_super/templates/home/layout1.html
A ckanext/example_theme/v07_helper_function/__init__.py
A ckanext/example_theme/v07_helper_function/plugin.py
A ckanext/example_theme/v07_helper_function/templates/home/layout1.html
A ckanext/example_theme/v08_custom_helper_function/__init__.py
A ckanext/example_theme/v08_custom_helper_function/plugin.py
A ckanext/example_theme/v08_custom_helper_function/templates/home/layout1.html
A ckanext/example_theme/v09_snippet/__init__.py
A ckanext/example_theme/v09_snippet/plugin.py
A ckanext/example_theme/v09_snippet/templates/home/layout1.html
A ckanext/example_theme/v10_custom_snippet/__init__.py
A ckanext/example_theme/v10_custom_snippet/plugin.py
A ckanext/example_theme/v10_custom_snippet/templates/home/layout1.html
A ckanext/example_theme/v10_custom_snippet/templates/snippets/example_theme_most_popular_groups.html
A ckanext/example_theme/v11_HTML_and_CSS/__init__.py
A ckanext/example_theme/v11_HTML_and_CSS/plugin.py
A ckanext/example_theme/v11_HTML_and_CSS/templates/home/layout1.html
A ckanext/example_theme/v11_HTML_and_CSS/templates/snippets/example_theme_most_popular_groups.html
A ckanext/example_theme/v12_extra_public_dir/__init__.py
A ckanext/example_theme/v12_extra_public_dir/plugin.py
A ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
A ckanext/example_theme/v12_extra_public_dir/templates/home/layout1.html
A ckanext/example_theme/v12_extra_public_dir/templates/home/snippets/promoted.html
A ckanext/example_theme/v12_extra_public_dir/templates/snippets
A ckanext/example_theme/v13_custom_css/__init__.py
A ckanext/example_theme/v13_custom_css/plugin.py
A ckanext/example_theme/v13_custom_css/public/example_theme.css
A ckanext/example_theme/v13_custom_css/public/promoted-image.jpg
A ckanext/example_theme/v13_custom_css/templates/base.html
A ckanext/example_theme/v13_custom_css/templates/home
A ckanext/example_theme/v13_custom_css/templates/snippets
A ckanext/example_theme/v14_more_custom_css/__init__.py
A ckanext/example_theme/v14_more_custom_css/plugin.py
A ckanext/example_theme/v14_more_custom_css/public/example_theme.css
A ckanext/example_theme/v14_more_custom_css/public/promoted-image.jpg
A ckanext/example_theme/v14_more_custom_css/templates
A ckanext/example_theme/v15_fanstatic/__init__.py
A ckanext/example_theme/v15_fanstatic/fanstatic/example_theme.css
A ckanext/example_theme/v15_fanstatic/plugin.py
A ckanext/example_theme/v15_fanstatic/public/promoted-image.jpg
A ckanext/example_theme/v15_fanstatic/templates/base.html
A ckanext/example_theme/v15_fanstatic/templates/home
A ckanext/example_theme/v15_fanstatic/templates/snippets
A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
A ckanext/example_theme/v16_initialize_a_javascript_module/plugin.py
A ckanext/example_theme/v16_initialize_a_javascript_module/public
A ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
A ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
R doc/ckan-coding-standards.rst
M doc/conf.py
M doc/configuration.rst
M doc/contents.rst
R doc/contributing.rst
A doc/contributing/architecture.rst
A doc/contributing/commit-messages.rst
A doc/contributing/css.rst
A doc/contributing/database-migrations.rst
A doc/contributing/documentation.rst
A doc/contributing/frontend/index.rst
A doc/contributing/frontend/javascript-module-tutorial.rst
A doc/contributing/frontend/resources.rst
A doc/contributing/frontend/template-blocks.rst
A doc/contributing/frontend/template-tutorial.rst
A doc/contributing/frontend/templating.rst
A doc/contributing/html.rst
A doc/contributing/i18n.rst
A doc/contributing/index.rst
A doc/contributing/issues.rst
A doc/contributing/javascript.rst
A doc/contributing/pull-requests.rst
A doc/contributing/python.rst
A doc/contributing/reviewing.rst
A doc/contributing/testing.rst
A doc/contributing/upgrading-dependencies.rst
R doc/css-coding-standards.rst
R doc/documentation-guidelines.rst
M doc/extensions/best-practices.rst
A doc/extensions/custom-config-settings.rst
M doc/extensions/index.rst
M doc/extensions/tutorial.rst
R doc/frontend-development.rst
R doc/html-coding-standards.rst
R doc/i18n.rst
A doc/images/custom-css.png
A doc/images/debug-footer.png
A doc/images/extra-public-dir.png
A doc/images/html_and_css.png
A doc/images/more-custom-css.png
A doc/images/most-popular-groups-custom-snippet.png
A doc/images/most-popular-groups-snippet.png
A doc/images/most-popular-groups.png
A doc/images/recently-changed-packages-activity-stream.png
M doc/index.rst
R doc/javascript-coding-standards.rst
R doc/javascript-module-tutorial.rst
R doc/migration.rst
M doc/multilingual.rst
R doc/python-coding-standards.rst
R doc/resources.rst
M doc/sysadmin-guide.rst
M doc/tag-vocabularies.rst
R doc/template-blocks.rst
R doc/template-tutorial.rst
R doc/templating.rst
R doc/testing-coding-standards.rst
R doc/theming.rst
A doc/theming/best-practices.rst
A doc/theming/css.rst
A doc/theming/fanstatic.rst
A doc/theming/index.rst
A doc/theming/javascript.rst
A doc/theming/jinja-tags.rst
A doc/theming/static-files.rst
A doc/theming/substitutions.rst
A doc/theming/template-helper-functions.rst
A doc/theming/template-snippets.rst
A doc/theming/templates.rst
A doc/theming/variables-and-functions.rst
M doc/upgrade-package-ckan-1-to-2.rst
R doc/upgrading-dependencies.rst
M setup.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1389-release-docs-tweaks-2
Commit: 97855aaf17ee62e030c878c23d871c85c7c37232
https://github.com/ckan/ckan/commit/97855aaf17ee62e030c878c23d871c85c7c37232
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-12-19 (Thu, 19 Dec 2013)
Changed paths:
R ckan_deb/DEBIAN/control.template
R ckan_deb/usr/bin/ckan-create-instance
R ckan_deb/usr/bin/ckan-instance-maintenance
R ckan_deb/usr/bin/ckan-setup-solr
R ckan_deb/usr/lib/ckan/common.sh
Log Message:
-----------
Merge pull request #1401 from okfn/1401-delete-ckan_deb-dir
[#1401] Delete ckan_deb dir
Commit: 9d8454964ea4e79066901cdc16785e5d4c1a63ef
https://github.com/ckan/ckan/commit/9d8454964ea4e79066901cdc16785e5d4c1a63ef
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-12-20 (Fri, 20 Dec 2013)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/get.py
M ckan/tests/functional/test_related.py
Log Message:
-----------
Fix test failures associted with related_list
The related_list dictization changes returned them as returned by
the database. This change gives it a default order if they're not
previously sorted.
Commit: a0aaa9abca4150b96b0adf7380cef6b5ff556e91
https://github.com/ckan/ckan/commit/a0aaa9abca4150b96b0adf7380cef6b5ff556e91
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-20 (Fri, 20 Dec 2013)
Changed paths:
R ckan_deb/DEBIAN/control.template
R ckan_deb/usr/bin/ckan-create-instance
R ckan_deb/usr/bin/ckan-instance-maintenance
R ckan_deb/usr/bin/ckan-setup-solr
R ckan_deb/usr/lib/ckan/common.sh
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1389-release-docs-tweaks-2
Commit: 254c4990c18de8d3fef5c55ef8fa1f347433a252
https://github.com/ckan/ckan/commit/254c4990c18de8d3fef5c55ef8fa1f347433a252
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-20 (Fri, 20 Dec 2013)
Changed paths:
M doc/contributing/index.rst
A doc/contributing/release-process.rst
R doc/release-process.rst
M doc/upgrading.rst
Log Message:
-----------
[#1389] Reorganize the release process docs a little
Put all the stuff that users need to know (what the different types of
release are, and how to upgrade) in /upgrading.html, and put all the
stuff for developers only (how to do a CKAN release) in /contributing/.
Use .. seealso:: boxes to link the two pages together. Also removed
some duplicated information, fixed some title styles, etc.
Commit: 5e5a1c5c8b71f016e8a892ed1608728a71fcde4c
https://github.com/ckan/ckan/commit/5e5a1c5c8b71f016e8a892ed1608728a71fcde4c
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-20 (Fri, 20 Dec 2013)
Changed paths:
M doc/theming/fanstatic.rst
Log Message:
-----------
[#1389] Fix a Sphinx error
Commit: cac9247ae8194da1ec881ebf5466d82d3a0ebd21
https://github.com/ckan/ckan/commit/cac9247ae8194da1ec881ebf5466d82d3a0ebd21
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-20 (Fri, 20 Dec 2013)
Changed paths:
M doc/contributing/index.rst
A doc/contributing/release-process.rst
R doc/release-process.rst
M doc/theming/fanstatic.rst
M doc/upgrading.rst
Log Message:
-----------
Merge branch '1389-release-docs-tweaks-2'
Commit: 46752e562498af4ebe2eb07df71caf3eaf07a51f
https://github.com/ckan/ckan/commit/46752e562498af4ebe2eb07df71caf3eaf07a51f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-20 (Fri, 20 Dec 2013)
Changed paths:
M doc/contributing/documentation.rst
Log Message:
-----------
Add a note about seealso boxes in the docs
Commit: 59aae2cb68eca43fb0fd300d40672929fb7bb5df
https://github.com/ckan/ckan/commit/59aae2cb68eca43fb0fd300d40672929fb7bb5df
Author: John Martin <me at johnmart.in>
Date: 2013-12-24 (Tue, 24 Dec 2013)
Changed paths:
M ckan/public/base/less/layout.less
Log Message:
-----------
[#1398] Adds: 'word-break: break-word;' for better word breaking on long words
Commit: 87fc0807ec5aa7aa5c8a93b744bcf0daa75e2609
https://github.com/ckan/ckan/commit/87fc0807ec5aa7aa5c8a93b744bcf0daa75e2609
Author: John Martin <me at johnmart.in>
Date: 2013-12-24 (Tue, 24 Dec 2013)
Changed paths:
M ckan/templates/group/about.html
M ckan/templates/group/snippets/group_item.html
M ckan/templates/group/snippets/info.html
M ckan/templates/organization/about.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/snippets/organization_item.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/snippets/package_context.html
M ckan/templates/package/snippets/resource_item.html
M ckan/templates/related/snippets/related_item.html
M ckan/templates/snippets/group.html
M ckan/templates/snippets/group_item.html
M ckan/templates/snippets/organization_item.html
M ckan/templates/snippets/package_item.html
Log Message:
-----------
[#1302] Removes mentions of 'no description' from templates
Commit: 46c53d5093ef998337f434da2cf141573002fb72
https://github.com/ckan/ckan/commit/46c53d5093ef998337f434da2cf141573002fb72
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-12-31 (Tue, 31 Dec 2013)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
[#1360] Update package_update docstring.
Commit: bf5b82eab080d9b655b6bf8c6db705281d13ecad
https://github.com/ckan/ckan/commit/bf5b82eab080d9b655b6bf8c6db705281d13ecad
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2014-01-07 (Tue, 07 Jan 2014)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
Log Message:
-----------
Merge branch '1022-api-docs-improvements'
Commit: 6ced7cbffaa256ba6d1117012cdb078ecc83191d
https://github.com/ckan/ckan/commit/6ced7cbffaa256ba6d1117012cdb078ecc83191d
Author: amercader <amercadero at gmail.com>
Date: 2014-01-07 (Tue, 07 Jan 2014)
Changed paths:
M ckan/config/middleware.py
M ckan/config/who.ini
Log Message:
-----------
[#1422] More secure default for the repoze secret key
The who.ini file has a secret key used during authentication. To make sure
users don't forget to update it we can use the beaker session secret which
is generated randomly when creating the ckan ini file.
If users define a secret in the who.ini file, this one will be used.
To do this, we use a small custom plugin that checks the secret key and
calls the core repoze plugin afterwards.
Commit: a10adfd64aee7e81aa3b70f0577f91a682385efa
https://github.com/ckan/ckan/commit/a10adfd64aee7e81aa3b70f0577f91a682385efa
Author: Nigel Babu <nigel.babu at okfn.org>
Date: 2014-01-07 (Tue, 07 Jan 2014)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#1425] Call logic.NotFound
Commit: 2c9236168f4e64f442d29501e497ab97b29a4fa3
https://github.com/ckan/ckan/commit/2c9236168f4e64f442d29501e497ab97b29a4fa3
Author: amercader <amercadero at gmail.com>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/get.py
M ckan/tests/functional/test_related.py
Log Message:
-----------
Merge branch 'related-list-test-failure'
Commit: baadd73a116fc6bc14270149cf3300b7a6be5346
https://github.com/ckan/ckan/commit/baadd73a116fc6bc14270149cf3300b7a6be5346
Author: amercader <amercadero at gmail.com>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M ckan/public/base/less/layout.less
Log Message:
-----------
Merge branch '1398-info-overflow-word-break'
Commit: 0677c8bf9a614c969af23b96537c39c82b92be28
https://github.com/ckan/ckan/commit/0677c8bf9a614c969af23b96537c39c82b92be28
Author: amercader <amercadero at gmail.com>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
Log Message:
-----------
[#1389] Rebuild css after merge
Commit: cf0fdb8cfb4fcb5331e72b34847c036fa4d9cf9d
https://github.com/ckan/ckan/commit/cf0fdb8cfb4fcb5331e72b34847c036fa4d9cf9d
Author: amercader <amercadero at gmail.com>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M ckan/templates/group/member_new.html
M ckan/templates/group/members.html
Log Message:
-----------
Merge branch '1392-group-member-add-template-fix'
Commit: 747f2cd24e45aaf0471be1973cf15ebe9feae2d3
https://github.com/ckan/ckan/commit/747f2cd24e45aaf0471be1973cf15ebe9feae2d3
Author: amercader <amercadero at gmail.com>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M ckan/templates/group/snippets/group_form.html
Log Message:
-----------
[#1426] Remove duplicated require notice
Commit: cc2ab8f2773dd0f67691f2bc18269d4c96ab32b9
https://github.com/ckan/ckan/commit/cc2ab8f2773dd0f67691f2bc18269d4c96ab32b9
Author: amercader <amercadero at gmail.com>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
Merge branch '1425-exception-fix'
Commit: 7608b4ce0c2c22c9f55a9de4d250aa648b214e44
https://github.com/ckan/ckan/commit/7608b4ce0c2c22c9f55a9de4d250aa648b214e44
Author: amercader <amercadero at gmail.com>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Merge branch 'bug-1375-user-add-command-fix' of github.com:rshk/ckan into rshk-bug-1375-user-add-command-fix
Commit: 682e8d556c27db837f4269139a1b66691157172a
https://github.com/ckan/ckan/commit/682e8d556c27db837f4269139a1b66691157172a
Author: amercader <amercadero at gmail.com>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
A doc/.gitignore
M doc/conf.py
M doc/install-from-package.rst
M doc/install-from-source.rst
Log Message:
-----------
Merge branch '1380-encourage-installing-latest-release'
Commit: f82bd541d2bcc03327fb44ac0a79dc25560aebb8
https://github.com/ckan/ckan/commit/f82bd541d2bcc03327fb44ac0a79dc25560aebb8
Author: amercader <amercadero at gmail.com>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
Merge branch '1360-update-docstring'
Conflicts:
ckan/logic/action/update.py
Commit: d696e975e7cdaddc27bba84519e7926cfa71a6f6
https://github.com/ckan/ckan/commit/d696e975e7cdaddc27bba84519e7926cfa71a6f6
Author: amercader <amercadero at gmail.com>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M ckan/templates/group/about.html
M ckan/templates/group/snippets/group_item.html
M ckan/templates/group/snippets/info.html
M ckan/templates/organization/about.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/snippets/organization_item.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/snippets/package_context.html
M ckan/templates/package/snippets/resource_item.html
M ckan/templates/related/snippets/related_item.html
M ckan/templates/snippets/group.html
M ckan/templates/snippets/group_item.html
M ckan/templates/snippets/organization_item.html
M ckan/templates/snippets/package_item.html
Log Message:
-----------
Merge branch '1302-remove-mentions-of-no-description'
Commit: 39662c35a1ab89a35e7d73bb0d129a42ac0d3e80
https://github.com/ckan/ckan/commit/39662c35a1ab89a35e7d73bb0d129a42ac0d3e80
Author: amercader <amercadero at gmail.com>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#1188] Tweak checks to support empty strings
Commit: 6eeb2b1bd0605cc470e4ad742b2dbdedf4d74b79
https://github.com/ckan/ckan/commit/6eeb2b1bd0605cc470e4ad742b2dbdedf4d74b79
Author: amercader <amercadero at gmail.com>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#1421] Ensure that check_access is called on activity_create
Otherwise when disabling the activity streams the action returned before
calling the auth function, which made the auth audit fail
Commit: 337b5c9b7010f897d622779f508478eb96c879e8
https://github.com/ckan/ckan/commit/337b5c9b7010f897d622779f508478eb96c879e8
Author: amercader <amercadero at gmail.com>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M ckan/logic/__init__.py
Log Message:
-----------
[#1421] Better exception message for auth audit
Commit: 3a00b572e795e03b915f6250dfed8b83aad768f7
https://github.com/ckan/ckan/commit/3a00b572e795e03b915f6250dfed8b83aad768f7
Author: amercader <amercadero at gmail.com>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M ckan/templates/group/read.html
M ckan/templates/organization/read.html
Log Message:
-----------
[#1368] Fix dataset ordering on org and group pages
Match dataset ordering options with those on the main search
Commit: 4bddcd8fe211270f664331b08b676dbc1fa99d9e
https://github.com/ckan/ckan/commit/4bddcd8fe211270f664331b08b676dbc1fa99d9e
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M ckan/logic/validators.py
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
Merge branch '1188-fix-org-list-dataset-form'
Commit: 917e4c6d775a9bc92efe4aa205f3a535ed826c12
https://github.com/ckan/ckan/commit/917e4c6d775a9bc92efe4aa205f3a535ed826c12
Author: kindly <kindly at gmail.com>
Date: 2014-01-09 (Thu, 09 Jan 2014)
Changed paths:
M ckan/lib/dictization/__init__.py
Log Message:
-----------
[#1427] add contitional to allow 0.8 sqlalchemy
Commit: 116ec3d2533b1bb969ae9bcc37cfc3952851ea5a
https://github.com/ckan/ckan/commit/116ec3d2533b1bb969ae9bcc37cfc3952851ea5a
Author: kindly <kindly at gmail.com>
Date: 2014-01-09 (Thu, 09 Jan 2014)
Changed paths:
M ckan/config/middleware.py
M ckan/config/who.ini
Log Message:
-----------
Merge pull request #1422 from okfn/1422-repoze-key
Use a more secure default for the repoze secret key
Commit: ed05bad70c03b3dc79429160ecb6ee5847c704bf
https://github.com/ckan/ckan/commit/ed05bad70c03b3dc79429160ecb6ee5847c704bf
Author: David Read <david.read at hackneyworkshop.com>
Date: 2014-01-14 (Tue, 14 Jan 2014)
Changed paths:
M ckan/controllers/group.py
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
[#1420] Fix group_show by taking schema out of the context when making sub-calls.
Commit: 2da633fa09b64362aed5d4b22057ae0ad90da452
https://github.com/ckan/ckan/commit/2da633fa09b64362aed5d4b22057ae0ad90da452
Author: Nigel Babu <nigel.babu at okfn.org>
Date: 2014-01-19 (Sun, 19 Jan 2014)
Changed paths:
M doc/install-from-package.rst
Log Message:
-----------
[#1437] Instruction to restart apache and nginx
Commit: 56d2857e6bd04ee4a63bf96bac6a5cf278143e25
https://github.com/ckan/ckan/commit/56d2857e6bd04ee4a63bf96bac6a5cf278143e25
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2014-01-20 (Mon, 20 Jan 2014)
Changed paths:
M ckan/lib/mailer.py
Log Message:
-----------
[#1409] Change string formatting to use "{foo}".format(foo="bar")
Commit: b5b751028b582938c9d207ae60f4b408b29d40a6
https://github.com/ckan/ckan/commit/b5b751028b582938c9d207ae60f4b408b29d40a6
Author: Nigel Babu <nigel.babu at okfn.org>
Date: 2014-01-20 (Mon, 20 Jan 2014)
Changed paths:
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-package-to-patch-release.rst
Log Message:
-----------
Add restart instructions in upgrade docs too
Commit: 62337405ed21f795f1362e0627e0826a9ab9cfb3
https://github.com/ckan/ckan/commit/62337405ed21f795f1362e0627e0826a9ab9cfb3
Author: amercader <amercadero at gmail.com>
Date: 2014-01-20 (Mon, 20 Jan 2014)
Changed paths:
M doc/install-from-package.rst
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-package-to-patch-release.rst
Log Message:
-----------
Merge branch '1437-package-update'
Commit: c886cb77a110368365f649addb9806c4258a288c
https://github.com/ckan/ckan/commit/c886cb77a110368365f649addb9806c4258a288c
Author: amercader <amercadero at gmail.com>
Date: 2014-01-20 (Mon, 20 Jan 2014)
Changed paths:
M ckan/lib/dictization/__init__.py
Log Message:
-----------
Merge branch '1427-sqlalchamy-08-compatability'
Commit: 47b38e5645b6cc1309d2c933827064756d1e462a
https://github.com/ckan/ckan/commit/47b38e5645b6cc1309d2c933827064756d1e462a
Author: amercader <amercadero at gmail.com>
Date: 2014-01-20 (Mon, 20 Jan 2014)
Changed paths:
M ckan/public/base/less/dataset.less
Log Message:
-----------
[#1428] Fix superimposing resource items
This was caused by removing the "This resource has no description"
message in #1302.
Commit: 7f5ec21cb964a7c5948dbae8205a2f421857a0db
https://github.com/ckan/ckan/commit/7f5ec21cb964a7c5948dbae8205a2f421857a0db
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M ckan/logic/__init__.py
M ckan/logic/action/create.py
Log Message:
-----------
Merge pull request #1421 from okfn/1421-activity_create-auth-exception
Disabling activity_streams borks editing groups and user
Commit: f3c706d41045c92c5e18ddd9893debcbce505459
https://github.com/ckan/ckan/commit/f3c706d41045c92c5e18ddd9893debcbce505459
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M ckan/public/base/less/dataset.less
Log Message:
-----------
Merge pull request #1428 from okfn/1428-superimposing-resources
Superimposing resources on dataset page
Commit: 134bd00fc62c8d4d53dce36a374d904b34afff2c
https://github.com/ckan/ckan/commit/134bd00fc62c8d4d53dce36a374d904b34afff2c
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M ckan/templates/group/snippets/group_form.html
Log Message:
-----------
Merge pull request #1426 from okfn/1426-duplicated-required-tag
Duplicated Required Fields notice on Group form
Commit: 3f0d11b7242bc83daaab65e6473fae524133d2b4
https://github.com/ckan/ckan/commit/3f0d11b7242bc83daaab65e6473fae524133d2b4
Author: kindly <kindly at gmail.com>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M ckan/templates/group/read.html
M ckan/templates/organization/read.html
Log Message:
-----------
Merge pull request #1368 from okfn/1368-org-datasets-ordering
Default search ordering on organization home page is broken
Commit: 412fba44ace2bef514f54891afdec897dd702e6e
https://github.com/ckan/ckan/commit/412fba44ace2bef514f54891afdec897dd702e6e
Author: Rachel Knowler <rachel.knowler at liip.ch>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/lib/helpers.py
Log Message:
-----------
Changed license to licenses in facet titles where this makes more sense.
Commit: 4936c7c2ceb0987f80446ae69128281757f8e69e
https://github.com/ckan/ckan/commit/4936c7c2ceb0987f80446ae69128281757f8e69e
Author: amercader <amercadero at gmail.com>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#1429] Pass came_from to login handler after creating a user
Otherwise you lose the language setting for the UI. I'm not entirely
sure but that may involve two redirects.
Commit: ae5c63a48670611cb04afa75b13a673357a6f132
https://github.com/ckan/ckan/commit/ae5c63a48670611cb04afa75b13a673357a6f132
Author: Gael Pasgrimaud <gael at gawel.org>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M ckan/controllers/feed.py
Log Message:
-----------
avoid UnicodeEncodeError when params contains non ascii characters
Commit: cd648de7d085c002475065be1e8ff50ec185251d
https://github.com/ckan/ckan/commit/cd648de7d085c002475065be1e8ff50ec185251d
Author: amercader <amercadero at gmail.com>
Date: 2014-01-22 (Wed, 22 Jan 2014)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#1429] PEP8 fixes
Commit: cc2d3545d7ccf8f41a708c64d62bde680d6e9c01
https://github.com/ckan/ckan/commit/cc2d3545d7ccf8f41a708c64d62bde680d6e9c01
Author: amercader <amercadero at gmail.com>
Date: 2014-01-22 (Wed, 22 Jan 2014)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/lib/helpers.py
Log Message:
-----------
Merge branch 'ogdch-refer-to-licenses-in-facets-2'
Commit: 0b0d046a8c25d71ad8e2bc53d7bd65490efb18e4
https://github.com/ckan/ckan/commit/0b0d046a8c25d71ad8e2bc53d7bd65490efb18e4
Author: amercader <amercadero at gmail.com>
Date: 2014-01-22 (Wed, 22 Jan 2014)
Changed paths:
M ckan/controllers/feed.py
Log Message:
-----------
Merge branch 'urlencode_error' of github.com:regardscitoyens/ckan into regardscitoyens-urlencode_error
Commit: c9d05af7b5fc45ad114e373c83ff50814769f8ef
https://github.com/ckan/ckan/commit/c9d05af7b5fc45ad114e373c83ff50814769f8ef
Author: amercader <amercadero at gmail.com>
Date: 2014-01-22 (Wed, 22 Jan 2014)
Changed paths:
M ckan/controllers/feed.py
Log Message:
-----------
Merge branch 'regardscitoyens-urlencode_error'
Commit: fd257d06b5f689cb70b4e6b40cfab0f9a9e2a888
https://github.com/ckan/ckan/commit/fd257d06b5f689cb70b4e6b40cfab0f9a9e2a888
Author: Ian Ward <ian at excess.org>
Date: 2014-01-22 (Wed, 22 Jan 2014)
Changed paths:
M ckanext/datastore/db.py
Log Message:
-----------
we need try, except to handle local datastore use
This reverts commit 129aec805528f1cba3c6ac73c7363421d35e38d2.
Commit: b6b981c07744c1193f82a64c08087d6d934c7d8a
https://github.com/ckan/ckan/commit/b6b981c07744c1193f82a64c08087d6d934c7d8a
Author: amercader <amercadero at gmail.com>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M ckanext/datapusher/plugin.py
Log Message:
-----------
[#1446] Require ckan.site_url when using the DataPusher
Commit: 306c3d84a3d45e845c4206796a681059941f1210
https://github.com/ckan/ckan/commit/306c3d84a3d45e845c4206796a681059941f1210
Author: David Read <david.read at hackneyworkshop.com>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#1433] Flesh out the context for group/about setup_template_variables.
Commit: 0230587df78bae50288272f78b0a69527335e1fa
https://github.com/ckan/ckan/commit/0230587df78bae50288272f78b0a69527335e1fa
Author: amercader <amercadero at gmail.com>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M ckan/config/deployment.ini_tmpl
M doc/configuration.rst
Log Message:
-----------
[#1446] Better defaults for DataPusher config options + docs
Commit: b128ebb1437c4f882be1304feb2020eebddc95a8
https://github.com/ckan/ckan/commit/b128ebb1437c4f882be1304feb2020eebddc95a8
Author: amercader <amercadero at gmail.com>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M doc/datastore.rst
M doc/install-from-package.rst
Log Message:
-----------
[#1446] Clarify DataPusher issues in docs
Commit: 853568a023662308113fb1756d606f1c0c4b216c
https://github.com/ckan/ckan/commit/853568a023662308113fb1756d606f1c0c4b216c
Author: amercader <amercadero at gmail.com>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M ckan/config/deployment.ini_tmpl
Log Message:
-----------
[#1446] Remove SQLite urls from template ini file
Commit: 213e14f37d40163a541348dd80550258d76c8f5d
https://github.com/ckan/ckan/commit/213e14f37d40163a541348dd80550258d76c8f5d
Author: Ian Ward <ian at excess.org>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M ckanext/datastore/db.py
Log Message:
-----------
pep8
Commit: 770df34be2a487b4f3b81286987cd38e74c9ebf8
https://github.com/ckan/ckan/commit/770df34be2a487b4f3b81286987cd38e74c9ebf8
Author: Ian Ward <ian at excess.org>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M ckan/controllers/group.py
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
Merge branch '1420-group-view-schema-fix'
Commit: 1613ed86d45a7694281ba9b161cb5a2c23dc8acf
https://github.com/ckan/ckan/commit/1613ed86d45a7694281ba9b161cb5a2c23dc8acf
Author: amercader <amercadero at gmail.com>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M ckanext/datapusher/plugin.py
Log Message:
-----------
[#1446] Enable DataPusher for private datasets
There's no need to prevent the import to the datastore on them, as the
datastore will manage the authorization, and logged in users still
expect these files to get imported to the DataStore.
Commit: 699dac215996c01afecc93fc062d3a230d8e810e
https://github.com/ckan/ckan/commit/699dac215996c01afecc93fc062d3a230d8e810e
Author: amercader <amercadero at gmail.com>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M doc/datastore.rst
Log Message:
-----------
[#1446] Remove misleading datastore warning in docs
Commit: 6247a8110807c7a9daa92adfb1dcbe0ea46c75f5
https://github.com/ckan/ckan/commit/6247a8110807c7a9daa92adfb1dcbe0ea46c75f5
Author: amercader <amercadero at gmail.com>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M ckan/public/base/css/main.css
Log Message:
-----------
Recompile main.css (should have been done after #1428 merge)
Commit: fc60167013fb0e4842514d20d47dfbd728c583fa
https://github.com/ckan/ckan/commit/fc60167013fb0e4842514d20d47dfbd728c583fa
Author: amercader <amercadero at gmail.com>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M ckanext/datastore/db.py
Log Message:
-----------
Merge branch 'fix-local-datastore' of github.com:wardi/ckan into wardi-fix-local-datastore
Commit: 1017a28bc6f45851c2362f1ce498fd2fcd0716c4
https://github.com/ckan/ckan/commit/1017a28bc6f45851c2362f1ce498fd2fcd0716c4
Author: amercader <amercadero at gmail.com>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M ckanext/datastore/db.py
Log Message:
-----------
Merge branch 'wardi-fix-local-datastore'
Commit: e8c8bdaae7109f9255be763ad91205cb2fad04ea
https://github.com/ckan/ckan/commit/e8c8bdaae7109f9255be763ad91205cb2fad04ea
Author: kindly <kindly at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckanext/datapusher/plugin.py
M doc/configuration.rst
M doc/datastore.rst
M doc/install-from-package.rst
Log Message:
-----------
Merge pull request #1446 from okfn/1446-datapusher-integration-issues
DataPusher integration issues
Commit: f9638b4a01b961f5afd6a5658889287a96606b8d
https://github.com/ckan/ckan/commit/f9638b4a01b961f5afd6a5658889287a96606b8d
Author: kindly <kindly at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
R ckan/public/base/vendor/jquery.ui.widget.min.js
Log Message:
-----------
[#1450] remove min file as it does not work properly with fanstatic
Commit: a0b7780bd20298b0c8c26624f1e708fb3e69cada
https://github.com/ckan/ckan/commit/a0b7780bd20298b0c8c26624f1e708fb3e69cada
Author: kindly <kindly at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M ckanext/datapusher/logic/action.py
Log Message:
-----------
[#1451] use site url to get callback url for datapusher
Commit: 558a38cd90d350e731677b3cec8961e9d206cc63
https://github.com/ckan/ckan/commit/558a38cd90d350e731677b3cec8961e9d206cc63
Author: amercader <amercadero at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M ckan/public/base/javascript/modules/custom-fields.js
Log Message:
-----------
[#1449] Fix extras deletion
The custom-fields module was actually disabling the fields when clicking
the delete extra cross button. This prevented the key and value from
being sent, which caused a validation error.
We now change only the class to make it look disabled, which should be
good enough.
Commit: d65d22d8c53cd3b8822a21a110bf035aa3db318c
https://github.com/ckan/ckan/commit/d65d22d8c53cd3b8822a21a110bf035aa3db318c
Author: amercader <amercadero at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M ckanext/textpreview/tests/test_preview.py
Log Message:
-----------
[#1452] Fix text preview tests
Commit: bc9d7fbd2557bf6a2094a01af0bdee7c6d3f0a42
https://github.com/ckan/ckan/commit/bc9d7fbd2557bf6a2094a01af0bdee7c6d3f0a42
Author: kindly <kindly at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M ckan/lib/helpers.py
M ckan/logic/validators.py
M ckan/templates/package/snippets/package_basic_fields.html
Log Message:
-----------
[#1453] remove item for select list if config not set by adding helper and change validator to fail when config is set with empty string
Commit: 336dfd5304f1a6416dc6ffcd45cd51cf72d594e0
https://github.com/ckan/ckan/commit/336dfd5304f1a6416dc6ffcd45cd51cf72d594e0
Author: kindly <kindly at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M ckanext/textpreview/tests/test_preview.py
Log Message:
-----------
Merge pull request #1452 from okfn/1452-textpreview-tests
Text preview tests fail when using production JS scripts
Commit: b332fe6dea77dc8c072f2b399a32b01db20c4659
https://github.com/ckan/ckan/commit/b332fe6dea77dc8c072f2b399a32b01db20c4659
Author: amercader <amercadero at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
R ckan/public/base/vendor/jquery.ui.widget.min.js
Log Message:
-----------
Merge branch '1450-resource-reordering-production'
Commit: 4fa7b5ce666e271f1f6e9f315456a0f1cbe0bce2
https://github.com/ckan/ckan/commit/4fa7b5ce666e271f1f6e9f315456a0f1cbe0bce2
Author: amercader <amercadero at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M ckan/lib/helpers.py
M ckan/logic/validators.py
M ckan/templates/package/snippets/package_basic_fields.html
Log Message:
-----------
Merge branch '1453-sysadmins-not-create-unown-datasets'
Commit: 55959f6d979b94c0082e65396f837258a64924e7
https://github.com/ckan/ckan/commit/55959f6d979b94c0082e65396f837258a64924e7
Author: amercader <amercadero at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M ckan/public/base/test/spec/modules/custom-fields.spec.js
Log Message:
-----------
[#1449] Remove unneeded tests
Commit: 155fd9bde4009a1500a33efdd3853fbb4e7f0f32
https://github.com/ckan/ckan/commit/155fd9bde4009a1500a33efdd3853fbb4e7f0f32
Author: kindly <kindly at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M ckanext/datapusher/logic/action.py
Log Message:
-----------
[#1451] pep8 and a few things to make things a look nicer
Commit: e7cae2c43076658a6efd59f9c8e115a84a83ebdd
https://github.com/ckan/ckan/commit/e7cae2c43076658a6efd59f9c8e115a84a83ebdd
Author: kindly <kindly at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M ckanext/datapusher/logic/action.py
Log Message:
-----------
[#1451] add back in rstrip
Commit: f9f39eb71fafbc6fd84cd4d0aea0117c88028188
https://github.com/ckan/ckan/commit/f9f39eb71fafbc6fd84cd4d0aea0117c88028188
Author: kindly <kindly at gmail.com>
Date: 2014-01-26 (Sun, 26 Jan 2014)
Changed paths:
M ckan/controllers/group.py
M ckan/logic/action/delete.py
M ckan/logic/auth/delete.py
M ckan/public/base/javascript/modules/autocomplete.js
Log Message:
-----------
[#1454] make ie7 fallback to normal dropdown, add logic functions, make sure editor is in member dropdown
Commit: 515d3c56e18171e76bd988087917ada60aecdd84
https://github.com/ckan/ckan/commit/515d3c56e18171e76bd988087917ada60aecdd84
Author: kindly <kindly at gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M ckan/controllers/group.py
M ckan/templates/organization/bulk_process.html
Log Message:
-----------
[#1455] fix bulk editing
Commit: 82c554fa8f0191a3667696cd31bdcf3c9deb9e03
https://github.com/ckan/ckan/commit/82c554fa8f0191a3667696cd31bdcf3c9deb9e03
Author: amercader <amercadero at gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M ckanext/textpreview/tests/test_preview.py
Log Message:
-----------
[#1452] Fix PEP8
Commit: 6254fe51c114c1a3bbff132606eb421679b71242
https://github.com/ckan/ckan/commit/6254fe51c114c1a3bbff132606eb421679b71242
Author: kindly <kindly at gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M ckanext/textpreview/tests/test_preview.py
Log Message:
-----------
Merge pull request #1458 from okfn/1452-textpreview-tests
[#1452] Text Preview fails - Fix PEP8
Commit: bb70fc5b29fe550c56d1d9e58fd9b897a009321c
https://github.com/ckan/ckan/commit/bb70fc5b29fe550c56d1d9e58fd9b897a009321c
Author: amercader <amercadero at gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M ckanext/datapusher/logic/action.py
Log Message:
-----------
Merge branch '1451-use-site-url-for-datastore-callback'
Commit: da20b2c4fefdf3ce06571ac24da6c25fabf345fb
https://github.com/ckan/ckan/commit/da20b2c4fefdf3ce06571ac24da6c25fabf345fb
Author: amercader <amercadero at gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M ckan/lib/helpers.py
M ckan/logic/validators.py
R ckan/public/base/vendor/jquery.ui.widget.min.js
M ckan/templates/package/snippets/package_basic_fields.html
M ckanext/datapusher/logic/action.py
M ckanext/textpreview/tests/test_preview.py
Log Message:
-----------
Merge branch 'master' into 1449-cant-delete-extra
Commit: 9fdb6957e54313e30c47cfb4a87482770b556c33
https://github.com/ckan/ckan/commit/9fdb6957e54313e30c47cfb4a87482770b556c33
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#1461] remove repeated sort code in package_search
Commit: da90ffafbbd53c93064ea3020cd3dc362e642df0
https://github.com/ckan/ckan/commit/da90ffafbbd53c93064ea3020cd3dc362e642df0
Author: kindly <kindly at gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M ckan/controllers/package.py
M ckan/templates/group/snippets/group_item.html
Log Message:
-----------
[#1460] Change button to input so that ie7 works. Also needed to change way params are got as value needs to be the thing shown on the input
Commit: 1cae36c1e627749168627e2ef7da6f03248404b3
https://github.com/ckan/ckan/commit/1cae36c1e627749168627e2ef7da6f03248404b3
Author: amercader <amercadero at gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M ckan/controllers/group.py
M ckan/logic/action/delete.py
M ckan/logic/auth/delete.py
M ckan/public/base/javascript/modules/autocomplete.js
Log Message:
-----------
Merge branch '1454-member-editing-fixes'
Commit: afb6ee330544aa0fd0c72892e10848656b7b35a0
https://github.com/ckan/ckan/commit/afb6ee330544aa0fd0c72892e10848656b7b35a0
Author: amercader <amercadero at gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M ckan/controllers/group.py
M ckan/templates/organization/bulk_process.html
Log Message:
-----------
Merge branch '1455-fix-bulk-editing'
Commit: cda53dfe155ffd252e83daf6df5d2b0e2a2e8811
https://github.com/ckan/ckan/commit/cda53dfe155ffd252e83daf6df5d2b0e2a2e8811
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M doc/conf.py
Log Message:
-----------
Remove 'Comprehensive...' from docs
CKAN stands for CKAN
Commit: 9c0737265d067f60aea024c8d7f6434820a56e00
https://github.com/ckan/ckan/commit/9c0737265d067f60aea024c8d7f6434820a56e00
Author: amercader <amercadero at gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M ckan/controllers/package.py
M ckan/templates/group/snippets/group_item.html
Log Message:
-----------
Merge branch '1460-fix-group-remove-ie7'
Commit: dfb107e37da91f735c4af4c65b1d1b5a3da3c429
https://github.com/ckan/ckan/commit/dfb107e37da91f735c4af4c65b1d1b5a3da3c429
Author: amercader <amercadero at gmail.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Merge branch '1461-repeated-code-in-package_search'
Commit: ed063f144b915cb539fcc4ed8b14ec4cca7eb7aa
https://github.com/ckan/ckan/commit/ed063f144b915cb539fcc4ed8b14ec4cca7eb7aa
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
Merge pull request #1429 from okfn/1429-language-reset-after-register
UI language reset after account creation
Commit: 687491d637cd747ab9e158a3062814802c82f3e4
https://github.com/ckan/ckan/commit/687491d637cd747ab9e158a3062814802c82f3e4
Author: kindly <kindly at gmail.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M ckan/public/base/javascript/modules/custom-fields.js
M ckan/public/base/test/spec/modules/custom-fields.spec.js
Log Message:
-----------
Merge pull request #1449 from okfn/1449-cant-delete-extra
Can't delete extra
Commit: ff2bb1db74a7e247de17f67deb08edba31b338cd
https://github.com/ckan/ckan/commit/ff2bb1db74a7e247de17f67deb08edba31b338cd
Author: Ian Ward <ian at excess.org>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
Merge remote-tracking branch 'origin/1433-fix-context'
Commit: fd1ec8f8bd800571538f0d7b14ad5fdb8a394b83
https://github.com/ckan/ckan/commit/fd1ec8f8bd800571538f0d7b14ad5fdb8a394b83
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M doc/datastore.rst
M doc/filestore.rst
Log Message:
-----------
Fix a Sphinx error (broken links)
@kindly
Commit: 41d639f098f07393f1e0613ac35ae5669ff0edf4
https://github.com/ckan/ckan/commit/41d639f098f07393f1e0613ac35ae5669ff0edf4
Author: Nigel Babu <nigel.babu at okfn.org>
Date: 2014-01-29 (Wed, 29 Jan 2014)
Changed paths:
M CHANGELOG.rst
M README.rst
M doc/_templates/footer.html
M doc/background-tasks.rst
M doc/conf.py
M doc/contributing/documentation.rst
M doc/contributing/index.rst
M doc/contributing/issues.rst
M doc/data-viewer.rst
M doc/extensions/index.rst
M doc/features.rst
M doc/install-from-source.rst
M doc/stats.rst
M doc/theming/templates.rst
M doc/tracking.rst
Log Message:
-----------
Correct links to ckan repo
Commit: 625b51cdb0f1697add59c7e3faf723a48c8e04fd
https://github.com/ckan/ckan/commit/625b51cdb0f1697add59c7e3faf723a48c8e04fd
Author: amercader <amercadero at gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)
Changed paths:
M CHANGELOG.rst
M README.rst
M doc/_templates/footer.html
M doc/background-tasks.rst
M doc/conf.py
M doc/contributing/documentation.rst
M doc/contributing/index.rst
M doc/contributing/issues.rst
M doc/data-viewer.rst
M doc/extensions/index.rst
M doc/features.rst
M doc/install-from-source.rst
M doc/stats.rst
M doc/theming/templates.rst
M doc/tracking.rst
Log Message:
-----------
Merge branch 'repo-change'
Commit: 944d7286e72a1711c77001ca75dc534784a24622
https://github.com/ckan/ckan/commit/944d7286e72a1711c77001ca75dc534784a24622
Author: Nigel Babu <nigel.babu at okfn.org>
Date: 2014-01-29 (Wed, 29 Jan 2014)
Changed paths:
M CHANGELOG.rst
M README.rst
Log Message:
-----------
Change travis image. Remove coveralls for now
Commit: e73b580203851436e25bf6cd3c8ef4bd1f75d398
https://github.com/ckan/ckan/commit/e73b580203851436e25bf6cd3c8ef4bd1f75d398
Author: kindly <kindly at gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)
Changed paths:
M CHANGELOG.rst
M README.rst
Log Message:
-----------
Merge pull request #1469 from ckan/travis-image-change
Change travis image. Remove coveralls for now
Commit: d0c7356095b3b710f0164c072a42e5e97953f21d
https://github.com/ckan/ckan/commit/d0c7356095b3b710f0164c072a42e5e97953f21d
Author: kindly <kindly at gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)
Changed paths:
M ckan/logic/auth/delete.py
M ckan/tests/test_coding_standards.py
Log Message:
-----------
[#1470] fix member auth import as breaks auto auth pickup in tests
Commit: 1353f0b8f7f3606206c9d7983cc0ba2c9ad8652b
https://github.com/ckan/ckan/commit/1353f0b8f7f3606206c9d7983cc0ba2c9ad8652b
Author: amercader <amercadero at gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)
Changed paths:
M ckan/logic/auth/delete.py
M ckan/tests/test_coding_standards.py
Log Message:
-----------
Merge branch '1470-member-auth-test-fail'
Commit: a8417e970498e02be56f9b54acaa5d3615960c65
https://github.com/ckan/ckan/commit/a8417e970498e02be56f9b54acaa5d3615960c65
Author: kindly <kindly at gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#1473] allow empty string in owner org when there is no previous package or owner org
Commit: 2f2dba872933ce1be2f6d59f54d8dcd29f11cdd6
https://github.com/ckan/ckan/commit/2f2dba872933ce1be2f6d59f54d8dcd29f11cdd6
Author: amercader <amercadero at gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
Merge branch '1473-create-unowned-dataset-when-org-member'
Commit: 866b0b620e24ba36f3a4316d33fd93f60b25ccac
https://github.com/ckan/ckan/commit/866b0b620e24ba36f3a4316d33fd93f60b25ccac
Author: Nigel Babu <nigel.babu at okfn.org>
Date: 2014-01-30 (Thu, 30 Jan 2014)
Changed paths:
M ckan/lib/mailer.py
Log Message:
-----------
Merge remote-tracking branch 'origin/1409-reset-password-email-i18n-bug'
Commit: 55799c578eae624f5f46e3a2dd5b84eb1cafa088
https://github.com/ckan/ckan/commit/55799c578eae624f5f46e3a2dd5b84eb1cafa088
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2014-01-30 (Thu, 30 Jan 2014)
Changed paths:
M doc/theming/index.rst
A doc/theming/javascript-module-objects-and-methods.rst
M doc/theming/javascript.rst
Log Message:
-----------
[#1377] Move objects and methods available to JavaScript modules onto its own page
And tidy it up a little and finish it off
Commit: 86194246c3ba5368b54517e1e566d142aa595088
https://github.com/ckan/ckan/commit/86194246c3ba5368b54517e1e566d142aa595088
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2014-01-30 (Thu, 30 Jan 2014)
Changed paths:
M doc/conf.py
M doc/theming/javascript.rst
Log Message:
-----------
[#1377] Add some links to js tutorial
Commit: 4031e22552313f60100447ebf878bd20333b45a8
https://github.com/ckan/ckan/commit/4031e22552313f60100447ebf878bd20333b45a8
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2014-01-30 (Thu, 30 Jan 2014)
Changed paths:
M doc/theming/javascript.rst
Log Message:
-----------
[#1377] Add some links to js tutorial
Commit: aca6a6903344a31ec1fcd8136a2e2f153815b181
https://github.com/ckan/ckan/commit/aca6a6903344a31ec1fcd8136a2e2f153815b181
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2014-01-30 (Thu, 30 Jan 2014)
Changed paths:
A doc/images/example_theme_javascript_popover.png
A doc/images/example_theme_overlapping_popovers.png
M doc/theming/javascript.rst
Log Message:
-----------
[#1377] Add images to JS tutorial
Commit: 570fb1a58171d29fc3faae1f5c22d0b1a2ae9967
https://github.com/ckan/ckan/commit/570fb1a58171d29fc3faae1f5c22d0b1a2ae9967
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2014-01-30 (Thu, 30 Jan 2014)
Changed paths:
M CHANGELOG.rst
M CONTRIBUTING.rst
M README.rst
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/who.ini
M ckan/controllers/feed.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/user.py
M ckan/lib/accept.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/lib/mailer.py
M ckan/lib/plugins.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/delete.py
M ckan/logic/auth/update.py
M ckan/logic/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/group.py
M ckan/new_authz.py
M ckan/new_tests/factories.py
A ckan/new_tests/logic/action/test_get.py
M ckan/new_tests/logic/action/test_update.py
M ckan/new_tests/logic/test_validators.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/javascript/modules/autocomplete.js
M ckan/public/base/javascript/modules/custom-fields.js
M ckan/public/base/javascript/modules/image-upload.js
A ckan/public/base/javascript/modules/resource-reorder.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/dataset.less
M ckan/public/base/less/layout.less
M ckan/public/base/test/spec/modules/custom-fields.spec.js
A ckan/public/base/vendor/jquery.ui.core.js
A ckan/public/base/vendor/jquery.ui.mouse.js
A ckan/public/base/vendor/jquery.ui.sortable.js
M ckan/public/base/vendor/jquery.ui.widget.js
R ckan/public/base/vendor/jquery.ui.widget.min.js
M ckan/public/base/vendor/resource.config
M ckan/templates/group/about.html
M ckan/templates/group/member_new.html
M ckan/templates/group/members.html
M ckan/templates/group/read.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/group/snippets/group_item.html
M ckan/templates/group/snippets/info.html
M ckan/templates/macros/form.html
M ckan/templates/organization/about.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/read.html
M ckan/templates/organization/snippets/organization_item.html
M ckan/templates/package/resource_data.html
M ckan/templates/package/resource_edit_base.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/resources.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_context.html
M ckan/templates/package/snippets/package_form.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resource_item.html
M ckan/templates/related/snippets/related_item.html
M ckan/templates/snippets/group.html
M ckan/templates/snippets/group_item.html
M ckan/templates/snippets/organization_item.html
M ckan/templates/snippets/package_item.html
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_related.py
M ckan/tests/lib/test_accept.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_auth.py
M ckan/tests/logic/test_member.py
M ckan/tests/models/test_group.py
M ckan/tests/test_coding_standards.py
R ckan_deb/DEBIAN/control.template
R ckan_deb/usr/bin/ckan-create-instance
R ckan_deb/usr/bin/ckan-instance-maintenance
R ckan_deb/usr/bin/ckan-setup-solr
R ckan_deb/usr/lib/ckan/common.sh
M ckanext/datapusher/helpers.py
M ckanext/datapusher/logic/action.py
M ckanext/datapusher/plugin.py
M ckanext/datapusher/tests/test.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/plugin.py
R ckanext/example_iauthfunctions/plugin.py
A ckanext/example_iauthfunctions/plugin_v4.py
A ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
A ckanext/example_theme/custom_config_setting/__init__.py
A ckanext/example_theme/custom_config_setting/plugin.py
A ckanext/example_theme/custom_config_setting/templates/home/layout1.html
A ckanext/example_theme/custom_config_setting/templates/snippets
M ckanext/example_theme/v02_empty_template/plugin.py
M ckanext/example_theme/v10_custom_snippet/templates/home/layout1.html
M ckanext/example_theme/v10_custom_snippet/templates/snippets/example_theme_most_popular_groups.html
M ckanext/textpreview/tests/test_preview.py
A doc/.gitignore
M doc/_templates/footer.html
M doc/background-tasks.rst
R doc/ckan-coding-standards.rst
M doc/conf.py
M doc/configuration.rst
M doc/contents.rst
R doc/contributing.rst
A doc/contributing/architecture.rst
A doc/contributing/commit-messages.rst
A doc/contributing/css.rst
A doc/contributing/database-migrations.rst
A doc/contributing/documentation.rst
A doc/contributing/frontend/index.rst
A doc/contributing/frontend/javascript-module-tutorial.rst
A doc/contributing/frontend/resources.rst
A doc/contributing/frontend/template-blocks.rst
A doc/contributing/frontend/template-tutorial.rst
A doc/contributing/frontend/templating.rst
A doc/contributing/html.rst
A doc/contributing/i18n.rst
A doc/contributing/index.rst
A doc/contributing/issues.rst
A doc/contributing/javascript.rst
A doc/contributing/pull-requests.rst
A doc/contributing/python.rst
A doc/contributing/release-process.rst
A doc/contributing/reviewing.rst
A doc/contributing/testing.rst
A doc/contributing/upgrading-dependencies.rst
R doc/css-coding-standards.rst
M doc/data-viewer.rst
M doc/datastore.rst
R doc/documentation-guidelines.rst
M doc/extensions/best-practices.rst
A doc/extensions/custom-config-settings.rst
M doc/extensions/index.rst
M doc/extensions/tutorial.rst
M doc/features.rst
M doc/filestore.rst
R doc/frontend-development.rst
R doc/html-coding-standards.rst
R doc/i18n.rst
M doc/index.rst
M doc/install-from-package.rst
M doc/install-from-source.rst
R doc/javascript-coding-standards.rst
R doc/javascript-module-tutorial.rst
R doc/migration.rst
M doc/multilingual.rst
R doc/python-coding-standards.rst
R doc/release-process.rst
R doc/resources.rst
M doc/stats.rst
R doc/template-blocks.rst
R doc/template-tutorial.rst
R doc/templating.rst
R doc/testing-coding-standards.rst
M doc/theming/best-practices.rst
M doc/theming/css.rst
M doc/theming/fanstatic.rst
M doc/theming/javascript.rst
M doc/theming/static-files.rst
M doc/theming/templates.rst
M doc/tracking.rst
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-package-to-patch-release.rst
R doc/upgrading-dependencies.rst
M doc/upgrading.rst
M requirements.txt
M setup.py
Log Message:
-----------
Merge branch 'master' of github.com:ckan/ckan into 1377-javascript-tutorial
Conflicts:
doc/theming/javascript.rst
setup.py
Commit: 6d578a7cf53097c6f8ecd275bdb8800418571589
https://github.com/ckan/ckan/commit/6d578a7cf53097c6f8ecd275bdb8800418571589
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2014-01-30 (Thu, 30 Jan 2014)
Changed paths:
M doc/theming/index.rst
Log Message:
-----------
[#1377] Add jQuery plugins doc to index
Compare: https://github.com/ckan/ckan/compare/0ddf06b86797...6d578a7cf530
More information about the ckan-changes
mailing list