[ckan-changes] [okfn/ckan] 57d6a4: [#1273] resource upload with basic ui and mulitipa...

GitHub noreply at github.com
Thu Dec 5 15:33:26 UTC 2013


  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 57d6a4e6b112b4e159a4d93fdc9fa4626491d472
      https://github.com/okfn/ckan/commit/57d6a4e6b112b4e159a4d93fdc9fa4626491d472
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/templates/package/snippets/resource_form.html

  Log Message:
  -----------
  [#1273] resource upload with basic ui and mulitipart api uploading


  Commit: 83a0519533dca1f5112b2014ff7bd9a2a3088a52
      https://github.com/okfn/ckan/commit/83a0519533dca1f5112b2014ff7bd9a2a3088a52
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    A .coveragerc
    M .travis.yml
    M CHANGELOG.rst
    M README.rst
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    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/plugins.py
    M ckan/lib/uploader.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
    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/user.py
    M ckan/new_authz.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/client.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/autocomplete.js
    A ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/resource.config
    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/admin/config.html
    M ckan/templates/base.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.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/form.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    A ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    A ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/read_base.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/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.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/related/snippets/related_item.html
    A ckan/templates/snippets/datapusher_status.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/login.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.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_follow.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_related.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/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/legacy-api.rst
    M doc/upgrade-source.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  [#1273] fix merge with org upload branch


  Commit: 4913975a2863e2a4ab12a42daef737c632fe9284
      https://github.com/okfn/ckan/commit/4913975a2863e2a4ab12a42daef737c632fe9284
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M ckan/lib/uploader.py
    M ckan/logic/action/create.py

  Log Message:
  -----------
  [#1273] Make sure new resource upload works, also fixes #994


  Commit: 2ec5fcfc934d08be502af27d3459400394cd030f
      https://github.com/okfn/ckan/commit/2ec5fcfc934d08be502af27d3459400394cd030f
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M ckan/logic/action/update.py
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/snippets/resource_form.html

  Log Message:
  -----------
  [#1273] Add javascript to resource uploads


  Commit: 35acb45361c3e2eb750cf7f54d64023e5e9f728b
      https://github.com/okfn/ckan/commit/35acb45361c3e2eb750cf7f54d64023e5e9f728b
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M doc/configuration.rst

  Log Message:
  -----------
  [#1273] add size limits properly and add docs


  Commit: 4629b4125d5042f0346bd53172a87b2c31b4cf95
      https://github.com/okfn/ckan/commit/4629b4125d5042f0346bd53172a87b2c31b4cf95
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M doc/configuration.rst

  Log Message:
  -----------
  [#1273] change template.ini and fix more docs


  Commit: 091eb3b257ada4c72595eb69546a3131478c56d9
      https://github.com/okfn/ckan/commit/091eb3b257ada4c72595eb69546a3131478c56d9
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M doc/conf.py
    M doc/filestore.rst

  Log Message:
  -----------
  [#1273] change filestore docs


  Commit: 29366924e9f62ea94793c81f87033baf0ef1760a
      https://github.com/okfn/ckan/commit/29366924e9f62ea94793c81f87033baf0ef1760a
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-11-17 (Sun, 17 Nov 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M bin/travis-install-dependencies
    M ckan/controllers/user.py
    M ckan/public/base/css/main.css
    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
    A doc/upgrading-dependencies.rst

  Log Message:
  -----------
  Merge branch 'master' into 1273-resource-uploads


  Commit: 57397c20b0ceae51b1081c0589c67c9594104e83
      https://github.com/okfn/ckan/commit/57397c20b0ceae51b1081c0589c67c9594104e83
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/uploader.py
    M ckan/logic/action/update.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#1273] fix some tests


  Commit: 091284965aa43a79607cd6842900ab40b320e291
      https://github.com/okfn/ckan/commit/091284965aa43a79607cd6842900ab40b320e291
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M bin/travis-install-dependencies
    M ckan/controllers/user.py
    M ckan/public/base/css/main.css
    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
    A doc/upgrading-dependencies.rst

  Log Message:
  -----------
  Merge branch '1273-resource-uploads' of github.com:okfn/ckan into 1273-resource-uploads


  Commit: 53d6a1f869eb3afdb289305ab31a355ea7fba987
      https://github.com/okfn/ckan/commit/53d6a1f869eb3afdb289305ab31a355ea7fba987
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M ckan/logic/action/update.py

  Log Message:
  -----------
  [#1273] fix some more tests


  Commit: edb65c01afce7b8c5d699e7d704d3ab05a1518f0
      https://github.com/okfn/ckan/commit/edb65c01afce7b8c5d699e7d704d3ab05a1518f0
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

  Changed paths:
    M ckan/lib/uploader.py

  Log Message:
  -----------
  [#1273] pep8


  Commit: d4ff6a8a929855300be19e99b2e38a68f923788a
      https://github.com/okfn/ckan/commit/d4ff6a8a929855300be19e99b2e38a68f923788a
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

  Changed paths:
    M ckan/logic/action/create.py

  Log Message:
  -----------
  [#1273] fix datastore test


  Commit: f011d992d64c0a46ebd07be4e226f38e5a1fcf54
      https://github.com/okfn/ckan/commit/f011d992d64c0a46ebd07be4e226f38e5a1fcf54
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M ckan/public/base/less/dataset.less

  Log Message:
  -----------
  [#1273] Removes old CSS for resource file type swtiching


  Commit: 89583c8354a5ab5b3b314ef5233390d30d4f7ea1
      https://github.com/okfn/ckan/commit/89583c8354a5ab5b3b314ef5233390d30d4f7ea1
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-11-28 (Thu, 28 Nov 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M MANIFEST.in
    M bin/travis-install-dependencies
    M bin/travis-run-tests
    M ckan/ckan_nose_plugin.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/new_authz.py
    M ckan/new_tests/helpers.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/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/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/header.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/package/activity.html
    R ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.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/snippets/organization.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 doc/_themes/sphinx-theme-okfn
    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/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
    R doc/solr-setup.rst
    A doc/sysadmin-guide.rst
    M doc/test.rst
    A doc/user-guide.rst

  Log Message:
  -----------
  Merge branch 'master' into 1273-resource-uploads

Conflicts:
	ckan/templates/group/snippets/group_form.html
	doc/filestore.rst


  Commit: 042c161257891726f88971d6403651647760b14c
      https://github.com/okfn/ckan/commit/042c161257891726f88971d6403651647760b14c
  Author: kindly <kindly at gmail.com>
  Date:   2013-12-02 (Mon, 02 Dec 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/templates/macros/form.html
    M doc/configuration.rst
    M doc/filestore.rst

  Log Message:
  -----------
  [#1273] fix typos and minor issues from pull request


  Commit: 62b91b1bf522fad39ad0a2d0a9b7c6c16b2b2cca
      https://github.com/okfn/ckan/commit/62b91b1bf522fad39ad0a2d0a9b7c6c16b2b2cca
  Author: kindly <kindly at gmail.com>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    M ckan/lib/cli.py
    M doc/filestore.rst

  Log Message:
  -----------
  [#1273] add filestore migration script


  Commit: 9416adc0c9f7e54b5573a99a348e34b17f421154
      https://github.com/okfn/ckan/commit/9416adc0c9f7e54b5573a99a348e34b17f421154
  Author: kindly <kindly at gmail.com>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M doc/filestore.rst

  Log Message:
  -----------
  [#1273] fix some typos


  Commit: 6dde1045105f7c9574c039336ed19cf191e9ef17
      https://github.com/okfn/ckan/commit/6dde1045105f7c9574c039336ed19cf191e9ef17
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-12-05 (Thu, 05 Dec 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/less/dataset.less
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/tests/logic/test_action.py
    M doc/conf.py
    M doc/configuration.rst
    M doc/filestore.rst

  Log Message:
  -----------
  Merge pull request #1273 from okfn/1273-resource-uploads

Resource uploads through multipart form data.


Compare: https://github.com/okfn/ckan/compare/82cdbb83c472...6dde1045105f


More information about the ckan-changes mailing list