[ckan-changes] [okfn/ckan] 211c80: [#1602, merge][s]: Merge branch 'feature-1602-data-...

• Previous message: [ckan-changes] [okfn/ckan] ea4541: [#1705] Add vocab=None argument to Package.add_tag...
• Next message: [ckan-changes] [okfn/ckan] 17b3d1: [#1741] fix license in template and dictization
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/feature-1602-data-viewer-v2
  Home:   https://github.com/okfn/ckan
  Commit: 211c8006fe28106f532db5f09ca47e02f065f454
      https://github.com/okfn/ckan/commit/211c8006fe28106f532db5f09ca47e02f065f454
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/public/scripts/application.js
  A ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
  A ckan/public/scripts/vendor/recline/css/data-explorer.css
  A ckan/public/scripts/vendor/recline/css/graph-flot.css
  A ckan/public/scripts/vendor/recline/css/images/edit-map.png
  A ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
  A ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#1602,merge][s]: Merge branch 'feature-1602-data-viewer-v2' - fixes #1602.


  Commit: fda5bbb8927f1220598cf2225954c7f3f4443321
      https://github.com/okfn/ckan/commit/fda5bbb8927f1220598cf2225954c7f3f4443321
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/lib/search/sql.py

  Log Message:
  -----------
  [#1709][xs]: correct sql search so it correctly does unfiltered search when passed '*:*' as query.

* commiting this fix in master because so tiny (plus had it in #1602 branch but thought better to commit here than there).


  Commit: 7297e0b6db2eb3c1c4975cf9603030f5bab75a6e
      https://github.com/okfn/ckan/commit/7297e0b6db2eb3c1c4975cf9603030f5bab75a6e
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-27 (Fri, 27 Jan 2012)

  Changed paths:
    M ckan/lib/cli.py
  M ckan/lib/dumper.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/lib/search/sql.py
  M ckan/logic/schema.py
  M ckan/migration/versions/034_resource_group_table.py
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  A ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
  A ckan/public/scripts/vendor/recline/css/data-explorer.css
  A ckan/public/scripts/vendor/recline/css/graph-flot.css
  A ckan/public/scripts/vendor/recline/css/images/edit-map.png
  A ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
  A ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/group/layout.html
  M ckan/templates/group/read.html
  M ckan/templates/js_strings.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  Merge branch 'master' of ssh://github.com/okfn/ckan


  Commit: 37b8a0b742ed21c9ec415f77d1f7b62052ae9464
      https://github.com/okfn/ckan/commit/37b8a0b742ed21c9ec415f77d1f7b62052ae9464
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-27 (Fri, 27 Jan 2012)

  Changed paths:
    M ckan/lib/search/sql.py
  A ckan/tests/lib/test_simple_search.py

  Log Message:
  -----------
  [master][#1709]: Fix for simple_search broken on home page and added simple tests.


  Commit: 4325830ab0aa50cb2e27f3a691b5265ca7148271
      https://github.com/okfn/ckan/commit/4325830ab0aa50cb2e27f3a691b5265ca7148271
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-27 (Fri, 27 Jan 2012)

  Changed paths:
    M ckan/lib/navl/dictization_functions.py
  M ckan/logic/schema.py
  M ckan/migration/versions/034_resource_group_table.py
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  A ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
  A ckan/public/scripts/vendor/recline/css/data-explorer.css
  A ckan/public/scripts/vendor/recline/css/graph-flot.css
  A ckan/public/scripts/vendor/recline/css/images/edit-map.png
  A ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
  A ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/group/layout.html
  M ckan/templates/js_strings.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  Merge branch 'master' of ssh://github.com/okfn/ckan

Conflicts:
	ckan/lib/search/sql.py


  Commit: 02788e7339c69fddba1e6b70c14762872b8f27b0
      https://github.com/okfn/ckan/commit/02788e7339c69fddba1e6b70c14762872b8f27b0
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-27 (Fri, 27 Jan 2012)

  Changed paths:
    M ckan/lib/search/sql.py
  A ckan/tests/lib/test_simple_search.py

  Log Message:
  -----------
  Merge branch 'master' of ssh://github.com/okfn/ckan


  Commit: cb5bba788a8fe0aaab1f88cb673962214e3d7faa
      https://github.com/okfn/ckan/commit/cb5bba788a8fe0aaab1f88cb673962214e3d7faa
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-27 (Fri, 27 Jan 2012)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  [master][#1708][xs]: Protect against import of controller/search code before config initialisation.


  Commit: e2ea171fe3728c106ca898075ee7e1a8d0404189
      https://github.com/okfn/ckan/commit/e2ea171fe3728c106ca898075ee7e1a8d0404189
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-01-27 (Fri, 27 Jan 2012)

  Changed paths:
    M ckan/templates/user/edit.html

  Log Message:
  -----------
  [bugfix,user/edit][xs]: correct template so that we show user name of person being edited not user doing the editing.


  Commit: 7602134e2908cb1f6100349daac39a61b23f572e
      https://github.com/okfn/ckan/commit/7602134e2908cb1f6100349daac39a61b23f572e
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-01-27 (Fri, 27 Jan 2012)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  [bugfix,routing][xs]: ensure /user/ redirects to /user rather than displaying current user's home page.


  Commit: 344ff3e28e451eb7c2f6a669c97e4c489de33d80
      https://github.com/okfn/ckan/commit/344ff3e28e451eb7c2f6a669c97e4c489de33d80
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-01-28 (Sat, 28 Jan 2012)

  Changed paths:
    M ckan/public/scripts/vendor/recline/css/data-explorer.css
  M ckan/public/scripts/vendor/recline/recline.js

  Log Message:
  -----------
  [#1602,vendor/recline][xs]: integrate some very minor improvements from recline upstream.


  Commit: ec733cd1f7c8c11c0b7e889e4b719ba2275be077
      https://github.com/okfn/ckan/commit/ec733cd1f7c8c11c0b7e889e4b719ba2275be077
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-01-30 (Mon, 30 Jan 2012)

  Changed paths:
    M ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js

  Log Message:
  -----------
  [#1574][xs]: Experimental hotfix for test.ckan.net uploader


  Commit: b21f4cc3992ef8b091fdf3ac9088d7e29653b465
      https://github.com/okfn/ckan/commit/b21f4cc3992ef8b091fdf3ac9088d7e29653b465
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-01-30 (Mon, 30 Jan 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/storage.py

  Log Message:
  -----------
  [#1574][s]: Hotfix #2 for text.ckan.net. Can be reverted.


  Commit: 71c7d79637a544903ea233b48d60f60ee22e4a54
      https://github.com/okfn/ckan/commit/71c7d79637a544903ea233b48d60f60ee22e4a54
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-01-30 (Mon, 30 Jan 2012)

  Changed paths:
    M ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js

  Log Message:
  -----------
  Revert "[#1574][xs]: Experimental hotfix for test.ckan.net uploader"

This reverts commit ec733cd1f7c8c11c0b7e889e4b719ba2275be077.


  Commit: e7e5c05a0f92725a74d9209ab42b0ec54e952332
      https://github.com/okfn/ckan/commit/e7e5c05a0f92725a74d9209ab42b0ec54e952332
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-01-30 (Mon, 30 Jan 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/storage.py

  Log Message:
  -----------
  Revert "[#1574][s]: Hotfix #2 for text.ckan.net. Can be reverted."

This reverts commit b21f4cc3992ef8b091fdf3ac9088d7e29653b465.


  Commit: c826b53e7479dd96c6bf4ad0fffad09426d336cf
      https://github.com/okfn/ckan/commit/c826b53e7479dd96c6bf4ad0fffad09426d336cf
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-30 (Mon, 30 Jan 2012)

  Changed paths:
    M ckan/controllers/group.py
  M ckan/controllers/package.py

  Log Message:
  -----------
  [master][noticket][controllers][xs]: Fix for group search failure - logging caused exception as it was not imported.


  Commit: 5d5d88433e89608bb73dab1b328a960d9e26eb70
      https://github.com/okfn/ckan/commit/5d5d88433e89608bb73dab1b328a960d9e26eb70
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-30 (Mon, 30 Jan 2012)

  Changed paths:
    M ckan/tests/functional/api/model/test_relationships.py

  Log Message:
  -----------
  [master][noticket][tests][xs]: Refactored test to be more reliable - 123 was appearing in UUIDs in the page elsewhere.


  Commit: 76d9bce80e4c243e44962d52c321ce6432e12e9e
      https://github.com/okfn/ckan/commit/76d9bce80e4c243e44962d52c321ce6432e12e9e
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-30 (Mon, 30 Jan 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/user/edit.html

  Log Message:
  -----------
  Merge branch 'master' of ssh://github.com/okfn/ckan


  Commit: c6172731365666241692dc54fd3eb37c283d8aec
      https://github.com/okfn/ckan/commit/c6172731365666241692dc54fd3eb37c283d8aec
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-01-30 (Mon, 30 Jan 2012)

  Changed paths:
    A bin/canada.py
  A bin/status.py
  M ckan/authz.py
  M ckan/ckan_nose_plugin.py
  M ckan/config/deployment.ini_tmpl
  M ckan/config/environment.py
  M ckan/config/middleware.py
  M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  A ckan/controllers/storage.py
  M ckan/forms/group.py
  M ckan/lib/app_globals.py
  M ckan/lib/cli.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dumper.py
  M ckan/lib/hash.py
  M ckan/lib/helpers.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/lib/repoze_patch.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/common.py
  M ckan/lib/search/index.py
  M ckan/lib/search/query.py
  M ckan/lib/search/sql.py
  M ckan/logic/action/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/create.py
  M ckan/logic/auth/delete.py
  M ckan/logic/auth/update.py
  M ckan/logic/schema.py
  M ckan/migration/versions/034_resource_group_table.py
  M ckan/migration/versions/047_rename_package_group_member.py
  M ckan/model/__init__.py
  M ckan/model/authz.py
  M ckan/model/package.py
  M ckan/plugins/interfaces.py
  M ckan/public/css/style.css
  A ckan/public/images/icons/ckan.ico
  A ckan/public/images/icons/star.png
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  A ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
  A ckan/public/scripts/vendor/recline/css/data-explorer.css
  A ckan/public/scripts/vendor/recline/css/graph-flot.css
  A ckan/public/scripts/vendor/recline/css/images/edit-map.png
  A ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
  A ckan/public/scripts/vendor/recline/recline.js
  A ckan/templates/facets.html
  M ckan/templates/group/layout.html
  M ckan/templates/group/read.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  R ckan/templates/package/facets.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/search.html
  M ckan/templates/package/search_form.html
  A ckan/templates/storage/index.html
  A ckan/templates/storage/success.html
  M ckan/templates/user/edit.html
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/model/test_relationships.py
  M ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_pagination.py
  A ckan/tests/functional/test_storage.py
  A ckan/tests/functional/test_upload.py
  A ckan/tests/lib/test_cli.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  A ckan/tests/lib/test_simple_search.py
  M ckan/tests/lib/test_solr_search_index.py
  M ckan/tests/models/test_repo.py
  M ckan_deb/usr/bin/ckan-create-instance
  M ckan_deb/usr/lib/ckan/common.sh
  M doc/api.rst
  M doc/common-error-messages.rst
  M doc/configuration.rst
  A doc/file-upload.rst
  M doc/index.rst
  M doc/install-from-package.rst
  M doc/paster.rst
  M doc/solr-setup.rst
  M requires/lucid_missing.txt

  Log Message:
  -----------
  Merge branch 'master' into defect-1401-mount-non-root


  Commit: 42e8efc53d68032cfa847b36b4f82d3a54b000d0
      https://github.com/okfn/ckan/commit/42e8efc53d68032cfa847b36b4f82d3a54b000d0
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-01-31 (Tue, 31 Jan 2012)

  Changed paths:
    M ckan/public/css/style.css

  Log Message:
  -----------
  [#1401,css][xs]: correct non relative links to images in css (which caused problems with non-root mounting of the app).


  Commit: 5f120a8fc8e9fbfc29cd5c5c0ab2d19b96c4920c
      https://github.com/okfn/ckan/commit/5f120a8fc8e9fbfc29cd5c5c0ab2d19b96c4920c
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-01-31 (Tue, 31 Jan 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [#1401,templates][xs]: set js global CKAN.SITE_URL with h.url('/') rather than g.site_url.


  Commit: abb99cae9972d45f4b3acfbf8ea711da398d8a4a
      https://github.com/okfn/ckan/commit/abb99cae9972d45f4b3acfbf8ea711da398d8a4a
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-01-31 (Tue, 31 Jan 2012)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  Merge branch 'defect-1401-mount-non-root'


  Commit: 6fecbd9fb08f5a22e9dd2dd2745c287a38f44a30
      https://github.com/okfn/ckan/commit/6fecbd9fb08f5a22e9dd2dd2745c287a38f44a30
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-31 (Tue, 31 Jan 2012)

  Changed paths:
    M ckan/logic/validators.py
  A ckan/tests/logic/test_validators.py

  Log Message:
  -----------
  [master][#1725][logic/validators]: Ignore trailing commas in tag list (created by tag autocomplete).


  Commit: eb52431797a3f0fb5957e536cf29ab9f0b9a48bb
      https://github.com/okfn/ckan/commit/eb52431797a3f0fb5957e536cf29ab9f0b9a48bb
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-31 (Tue, 31 Jan 2012)

  Changed paths:
    R ckan/tests/functional/api/test_action.py
  A ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [master][noticket][tests][xs]: Move logic layer tests to its own directory - see ckan-dev announcement.


  Commit: dd2c0c677117f06a52aa22b3b2717bb605263570
      https://github.com/okfn/ckan/commit/dd2c0c677117f06a52aa22b3b2717bb605263570
  Author: kindly <kindly at gmail.com>
  Date:   2012-01-31 (Tue, 31 Jan 2012)

  Changed paths:
    M ckan/lib/search/index.py
  M ckan/logic/action/create.py
  M ckan/plugins/interfaces.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#1738] before indes extension made


  Commit: 117dce4d64de731e7b0a3c55175a1d093f2bf540
      https://github.com/okfn/ckan/commit/117dce4d64de731e7b0a3c55175a1d093f2bf540
  Author: kindly <kindly at gmail.com>
  Date:   2012-01-31 (Tue, 31 Jan 2012)

  Changed paths:
    M ckan/templates/package/new_package_form.html
  M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  [#1739] fix errors due to tests not being run


  Commit: 64abd2ff19ac331d15af038339ef19410e02f419
      https://github.com/okfn/ckan/commit/64abd2ff19ac331d15af038339ef19410e02f419
  Author: kindly <kindly at gmail.com>
  Date:   2012-01-31 (Tue, 31 Jan 2012)

  Changed paths:
    M ckan/lib/search/index.py
  M ckan/logic/action/create.py
  M ckan/plugins/interfaces.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch 'feature-1738-add-before-index-extension'


  Commit: 94f10371666bf2ca976fe26ce06344b9ed2191b9
      https://github.com/okfn/ckan/commit/94f10371666bf2ca976fe26ce06344b9ed2191b9
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-01 (Wed, 01 Feb 2012)

  Changed paths:
    M ckan/ckan_nose_plugin.py
  M ckan/config/environment.py
  M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/controllers/storage.py
  M ckan/forms/group.py
  M ckan/lib/cli.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dumper.py
  M ckan/lib/hash.py
  M ckan/lib/helpers.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/common.py
  M ckan/lib/search/index.py
  M ckan/lib/search/query.py
  M ckan/lib/search/sql.py
  M ckan/logic/action/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/create.py
  M ckan/logic/auth/delete.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/migration/versions/034_resource_group_table.py
  M ckan/migration/versions/047_rename_package_group_member.py
  M ckan/model/__init__.py
  M ckan/model/package.py
  M ckan/plugins/interfaces.py
  M ckan/public/css/style.css
  A ckan/public/images/icons/star.png
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  A ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
  A ckan/public/scripts/vendor/recline/css/data-explorer.css
  A ckan/public/scripts/vendor/recline/css/graph-flot.css
  A ckan/public/scripts/vendor/recline/css/images/edit-map.png
  A ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
  A ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/_util.html
  A ckan/templates/facets.html
  M ckan/templates/group/layout.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  R ckan/templates/package/facets.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/search.html
  M ckan/templates/user/edit.html
  M ckan/templates/user/login.html
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/model/test_relationships.py
  R ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_pagination.py
  M ckan/tests/functional/test_storage.py
  M ckan/tests/functional/test_upload.py
  M ckan/tests/functional/test_user.py
  M ckan/tests/lib/test_cli.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  A ckan/tests/lib/test_simple_search.py
  M ckan/tests/lib/test_solr_search_index.py
  A ckan/tests/logic/test_action.py
  A ckan/tests/logic/test_validators.py
  M ckan/tests/test_plugins.py
  M ckanext/stats/templates/ckanext/stats/leaderboard.html
  M doc/api.rst
  M doc/common-error-messages.rst
  M doc/configuration.rst
  M doc/file-upload.rst
  M doc/index.rst
  M doc/install-from-package.rst
  M doc/paster.rst
  M doc/solr-setup.rst
  M doc/theming.rst

  Log Message:
  -----------
  Merge branch 'master' into feature-1608-move-storage-to-core


  Commit: a80f50a1e55d464b50aa6686df4d01c093798cbd
      https://github.com/okfn/ckan/commit/a80f50a1e55d464b50aa6686df4d01c093798cbd
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-01 (Wed, 01 Feb 2012)

  Changed paths:
    M ckan/controllers/storage.py
  M ckan/tests/functional/test_storage.py
  M doc/file-upload.rst

  Log Message:
  -----------
  [#1608,storage][m]: reinstate direct upload to cloud storage.

* Reinstate cloud storage tests
* Also greatly extend docs with existing material from ckanext-storage


  Commit: 3c9ddd31d741eb8ec8c145063ce967e781947a88
      https://github.com/okfn/ckan/commit/3c9ddd31d741eb8ec8c145063ce967e781947a88
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-01 (Wed, 01 Feb 2012)

  Changed paths:
    M ckan/tests/functional/test_storage.py

  Log Message:
  -----------
  [#1608,tests][xs]: disable remote storage (GS) test as reqires GS access codes (not generally available).


  Commit: 4488795a54866a02305268d77a2648fa85538ee8
      https://github.com/okfn/ckan/commit/4488795a54866a02305268d77a2648fa85538ee8
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-01 (Wed, 01 Feb 2012)

  Changed paths:
    M ckan/controllers/storage.py
  M ckan/tests/functional/test_storage.py
  M doc/file-upload.rst

  Log Message:
  -----------
  [#1608,merge][s]: Merge branch 'feature-1608-move-storage-to-core'.


  Commit: cd21b89e8aea6d2aa37e547fcd2d1a65f740415e
      https://github.com/okfn/ckan/commit/cd21b89e8aea6d2aa37e547fcd2d1a65f740415e
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-01 (Wed, 01 Feb 2012)

  Changed paths:
    M ckan/config/environment.py
  M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/controllers/storage.py
  M ckan/forms/group.py
  M ckan/lib/cli.py
  M ckan/lib/dumper.py
  M ckan/lib/hash.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/common.py
  M ckan/lib/search/index.py
  M ckan/lib/search/query.py
  M ckan/lib/search/sql.py
  M ckan/logic/action/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/create.py
  M ckan/logic/auth/delete.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/migration/versions/034_resource_group_table.py
  M ckan/model/package.py
  M ckan/plugins/interfaces.py
  M ckan/public/css/style.css
  A ckan/public/images/icons/star.png
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  M ckan/public/scripts/vendor/recline/recline.js
  A ckan/templates/facets.html
  M ckan/templates/group/layout.html
  M ckan/templates/group/read.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  R ckan/templates/package/facets.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/search.html
  M ckan/templates/user/edit.html
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/model/test_relationships.py
  R ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_pagination.py
  M ckan/tests/functional/test_storage.py
  M ckan/tests/functional/test_user.py
  A ckan/tests/lib/test_simple_search.py
  M ckan/tests/lib/test_solr_search_index.py
  A ckan/tests/logic/test_action.py
  A ckan/tests/logic/test_validators.py
  M ckan/tests/test_plugins.py
  M doc/api.rst
  M doc/common-error-messages.rst
  M doc/configuration.rst
  M doc/file-upload.rst
  M doc/index.rst
  M doc/paster.rst
  M doc/solr-setup.rst

  Log Message:
  -----------
  Merge branch 'master' into feature-1602-data-viewer-v2


  Commit: f51d0e987f7a9e5477c87ee6de5cebc85c40ebde
      https://github.com/okfn/ckan/commit/f51d0e987f7a9e5477c87ee6de5cebc85c40ebde
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-01 (Wed, 01 Feb 2012)

  Changed paths:
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  [js][xs]: remove console.log that had crept in.


  Commit: a0f4b8af14d2022e8a00f45fbc9b1c147d261d88
      https://github.com/okfn/ckan/commit/a0f4b8af14d2022e8a00f45fbc9b1c147d261d88
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-01 (Wed, 01 Feb 2012)

  Changed paths:
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  [#1602,js/data-viewer][xs]: make errors a bit nicer esp for case where we can't preview.


  Commit: a00aa48fa4be84354969475bbbaba7c0ba58086c
      https://github.com/okfn/ckan/commit/a00aa48fa4be84354969475bbbaba7c0ba58086c
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-01 (Wed, 01 Feb 2012)

  Changed paths:
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  [#1602,js/data-viewer][s]: image (pre)view support.


Compare: https://github.com/okfn/ckan/compare/7c78221...a00aa48

• Previous message: [ckan-changes] [okfn/ckan] ea4541: [#1705] Add vocab=None argument to Package.add_tag...
• Next message: [ckan-changes] [okfn/ckan] 17b3d1: [#1741] fix license in template and dictization
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]