[ckan-changes] [okfn/ckan] 3d5fe7: [1262] basic image upload functionality

Mon Nov 11 09:19:23 UTC 2013

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 3d5fe71e8b17067f032784be75b932a352163fc6
      https://github.com/okfn/ckan/commit/3d5fe71e8b17067f032784be75b932a352163fc6
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/controllers/group.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/schema.py
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_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

  Log Message:
  -----------
  [1262] basic image upload functionality

  Commit: 66105d360e010114751ff0280b07196e6f73445a
      https://github.com/okfn/ckan/commit/66105d360e010114751ff0280b07196e6f73445a
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/uploader.py
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/info.html

  Log Message:
  -----------
  [#1262] fix how url field is handled

  Commit: 1b62423d9d013dbc4481bbddd5a1037b49e52529
      https://github.com/okfn/ckan/commit/1b62423d9d013dbc4481bbddd5a1037b49e52529
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/templates/organization/snippets/organization_form.html

  Log Message:
  -----------
  [1262] use logic instead of requests

  Commit: c4d673327c6b83e01ead0091246cecb83875160a
      https://github.com/okfn/ckan/commit/c4d673327c6b83e01ead0091246cecb83875160a
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-10 (Thu, 10 Oct 2013)

  Changed paths:
    M ckan/lib/uploader.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py

  Log Message:
  -----------
  [#1262] fix test failures

  Commit: bb6cb7d0ff417b72f002dd372bdfd09ba560a766
      https://github.com/okfn/ckan/commit/bb6cb7d0ff417b72f002dd372bdfd09ba560a766
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-14 (Mon, 14 Oct 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/lib/uploader.py

  Log Message:
  -----------
  [#1261] add filesize limit, make storage folder backwards compatable, document a bit more

  Commit: 3dee85226f1fa6a29a03d598c8c11be1c5dba4ca
      https://github.com/okfn/ckan/commit/3dee85226f1fa6a29a03d598c8c11be1c5dba4ca
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    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/group/snippets/group_form.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html

  Log Message:
  -----------
  [#1262] First working version of the JS module for image uploading

  Commit: 0f74db8a964451e5cba1360b4f15ea3a84a56544
      https://github.com/okfn/ckan/commit/0f74db8a964451e5cba1360b4f15ea3a84a56544
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js

  Log Message:
  -----------
  [#1262] Adds in doc blocks into the image_upload JS module

  Commit: 7d15d591499d5722f60cc0ecfc09abf59dad177f
      https://github.com/okfn/ckan/commit/7d15d591499d5722f60cc0ecfc09abf59dad177f
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/templates/macros/form.html

  Log Message:
  -----------
  [#1262] Adds support for different field names for image upload

  Commit: 6cc143f9deec75bf13fe2e517bead4ae90b91b50
      https://github.com/okfn/ckan/commit/6cc143f9deec75bf13fe2e517bead4ae90b91b50
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/lib/uploader.py

  Log Message:
  -----------
  [#1262] make tests pass

  Commit: 4f732627fbf515bc7cbe29e84731606409a637b7
      https://github.com/okfn/ckan/commit/4f732627fbf515bc7cbe29e84731606409a637b7
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M ckan/lib/uploader.py

  Log Message:
  -----------
  [#1262] only allow file already exists errors to not raise exception

  Commit: 8c7329c6246c03a965f8284c855c3e538d205a9c
      https://github.com/okfn/ckan/commit/8c7329c6246c03a965f8284c855c3e538d205a9c
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  [#1262] only allow file already exists errors to not raise exception for other case

  Commit: 8b15c7938295f7919d95857975d45282f3daffbe
      https://github.com/okfn/ckan/commit/8b15c7938295f7919d95857975d45282f3daffbe
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/public/base/css/main.css
    M ckan/templates/macros/form.html

  Log Message:
  -----------
  [#1262] fix pull request issues

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

  Changed paths:
    M ckan/templates/organization/snippets/organization_form.html

  Log Message:
  -----------
  [#1262] fix required field in wrong place

  Commit: ae17348ce8d26d121d65d0688392000ab38dcc3f
      https://github.com/okfn/ckan/commit/ae17348ce8d26d121d65d0688392000ab38dcc3f
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-11-11 (Mon, 11 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/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/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
    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_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/organization/member_new.html
    M ckan/templates/organization/snippets/helper.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_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:
  -----------
  Merge branch 'master' into 1262-org-group-image-upload

Conflicts:
	ckan/lib/helpers.py
	ckan/logic/action/create.py
	ckan/public/base/css/main.css
	ckan/public/base/less/forms.less
	ckan/templates/group/snippets/group_item.html
	ckan/templates/organization/snippets/organization_item.html

  Commit: 6aa06a2a70c3b74249fbf145f8a4945fad0d997a
      https://github.com/okfn/ckan/commit/6aa06a2a70c3b74249fbf145f8a4945fad0d997a
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/controllers/group.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/update.py
    M ckan/logic/schema.py
    M ckan/public/base/css/main.css
    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/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/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_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/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py

  Log Message:
  -----------
  Merge pull request #1262 from okfn/1262-org-group-image-upload

Upload for group and organization images.

Compare: https://github.com/okfn/ckan/compare/31f30dc2d996...6aa06a2a70c3